From 44713eda4ece6304394a33743af56269deea6450 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Tue, 29 Apr 2025 23:20:06 -0500 Subject: [PATCH 1/5] Might work? --- scripts/buildHomebrew.js | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/buildHomebrew.js b/scripts/buildHomebrew.js index 4d55a4176..031aa4fc7 100644 --- a/scripts/buildHomebrew.js +++ b/scripts/buildHomebrew.js @@ -30,25 +30,6 @@ const build = async ({ bundle, render, ssr })=>{ await fs.copy('./client/homebrew/favicon.ico', './build/assets/favicon.ico'); - //compress files in production - if(!isDev){ - await fs.outputFile('./build/homebrew/bundle.css.br', zlib.brotliCompressSync(css)); - await fs.outputFile('./build/homebrew/bundle.js.br', zlib.brotliCompressSync(bundle)); - await fs.outputFile('./build/homebrew/ssr.js.br', zlib.brotliCompressSync(ssr)); - } else { - await fs.remove('./build/homebrew/bundle.css.br'); - await fs.remove('./build/homebrew/bundle.js.br'); - await fs.remove('./build/homebrew/ssr.js.br'); - } -}; - -fs.emptyDirSync('./build'); - - -(async ()=>{ - - //v==----------------------------- COMPILE THEMES --------------------------------==v// - // Update list of all Theme files const themes = { Legacy: {}, V3: {} }; @@ -88,6 +69,26 @@ fs.emptyDirSync('./build'); await fs.outputFile('./themes/themes.json', JSON.stringify(themes, null, 2)); + //compress files in production + if(!isDev){ + await fs.outputFile('./build/homebrew/bundle.css.br', zlib.brotliCompressSync(css)); + await fs.outputFile('./build/homebrew/bundle.js.br', zlib.brotliCompressSync(bundle)); + await fs.outputFile('./build/homebrew/ssr.js.br', zlib.brotliCompressSync(ssr)); + } else { + await fs.remove('./build/homebrew/bundle.css.br'); + await fs.remove('./build/homebrew/bundle.js.br'); + await fs.remove('./build/homebrew/ssr.js.br'); + } +}; + +fs.emptyDirSync('./build'); + + +(async ()=>{ + + //v==----------------------------- COMPILE THEMES --------------------------------==v// + + // await less.render(lessCode, { // compress : !dev, // sourceMap : (dev ? { @@ -158,9 +159,8 @@ fs.emptyDirSync('./build'); //In development, set up LiveReload (refreshes browser), and Nodemon (restarts server) if(isDev){ - livereload('./build'); // Install the Chrome extension LiveReload to automatically refresh the browser watchFile('./server.js', { // Restart server when change detected to this file or any nested directory from here - ignore : ['./build', './client', './themes'], // Ignore folders that are not running server code / avoids unneeded restarts + ignore : ['./build', './client'], // Ignore folders that are not running server code / avoids unneeded restarts ext : 'js json' // Extensions to watch (only .js/.json by default) //watch : ['./server', './themes'], // Watch additional folders if needed }); From 742de8582c9528991668c6fd9fe6c8fa18f91305 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Tue, 6 May 2025 16:27:55 -0500 Subject: [PATCH 2/5] Allow pagebreak and columnbreak compatibility --- client/homebrew/brewRenderer/brewRenderer.jsx | 2 +- client/homebrew/editor/editor.jsx | 4 ++-- shared/naturalcrit/markdown.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index c2c996e79..9f44359ff 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -19,7 +19,7 @@ const { printCurrentBrew } = require('../../../shared/helpers.js'); import HeaderNav from './headerNav/headerNav.jsx'; import { safeHTML } from './safeHTML.js'; -const PAGEBREAK_REGEX_V3 = /^(?=\\page(?: *{[^\n{}]*})?$)/m; +const PAGEBREAK_REGEX_V3 = /^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m; const PAGE_HEIGHT = 1056; const INITIAL_CONTENT = dedent` diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx index 6859c5aa2..cf9a17303 100644 --- a/client/homebrew/editor/editor.jsx +++ b/client/homebrew/editor/editor.jsx @@ -12,7 +12,7 @@ const MetadataEditor = require('./metadataEditor/metadataEditor.jsx'); const EDITOR_THEME_KEY = 'HOMEBREWERY-EDITOR-THEME'; -const PAGEBREAK_REGEX_V3 = /^(?=\\page(?: *{[^\n{}]*})?$)/m; +const PAGEBREAK_REGEX_V3 = /^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m; const SNIPPETBREAK_REGEX_V3 = /^\\snippet\ .*$/; const SNIPPETBAR_HEIGHT = 25; const DEFAULT_STYLE_TEXT = dedent` @@ -211,7 +211,7 @@ const Editor = createClass({ // New Codemirror styling for V3 renderer if(this.props.renderer === 'V3') { - if(line.match(/^\\column$/)){ + if(line.match(/^\\column(?:break)?$/)){ codeMirror.addLineClass(lineNumber, 'text', 'columnSplit'); } diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index 90a9488dc..ac6988734 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -825,7 +825,7 @@ const Markdown = { MarkedGFMResetHeadingIDs(); } - rawBrewText = rawBrewText.replace(/^\\column$/gm, `\n
\n`); + rawBrewText = rawBrewText.replace(/^\\column(?:break)?$/gm, `\n
\n`); const opts = Marked.defaults; From 6867cb5a4a6d196141a9d08953557f30e2487e5e Mon Sep 17 00:00:00 2001 From: David Bolack Date: Tue, 6 May 2025 16:35:53 -0500 Subject: [PATCH 3/5] Clear up debris that was on the wrong branch --- scripts/buildHomebrew.js | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/buildHomebrew.js b/scripts/buildHomebrew.js index 031aa4fc7..4d55a4176 100644 --- a/scripts/buildHomebrew.js +++ b/scripts/buildHomebrew.js @@ -30,6 +30,25 @@ const build = async ({ bundle, render, ssr })=>{ await fs.copy('./client/homebrew/favicon.ico', './build/assets/favicon.ico'); + //compress files in production + if(!isDev){ + await fs.outputFile('./build/homebrew/bundle.css.br', zlib.brotliCompressSync(css)); + await fs.outputFile('./build/homebrew/bundle.js.br', zlib.brotliCompressSync(bundle)); + await fs.outputFile('./build/homebrew/ssr.js.br', zlib.brotliCompressSync(ssr)); + } else { + await fs.remove('./build/homebrew/bundle.css.br'); + await fs.remove('./build/homebrew/bundle.js.br'); + await fs.remove('./build/homebrew/ssr.js.br'); + } +}; + +fs.emptyDirSync('./build'); + + +(async ()=>{ + + //v==----------------------------- COMPILE THEMES --------------------------------==v// + // Update list of all Theme files const themes = { Legacy: {}, V3: {} }; @@ -69,26 +88,6 @@ const build = async ({ bundle, render, ssr })=>{ await fs.outputFile('./themes/themes.json', JSON.stringify(themes, null, 2)); - //compress files in production - if(!isDev){ - await fs.outputFile('./build/homebrew/bundle.css.br', zlib.brotliCompressSync(css)); - await fs.outputFile('./build/homebrew/bundle.js.br', zlib.brotliCompressSync(bundle)); - await fs.outputFile('./build/homebrew/ssr.js.br', zlib.brotliCompressSync(ssr)); - } else { - await fs.remove('./build/homebrew/bundle.css.br'); - await fs.remove('./build/homebrew/bundle.js.br'); - await fs.remove('./build/homebrew/ssr.js.br'); - } -}; - -fs.emptyDirSync('./build'); - - -(async ()=>{ - - //v==----------------------------- COMPILE THEMES --------------------------------==v// - - // await less.render(lessCode, { // compress : !dev, // sourceMap : (dev ? { @@ -159,8 +158,9 @@ fs.emptyDirSync('./build'); //In development, set up LiveReload (refreshes browser), and Nodemon (restarts server) if(isDev){ + livereload('./build'); // Install the Chrome extension LiveReload to automatically refresh the browser watchFile('./server.js', { // Restart server when change detected to this file or any nested directory from here - ignore : ['./build', './client'], // Ignore folders that are not running server code / avoids unneeded restarts + ignore : ['./build', './client', './themes'], // Ignore folders that are not running server code / avoids unneeded restarts ext : 'js json' // Extensions to watch (only .js/.json by default) //watch : ['./server', './themes'], // Watch additional folders if needed }); From e97d45e5b56cbe9a39ada988c210935f8cc6fcc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 May 2025 03:28:37 +0000 Subject: [PATCH 4/5] Bump mongoose from 8.14.1 to 8.14.2 Bumps [mongoose](https://github.com/Automattic/mongoose) from 8.14.1 to 8.14.2. - [Release notes](https://github.com/Automattic/mongoose/releases) - [Changelog](https://github.com/Automattic/mongoose/blob/master/CHANGELOG.md) - [Commits](https://github.com/Automattic/mongoose/compare/8.14.1...8.14.2) --- updated-dependencies: - dependency-name: mongoose dependency-version: 8.14.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f4e2dce0b..a4b1b9d66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "marked-subsuper-text": "^1.0.3", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.30.1", - "mongoose": "^8.14.1", + "mongoose": "^8.14.2", "nanoid": "5.1.5", "nconf": "^0.13.0", "react": "^18.3.1", @@ -10506,9 +10506,9 @@ } }, "node_modules/mongoose": { - "version": "8.14.1", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.14.1.tgz", - "integrity": "sha512-ijd12vjqUBr5Btqqflu0c/o8Oed5JpdaE0AKO9TjGxCgywYwnzt6ynR1ySjhgxGxrYVeXC0t1P11f1zlRiE93Q==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.14.2.tgz", + "integrity": "sha512-LPLZiN6M8ap4GlXmaaG7yrHIkK45dSO3NZ0qgERJl2CfcL5eP7MA9umn4zGhKiWkMLbnHM4jhebIYbUhvuwWvQ==", "license": "MIT", "dependencies": { "bson": "^6.10.3", diff --git a/package.json b/package.json index a22d924d2..9e1ecb685 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "marked-subsuper-text": "^1.0.3", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.30.1", - "mongoose": "^8.14.1", + "mongoose": "^8.14.2", "nanoid": "5.1.5", "nconf": "^0.13.0", "react": "^18.3.1", From cf68cc46adcf925453c91b5ce5260d834a10050c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 May 2025 13:24:37 +0000 Subject: [PATCH 5/5] Bump react-router from 7.5.3 to 7.6.0 Bumps [react-router](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router) from 7.5.3 to 7.6.0. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router@7.6.0/packages/react-router) --- updated-dependencies: - dependency-name: react-router dependency-version: 7.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 17 +++++------------ package.json | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index a4b1b9d66..43cb73466 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "react-frame-component": "^4.1.3", - "react-router": "^7.5.3", + "react-router": "^7.6.0", "romans": "^3.0.0", "sanitize-filename": "1.6.3", "superagent": "^10.2.1", @@ -11960,14 +11960,13 @@ "license": "MIT" }, "node_modules/react-router": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.5.3.tgz", - "integrity": "sha512-3iUDM4/fZCQ89SXlDa+Ph3MevBrozBAI655OAfWQlTm9nBR0IKlrmNwFow5lPHttbwvITZfkeeeZFP6zt3F7pw==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.6.0.tgz", + "integrity": "sha512-GGufuHIVCJDbnIAXP3P9Sxzq3UUsddG3rrI3ut1q6m0FI6vxVBF3JoPQ38+W/blslLH4a5Yutp8drkEpXoddGQ==", "license": "MIT", "dependencies": { "cookie": "^1.0.1", - "set-cookie-parser": "^2.6.0", - "turbo-stream": "2.4.0" + "set-cookie-parser": "^2.6.0" }, "engines": { "node": ">=20.0.0" @@ -14101,12 +14100,6 @@ "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==", "license": "MIT" }, - "node_modules/turbo-stream": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", - "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==", - "license": "ISC" - }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", diff --git a/package.json b/package.json index 9e1ecb685..d7f0eac6d 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "react-frame-component": "^4.1.3", - "react-router": "^7.5.3", + "react-router": "^7.6.0", "romans": "^3.0.0", "sanitize-filename": "1.6.3", "superagent": "^10.2.1",