From ab400b82d66b9973c327c60c22211a4e434c0fa1 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Tue, 6 May 2025 16:36:19 -0500 Subject: [PATCH 1/4] Revert debris --- 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 33ea39791589b0af1f229c8fdd72b07cdd6399b6 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Sat, 10 May 2025 09:50:19 -0500 Subject: [PATCH 2/4] Restore removed line and warn. Yeah, it's a bit extra. --- client/homebrew/brewRenderer/brewRenderer.jsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index c2c996e79..a0edd897a 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -195,6 +195,10 @@ const BrewRenderer = (props)=>{ pageText = pageText.includes('\n') ? pageText.substring(pageText.indexOf('\n') + 1) : ''; // Remove the \page line } + // DO NOT REMOVE!!! REQUIRED FOR BACKWARDS COMPATIBILITY WITH NON-UPGRADABLE VERSIONS OF CHROME. + pageText += `\n\n \n\\column\n `; //Artificial column break at page end to emulate column-fill:auto (until `wide` is used, when column-fill:balance will reappear) + // DO NOT REMOVE!!! REQUIRED FOR BACKWARDS COMPATIBILITY WITH NON-UPGRADABLE VERSIONS OF CHROME. + const html = Markdown.render(pageText, index); return ; From dd20fc8475f52b3a9044c43b2247fe4ad80c64aa Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Sat, 10 May 2025 13:21:35 -0400 Subject: [PATCH 3/4] Revert "Revert debris" This reverts commit ab400b82d66b9973c327c60c22211a4e434c0fa1. --- 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 083e8c9b52369f8411d15db410a802770e37d7a6 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Sat, 10 May 2025 13:30:38 -0400 Subject: [PATCH 4/4] remove duplicate comment --- client/homebrew/brewRenderer/brewRenderer.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 0558c8af6..16bd5adb0 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -204,7 +204,6 @@ const BrewRenderer = (props)=>{ // DO NOT REMOVE!!! REQUIRED FOR BACKWARDS COMPATIBILITY WITH NON-UPGRADABLE VERSIONS OF CHROME. pageText += `\n\n \n\\column\n `; //Artificial column break at page end to emulate column-fill:auto (until `wide` is used, when column-fill:balance will reappear) - // DO NOT REMOVE!!! REQUIRED FOR BACKWARDS COMPATIBILITY WITH NON-UPGRADABLE VERSIONS OF CHROME. const html = Markdown.render(pageText, index);