Merge branch 'master' into V4_Persistant_Templates

Change enable_v4 to enableV4 to shut up linter.

.github/dependabot.yml

@@ -66,10 +66,6 @@ updates:
   - dependency-name: "@babel/preset-react"
     versions:
     - 7.13.13
-  - dependency-name: codemirror
-    versions:
-    - 5.59.3
-    - 5.60.0
   - dependency-name: classnames
     versions:
     - 2.3.0

changelog.md

@@ -85,14 +85,52 @@ pre {
 }
 
 .page .df {
-  font-size: 2em;
+	font-size: 2em;
-  vertical-align: middle;
+	vertical-align: middle;
 }
 ```
 
 ## changelog
 For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).
 
+### Saturday 4/20/2026 - v3.22.0
+
+{{taskList
+##### 5e-Cleric
+* [x] Major update to editor framework (Codemirror 6)
+Fixes issues [#3511](https://github.com/naturalcrit/homebrewery/issues/3511), [#4590](https://github.com/naturalcrit/homebrewery/issues/4590), [#4563](https://github.com/naturalcrit/homebrewery/issues/4653), [#4655](https://github.com/naturalcrit/homebrewery/issues/4655)
+* [x] Fix to Admin page tab names
+
+##### G-Ambatte
+* [x] Fix white page crash on certain browsers
+}}
+
+### Saturday 4/04/2026 - v3.21.0
+
+{{taskList
+##### Gazook89
+* [x] Allow custom {{openSans **:fas_table_list: SNIPPETS**}} to be inserted mid-line
+
+##### abquintic
+* [x] Move example snippet images out of imgur (for folks without imgur access)
+
+##### 5e-Cleric
+* [x] Add auto-suggest to tag entry input box
+* [x] Replace all example artwork with
+* [x] Added tooltips to the {{openSans :fas_circle_info: **Properties**}} menu
+* [x] Removed {{openSans **SYSTEMS**}} checkboxes from {{openSans :fas_circle_info: **Properties**}} menu; instead {{openSans **TAGS**}} should be used for this purpose
+* [x] Replace all AI-generated art with public domain art
+* [x] Major backend refactor to use Vite
+
+##### A1Asriel (new contributor!)
+* [x] Add fix for column breaks on Firefox 
+
+Fixes issues [#543](https://github.com/naturalcrit/homebrewery/issues/543), [#2473](https://github.com/naturalcrit/homebrewery/issues/2473), [#3712](https://github.com/naturalcrit/homebrewery/issues/3712)
+
+##### G-Ambatte, abquintic, 5e-Cleric
+* [x] Multiple other backend fixes and refactors
+}}
+
 ### Friday 1/11/2026 - v3.20.1
 
 {{taskList

client/admin/admin.jsx

@@ -49,4 +49,4 @@ const Admin = ()=>{
 	);
 };
 
-module.exports = Admin;
+export default Admin;

client/admin/admin.less

@@ -1,11 +1,9 @@
-@import 'naturalcrit/styles/reset.less';
+@import '@sharedStyles/reset.less';
-@import 'naturalcrit/styles/elements.less';
+@import '@sharedStyles/elements.less';
-@import 'naturalcrit/styles/animations.less';
+@import '@sharedStyles/animations.less';
-@import 'naturalcrit/styles/colors.less';
+@import '@sharedStyles/colors.less';
-@import 'naturalcrit/styles/tooltip.less';
+@import '@sharedStyles/tooltip.less';
-@import './themes/fonts/iconFonts/fontAwesome.less';
+@import '@themes/fonts/iconFonts/fontAwesome.less';
-
-@import 'font-awesome/css/font-awesome.css';
 
 html,body, #reactContainer, .naturalCrit { min-height : 100%; }
 

client/admin/brewUtils/brewCleanup/brewCleanup.jsx

@@ -1,71 +1,72 @@
-import React from 'react';
+import React, { useState } from 'react';
-import createReactClass from 'create-react-class';
 import request from 'superagent';
 
-const BrewCleanup = createReactClass({
+const BrewCleanup = ({})=>{
-	displayName : 'BrewCleanup',
+	const [count, setCount] = useState(0);
-	getDefaultProps(){
+	const [pending, setPending] = useState(false);
-		return {};
+	const [primed, setPrimed] = useState(false);
-	},
+	const [error, setError] = useState(null);
-	getInitialState() {
-		return {
-			count : 0,
 
-			pending : false,
+	const prime = async ()=>{
-			primed  : false,
+		setPending(true);
-			err     : null
-		};
-	},
-	prime(){
-		this.setState({ pending: true });
 
-		request.get('/admin/cleanup')
+		try {
-			.then((res)=>this.setState({ count: res.body.count, primed: true }))
+			const res = await request.get('/admin/cleanup');
-			.catch((err)=>this.setState({ error: err }))
-			.finally(()=>this.setState({ pending: false }));
-	},
-	cleanup(){
-		this.setState({ pending: true });
 
-		request.post('/admin/cleanup')
+			setCount(res.body.count);
-			.then((res)=>this.setState({ count: res.body.count }))
+			setPrimed(true);
-			.catch((err)=>this.setState({ error: err }))
+		} catch (err) {
-			.finally(()=>this.setState({ pending: false, primed: false }));
+			setError(err);
-	},
+		} finally {
-	renderPrimed(){
+			setPending(false);
-		if(!this.state.primed) return;
-
-		if(!this.state.count){
-			return <div className='result noBrews'>No Matching Brews found.</div>;
 		}
+	};
+
+	const cleanup = async ()=>{
+		setPending(true);
+
+		try {
+			const res = await request.post('/admin/cleanup');
+
+			setCount(res.body.count);
+		} catch (err) {
+			setError(err);
+		} finally {
+			setPending(false);
+			setPrimed(false);
+		}
+	};
+	const renderPrimed = ()=>{
+		if(!primed) return;
+
+		if(!count) return <div className='result noBrews'>No Matching Brews found.</div>;
+
 		return <div className='result'>
-			<button onClick={this.cleanup} className='remove'>
+			<button onClick={()=>cleanup()} className='remove'>
-				{this.state.pending
+				{pending
 					? <i className='fas fa-spin fa-spinner' />
 					: <span><i className='fas fa-times' /> Remove</span>
 				}
 			</button>
-			<span>Found {this.state.count} Brews that could be removed. </span>
+			<span>Found {count} Brews that could be removed. </span>
 		</div>;
-	},
+	};
-	render(){
-		return <div className='brewUtil brewCleanup'>
-			<h2> Brew Cleanup </h2>
-			<p>Removes very short brews to tidy up the database</p>
 
-			<button onClick={this.prime} className='query'>
+	return <div className='brewUtil brewCleanup'>
-				{this.state.pending
+		<h2> Brew Cleanup </h2>
-					? <i className='fas fa-spin fa-spinner' />
+		<p>Removes very short brews to tidy up the database</p>
-					: 'Query Brews'
-				}
-			</button>
-			{this.renderPrimed()}
 
-			{this.state.error
+		<button onClick={()=>prime()} className='query'>
-				&& <div className='error noBrews'>{this.state.error.toString()}</div>
+			{pending
+				? <i className='fas fa-spin fa-spinner' />
+				: 'Query Brews'
 			}
-		</div>;
+		</button>
-	}
+		{renderPrimed()}
-});
+
+		{error && <div className='error noBrews'>{error.toString()}</div>}
+	</div>;
+
+};
 
 export default BrewCleanup;

client/admin/brewUtils/brewUtils.less

@@ -1,3 +1,5 @@
+@import '@sharedStyles/colors.less';
+
 .brewUtil {
 	.result {
 		margin-top : 20px;

client/admin/main.jsx

@@ -0,0 +1,6 @@
+import { createRoot } from 'react-dom/client';
+import Admin from './admin.jsx';
+
+const props = window.__INITIAL_PROPS__ || {};
+
+createRoot(document.getElementById('reactRoot')).render(<Admin {...props} />);

client/components/codeEditor/autocompleteEmoji.js

@@ -1,84 +0,0 @@
-import diceFont      from 'themes/fonts/iconFonts/diceFont.js';
-import elderberryInn from 'themes/fonts/iconFonts/elderberryInn.js';
-import fontAwesome   from 'themes/fonts/iconFonts/fontAwesome.js';
-import gameIcons     from 'themes/fonts/iconFonts/gameIcons.js';
-
-const emojis = {
-	...diceFont,
-	...elderberryInn,
-	...fontAwesome,
-	...gameIcons
-};
-
-const showAutocompleteEmoji = function(CodeMirror, editor) {
-	CodeMirror.commands.autocomplete = function(editor) {
-		editor.showHint({
-			completeSingle : false,
-			hint           : function(editor) {
-				const cursor = editor.getCursor();
-				const line = cursor.line;
-				const lineContent = editor.getLine(line);
-				const start = lineContent.lastIndexOf(':', cursor.ch - 1) + 1;
-				const end = cursor.ch;
-				const currentWord = lineContent.slice(start, end);
-
-
-				const list = Object.keys(emojis).filter(function(emoji) {
-					return emoji.toLowerCase().indexOf(currentWord.toLowerCase()) >= 0;
-				}).sort((a, b)=>{
-					const lowerA = a.replace(/\d+/g, function(match) {	// Temporarily convert any numbers in emoji string
-						return match.padStart(4, '0');										// to 4-digits, left-padded with 0's, to aid in
-					}).toLowerCase();																		// sorting numbers, i.e., "d6, d10, d20", not "d10, d20, d6"
-					const lowerB = b.replace(/\d+/g, function(match) {	// Also make lowercase for case-insensitive alpha sorting
-						return match.padStart(4, '0');
-					}).toLowerCase();
-
-					if(lowerA < lowerB)
-						return -1;
-					return 1;
-				}).map(function(emoji) {
-					return {
-						text   : `${emoji}:`,														// Text to output to editor when option is selected
-						render : function(element, self, data) {				// How to display the option in the dropdown
-							const div = document.createElement('div');
-							div.innerHTML = `<i class="emojiPreview ${emojis[emoji]}"></i> ${emoji}`;
-							element.appendChild(div);
-						}
-					};
-				});
-
-				return {
-					list : list.length ? list : [],
-					from : CodeMirror.Pos(line, start),
-					to   : CodeMirror.Pos(line, end)
-				};
-			}
-		});
-	};
-
-	editor.on('inputRead', function(instance, change) {
-		const cursor = editor.getCursor();
-		const line = editor.getLine(cursor.line);
-
-		// Get the text from the start of the line to the cursor
-		const textToCursor = line.slice(0, cursor.ch);
-
-		// Do not autosuggest emojis in curly span/div/injector properties
-		if(line.includes('{')) {
-			const curlyToCursor = textToCursor.slice(textToCursor.indexOf(`{`));
-			const curlySpanRegex = /{(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\1$/g;
-
-			if(curlySpanRegex.test(curlyToCursor))
-				return;
-		}
-
-		// Check if the text ends with ':xyz'
-		if(/:[^\s:]+$/.test(textToCursor)) {
-			CodeMirror.commands.autocomplete(editor);
-		}
-	});
-};
-
-export default {
-	showAutocompleteEmoji
-};

client/components/codeEditor/close-tag.js

@@ -1,48 +0,0 @@
-const autoCloseCurlyBraces = function(CodeMirror, cm, typingClosingBrace) {
-	const ranges = cm.listSelections(), replacements = [];
-	for (let i = 0; i < ranges.length; i++) {
-		if(!ranges[i].empty()) return CodeMirror.Pass;
-		const pos = ranges[i].head, line = cm.getLine(pos.line), tok = cm.getTokenAt(pos);
-		if(!typingClosingBrace && (tok.type == 'string' || tok.string.charAt(0) != '{' || tok.start != pos.ch - 1))
-			return CodeMirror.Pass;
-		else if(typingClosingBrace) {
-			let hasUnclosedBraces = false, index = -1;
-			do {
-				index = line.indexOf('{{', index + 1);
-				if(index !== -1 && line.indexOf('}}', index + 1) === -1) {
-					hasUnclosedBraces = true;
-					break;
-				}
-			} while (index !== -1);
-			if(!hasUnclosedBraces) return CodeMirror.Pass;
-		}
-
-		replacements[i] = typingClosingBrace ? {
-			text   : '}}',
-			newPos : CodeMirror.Pos(pos.line, pos.ch + 2)
-		} : {
-			text   : '{}}',
-			newPos : CodeMirror.Pos(pos.line, pos.ch + 1)
-		};
-	}
-
-	for (let i = ranges.length - 1; i >= 0; i--) {
-		const info = replacements[i];
-		cm.replaceRange(info.text, ranges[i].head, ranges[i].anchor, '+insert');
-		const sel = cm.listSelections().slice(0);
-		sel[i] = {
-			head   : info.newPos,
-			anchor : info.newPos
-		};
-		cm.setSelections(sel);
-	}
-};
-
-export default {
-	autoCloseCurlyBraces : function(CodeMirror, codeMirror) {
-		const map = { name: 'autoCloseCurlyBraces' };
-		map[`'{'`] = function(cm) { return autoCloseCurlyBraces(CodeMirror, cm); };
-		map[`'}'`] = function(cm) { return autoCloseCurlyBraces(CodeMirror, cm, true); };
-		codeMirror?.addKeyMap(map);
-	}
-};

client/components/codeEditor/codeEditor.jsx

@@ -1,490 +1,402 @@
-/* eslint-disable max-lines */
+/* eslint max-lines: ["error", { "max": 405 }] */
 import './codeEditor.less';
-import React from 'react';
+import React, { useEffect, useRef, forwardRef, useImperativeHandle } from 'react';
-import createReactClass from 'create-react-class';
-import _ from 'lodash';
-import closeTag from './close-tag';
-import autoCompleteEmoji from './autocompleteEmoji';
-let CodeMirror;
 
-const CodeEditor = createReactClass({
+import {
-	displayName     : 'CodeEditor',
+	EditorView,
-	getDefaultProps : function() {
+	keymap,
-		return {
+	lineNumbers,
-			language      : '',
+	highlightActiveLineGutter,
-			tab           : 'brewText',
+	highlightActiveLine,
-			value         : '',
+	scrollPastEnd,
-			wrap          : true,
+	Decoration,
-			onChange      : ()=>{},
+	drawSelection,
-			enableFolding : true,
+	dropCursor,
-			editorTheme   : 'default'
+	rectangularSelection,
-		};
+	crosshairCursor,
+} from '@codemirror/view';
+import { EditorState, Compartment, StateEffect, StateField } from '@codemirror/state';
+import {
+	unfoldAll as unfoldAllCmd,
+	foldGutter,
+	foldKeymap,
+	foldEffect,
+	foldState,
+	syntaxHighlighting,
+} from '@codemirror/language';
+import { defaultKeymap, history, undo, redo, undoDepth, redoDepth } from '@codemirror/commands';
+import { languages } from '@codemirror/language-data';
+import { css } from '@codemirror/lang-css';
+import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
+import { html } from '@codemirror/lang-html';
+import { autocompleteEmoji } from './extensions/autocompleteEmoji.js';
+import { searchKeymap, search } from '@codemirror/search';
+import { closeBrackets } from '@codemirror/autocomplete';
+
+const autoCloseBrackets = closeBrackets({ brackets: ['()', '[]', '{{}}'] });
+
+import defaultCM5Theme from '@themes/codeMirror/default.js';
+import darkbrewery from '@themes/codeMirror/darkbrewery.js';
+import cm5Themes from 'codemirror-5-themes';
+
+const themes = { default: defaultCM5Theme, ...cm5Themes, darkbrewery };
+const themeCompartment = new Compartment();
+const highlightCompartment = new Compartment();
+
+import { generalKeymap, markdownKeymap } from './extensions/customKeyMaps.js';
+import foldOnPages from './extensions/customFolding.js';
+import { customHighlightPlugin, customHighlightStyle } from './extensions/customHighlight.js';
+import { legacyCustomHighlightStyle } from './extensions/legacyCustomHighlight.js';
+
+const PAGEBREAK_REGEX_V3 = /^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m;
+
+const setProgrammaticCursorLine = StateEffect.define();
+
+const programmaticCursorLineField = StateField.define({
+	create() {
+		return Decoration.none;
 	},
+	update(decorations, transitionState) {
+		//deco is the decoratiions object
+		//tr is the transition state object, tr.effects is an array of stateEffects
+		//seems to be the easiest way of setting a class programatically only when called
+		for (const effects of transitionState.effects) {
+			if(effects.is(setProgrammaticCursorLine)) {
+				const pos = effects.value;
+				if(pos == null) return Decoration.none;
+				const line = transitionState.state.doc.lineAt(pos);
 
-	getInitialState : function() {
+				return Decoration.set([
-		return {
+					Decoration.line({
-			docs : {}
+						class : 'sourceMoveFlash'
-		};
+					}).range(line.from)
-	},
+				]);
-
-	editor : React.createRef(null),
-
-	async componentDidMount() {
-		CodeMirror = (await import('codemirror')).default;
-		this.CodeMirror = CodeMirror;
-
-		await import('codemirror/mode/gfm/gfm.js');
-		await import('codemirror/mode/css/css.js');
-		await import('codemirror/mode/javascript/javascript.js');
-
-		// addons
-		await import('codemirror/addon/fold/foldcode.js');
-		await import('codemirror/addon/fold/foldgutter.js');
-		await import('codemirror/addon/fold/xml-fold.js');
-		await import('codemirror/addon/search/search.js');
-		await import('codemirror/addon/search/searchcursor.js');
-		await import('codemirror/addon/search/jump-to-line.js');
-		await import('codemirror/addon/search/match-highlighter.js');
-		await import('codemirror/addon/search/matchesonscrollbar.js');
-		await import('codemirror/addon/dialog/dialog.js');
-		await import('codemirror/addon/scroll/scrollpastend.js');
-		await import('codemirror/addon/edit/closetag.js');
-		await import('codemirror/addon/hint/show-hint.js');
-		// import 'codemirror/addon/selection/active-line.js';
-		// import 'codemirror/addon/edit/trailingspace.js';
-
-
-		// register helpers dynamically as well
-		const foldPagesCode = (await import('./fold-pages')).default;
-		const foldCSSCode   = (await import('./fold-css')).default;
-		foldPagesCode.registerHomebreweryHelper(CodeMirror);
-		foldCSSCode.registerHomebreweryHelper(CodeMirror);
-
-		this.buildEditor();
-		const newDoc = CodeMirror?.Doc(this.props.value, this.props.language);
-		this.codeMirror?.swapDoc(newDoc);
-	},
-
-
-	componentDidUpdate : function(prevProps) {
-		if(prevProps.view !== this.props.view){ //view changed; swap documents
-			let newDoc;
-
-			if(!this.state.docs[this.props.view]) {
-				newDoc = CodeMirror?.Doc(this.props.value, this.props.language);
-			} else {
-				newDoc = this.state.docs[this.props.view];
 			}
-
-			const oldDoc = { [prevProps.view]: this.codeMirror?.swapDoc(newDoc) };
-
-			this.setState((prevState)=>({
-				docs : _.merge({}, prevState.docs, oldDoc)
-			}));
-
-			this.props.rerenderParent();
-		} else if(this.codeMirror?.getValue() != this.props.value) { //update editor contents if brew.text is changed from outside
-			this.codeMirror?.setValue(this.props.value);
-		}
-
-		if(this.props.enableFolding) {
-			this.codeMirror?.setOption('foldOptions', this.foldOptions(this.codeMirror));
-		} else {
-			this.codeMirror?.setOption('foldOptions', false);
-		}
-
-		if(prevProps.editorTheme !== this.props.editorTheme){
-			this.codeMirror?.setOption('theme', this.props.editorTheme);
 		}
+		return decorations;
 	},
-
+	provide : (decorationSet)=>EditorView.decorations.from(decorationSet)
-	buildEditor : function() {
-		this.codeMirror = CodeMirror(this.editor.current, {
-			lineNumbers       : true,
-			lineWrapping      : this.props.wrap,
-			indentWithTabs    : false,
-			tabSize           : 2,
-			smartIndent       : false,
-			historyEventDelay : 250,
-			scrollPastEnd     : true,
-			extraKeys         : {
-				'Tab'              : this.indent,
-				'Shift-Tab'        : this.dedent,
-				'Ctrl-B'           : this.makeBold,
-				'Cmd-B'            : this.makeBold,
-				'Shift-Ctrl-='     : this.makeSuper,
-				'Shift-Cmd-='      : this.makeSuper,
-				'Ctrl-='           : this.makeSub,
-				'Cmd-='            : this.makeSub,
-				'Ctrl-I'           : this.makeItalic,
-				'Cmd-I'            : this.makeItalic,
-				'Ctrl-U'           : this.makeUnderline,
-				'Cmd-U'            : this.makeUnderline,
-				'Ctrl-.'           : this.makeNbsp,
-				'Cmd-.'            : this.makeNbsp,
-				'Shift-Ctrl-.'     : this.makeSpace,
-				'Shift-Cmd-.'      : this.makeSpace,
-				'Shift-Ctrl-,'     : this.removeSpace,
-				'Shift-Cmd-,'      : this.removeSpace,
-				'Ctrl-M'           : this.makeSpan,
-				'Cmd-M'            : this.makeSpan,
-				'Shift-Ctrl-M'     : this.makeDiv,
-				'Shift-Cmd-M'      : this.makeDiv,
-				'Ctrl-/'           : this.makeComment,
-				'Cmd-/'            : this.makeComment,
-				'Ctrl-K'           : this.makeLink,
-				'Cmd-K'            : this.makeLink,
-				'Ctrl-L'           : ()=>this.makeList('UL'),
-				'Cmd-L'            : ()=>this.makeList('UL'),
-				'Shift-Ctrl-L'     : ()=>this.makeList('OL'),
-				'Shift-Cmd-L'      : ()=>this.makeList('OL'),
-				'Shift-Ctrl-1'     : ()=>this.makeHeader(1),
-				'Shift-Ctrl-2'     : ()=>this.makeHeader(2),
-				'Shift-Ctrl-3'     : ()=>this.makeHeader(3),
-				'Shift-Ctrl-4'     : ()=>this.makeHeader(4),
-				'Shift-Ctrl-5'     : ()=>this.makeHeader(5),
-				'Shift-Ctrl-6'     : ()=>this.makeHeader(6),
-				'Shift-Cmd-1'      : ()=>this.makeHeader(1),
-				'Shift-Cmd-2'      : ()=>this.makeHeader(2),
-				'Shift-Cmd-3'      : ()=>this.makeHeader(3),
-				'Shift-Cmd-4'      : ()=>this.makeHeader(4),
-				'Shift-Cmd-5'      : ()=>this.makeHeader(5),
-				'Shift-Cmd-6'      : ()=>this.makeHeader(6),
-				'Shift-Ctrl-Enter' : this.newColumn,
-				'Shift-Cmd-Enter'  : this.newColumn,
-				'Ctrl-Enter'       : this.newPage,
-				'Cmd-Enter'        : this.newPage,
-				'Ctrl-F'           : 'findPersistent',
-				'Cmd-F'            : 'findPersistent',
-				'Shift-Enter'      : 'findPersistentPrevious',
-				'Ctrl-['           : this.foldAllCode,
-				'Cmd-['            : this.foldAllCode,
-				'Ctrl-]'           : this.unfoldAllCode,
-				'Cmd-]'            : this.unfoldAllCode
-			},
-			foldGutter        : true,
-			foldOptions       : this.foldOptions(this.codeMirror),
-			gutters           : ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
-			autoCloseTags     : true,
-			styleActiveLine   : true,
-			showTrailingSpace : false,
-			theme             : this.props.editorTheme
-			// specialChars           : / /,
-			// specialCharPlaceholder : function(char) {
-			// 	const el = document.createElement('span');
-			// 	el.className = 'cm-space';
-			// 	el.innerHTML = ' ';
-			// 	return el;
-			// }
-		});
-
-		// Add custom behaviors (auto-close curlies and auto-complete emojis)
-		closeTag.autoCloseCurlyBraces(CodeMirror, this.codeMirror);
-		autoCompleteEmoji.showAutocompleteEmoji(CodeMirror, this.codeMirror);
-
-		// Note: codeMirror passes a copy of itself in this callback. cm === this.codeMirror?. Either one works.
-		this.codeMirror?.on('change', (cm)=>{this.props.onChange(cm.getValue());});
-		this.updateSize();
-	},
-
-	// Use for GFM tabs that use common hot-keys
-	isGFM : function() {
-		if((this.isGFM()) || (this.props.tab === 'brewSnippets')) return true;
-		return false;
-	},
-
-	isBrewText : function() {
-		if(this.isGFM()) return true;
-		return false;
-	},
-
-	isBrewSnippets : function() {
-		if(this.props.tab === 'brewSnippets') return true;
-		return false;
-	},
-
-	indent : function () {
-		const cm = this.codeMirror;
-		if(cm.somethingSelected()) {
-			cm.execCommand('indentMore');
-		} else {
-			cm.execCommand('insertSoftTab');
-		}
-	},
-
-	dedent : function () {
-		this.codeMirror?.execCommand('indentLess');
-	},
-
-	makeHeader : function (number) {
-		if(!this.isGFM()) return;
-		const selection = this.codeMirror?.getSelection();
-		const header = Array(number).fill('#').join('');
-		this.codeMirror?.replaceSelection(`${header} ${selection}`, 'around');
-		const cursor = this.codeMirror?.getCursor();
-		this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch + selection.length + number + 1 });
-	},
-
-	makeBold : function() {
-		if(!this.isGFM()) return;
-		const selection = this.codeMirror?.getSelection(), t = selection.slice(0, 2) === '**' && selection.slice(-2) === '**';
-		this.codeMirror?.replaceSelection(t ? selection.slice(2, -2) : `**${selection}**`, 'around');
-		if(selection.length === 0){
-			const cursor = this.codeMirror?.getCursor();
-			this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch - 2 });
-		}
-	},
-
-	makeItalic : function() {
-		if(!this.isGFM()) return;
-		const selection = this.codeMirror.getSelection(), t = selection.slice(0, 1) === '*' && selection.slice(-1) === '*';
-		this.codeMirror?.replaceSelection(t ? selection.slice(1, -1) : `*${selection}*`, 'around');
-		if(selection.length === 0){
-			const cursor = this.codeMirror?.getCursor();
-			this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch - 1 });
-		}
-	},
-
-	makeSuper : function() {
-		if(!this.isGFM()) return;
-		const selection = this.codeMirror.getSelection(), t = selection.slice(0, 1) === '^' && selection.slice(-1) === '^';
-		this.codeMirror?.replaceSelection(t ? selection.slice(1, -1) : `^${selection}^`, 'around');
-		if(selection.length === 0){
-			const cursor = this.codeMirror?.getCursor();
-			this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch - 1 });
-		}
-	},
-
-	makeSub : function() {
-		if(!this.isGFM()) return;
-		const selection = this.codeMirror.getSelection(), t = selection.slice(0, 2) === '^^' && selection.slice(-2) === '^^';
-		this.codeMirror?.replaceSelection(t ? selection.slice(2, -2) : `^^${selection}^^`, 'around');
-		if(selection.length === 0){
-			const cursor = this.codeMirror?.getCursor();
-			this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch - 2 });
-		}
-	},
-
-
-	makeNbsp : function() {
-		if(!this.isGFM()) return;
-		this.codeMirror?.replaceSelection(' ', 'end');
-	},
-
-	makeSpace : function() {
-		if(!this.isGFM()) return;
-		const selection = this.codeMirror?.getSelection();
-		const t = selection.slice(0, 8) === '{{width:' && selection.slice(0 -4) === '% }}';
-		if(t){
-			const percent = parseInt(selection.slice(8, -4)) + 10;
-			this.codeMirror?.replaceSelection(percent < 90 ? `{{width:${percent}% }}` : '{{width:100% }}', 'around');
-		} else {
-			this.codeMirror?.replaceSelection(`{{width:10% }}`, 'around');
-		}
-	},
-
-	removeSpace : function() {
-		if(!this.isGFM()) return;
-		const selection = this.codeMirror?.getSelection();
-		const t = selection.slice(0, 8) === '{{width:' && selection.slice(0 -4) === '% }}';
-		if(t){
-			const percent = parseInt(selection.slice(8, -4)) - 10;
-			this.codeMirror?.replaceSelection(percent > 10 ? `{{width:${percent}% }}` : '', 'around');
-		}
-	},
-
-	newColumn : function() {
-		if(!this.isGFM()) return;
-		this.codeMirror?.replaceSelection('\n\\column\n\n', 'end');
-	},
-
-	newPage : function() {
-		if(!this.isGFM()) return;
-		this.codeMirror?.replaceSelection('\n\\page\n\n', 'end');
-	},
-
-	injectText : function(injectText, overwrite=true) {
-		const cm = this.codeMirror;
-		if(!overwrite) {
-			cm.setCursor(cm.getCursor('from'));
-		}
-		cm.replaceSelection(injectText, 'end');
-		cm.focus();
-	},
-
-	makeUnderline : function() {
-		if(!this.isGFM()) return;
-		const selection = this.codeMirror.getSelection(), t = selection.slice(0, 3) === '<u>' && selection.slice(-4) === '</u>';
-		this.codeMirror?.replaceSelection(t ? selection.slice(3, -4) : `<u>${selection}</u>`, 'around');
-		if(selection.length === 0){
-			const cursor = this.codeMirror?.getCursor();
-			this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch - 4 });
-		}
-	},
-
-	makeSpan : function() {
-		if(!this.isGFM()) return;
-		const selection = this.codeMirror.getSelection(), t = selection.slice(0, 2) === '{{' && selection.slice(-2) === '}}';
-		this.codeMirror?.replaceSelection(t ? selection.slice(2, -2) : `{{ ${selection}}}`, 'around');
-		if(selection.length === 0){
-			const cursor = this.codeMirror?.getCursor();
-			this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch - 2 });
-		}
-	},
-
-	makeDiv : function() {
-		if(!this.isGFM()) return;
-		const selection = this.codeMirror.getSelection(), t = selection.slice(0, 2) === '{{' && selection.slice(-2) === '}}';
-		this.codeMirror?.replaceSelection(t ? selection.slice(2, -2) : `{{\n${selection}\n}}`, 'around');
-		if(selection.length === 0){
-			const cursor = this.codeMirror?.getCursor();
-			this.codeMirror?.setCursor({ line: cursor.line - 1, ch: cursor.ch });  // set to -2? if wanting to enter classes etc.  if so, get rid of first \n when replacing selection
-		}
-	},
-
-	makeComment : function() {
-		let regex;
-		let cursorPos;
-		let newComment;
-		const selection = this.codeMirror?.getSelection();
-		if(this.isGFM()){
-			regex = /^\s*(<!--\s?)(.*?)(\s?-->)\s*$/gs;
-			cursorPos = 4;
-			newComment = `<!-- ${selection} -->`;
-		} else {
-			regex = /^\s*(\/\*\s?)(.*?)(\s?\*\/)\s*$/gs;
-			cursorPos = 3;
-			newComment = `/* ${selection} */`;
-		}
-		this.codeMirror?.replaceSelection(regex.test(selection) == true ? selection.replace(regex, '$2') : newComment, 'around');
-		if(selection.length === 0){
-			const cursor = this.codeMirror?.getCursor();
-			this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch - cursorPos });
-		};
-	},
-
-	makeLink : function() {
-		if(!this.isGFM()) return;
-		const isLink = /^\[(.*)\]\((.*)\)$/;
-		const selection = this.codeMirror?.getSelection().trim();
-		let match;
-		if(match = isLink.exec(selection)){
-			const altText = match[1];
-			const url     = match[2];
-			this.codeMirror?.replaceSelection(`${altText} ${url}`);
-			const cursor = this.codeMirror?.getCursor();
-			this.codeMirror?.setSelection({ line: cursor.line, ch: cursor.ch - url.length }, { line: cursor.line, ch: cursor.ch });
-		} else {
-			this.codeMirror?.replaceSelection(`[${selection || 'alt text'}](url)`);
-			const cursor = this.codeMirror?.getCursor();
-			this.codeMirror?.setSelection({ line: cursor.line, ch: cursor.ch - 4 }, { line: cursor.line, ch: cursor.ch - 1 });
-		}
-	},
-
-	makeList : function(listType) {
-		if(!this.isGFM()) return;
-		const selectionStart = this.codeMirror.getCursor('from'), selectionEnd = this.codeMirror.getCursor('to');
-		this.codeMirror?.setSelection(
-			{ line: selectionStart.line, ch: 0 },
-			{ line: selectionEnd.line, ch: this.codeMirror?.getLine(selectionEnd.line).length }
-		);
-		const newSelection = this.codeMirror?.getSelection();
-
-		const regex = /^\d+\.\s|^-\s/gm;
-		if(newSelection.match(regex) != null){   	// if selection IS A LIST
-			this.codeMirror?.replaceSelection(newSelection.replace(regex, ''), 'around');
-		} else {									// if selection IS NOT A LIST
-			listType == 'UL' ? this.codeMirror?.replaceSelection(newSelection.replace(/^/gm, `- `), 'around') :
-				this.codeMirror?.replaceSelection(newSelection.replace(/^/gm, (()=>{
-					let n = 1;
-					return ()=>{
-						return `${n++}. `;
-					};
-				})()), 'around');
-		}
-	},
-
-	foldAllCode : function() {
-		this.codeMirror?.execCommand('foldAll');
-	},
-
-	unfoldAllCode : function() {
-		this.codeMirror?.execCommand('unfoldAll');
-	},
-
-	//=-- Externally used -==//
-	setCursorPosition : function(line, char){
-		setTimeout(()=>{
-			this.codeMirror?.focus();
-			this.codeMirror?.doc.setCursor(line, char);
-		}, 10);
-	},
-	getCursorPosition : function(){
-		return this.codeMirror?.getCursor();
-	},
-	getTopVisibleLine : function(){
-		const rect = this.codeMirror?.getWrapperElement().getBoundingClientRect();
-		const topVisibleLine = this.codeMirror?.lineAtHeight(rect.top, 'window');
-		return topVisibleLine;
-	},
-	updateSize : function(){
-		this.codeMirror?.refresh();
-	},
-	redo : function(){
-		return this.codeMirror?.redo();
-	},
-	undo : function(){
-		return this.codeMirror?.undo();
-	},
-	historySize : function(){
-		return this.codeMirror?.doc.historySize();
-	},
-
-	foldOptions : function(cm){
-		return {
-			scanUp      : true,
-			rangeFinder : this.props.language === 'css' ? CodeMirror.fold.homebrewerycss : CodeMirror.fold.homebrewery,
-			widget      : (from, to)=>{
-				let text = '';
-				let currentLine = from.line;
-				let maxLength = 50;
-
-				let foldPreviewText = '';
-				while (currentLine <= to.line && text.length <= maxLength) {
-					const currentText = this.codeMirror?.getLine(currentLine);
-					currentLine++;
-					if(currentText[0] == '#'){
-						foldPreviewText = currentText;
-						break;
-					}
-					if(!foldPreviewText && currentText != '\n') {
-						foldPreviewText = currentText;
-					}
-				}
-				text = foldPreviewText || `Lines ${from.line+1}-${to.line+1}`;
-				text = text.replace('{', '').trim();
-
-				// Truncate data URLs at `data:`
-				const startOfData = text.indexOf('data:');
-				if(startOfData > 0)
-					maxLength = Math.min(startOfData + 5, maxLength);
-
-				if(text.length > maxLength)
-					text = `${text.slice(0, maxLength)}...`;
-
-				return `\u21A4 ${text} \u21A6`;
-			}
-		};
-	},
-	//----------------------//
-
-	render : function(){
-		return <>
-			<link href={`../homebrew/cm-themes/${this.props.editorTheme}.css`} type='text/css' rel='stylesheet' />
-			<div className='codeEditor' ref={this.editor} style={this.props.style}/>
-		</>;
-	}
 });
 
-export default CodeEditor;
+const CodeEditor = forwardRef(
+	(
+		{
+			language = '',
+			tab = 'brewText',
+			view,
+			value = '',
+			onChange = ()=>{},
+			onCursorChange = ()=>{},
+			onViewChange = ()=>{},
+			editorTheme = 'default',
+			style,
+			renderer,
+			...props
+		},
+		ref,
+	)=>{
+		const editorRef = useRef(null);
+		const viewRef = useRef(null);
+		const docsRef = useRef({});
+		const tabRef = useRef(tab);
+		const prevTabRef = useRef(tab);
+		const scrollRef = useRef({});
+		const foldsRef = useRef({});
+		const pageMap = useRef([]);
 
+		const recomputePages = (doc)=>{
+			if(tab !== 'brewText') return;
+			const pages = [0];
+			const text = doc.toString();
+			let offset = 0;
+
+			for (const line of text.split('\n')) {
+				if(PAGEBREAK_REGEX_V3.test(line)) {
+					pages.push(offset);
+				}
+				offset += line.length + 1;
+			}
+
+			pageMap.current = pages;
+		};
+
+		const findPageFromPos = (pos)=>{
+			const pages = pageMap.current;
+			let page = 1;
+
+			for (let i = 1; i < pages.length; i++) {
+				if(pos >= pages[i]) page = i + 1;
+			}
+
+			return page;
+		};
+
+		const getFoldRanges = (state)=>{
+			const folds = [];
+			state.field(foldState, false)?.between(0, state.doc.length, (from, to)=>{
+				folds.push({ from, to });
+			});
+			return folds;
+		};
+
+		const createExtensions = ({ onChange, language, editorTheme })=>{
+			const setEventListeners = EditorView.updateListener.of((update)=>{
+				if(update.docChanged) {
+					recomputePages(update.state.doc);
+					onChange(update.state.doc.toString());
+				}
+				if(update.selectionSet) {
+					const pos = update.state.selection.main.head;
+					const page = findPageFromPos(pos);
+					onCursorChange(page);
+				}
+			});
+
+			const highlightExtension = renderer === 'V3'
+  			? syntaxHighlighting(customHighlightStyle)
+  			: syntaxHighlighting(legacyCustomHighlightStyle);
+
+			const languageExtension = language === 'css' ? css() : [markdown({ base: markdownLanguage, codeLanguages: languages }), html({ autoCloseTags: true })];
+			const themeExtension = Array.isArray(themes[editorTheme]) ? themes[editorTheme] : themes[editorTheme] || themes['default'];
+
+			return [
+				EditorView.lineWrapping,
+				setEventListeners,
+				languageExtension,
+				autoCloseBrackets,
+				lineNumbers(),
+				scrollPastEnd(),
+				search(),
+				history(), //allows for undo and redo
+				...(tab !== 'brewStyles' ? [autocompleteEmoji] : []),
+
+				//folding
+				foldOnPages,
+				foldGutter({
+					openText   : '▾',
+					closedText : '▸'
+				}),
+
+				//highlights
+				highlightCompartment.of([customHighlightPlugin(renderer, tab), highlightExtension]),
+				themeCompartment.of(themeExtension),
+				highlightActiveLine(),
+				highlightActiveLineGutter(),
+
+				//keyboard shortcut
+				keymap.of([...defaultKeymap, foldKeymap, ...searchKeymap]),
+				generalKeymap,
+				...(tab !== 'brewStyles' ? [markdownKeymap] : []),
+
+				//multiple cursors and selections
+				drawSelection(),
+				rectangularSelection(),
+				crosshairCursor(),
+				EditorState.allowMultipleSelections.of(true),
+				dropCursor(),
+				programmaticCursorLineField,
+			];
+		};
+
+		useEffect(()=>{
+			if(!editorRef.current) return;
+
+			const state = EditorState.create({
+				doc        : value,
+				extensions : createExtensions({ onChange, language, editorTheme }),
+			});
+
+			recomputePages(state.doc);
+
+			viewRef.current = new EditorView({
+				state,
+				parent : editorRef.current,
+			});
+
+			const view = viewRef.current;
+
+			let ticking = false;
+
+			const handleScroll = ()=>{
+				if(ticking) return;
+
+				ticking = true;
+				requestAnimationFrame(()=>{
+					const top = view.scrollDOM.scrollTop;
+					scrollRef.current[tabRef.current] = top;
+					const block = view.lineBlockAtHeight(top);
+					const page = findPageFromPos(block.from);
+					onViewChange(page);
+					ticking = false;
+				});
+			};
+
+			view.scrollDOM.addEventListener('scroll', handleScroll);
+
+			docsRef.current[tab] = state;
+
+			return ()=>{
+				view.scrollDOM.removeEventListener('scroll', handleScroll);
+				viewRef.current?.destroy();
+			};
+		}, []);
+
+		const restoreFolds = (view, folds)=>{
+  			if(!folds?.length) return;
+
+  			view.dispatch({
+    			effects : folds.map((f)=>foldEffect.of(f))
+  			});
+		};
+
+		useEffect(()=>{
+			const view = viewRef.current;
+			if(!view) return;
+
+			tabRef.current = tab;
+			const prevTab = prevTabRef.current;
+
+			foldsRef.current[prevTab] = getFoldRanges(view.state);
+
+			if(prevTab !== tab) {
+				docsRef.current[prevTab] = view.state;
+
+				let nextState = docsRef.current[tab];
+
+				if(!nextState) {
+					nextState = EditorState.create({
+						doc        : value,
+						extensions : createExtensions({ onChange, language, editorTheme }),
+					});
+				}
+
+				view.setState(nextState);
+				restoreFolds(view, foldsRef.current[tab]);
+
+				const savedScroll = scrollRef.current[tab];
+
+				if(savedScroll != null) {
+					requestAnimationFrame(()=>{
+						view.scrollDOM.scrollTop = savedScroll;
+					});
+				}
+
+				prevTabRef.current = tab;
+			}
+			view.focus();
+		}, [tab]);
+
+		useEffect(()=>{
+			const view = viewRef.current;
+			if(!view) return;
+
+			const current = view.state.doc.toString();
+			if(value !== current) {
+				view.dispatch({
+					changes : { from: 0, to: current.length, insert: value },
+				});
+			}
+		}, [value]);
+
+		useEffect(()=>{
+			//rebuild theme extension on theme change
+			const view = viewRef.current;
+			if(!view) return;
+
+			const themeExtension = Array.isArray(themes[editorTheme])? themes[editorTheme]: themes[editorTheme] || themes['default'];
+
+			view.dispatch({
+				effects : themeCompartment.reconfigure(themeExtension),
+			});
+		}, [editorTheme]);
+
+		useEffect(()=>{
+			//rebuild syntax highlight when changing tab or renderer
+			const view = viewRef.current;
+			if(!view) return;
+
+			const highlightExtension =renderer === 'V3'
+    		? syntaxHighlighting(customHighlightStyle)
+    		: syntaxHighlighting(legacyCustomHighlightStyle);
+
+			view.dispatch({
+				effects : highlightCompartment.reconfigure([customHighlightPlugin(renderer, tab), highlightExtension]),
+			});
+		}, [renderer, tab]);
+
+		useImperativeHandle(ref, ()=>({
+
+			injectText : (text)=>{
+				const view = viewRef.current;
+
+				view.dispatch(
+					view.state.replaceSelection(text)
+				);
+				view.focus();
+			},
+			getCursorPosition : ()=>viewRef.current.state.selection.main.head,
+
+			scrollToPage : (pageNumber, smooth = true)=>{
+				const view = viewRef.current;
+				if(!view) return;
+
+				const pos = pageMap.current[pageNumber - 1] ?? 0;
+
+				view.dispatch({
+					selection : { anchor: pos },
+					effects   : [setProgrammaticCursorLine.of(pos), EditorView.scrollIntoView(pos, { y: 'start' })],
+				});
+
+				view.focus();
+
+				setTimeout(()=>{
+					view.dispatch({
+						effects : setProgrammaticCursorLine.of(null)
+					});
+				}, 400);
+			},
+
+			undo : ()=>undo(viewRef.current),
+			redo : ()=>redo(viewRef.current),
+
+			historySize : ()=>{
+				const view = viewRef.current;
+				if(!view) return { done: 0, undone: 0 };
+
+				return {
+					done   : undoDepth(view.state),
+					undone : redoDepth(view.state),
+				};
+			},
+
+			foldAll : ()=>{
+				const view = viewRef.current;
+				if(!view) return;
+
+				const doc = view.state.doc;
+				const pages = pageMap.current;
+
+				const effects = pages.map((start, i)=>{
+					const next = pages[i + 1] || doc.length;
+					const from = i ? doc.line(doc.lineAt(start).number + 1).from : 0;
+					const to = doc.line(doc.lineAt(next).number).from - 1;
+
+					return to > from ? foldEffect.of({ from, to }) : null;
+				}).filter(Boolean);
+
+				view.dispatch({ effects });
+			},
+			unfoldAll : ()=>{
+				const view = viewRef.current;
+				if(!view) return;
+				view.dispatch(unfoldAllCmd(view));
+			},
+
+			focus : ()=>viewRef.current.focus(),
+		}));
+
+		return <div className={`codeEditor ${tab}`} ref={editorRef} style={style} />;
+	},
+);
+
+export default CodeEditor;

client/components/codeEditor/codeEditor.less

@@ -1,59 +1,206 @@
-@import (less) 'codemirror/lib/codemirror.css';
+// Icon fonts for emoji/autocomplete
-@import (less) 'codemirror/addon/fold/foldgutter.css';
+@import (less) '@themes/fonts/iconFonts/diceFont.less';
-@import (less) 'codemirror/addon/search/matchesonscrollbar.css';
+@import (less) '@themes/fonts/iconFonts/elderberryInn.less';
-@import (less) 'codemirror/addon/dialog/dialog.css';
+@import (less) '@themes/fonts/iconFonts/gameIcons.less';
-@import (less) 'codemirror/addon/hint/show-hint.css';
+@import (less) '@themes/fonts/iconFonts/fontAwesome.less';
-
-//Icon fonts included so they can appear in emoji autosuggest dropdown
-@import (less) './themes/fonts/iconFonts/diceFont.less';
-@import (less) './themes/fonts/iconFonts/elderberryInn.less';
-@import (less) './themes/fonts/iconFonts/gameIcons.less';
-@import (less) './themes/fonts/iconFonts/fontAwesome.less';
 
 @keyframes sourceMoveAnimation {
-	50% {   color            : white;background-color : red;}
+	50% {
-	100% { color            : unset;background-color : unset;}
+		color            : white;
+		background-color : red;
+	}
+	100% {
+		color            : unset;
+		background-color : unset;
+	}
 }
 
-.codeEditor {
+:where(.codeEditor) {
+	width             : 100%;
+	height            : calc(100% - 25px);
+	font-family       : monospace;
+
+	.cm-editor { 
+		height  : 100%;
+		outline : none !important;
+	}
+
+	&.brewSnippets .cm-snippetLine,
+	:where(&.brewText) .cm-pageLine {
+		background : #33333328;
+		border-top : #333399 solid 1px;
+	}
+
+	&.brewSnippets {
+		.cm-pageLine {
+			color      : #777777;
+			background : #3E4E3E1B;
+			border-top : #3399423B solid 1px;
+		}
+	}
+
+	&:where(.brewText), &.brewSnippets {
+
+	
+		.cm-pageLine[data-page-number]::after {
+			float   : right;
+			color   : grey;
+			content : attr(data-page-number);
+		}
+		.cm-columnSplit {
+			font-style        : italic;
+			color             : grey;
+			background-color  : fade(#229999, 15%);
+			border-bottom     : #229999 solid 1px;
+		}
+		.cm-define {
+			&:not(.term):not(.definition) {
+				font-weight   : bold;
+				color         : #949494;
+				background    : #E5E5E5;
+				border-radius : 3px;
+			}
+			&.term { color : rgb(96, 117, 143); }
+			&.definition { color : rgb(97, 57, 178); }
+		}
+		.cm-block:not(.cm-comment),
+		.cm-block:not(.cm-comment) * {
+			font-weight : bold;
+			color       : purple;
+		}
+		.cm-inline-block,
+		.cm-define .cm-inline-block {
+			font-weight : bold;
+			color       : red;
+			span:not(.cm-comment) { color : inherit; }
+		}
+		.cm-injection:not(.cm-comment) {
+			font-weight : bold;
+			color       : green;
+			span { color : inherit; }
+		}
+		.cm-emoji:not(.cm-comment) {
+			padding-bottom : 1px;
+			margin-left    : 2px;
+			font-weight    : bold;
+			color          : #360034;
+			outline        : solid 2px #FF96FC;
+			outline-offset : -2px;
+			background     : #FFC8FF;
+			border-radius  : 6px;
+		}
+		.cm-superscript:not(.cm-comment) {
+			font-size      : 0.9em;
+			font-weight    : bold;
+			vertical-align : super;
+			color          : goldenrod;
+		}
+		.cm-subscript:not(.cm-comment) {
+			font-size      : 0.9em;
+			font-weight    : bold;
+			vertical-align : sub;
+			color          : rgb(123, 123, 15);
+		}
+		.cm-strikethrough {
+			text-decoration: line-through;
+		}
+
+		.cm-definitionList {
+			.cm-definitionTerm { color : rgb(96, 117, 143); }
+			.cm-definitionColon:not(:has(.cm-comment)) {
+				font-weight   : bold;
+				color         : #949494;
+				background    : #E5E5E5;
+				border-radius : 3px;
+			}
+			.cm-definitionDesc { color : rgb(97, 57, 178); }
+		}		
+
+		.cm-tooltip-autocomplete {
+
+			li {
+				display         : flex;
+				gap             : 10px;
+				align-items     : center;
+				justify-content : flex-start;
+
+				.cm-completionIcon { display : none; }
+				.cm-tooltip-autocomplete .cm-completionLabel { translate : 0 -2px; }
+			}
+		}
+	}
+	
+	.cm-content { tab-size : 2 !important; }
+
 	@media screen and (pointer : coarse) {
 		font-size : 16px;
 	}
-	.CodeMirror-foldmarker {
+
+	.cm-gutterElement span {
 		font-family : inherit;
 		font-weight : 600;
 		color       : grey;
 		text-shadow : none;
 	}
 
-	.CodeMirror-foldgutter {
+	.cm-foldGutter {
 		cursor      : pointer;
 		border-left : 1px solid #EEEEEE;
 		transition  : background 0.1s;
 		&:hover { background : #DDDDDD; }
 	}
 
-	.sourceMoveFlash .CodeMirror-line {
+	/* Flash animation for source moves */
+	.cm-line.sourceMoveFlash {
 		animation-name     : sourceMoveAnimation;
 		animation-duration : 0.4s;
 	}
 
-	.CodeMirror-search-field {
+	/* Search input */
-		width:25em !important;
+	.cm-searchField {
-		outline:1px inset #00000055 !important;
+		width   : 25em !important;
+		outline : 1px inset #00000055 !important;
 	}
 
+	.cm-image {
+		position:relative;
+		
+		.cm-preview {
+			object-fit: contain;
+			position:absolute;
+			bottom:0;
+			left:0;
+			height:200px;
+			width:200px;
+			height:200px;
+			padding:5px;
+			background-color: #fff;
+			border-radius:10px;
+			border:3px solid grey;
+			pointer-events: none;
+			opacity:0;
+			transition:0.2s opacity 0.5s;
+			translate:0 100%;
+			z-index:1000;
+		}
+
+		&:hover .cm-preview {
+			opacity:1;
+		}
+	}
+
+	/* Tab character visualization (optional) */
 	//.cm-tab {
-	//  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAQAAACOs/baAAAARUlEQVR4nGJgIAG8JkXxUAcCtDWemcGR1lY4MvgzCEKY7jSBjgxBDAG09UEQzAe0AMwMHrSOAwEGRtpaMIwAAAAA//8DAG4ID9EKs6YqAAAAAElFTkSuQmCC) no-repeat right;
+	//  background: url(...) no-repeat right;
 	//}
 
-	//.cm-trailingspace {
+	/* Trailing space visualization (optional) */
-	//  .cm-space {
+	//.cm-trailingSpace .cm-space {
-	//    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAQAgMAAABW5NbuAAAACVBMVEVHcEwAAAAAAAAWawmTAAAAA3RSTlMAPBJ6PMxpAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAFUlEQVQI12NgwACcCQysASAEZGAAACMuAX06aCQUAAAAAElFTkSuQmCC) no-repeat right;
+	//  background: url(...) no-repeat right;
-	//  }
 	//}
 }
 
+/* Emoji preview styling */
 .emojiPreview {
 	font-size   : 1.5em;
 	line-height : 1.2em;

client/components/codeEditor/extensions/autocompleteEmoji.js

@@ -0,0 +1,76 @@
+import { autocompletion } from '@codemirror/autocomplete';
+
+import diceFont      from '@themes/fonts/iconFonts/diceFont.js';
+import elderberryInn from '@themes/fonts/iconFonts/elderberryInn.js';
+import fontAwesome   from '@themes/fonts/iconFonts/fontAwesome.js';
+import gameIcons     from '@themes/fonts/iconFonts/gameIcons.js';
+
+const emojis = {
+	...diceFont,
+	...elderberryInn,
+	...fontAwesome,
+	...gameIcons
+};
+
+const emojiCompletionList = (context)=>{
+	const word = context.matchBefore(/:[^\s:]+/);
+	if(!word) return null;
+
+	const line = context.state.doc.lineAt(context.pos);
+	const textToCursor = line.text.slice(0, context.pos - line.from);
+
+	if(textToCursor.includes('{')) {
+		const curlyToCursor = textToCursor.slice(textToCursor.indexOf('{'));
+		const curlySpanRegex = /{(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\1$/g;
+		if(curlySpanRegex.test(curlyToCursor)) return null;
+	}
+
+	const currentWord = word.text.slice(1); // remove ':'
+
+	const options = Object.keys(emojis)
+    .filter((e)=>e.toLowerCase().includes(currentWord.toLowerCase()))
+    .sort((a, b)=>{
+    	const normalize = (str)=>str.replace(/\d+/g, (m)=>m.padStart(4, '0')).toLowerCase();
+    	return normalize(a) < normalize(b) ? -1 : 1;
+    })
+    .map((e)=>({
+    	label : e,
+    	apply	: `${e}:`,
+    	type  : 'text',
+    	info  : ()=>{
+    		const div = document.createElement('div');
+    		div.innerHTML = `<i class="emojiPreview ${emojis[e]}"></i> ${e}`;
+    		return div;
+    	}
+    }));
+	//Label is the text in the list, comes with an icon that just
+		//renders example text "abc", hid that with css because i didn't see other choice
+	//Apply is the text that is set when the choice is selected
+	//Info is the tooltip
+
+	return {
+		from   : word.from + 1,
+		options,
+		filter : false,
+	};
+};
+
+export const autocompleteEmoji = autocompletion({
+	override         : [emojiCompletionList],
+	activateOnTyping : true,
+	 addToOptions     : [
+		{
+			render(completion) {
+				const e = completion.label;
+
+				const icon = document.createElement('i');
+				icon.className = `emojiPreview ${emojis[e]}`;
+
+				const fragment = document.createDocumentFragment();
+				fragment.appendChild(icon);
+
+				return fragment;
+			}
+		}
+	]
+});

client/components/codeEditor/extensions/customFolding.js

@@ -0,0 +1,46 @@
+import { foldService, codeFolding } from '@codemirror/language';
+
+const foldOnPages = [
+	foldService.of((state, lineStart)=>{ //tells where to fold
+		const doc = state.doc;
+		const matcher = /^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m;
+
+		const startLine = doc.lineAt(lineStart);
+		const prevLineText = startLine.number > 1 ? doc.line(startLine.number - 1).text : '';
+
+		if(!matcher.test(prevLineText)) return null;
+
+		let endLine = startLine.number;
+		while (endLine < doc.lines && !matcher.test(doc.line(endLine + 1).text)) {
+			endLine++;
+		}
+
+		if(endLine === startLine.number) return null;
+
+		return { from: startLine.from, to: doc.line(endLine).to };
+	}),
+	codeFolding({
+		preparePlaceholder : (state, range)=>{
+			const doc = state.doc;
+			const start = doc.lineAt(range.from).number;
+			const end = doc.lineAt(range.to).number;
+
+			if(doc.line(start).text.trim()) return ` ↤ Lines ${start}-${end} ↦`;
+
+			const preview = Array.from({ length: end - start }, (_, i)=>doc.line(start + 1 + i).text.trim()
+			).find(Boolean) || `Lines ${start}-${end}`;
+
+			return ` ↤ ${preview.replace('{', '').slice(0, 50).trim()}${preview.length > 50 ? '...' : ''} ↦`;
+		},
+		placeholderDOM(view, onclick, prepared) {
+			const span = document.createElement('span');
+			span.className = 'cm-fold-placeholder';
+			span.textContent = prepared;
+			span.onclick = onclick;
+			span.style.color = '#989898';
+			return span;
+		},
+	}),
+];
+
+export default foldOnPages;

client/components/codeEditor/extensions/customHighlight.js

@@ -0,0 +1,472 @@
+/* eslint max-lines: ["error", { "max": 500 }] */
+import { HighlightStyle } from '@codemirror/language';
+import { tags } from '@lezer/highlight';
+import { legacyTokenizeCustomMarkdown } from './legacyCustomHighlight';
+import {
+	Decoration,
+	ViewPlugin,
+} from '@codemirror/view';
+import {
+	syntaxTree,
+	ensureSyntaxTree
+} from '@codemirror/language';
+
+// Making the tokens
+const customTags = {
+	pageLine        : 'pageLine', 		// .cm-pageLine
+	snippetLine     : 'snippetLine', 	// .cm-snippetLine
+	columnSplit     : 'columnSplit', 	// .cm-columnSplit
+	block           : 'block', 			// .cm-block
+	inlineBlock     : 'inline-block', 	// .cm-inline-block
+	injection       : 'injection', 		// .cm-injection
+	emoji           : 'emoji', 			// .cm-emoji
+	superscript     : 'superscript', 	// .cm-superscript
+	subscript       : 'subscript', 		// .cm-subscript
+	definitionList  : 'definitionList', // .cm-definitionList
+	definitionTerm  : 'definitionTerm', // .cm-definitionTerm
+	definitionDesc  : 'definitionDesc', // .cm-definitionDesc
+	definitionColon : 'definitionColon', // .cm-definitionColon
+	strikethrough   : 'strikethrough', // .cm-strikethrough
+
+	//CSS
+
+	variable : 'variable',
+};
+
+function tokenizeCustomMarkdown(text) {
+	const tokens = [];
+	const lines = text.split('\n');
+
+	//tokens without a `from` or `to` are interpreted by the custom plugin as line tokens
+
+	lines.forEach((lineText, lineNumber)=>{
+		// --- Page / snippet lines ---
+		if(/^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m.test(lineText)) tokens.push({ line: lineNumber, type: customTags.pageLine });
+		if(/^\\snippet\ .*$/.test(lineText)) tokens.push({ line: lineNumber, type: customTags.snippetLine });
+		if(/^\\column(?:break)?$/.test(lineText)) tokens.push({ line: lineNumber, type: customTags.columnSplit });
+
+		// --- Emoji ---
+		if(/:.\w+?:/.test(lineText)) {
+			const emojiRegex = /(:\w+?:)/g;
+			let match;
+			while ((match = emojiRegex.exec(lineText)) !== null) {
+				tokens.push({
+					line : lineNumber,
+					type : customTags.emoji,
+					from : match.index,
+					to   : match.index + match[0].length,
+				});
+			}
+		}
+
+		// --- Superscript / Subscript ---
+		if(/\^/.test(lineText)) {
+			let startIndex = lineText.indexOf('^');
+			const superRegex = /\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^/gy;
+			const subRegex = /\^\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^\^/gy;
+
+			while (startIndex >= 0) {
+				superRegex.lastIndex = subRegex.lastIndex = startIndex;
+
+				let match = subRegex.exec(lineText);
+				let type = customTags.subscript;
+
+				if(!match) {
+					match = superRegex.exec(lineText);
+					type = customTags.superscript;
+				}
+
+				if(match) {
+					tokens.push({
+						line : lineNumber,
+						type,
+						from : match.index,
+						to   : match.index + match[0].length,
+					});
+				}
+
+				startIndex = lineText.indexOf(
+					'^',
+					Math.max(startIndex + 1, superRegex.lastIndex || 0, subRegex.lastIndex || 0),
+				);
+			}
+		}
+
+		// --- Strikethrough ---
+		if(/\~/.test(lineText)) {
+			const strikethroughRegex = /~(?!\s)(.+?)(?<!\s)~/g;
+
+			const match = strikethroughRegex.exec(lineText);
+			const type = customTags.strikethrough;
+
+			if(match) {
+				tokens.push({
+					line : lineNumber,
+					type,
+					from : match.index,
+					to   : match.index + match[0].length,
+				});
+			}
+		}
+
+		// --- single line def list ---
+		const singleLineRegex = /^(?=.*[^:])(.+?)(\s*)(::)([^\n]*)$/dmy;
+		const match = singleLineRegex.exec(lineText);
+
+		if(match) {
+			const [full, term, spaces, colons, desc] = match;
+
+			let offset = 0;
+
+			tokens.push({
+				line : lineNumber,
+				type : customTags.definitionList,
+			});
+
+			// Term
+			tokens.push({
+				line : lineNumber,
+				type : customTags.definitionTerm,
+				from : offset,
+				to   : offset + term.length,
+			});
+			offset += term.length;
+
+			// Spaces before ::
+			if(spaces) {
+				offset += spaces.length;
+			}
+
+			// :: colons
+			tokens.push({
+				line : lineNumber,
+				type : customTags.definitionColon,
+				from : offset,
+				to   : offset + colons.length,
+			});
+			offset += colons.length;
+
+			// Definition
+			tokens.push({
+				line : lineNumber,
+				type : customTags.definitionDesc,
+				from : offset,
+				to   : offset + desc.length,
+			});
+		}
+
+		//  --- multiline def list ---
+		if(!/^::/.test(lines[lineNumber]) && lineNumber + 1 < lines.length && /^::/.test(lines[lineNumber + 1])) {
+			const startLine = lineNumber;
+			const defs = [];
+
+			// collect all following :: definitions
+			for (let i = lineNumber + 1; i < lines.length; i++) {
+				const nextLine = lines[i];
+				const onlyColonsMatch = /^:*$/.test(nextLine);
+				const defMatch = /^(::)(.+)$/.exec(nextLine);
+				if(!onlyColonsMatch && defMatch) {
+					defs.push({ colons: defMatch[1], desc: defMatch[2], line: i });
+				} else break;
+			}
+
+			if(defs.length > 0 && lineText.trim().length > 0) {
+				tokens.push({
+					line : startLine,
+					type : customTags.definitionList,
+				});
+
+				// term
+				tokens.push({
+					line : startLine,
+					type : customTags.definitionTerm,
+					from : 0,
+					to   : lineText.length,
+				});
+
+				// definitions
+				defs.forEach((d)=>{
+					tokens.push({
+						line : d.line,
+						type : customTags.definitionList,
+					});
+
+					tokens.push({
+						line : d.line,
+						type : customTags.definitionColon,
+						from : 0,
+						to   : d.colons.length,
+					});
+					tokens.push({
+						line : d.line,
+						type : customTags.definitionDesc,
+						from : d.colons.length,
+						to   : d.colons.length + d.desc?.length,
+					});
+				});
+			}
+		}
+
+		if(lineText.includes('{') && lineText.includes('}')) {
+			const injectionRegex = /(?:^|[^{\n])({(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\2})/gmd;
+			let match;
+
+			while ((match = injectionRegex.exec(lineText)) !== null) {
+				tokens.push({
+					line : lineNumber,
+					from : match.indices[1][0],
+					to   : match.indices[1][1],
+					type : customTags.injection,
+				});
+			}
+		}
+		if(lineText.includes('{{') && lineText.includes('}}')) {
+			// Inline blocks: single-line {{…}}
+			const spanRegex = /{{(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\1 *|}}/g;
+			let match;
+			let blockCount = 0;
+			while ((match = spanRegex.exec(lineText)) !== null) {
+				if(match[0].startsWith('{{')) {
+					blockCount += 1;
+				} else {
+					blockCount -= 1;
+				}
+				if(blockCount < 0) {
+					blockCount = 0;
+					continue;
+				}
+				tokens.push({
+					line : lineNumber,
+					from : match.index,
+					to   : match.index + match[0].length,
+					type : customTags.inlineBlock,
+				});
+			}
+		} else if(lineText.trimLeft().startsWith('{{') || lineText.trimLeft().startsWith('}}')) {
+			// Highlight block divs {{\n Content \n}}
+			let endCh = lineText.length + 1;
+
+			const match = lineText.match(
+				/^ *{{(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\1 *$|^ *}}$/,
+			);
+			if(match) endCh = match.index + match[0].length;
+			const closingMatch = lineText.match(/ *(}})/d);
+			
+			if(closingMatch) {
+				tokens.push({ line: lineNumber, from: closingMatch.indices[1][0], to: closingMatch.indices[1][1], type: customTags.block });
+			} else {
+				tokens.push({ line: lineNumber, type: customTags.block });
+			}
+			
+		}
+	});
+
+	return tokens;
+}
+
+function tokenizeCustomCSS(text) {
+	const tokens = [];
+	const lines = text.split('\n');
+
+	lines.forEach((lineText, lineNumber)=>{
+
+		if(/--[a-zA-Z0-9-_]+/gm.test(lineText)) {
+			const varRegex =/--[a-zA-Z0-9-_]+/gm;
+			let match;
+			while ((match = varRegex.exec(lineText)) !== null) {
+				tokens.push({
+					line : lineNumber,
+					from : match.index +1,
+					to   : match.index + match.length[1] +1,
+					type : customTags.varProperty,
+				});
+			}
+		}
+	});
+
+	return tokens;
+}
+
+//assign classes to tags provided by lezer, not unlike the function above
+export const customHighlightStyle = HighlightStyle.define([
+	{ tag: tags.heading,  class: 'cm-header' },
+	{ tag: tags.heading1,  class: 'cm-header cm-header-1' },
+	{ tag: tags.heading2,  class: 'cm-header cm-header-2' },
+	{ tag: tags.heading3,  class: 'cm-header cm-header-3' },
+	{ tag: tags.heading4,  class: 'cm-header cm-header-4' },
+	{ tag: tags.heading5,  class: 'cm-header cm-header-5' },
+	{ tag: tags.heading6,  class: 'cm-header cm-header-6' },
+	{ tag: tags.link,  class: 'cm-link' },
+	{ tag: tags.string,  class: 'cm-string' },
+	{ tag: tags.url,  class: 'cm-string cm-url' },
+	{ tag: tags.list,  class: 'cm-list' },
+	{ tag: tags.strong,  class: 'cm-strong' },
+	{ tag: tags.emphasis,  class: 'cm-em' },
+	{ tag: tags.quote,  class: 'cm-quote' },
+	{ tag: tags.comment,  class: 'cm-comment' },
+	{ tag: tags.monospace,  class: 'cm-comment' },
+
+	//css tags
+
+	{ tag: tags.tagName,  class: 'cm-tag' },
+	{ tag: tags.className,  class: 'cm-class' },
+	{ tag: tags.propertyName,  class: 'cm-property' },
+	{ tag: tags.attributeValue,  class: 'cm-value' },
+	{ tag: tags.keyword,  class: 'cm-keyword' },
+	{ tag: tags.atom,  class: 'cm-atom' },
+	{ tag: tags.integer,  class: 'cm-integer' },
+	{ tag: tags.unit,  class: 'cm-unit' },
+	{ tag: tags.color,  class: 'cm-color' },
+	{ tag: tags.paren,  class: 'cm-paren' },
+	{ tag: tags.variableName,  class: 'cm-variable' },
+	{ tag: tags.invalid,  class: 'cm-error' },
+
+]);
+
+function getUrl(node, doc) {
+	let url = null;
+
+	const cursor = node.node.cursor();
+
+	if(cursor.firstChild()) {
+		do {
+			if(cursor.name === 'URL') {
+				url = doc.sliceString(cursor.from, cursor.to);
+				break;
+			}
+		} while (cursor.nextSibling());
+	}
+
+	return url;
+}
+
+import { WidgetType } from '@codemirror/view';
+
+class ImageWidget extends WidgetType {
+	constructor(url) {
+		super();
+		this.url = url;
+	}
+
+	toDOM() {
+		const img = document.createElement('img');
+		img.loading = "lazy";
+		img.className = 'cm-preview';
+		img.src = this.url;
+		
+
+		img.onerror = ()=>{
+			img.src  = 'client/icons/broken-image.jpg';
+		};
+
+		return img;
+	}
+
+	eq(other) {
+		return other.url === this.url;
+	}
+}
+
+export function customHighlightPlugin(renderer, tab) {
+	//this function takes the custom tokens created in the tokenize function in customhighlight files
+	//takes the tokens defined by that function and assigns classes to them
+	//it also creates page number and snippet number widgets
+
+	let tokenize;
+
+	if(tab === 'brewStyles') {
+		tokenize = tokenizeCustomCSS;
+	} else {
+		tokenize = renderer === 'V3' ? tokenizeCustomMarkdown : legacyTokenizeCustomMarkdown;
+	}
+
+	return ViewPlugin.fromClass(
+		class {
+			constructor(view) {
+				this.decorations = this.buildDecorations(view);
+			}
+			update(update) {
+				if(update.docChanged) {
+					this.decorations = this.buildDecorations(update.view);
+				}
+			}
+			buildDecorations(view) {
+				const decos = [];
+				const tokens = tokenize(view.state.doc.toString());
+				let pageCount = 1;
+				let snippetCount = 0;
+
+				const tree = ensureSyntaxTree(view.state, view.state.doc.length, 50) || syntaxTree(view.state);
+				tree.iterate({
+					enter : (node)=>{
+						if(node.name === 'Image') {
+							const url = getUrl(node, view.state.doc);
+
+							const widgetPosition = node.node.lastChild.from;
+							//this is not exactly standard, but should hold, 
+							//and is the shortest way i could find of positioning 
+							//the image inside the cm-image node
+
+							if(!url) return;
+
+							decos.push(
+								Decoration.mark({
+									class : 'cm-image'
+								}).range(node.from, node.to)
+							);
+							decos.push(
+								Decoration.widget({
+									widget : new ImageWidget(url),
+									side   : 1
+								}).range(widgetPosition)
+							);
+						}
+					}
+				});
+
+				tokens.forEach((token)=>{
+					const line = view.state.doc.line(token.line + 1);
+
+					if(token.from != null && token.to != null && token.from < token.to) {
+						const from = line.from + token.from;
+						const to = line.from + token.to;
+
+						const attrs = {};
+						if(token.type === 'Image' && token.url) {
+
+							attrs['data-url'] = token.url;
+						}
+
+						decos.push(
+							Decoration.mark({
+								class : `cm-${token.type}`,
+								...(Object.keys(attrs).length
+									? { attributes: attrs }
+									: {})
+							}).range(from, to)
+						);
+					} else {
+						decos.push(
+							Decoration.line({
+								class : `cm-${token.type}`
+							}).range(line.from)
+						);
+						if(token.type === 'pageLine' && tab === 'brewText') {
+							pageCount++;
+							if(line.from === 0) pageCount--;
+							decos.push(Decoration.line({ attributes: { 'data-page-number': pageCount } }).range(line.from));
+						}
+						if(token.type === 'snippetLine' && tab === 'brewSnippets') {
+							snippetCount++;
+							decos.push(Decoration.line({ attributes: { 'data-page-number': snippetCount } }).range(line.from));
+						}
+					}
+				});
+
+				decos.sort((a, b)=>a.from - b.from || a.to - b.to);
+				return Decoration.set(decos);
+			}
+		},
+		{ decorations: (v)=>v.decorations }
+	);
+};

client/components/codeEditor/extensions/customKeyMaps.js

@@ -0,0 +1,204 @@
+/* eslint max-lines: ["error", { "max": 300 }] */
+import { keymap } from '@codemirror/view';
+import { undo, redo, indentMore, deleteLine } from '@codemirror/commands';
+import { Prec } from '@codemirror/state';
+
+const insertTab = (view)=>{
+	const { from, to } = view.state.selection.main;
+
+	view.dispatch({
+		changes   : { from, to, insert: '  ' },
+		selection : { anchor: from + 2 }
+	});
+
+	return true;
+};
+
+const indentLess = (view)=>{
+	const { from, to } = view.state.selection.main;
+	const lines = [];
+	for (let l = view.state.doc.lineAt(from).number; l <= view.state.doc.lineAt(to).number; l++) {
+		const line = view.state.doc.line(l);
+		const match = line.text.match(/^ {1,2}/); // match up to 2 spaces
+		if(match) {
+			lines.push({ from: line.from, to: line.from + match[0].length, insert: '' });
+		}
+	}
+	if(lines.length > 0) view.dispatch({ changes: lines });
+	return true;
+};
+
+const wrapSelection = (prefix, suffix)=>(view)=>{
+	const changes = [];
+
+	for (const range of view.state.selection.ranges) {
+		const { from, to } = range;
+		const selected = view.state.doc.sliceString(from, to);
+
+		let text;
+
+		if(from === to) { text = prefix + suffix; } else if(selected.startsWith(prefix) && selected.endsWith(suffix)) {
+			text = selected.slice(prefix.length, -suffix.length);
+		} else {text = `${prefix}${selected}${suffix}`;}
+
+		changes.push({ from, to, insert: text });
+	}
+
+	view.dispatch({
+		changes
+	});
+
+	return true;
+};
+
+const makeNbsp = (view)=>{
+	const { from } = view.state.selection.main;
+
+	const prev2 = from >= 2
+		? view.state.doc.sliceString(from - 2, from)
+		: '';
+
+	const insert = (prev2 === ':>' || prev2 === '>>') ? '>' : ':>';
+
+	view.dispatch({
+		changes   : { from, to: from, insert },
+		selection : { anchor: from + insert.length },
+	});
+
+	return true;
+};
+
+const makeSpace = (view)=>{
+	const { from, to } = view.state.selection.main;
+	const selected = view.state.doc.sliceString(from, to);
+	const match = selected.match(/^{{width:(\d+)% }}$/);
+	let newText = '{{width:10% }}';
+	if(match) {
+		const percent = Math.min(parseInt(match[1], 10) + 10, 100);
+		newText = `{{width:${percent}% }}`;
+	}
+	view.dispatch({ changes: { from, to, insert: newText } });
+	return true;
+};
+
+const removeSpace = (view)=>{
+	const { from, to } = view.state.selection.main;
+	const selected = view.state.doc.sliceString(from, to);
+	const match = selected.match(/^{{width:(\d+)% }}$/);
+	if(match) {
+		const percent = parseInt(match[1], 10) - 10;
+		const newText = percent > 0 ? `{{width:${percent}% }}` : '';
+		view.dispatch({ changes: { from, to, insert: newText } });
+	}
+	return true;
+};
+
+const makeSpan = (view)=>{
+	const { from, to } = view.state.selection.main;
+	const selected = view.state.doc.sliceString(from, to);
+	const text = selected.startsWith('{{') && selected.endsWith('}}')
+		? selected.slice(2, -2)
+		: `{{${selected}}}`;
+	view.dispatch({ changes: { from, to, insert: text } });
+	return true;
+};
+
+const makeDiv = (view)=>{
+	const { from, to } = view.state.selection.main;
+	const selected = view.state.doc.sliceString(from, to);
+	const text = selected.startsWith('{{') && selected.endsWith('}}')
+		? selected.slice(2, -2)
+		: `{{\n${selected}\n}}`;
+	view.dispatch({ changes: { from, to, insert: text } });
+	return true;
+};
+
+const makeComment = (view)=>{
+	const { from, to } = view.state.selection.main;
+	const selected = view.state.doc.sliceString(from, to);
+	const isHtmlComment = selected.startsWith('<!--') && selected.endsWith('-->');
+	const text = isHtmlComment
+		? selected.slice(4, -3)
+		: `<!-- ${selected} -->`;
+	view.dispatch({ changes: { from, to, insert: text } });
+	return true;
+};
+
+const makeLink = (view)=>{
+	const { from, to } = view.state.selection.main;
+	const selected = view.state.doc.sliceString(from, to).trim();
+	const isLink = /^\[(.*)\]\((.*)\)$/.exec(selected);
+	const text = isLink ? `${isLink[1]} ${isLink[2]}` : `[${selected || 'alt text'}](url)`;
+	view.dispatch({ changes: { from, to, insert: text } });
+	return true;
+};
+
+const makeList = (type)=>(view)=>{
+	const { from, to } = view.state.selection.main;
+	const lines = [];
+	for (let l = from; l <= to; l++) {
+		const lineText = view.state.doc.line(l + 1).text;
+		lines.push(lineText);
+	}
+	const joined = lines.join('\n');
+	let newText;
+	if(type === 'UL') newText = joined.replace(/^/gm, '- ');
+	else newText = joined.replace(/^/gm, (m, i)=>`${i + 1}. `);
+	view.dispatch({ changes: { from, to, insert: newText } });
+	return true;
+};
+
+const makeHeader = (level)=>(view)=>{
+	const { from, to } = view.state.selection.main;
+	const selected = view.state.doc.sliceString(from, to);
+	const text = `${'#'.repeat(level)} ${selected}`;
+	view.dispatch({ changes: { from, to, insert: text } });
+	return true;
+};
+
+const newColumn = (view)=>{
+	const { from, to } = view.state.selection.main;
+	view.dispatch({ changes: { from, to, insert: '\n\\column\n\n' } });
+	return true;
+};
+
+const newPage = (view)=>{
+	const { from, to } = view.state.selection.main;
+	view.dispatch({ changes: { from, to, insert: '\n\\page\n\n' } });
+	return true;
+};
+
+export const generalKeymap = Prec.high(keymap.of([
+	{ key: 'Tab', run: insertTab },
+	{ key: 'Mod-z', run: undo }, //i think it may be unnecessary
+	{ key: 'Mod-Shift-z', run: redo },
+	{ key: 'Mod-y', run: redo },
+	{ key: 'Mod-d', run: deleteLine },
+]));
+
+export const markdownKeymap = Prec.highest(keymap.of([
+	//{ key: 'Shift-Tab', run: indentMore },
+	{ key: 'Shift-Tab',       run: indentLess },
+	{ key: 'Mod-b',           run: wrapSelection('**', '**') },    // makeBold
+	{ key: 'Mod-i',           run: wrapSelection('*', '*') },      // makeItalic
+	{ key: 'Mod-u',           run: wrapSelection('<u>', '</u>') }, // makeUnderline
+	{ key: 'Shift-Mod-=',     run: wrapSelection('^', '^') },      // makeSuper
+	{ key: 'Mod-=',           run: wrapSelection('^^', '^^') },    // makeSub
+	{ key: 'Mod-.',           run: makeNbsp },
+	{ key: 'Shift-Mod-.',     run: makeSpace },
+	{ key: 'Shift-Mod-,',     run: removeSpace },
+	{ key: 'Mod-m',           run: makeSpan },
+	{ key: 'Shift-Mod-m',     run: makeDiv },
+	{ key: 'Mod-/',           run: makeComment },
+	{ key: 'Mod-k',           run: makeLink },
+	{ key: 'Mod-l',           run: makeList('UL') },
+	{ key: 'Shift-Mod-l',     run: makeList('OL') },
+	{ key: 'Shift-Mod-1',     run: makeHeader(1) },
+	{ key: 'Shift-Mod-2',     run: makeHeader(2) },
+	{ key: 'Shift-Mod-3',     run: makeHeader(3) },
+	{ key: 'Shift-Mod-4',     run: makeHeader(4) },
+	{ key: 'Shift-Mod-5',     run: makeHeader(5) },
+	{ key: 'Shift-Mod-6',     run: makeHeader(6) },
+	{ key: 'Mod-Enter',       run: newPage },
+	{ key: 'Shift-Mod-Enter', run: newColumn },
+]));

client/components/codeEditor/extensions/legacyCustomHighlight.js

@@ -0,0 +1,54 @@
+import { HighlightStyle } from '@codemirror/language';
+import { tags } from '@lezer/highlight';
+
+const customTags = {
+	pageLine    : 'pageLine', // .cm-pageLine
+	snippetLine : 'snippetLine', // .cm-snippetLine
+};
+
+export function legacyTokenizeCustomMarkdown(text) {
+	const tokens = [];
+	const lines = text.split('\n');
+
+	lines.forEach((lineText, lineNumber)=>{
+		// --- Page / snippet lines ---
+		if(/^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m.test(lineText)) tokens.push({ line: lineNumber, type: customTags.pageLine });
+		if(/^\\snippet\ .*$/.test(lineText)) tokens.push({ line: lineNumber, type: customTags.snippetLine });
+	});
+
+	return tokens;
+}
+
+export const legacyCustomHighlightStyle = HighlightStyle.define([
+	{ tag: tags.heading,  class: 'cm-header' },
+	{ tag: tags.heading1,  class: 'cm-header cm-header-1' },
+	{ tag: tags.heading2,  class: 'cm-header cm-header-2' },
+	{ tag: tags.heading3,  class: 'cm-header cm-header-3' },
+	{ tag: tags.heading4,  class: 'cm-header cm-header-4' },
+	{ tag: tags.heading5,  class: 'cm-header cm-header-5' },
+	{ tag: tags.heading6,  class: 'cm-header cm-header-6' },
+	{ tag: tags.link,  class: 'cm-link' },
+	{ tag: tags.string,  class: 'cm-string' },
+	{ tag: tags.url,  class: 'cm-string cm-url' },
+	{ tag: tags.list,  class: 'cm-list' },
+	{ tag: tags.strong,  class: 'cm-strong' },
+	{ tag: tags.emphasis,  class: 'cm-em' },
+	{ tag: tags.quote,  class: 'cm-quote' },
+
+	//css tags
+
+	{ tag: tags.tagName,  class: 'cm-tag' },
+	{ tag: tags.className,  class: 'cm-class' },
+	{ tag: tags.propertyName,  class: 'cm-property' },
+	{ tag: tags.attributeValue,  class: 'cm-value' },
+	{ tag: tags.keyword,  class: 'cm-keyword' },
+	{ tag: tags.atom,  class: 'cm-atom' },
+	{ tag: tags.integer,  class: 'cm-integer' },
+	{ tag: tags.unit,  class: 'cm-unit' },
+	{ tag: tags.color,  class: 'cm-color' },
+	{ tag: tags.paren,  class: 'cm-paren' },
+	{ tag: tags.variableName,  class: 'cm-variable' },
+	{ tag: tags.invalid,  class: 'cm-error' },
+	{ tag: tags.comment,  class: 'cm-comment' },
+]);
+

client/components/codeEditor/fold-css.js

@@ -1,44 +0,0 @@
-export default {
-	registerHomebreweryHelper : function(CodeMirror) {
-		CodeMirror.registerHelper('fold', 'homebrewerycss', function(cm, start) {
-
-			// BRACE FOLDING
-			const startMatcher = /\{[ \t]*$/;
-			const endMatcher = /\}[ \t]*$/;
-			const activeLine = cm.getLine(start.line);
-
-
-			if(activeLine.match(startMatcher)) {
-				const lastLineNo = cm.lastLine();
-				let end = start.line + 1;
-				let braceCount = 1;
-
-				while (end < lastLineNo) {
-					const curLine = cm.getLine(end);
-					if(curLine.match(startMatcher)) braceCount++;
-					if(curLine.match(endMatcher)) braceCount--;
-					if(braceCount == 0) break;
-					++end;
-				}
-
-				return {
-					from : CodeMirror.Pos(start.line, 0),
-					to   : CodeMirror.Pos(end, cm.getLine(end).length)
-				};
-			}
-
-			// @import and data-url folding
-			const importMatcher  = /^@import.*?;/;
-			const dataURLMatcher = /url\(.*?data\:.*\)/;
-
-			if(activeLine.match(importMatcher) || activeLine.match(dataURLMatcher)) {
-				return {
-					from : CodeMirror.Pos(start.line, 0),
-					to   : CodeMirror.Pos(start.line, activeLine.length)
-				};
-			}
-
-			return null;
-		});
-	}
-};

client/components/codeEditor/fold-pages.js

@@ -1,26 +0,0 @@
-export default {
-	registerHomebreweryHelper : function(CodeMirror) {
-		CodeMirror.registerHelper('fold', 'homebrewery', function(cm, start) {
-			const matcher = /^\\page.*/;
-			const prevLine = cm.getLine(start.line - 1);
-
-			if(start.line === cm.firstLine() || prevLine.match(matcher)) {
-				const lastLineNo = cm.lastLine();
-				let end = start.line;
-
-				while (end < lastLineNo) {
-					if(cm.getLine(end + 1).match(matcher))
-						break;
-					++end;
-				}
-
-				return {
-					from : CodeMirror.Pos(start.line, 0),
-					to   : CodeMirror.Pos(end, cm.getLine(end).length)
-				};
-			}
-
-			return null;
-		});
-	}
-};

client/components/combobox.jsx

@@ -11,16 +11,17 @@ const Combobox = createReactClass({
 			trigger     : 'hover',
 			default     : '',
 			placeholder : '',
-			tooltip: '',
+			tooltip     : '',
 			autoSuggest : {
 				clearAutoSuggestOnClick : true,
 				suggestMethod           : 'includes',
 				filterOn                : []  // should allow as array to filter on multiple attributes, or even custom filter
 			},
-			valuePatterns: /.+/
+			valuePatterns : /.+/
 		};
 	},
 	getInitialState : function() {
+		this.dropdownRef = React.createRef();
 		return {
 			showDropdown : false,
 			value        : '',
@@ -41,7 +42,7 @@ const Combobox = createReactClass({
 	},
 	handleClickOutside : function(e){
 		// Close dropdown when clicked outside
-		if(this.refs.dropdown && !this.refs.dropdown.contains(e.target)) {
+		if(this.dropdownRef.current && !this.dropdownRef.current.contains(e.target)) {
 			this.handleDropdown(false);
 		}
 	},
@@ -88,7 +89,7 @@ const Combobox = createReactClass({
 						}
 					}}
 					onKeyDown={(e)=>{
-						if (e.key === "Enter") {
+						if(e.key === 'Enter') {
 							e.preventDefault();
 							this.props.onEntry(e);
 						}
@@ -128,7 +129,7 @@ const Combobox = createReactClass({
 		});
 		return (
 			<div className={`dropdown-container ${this.props.className}`}
-				ref='dropdown'
+				ref={this.dropdownRef}
 				onMouseLeave={this.props.trigger == 'hover' ? ()=>{this.handleDropdown(false);} : undefined}>
 				{this.renderTextInput()}
 				{this.renderDropdown(dropdownChildren)}

client/components/renderWarnings/renderWarnings.less

@@ -1,3 +1,5 @@
+@import '@sharedStyles/colors.less';
+
 .renderWarnings {
 	position         : relative;
 	float            : right;

client/components/splitPane/splitPane.less

@@ -1,3 +1,4 @@
+@import '@sharedStyles/core.less';
 
 .splitPane {
 	position       : relative;

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -1,10 +1,12 @@
 /*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
+import brewRendererStylesUrl from './brewRenderer.less?url';
+import headerNavStylesUrl from './headerNav/headerNav.less?url';
 import './brewRenderer.less';
 import React, { useState, useRef, useMemo, useEffect } from 'react';
 import _ from 'lodash';
 
-import MarkdownLegacy from '../../../shared/markdownLegacy.js';
+import MarkdownLegacy from '@shared/markdownLegacy.js';
-import Markdown from '../../../shared/markdown.js';
+import Markdown from '@shared/markdown.js';
 import ErrorBar from './errorBar/errorBar.jsx';
 import ToolBar  from './toolBar/toolBar.jsx';
 
@@ -13,10 +15,10 @@ import RenderWarnings from '../../components/renderWarnings/renderWarnings.jsx';
 import NotificationPopup from './notificationPopup/notificationPopup.jsx';
 import Frame from 'react-frame-component';
 import dedent from 'dedent';
-import { printCurrentBrew } from '../../../shared/helpers.js';
+import { printCurrentBrew } from '@shared/helpers.js';
 
 import HeaderNav from './headerNav/headerNav.jsx';
-import { safeHTML } from './safeHTML.js';
+import safeHTML from './safeHTML.js';
 
 const PAGEBREAK_REGEX_V3 = /^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m;
 const PAGEBREAK_REGEX_LEGACY = /\\page(?:break)?/m;
@@ -27,9 +29,10 @@ const TOOLBAR_STATE_KEY = 'HB_renderer_toolbarState';
 
 const INITIAL_CONTENT = dedent`
 	<!DOCTYPE html><html><head>
-	<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
 	<link href='/homebrew/bundle.css' type="text/css" rel='stylesheet' />
-	<base target=_blank>
+	<link href="${brewRendererStylesUrl}" rel="stylesheet" />
+	<link href="${headerNavStylesUrl}" rel="stylesheet" />
+	<base target="_top">
 	</head><body style='overflow: hidden'><div></div></body></html>`;
 
 
@@ -38,6 +41,7 @@ const BrewPage = (props)=>{
 	props = {
 		contents : '',
 		index    : 0,
+		hoisted  : false,
 		...props
 	};
 	const pageRef   = useRef(null);
@@ -132,6 +136,7 @@ const BrewRenderer = (props)=>{
 
 	const mainRef  = useRef(null);
 	const pagesRef = useRef(null);
+	const urlRef = useRef('');
 
 	if(props.renderer == 'legacy') {
 		rawPages = props.text.split(PAGEBREAK_REGEX_LEGACY);
@@ -204,13 +209,13 @@ const BrewRenderer = (props)=>{
 					styles     = _.mapKeys(styles, (v, k)=>k.startsWith('--') ? k : _.camelCase(k)); // Convert CSS to camelCase for React
 					classes    = [classes, injectedTags.classes].join(' ').trim();
 					attributes = injectedTags.attributes;
-					if(global.enable_v4) {
+					if(global.enablev4) {
 						if (attributes && Object.hasOwn(attributes, 'hbtemplate')) {
 							pageTemplates[index] = attributes['hbtemplate'];
 						}
 					}
 				}
-				if(global.enable_v4) {
+				if(global.enablev4) {
 					// If we don't have a template for this page, look backwards until one is found or the first page.
 					if(!pageTemplates[index]) {
 						for (let i=index;i>=0; i--) {
@@ -231,7 +236,8 @@ const BrewRenderer = (props)=>{
 		}
 	};
 
-	const renderPages = ()=>{
+	const renderPages = (checkHoists = false)=>{
+
 		if(props.errors && props.errors.length)
 			return renderedPages;
 
@@ -245,10 +251,16 @@ const BrewRenderer = (props)=>{
 			renderedPages[props.currentEditorCursorPageNum - 1] = renderPage(rawPages[props.currentEditorCursorPageNum - 1], props.currentEditorCursorPageNum - 1);
 
 		_.forEach(rawPages, (page, index)=>{
-			if((isInView(index) || !renderedPages[index]) && typeof window !== 'undefined'){
+			const varsOnPageRegex = /([!$]?)\[((?!\s*\])(?:\\.|[^\[\]\\])+)\]/g; // Find out if there are any vars on the page.
+			const forceRender = checkHoists &&
+				!props.hoisted &&
+				(page.match(varsOnPageRegex));  // forceRender forces pages outside of the PPR range to render if true.
+			                                    // This is necessary on the first load to fully populate the variable table.
+			if((isInView(index) || !renderedPages[index] || forceRender) && typeof window !== 'undefined'){
 				renderedPages[index] = renderPage(page, index); // Render any page not yet rendered, but only re-render those in PPR range
 			}
 		});
+		if(!props.hoisted) { props.hoisted = true; } // Only fully hoist once.
 		return renderedPages;
 	};
 
@@ -285,8 +297,10 @@ const BrewRenderer = (props)=>{
 	const frameDidMount = ()=>{	//This triggers when iFrame finishes internal "componentDidMount"
 		scrollToHash(window.location.hash);
 
+		window.addEventListener('hashchange', ()=>scrollToHash(window.location.hash));
+
 		setTimeout(()=>{	//We still see a flicker where the style isn't applied yet, so wait 100ms before showing iFrame
-			renderPages(); //Make sure page is renderable before showing
+			renderPages(true); //Make sure page is renderable before showing
 			setState((prevState)=>({
 				...prevState,
 				isMounted  : true,

client/homebrew/brewRenderer/brewRenderer.less

@@ -1,4 +1,4 @@
-@import (multiple, less) 'shared/naturalcrit/styles/reset.less';
+@import '@sharedStyles/core.less';
 
 .brewRenderer {
 	height        : 100vh;

client/homebrew/brewRenderer/errorBar/errorBar.less

@@ -1,3 +1,4 @@
+@import '@sharedStyles/colors.less';
 
 .errorBar {
 	position         : absolute;

client/homebrew/brewRenderer/headerNav/headerNav.jsx

@@ -104,7 +104,7 @@ const HeaderNavItem = ({ link, text, depth, className })=>{
 	if(!link || !text) return;
 
 	return <li>
-		<a href={`#${link}`} target='_self' className={`depth-${depth} ${className ?? ''}`}>
+		<a href={`#${link}`} className={`depth-${depth} ${className ?? ''}`}>
 			{trimString(text, depth)}
 		</a>
 	</li>;

client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx

@@ -1,7 +1,7 @@
 import './notificationPopup.less';
 import React, { useEffect, useState } from 'react';
 import request from '../../utils/request-middleware.js';
-import Markdown from 'markdown.js';
+import Markdown from '@shared/markdown.js';
 
 import Dialog from '../../../components/dialog.jsx';
 

client/homebrew/brewRenderer/notificationPopup/notificationPopup.less

@@ -1,3 +1,5 @@
+@import './client/homebrew/navbar/navbar.less';
+
 .popups {
 	position         : fixed;
 	top              : calc(@navbarHeight + @viewerToolsHeight);

client/homebrew/brewRenderer/safeHTML.js

@@ -43,4 +43,4 @@ function safeHTML(htmlString) {
 	return div.innerHTML;
 };
 
-module.exports.safeHTML = safeHTML;
+export default safeHTML;

client/homebrew/editor/editor.jsx

@@ -4,7 +4,6 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import _ from 'lodash';
 import dedent from 'dedent';
-import Markdown from '../../../shared/markdown.js';
 
 import CodeEditor from '../../components/codeEditor/codeEditor.jsx';
 import SnippetBar from './snippetbar/snippetbar.jsx';
@@ -12,8 +11,22 @@ import MetadataEditor from './metadataEditor/metadataEditor.jsx';
 
 const EDITOR_THEME_KEY = 'HB_editor_theme';
 
-const PAGEBREAK_REGEX_V3 = /^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m;
+import defaultCM5Theme from '@themes/codeMirror/default.js';
-const SNIPPETBREAK_REGEX_V3 = /^\\snippet\ .*$/;
+import darkbrewery from '@themes/codeMirror/darkbrewery.js';
+import cm5Themes from 'codemirror-5-themes';
+
+const themes = { default: defaultCM5Theme, ...cm5Themes, darkbrewery };
+
+const EditorThemes = Object.entries(themes)
+  .filter(([name, value])=>Array.isArray(value) &&
+	!name.endsWith('Init') &&
+	!name.endsWith('Style')
+  )
+  .map(([name])=>name);
+
+
+//const PAGEBREAK_REGEX_V3 = /^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m;
+//const SNIPPETBREAK_REGEX_V3 = /^\\snippet\ .*$/;
 const DEFAULT_STYLE_TEXT = dedent`
 				/*=======---  Example CSS styling  ---=======*/
 				/* Any CSS here will apply to your document! */
@@ -30,6 +43,7 @@ const DEFAULT_SNIPPET_TEXT = dedent`
 				This snippet is accessible in the brew tab, and will be inherited if the brew is used as a theme.
 `;
 let isJumping = false;
+let jumpSource = null;
 
 const Editor = createReactClass({
 	displayName     : 'Editor',
@@ -72,23 +86,20 @@ const Editor = createReactClass({
 
 	componentDidMount : function() {
 
-		this.highlightCustomMarkdown();
+		const brewRenderer = document.getElementById('BrewRenderer');
-		document.getElementById('BrewRenderer').addEventListener('keydown', this.handleControlKeys);
+		brewRenderer.onload = ()=>brewRenderer.contentDocument?.addEventListener('keydown', this.handleControlKeys);
 		document.addEventListener('keydown', this.handleControlKeys);
 
-		this.codeEditor.current.codeMirror?.on('cursorActivity', (cm)=>{this.updateCurrentCursorPage(cm.getCursor());});
-		this.codeEditor.current.codeMirror?.on('scroll', _.throttle(()=>{this.updateCurrentViewPage(this.codeEditor.current.getTopVisibleLine());}, 200));
-
 		const editorTheme = window.localStorage.getItem(EDITOR_THEME_KEY);
-		if(editorTheme) {
+		if(editorTheme && EditorThemes.includes(editorTheme)) {
-			this.setState({
+  			this.setState({ editorTheme });
-				editorTheme : editorTheme
+		} else {
-			});
+  			this.setState({ editorTheme: 'default' });
 		}
 		const snippetBar = document.querySelector('.editor > .snippetBar');
 		if(!snippetBar) return;
 
-		this.resizeObserver = new ResizeObserver(entries=>{
+		this.resizeObserver = new ResizeObserver((entries)=>{
 			const height = document.querySelector('.editor > .snippetBar').offsetHeight;
 			this.setState({ snippetBarHeight: height });
 		});
@@ -98,7 +109,6 @@ const Editor = createReactClass({
 
 	componentDidUpdate : function(prevProps, prevState, snapshot) {
 
-		this.highlightCustomMarkdown();
 		if(prevProps.moveBrew !== this.props.moveBrew)
 			this.brewJump();
 
@@ -132,22 +142,16 @@ const Editor = createReactClass({
 		}
 	},
 
-	updateCurrentCursorPage : function(cursor) {
+	updateCurrentCursorPage : function(pageNumber) {
-		const lines = this.props.brew.text.split('\n').slice(1, cursor.line + 1);
+		this.props.onCursorPageChange(pageNumber);
-		const pageRegex = this.props.brew.renderer == 'V3' ? PAGEBREAK_REGEX_V3 : /\\page/;
-		const currentPage = lines.reduce((count, line)=>count + (pageRegex.test(line) ? 1 : 0), 1);
-		this.props.onCursorPageChange(currentPage);
 	},
 
-	updateCurrentViewPage : function(topScrollLine) {
+	updateCurrentViewPage : function(pageNumber) {
-		const lines = this.props.brew.text.split('\n').slice(1, topScrollLine + 1);
+		this.props.onViewPageChange(pageNumber);
-		const pageRegex = this.props.brew.renderer == 'V3' ? PAGEBREAK_REGEX_V3 : /\\page/;
-		const currentPage = lines.reduce((count, line)=>count + (pageRegex.test(line) ? 1 : 0), 1);
-		this.props.onViewPageChange(currentPage);
 	},
 
 	handleInject : function(injectText){
-		this.codeEditor.current?.injectText(injectText, false);
+		this.codeEditor.current?.injectText(injectText);
 	},
 
 	handleViewChange : function(newView){
@@ -156,181 +160,12 @@ const Editor = createReactClass({
 		this.setState({
 			view : newView
 		}, ()=>{
-			this.codeEditor.current?.codeMirror?.focus();
+			this.codeEditor.current?.focus();
 		});
 	},
 
-	highlightCustomMarkdown : function(){
-		if(!this.codeEditor.current?.codeMirror) return;
-		if((this.state.view === 'text') ||(this.state.view === 'snippet')) {
-			const codeMirror = this.codeEditor.current.codeMirror;
-
-			codeMirror?.operation(()=>{ // Batch CodeMirror styling
-
-				const foldLines = [];
-
-				//reset custom text styles
-				const customHighlights = codeMirror?.getAllMarks().filter((mark)=>{
-					// Record details of folded sections
-					if(mark.__isFold) {
-						const fold = mark.find();
-						foldLines.push({ from: fold.from?.line, to: fold.to?.line });
-					}
-					return !mark.__isFold;
-				}); //Don't undo code folding
-
-				for (let i=customHighlights.length - 1;i>=0;i--) customHighlights[i].clear();
-
-				let userSnippetCount = 1; // start snippet count from snippet 1
-				let editorPageCount = 1; // start page count from page 1
-
-				const whichSource = this.state.view === 'text' ? this.props.brew.text : this.props.brew.snippets;
-				_.forEach(whichSource?.split('\n'), (line, lineNumber)=>{
-
-					const tabHighlight = this.state.view === 'text' ? 'pageLine' : 'snippetLine';
-					const textOrSnip = this.state.view === 'text';
-
-					//reset custom line styles
-					codeMirror?.removeLineClass(lineNumber, 'background', 'pageLine');
-					codeMirror?.removeLineClass(lineNumber, 'background', 'snippetLine');
-					codeMirror?.removeLineClass(lineNumber, 'text');
-					codeMirror?.removeLineClass(lineNumber, 'wrap', 'sourceMoveFlash');
-
-					// Don't process lines inside folded text
-					// If the current lineNumber is inside any folded marks, skip line styling
-					if(foldLines.some((fold)=>lineNumber >= fold.from && lineNumber <= fold.to))
-						return;
-
-					// Styling for \page breaks
-					if((this.props.renderer == 'legacy' && line.includes('\\page')) ||
-				     (this.props.renderer == 'V3'     && line.match(textOrSnip ? PAGEBREAK_REGEX_V3 : SNIPPETBREAK_REGEX_V3))) {
-
-						if((lineNumber > 0) && (textOrSnip))      // Since \page is optional on first line of document,
-							editorPageCount += 1; // don't use it to increment page count; stay at 1
-						else if(this.state.view !== 'text')	userSnippetCount += 1;
-
-						// add back the original class 'background' but also add the new class '.pageline'
-						codeMirror?.addLineClass(lineNumber, 'background', tabHighlight);
-						const pageCountElement = Object.assign(document.createElement('span'), {
-							className   : 'editor-page-count',
-							textContent : textOrSnip ? editorPageCount : userSnippetCount
-						});
-						codeMirror?.setBookmark({ line: lineNumber, ch: line.length }, pageCountElement);
-					};
-
-
-					// New CodeMirror styling for V3 renderer
-					if(this.props.renderer === 'V3') {
-						if(line.match(/^\\column(?:break)?$/)){
-							codeMirror?.addLineClass(lineNumber, 'text', 'columnSplit');
-						}
-
-						// definition lists
-						if(line.includes('::')){
-							if(/^:*$/.test(line) == true){ return; };
-							const regex = /^([^\n]*?:?\s?)(::[^\n]*)(?:\n|$)/ymd;  // the `d` flag, for match indices, throws an ESLint error.
-							let match;
-							while ((match = regex.exec(line)) != null){
-								codeMirror?.markText({ line: lineNumber, ch: match.indices[0][0] }, { line: lineNumber, ch: match.indices[0][1] }, { className: 'dl-highlight' });
-								codeMirror?.markText({ line: lineNumber, ch: match.indices[1][0] }, { line: lineNumber, ch: match.indices[1][1] }, { className: 'dt-highlight' });
-								codeMirror?.markText({ line: lineNumber, ch: match.indices[2][0] }, { line: lineNumber, ch: match.indices[2][1] }, { className: 'dd-highlight' });
-								const ddIndex = match.indices[2][0];
-								const colons = /::/g;
-								const colonMatches = colons.exec(match[2]);
-								if(colonMatches !== null){
-									codeMirror?.markText({ line: lineNumber, ch: colonMatches.index + ddIndex }, { line: lineNumber, ch: colonMatches.index + colonMatches[0].length + ddIndex }, { className: 'dl-colon-highlight' });
-								}
-							}
-						}
-
-						// Subscript & Superscript
-						if(line.includes('^')) {
-							let startIndex = line.indexOf('^');
-							const superRegex = /\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^/gy;
-							const subRegex   = /\^\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^\^/gy;
-
-							while (startIndex >= 0) {
-								superRegex.lastIndex = subRegex.lastIndex = startIndex;
-								let isSuper = false;
-								const match = subRegex.exec(line) || superRegex.exec(line);
-								if(match) {
-									isSuper = !subRegex.lastIndex;
-									codeMirror?.markText({ line: lineNumber, ch: match.index }, { line: lineNumber, ch: match.index + match[0].length }, { className: isSuper ? 'superscript' : 'subscript' });
-								}
-								startIndex = line.indexOf('^', Math.max(startIndex + 1, subRegex.lastIndex, superRegex.lastIndex));
-							}
-						}
-
-						// Highlight injectors {style}
-						if(line.includes('{') && line.includes('}')){
-							const regex = /(?:^|[^{\n])({(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\2})/gm;
-							let match;
-							while ((match = regex.exec(line)) != null) {
-								codeMirror?.markText({ line: lineNumber, ch: line.indexOf(match[1]) }, { line: lineNumber, ch: line.indexOf(match[1]) + match[1].length }, { className: 'injection' });
-							}
-						}
-						// Highlight inline spans {{content}}
-						if(line.includes('{{') && line.includes('}}')){
-							const regex = /{{(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\1 *|}}/g;
-							let match;
-							let blockCount = 0;
-							while ((match = regex.exec(line)) != null) {
-								if(match[0].startsWith('{')) {
-									blockCount += 1;
-								} else {
-									blockCount -= 1;
-								}
-								if(blockCount < 0) {
-									blockCount = 0;
-									continue;
-								}
-								codeMirror?.markText({ line: lineNumber, ch: match.index }, { line: lineNumber, ch: match.index + match[0].length }, { className: 'inline-block' });
-							}
-						} else if(line.trimLeft().startsWith('{{') || line.trimLeft().startsWith('}}')){
-							// Highlight block divs {{\n Content \n}}
-							let endCh = line.length+1;
-
-							const match = line.match(/^ *{{(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\1 *$|^ *}}$/);
-							if(match)
-								endCh = match.index+match[0].length;
-							codeMirror?.markText({ line: lineNumber, ch: 0 }, { line: lineNumber, ch: endCh }, { className: 'block' });
-						}
-
-						// Emojis
-						if(line.match(/:[^\s:]+:/g)) {
-							let startIndex = line.indexOf(':');
-							const emojiRegex = /:[^\s:]+:/gy;
-
-							while (startIndex >= 0) {
-								emojiRegex.lastIndex = startIndex;
-								const match = emojiRegex.exec(line);
-								if(match) {
-									let tokens = Markdown.marked.lexer(match[0]);
-									tokens = tokens[0].tokens.filter((t)=>t.type == 'emoji');
-									if(!tokens.length)
-										return;
-
-									const startPos = { line: lineNumber, ch: match.index };
-									const endPos   = { line: lineNumber, ch: match.index + match[0].length };
-
-									// Iterate over conflicting marks and clear them
-									const marks = codeMirror?.findMarks(startPos, endPos);
-									marks.forEach(function(marker) {
-										if(!marker.__isFold) marker.clear();
-									});
-									codeMirror?.markText(startPos, endPos, { className: 'emoji' });
-								}
-								startIndex = line.indexOf(':', Math.max(startIndex + 1, emojiRegex.lastIndex));
-							}
-						}
-					}
-				});
-			});
-		}
-	},
-
 	brewJump : function(targetPage=this.props.currentEditorCursorPageNum, smooth=true){
-		if(!window || !this.isText() || isJumping)
+		if(!window || !this.isText() || isJumping || jumpSource === 'source')
 			return;
 
 		// Get current brewRenderer scroll position and calculate target position
@@ -343,11 +178,13 @@ const Editor = createReactClass({
 			clearTimeout(scrollingTimeout);   // Reset the timer every time a scroll event occurs
 			scrollingTimeout = setTimeout(()=>{
 				isJumping = false;
+				jumpSource = null;
 				brewRenderer.removeEventListener('scroll', checkIfScrollComplete);
 			}, 150);	// If 150 ms pass without a brewRenderer scroll event, assume scrolling is done
 		};
 
 		isJumping = true;
+		jumpSource = 'brew';
 		checkIfScrollComplete();
 		brewRenderer.addEventListener('scroll', checkIfScrollComplete);
 
@@ -371,54 +208,17 @@ const Editor = createReactClass({
 	},
 
 	sourceJump : function(targetPage=this.props.currentBrewRendererPageNum, smooth=true){
-		if(!this.isText() || isJumping)
+		if(!this.isText() || isJumping || jumpSource === 'brew')
 			return;
 
-		const textSplit  = this.props.renderer == 'V3' ? PAGEBREAK_REGEX_V3 : /\\page/;
+		const editor = this.codeEditor.current;
-		const textString = this.props.brew.text.split(textSplit).slice(0, targetPage-1).join(textSplit);
+		if(!editor) return;
-		const targetLine = textString.match('\n') ? textString.split('\n').length - 1 : -1;
+		jumpSource = 'source';
 
-		let currentY = this.codeEditor.current.codeMirror?.getScrollInfo().top;
+		editor.scrollToPage(targetPage);
-		let targetY  = this.codeEditor.current.codeMirror?.heightAtLine(targetLine, 'local', true);
+		setTimeout(()=>{
-
+			jumpSource = null;
-		let scrollingTimeout;
+		}, 200);
-		const checkIfScrollComplete = ()=>{ // Prevent interrupting a scroll in progress if user clicks multiple times
-			clearTimeout(scrollingTimeout); // Reset the timer every time a scroll event occurs
-			scrollingTimeout = setTimeout(()=>{
-				isJumping = false;
-				this.codeEditor.current.codeMirror?.off('scroll', checkIfScrollComplete);
-			}, 150); // If 150 ms pass without a scroll event, assume scrolling is done
-		};
-
-		isJumping = true;
-		checkIfScrollComplete();
-		if(this.codeEditor.current?.codeMirror) {
-			this.codeEditor.current.codeMirror?.on('scroll', checkIfScrollComplete);
-		}
-
-		if(smooth) {
-			//Scroll 1/10 of the way every 10ms until 1px off.
-			const incrementalScroll = setInterval(()=>{
-				currentY += (targetY - currentY) / 10;
-				this.codeEditor.current.codeMirror?.scrollTo(null, currentY);
-
-				// Update target: target height is not accurate until within +-10 lines of the visible window
-				if(Math.abs(targetY - currentY > 100))
-					targetY = this.codeEditor.current.codeMirror?.heightAtLine(targetLine, 'local', true);
-
-				// End when close enough
-				if(Math.abs(targetY - currentY) < 1) {
-					this.codeEditor.current.codeMirror?.scrollTo(null, targetY);  // Scroll any remaining difference
-					this.codeEditor.current.setCursorPosition({ line: targetLine + 1, ch: 0 });
-					this.codeEditor.current.codeMirror?.addLineClass(targetLine + 1, 'wrap', 'sourceMoveFlash');
-					clearInterval(incrementalScroll);
-				}
-			}, 10);
-		} else {
-			this.codeEditor.current.codeMirror?.scrollTo(null, targetY);  // Scroll any remaining difference
-			this.codeEditor.current.setCursorPosition({ line: targetLine + 1, ch: 0 });
-			this.codeEditor.current.codeMirror?.addLineClass(targetLine + 1, 'wrap', 'sourceMoveFlash');
-		}
 	},
 
 	//Called when there are changes to the editor's dimensions
@@ -446,9 +246,11 @@ const Editor = createReactClass({
 					view={this.state.view}
 					value={this.props.brew.text}
 					onChange={this.props.onBrewChange('text')}
+					onCursorChange={(page)=>this.updateCurrentCursorPage(page)}
+					onViewChange={(page)=>this.updateCurrentViewPage(page)}
 					editorTheme={this.state.editorTheme}
-					rerenderParent={this.rerenderParent}
+					renderer={this.props.brew.renderer}
-					style={{  height: `calc(100% - ${this.state.snippetBarHeight}px)` }} />
+					style={{  height: `calc(100% - ${this.state.snippetBarHeight}px)` }}/>
 			</>;
 		}
 		if(this.isStyle()){
@@ -460,18 +262,16 @@ const Editor = createReactClass({
 					view={this.state.view}
 					value={this.props.brew.style ?? DEFAULT_STYLE_TEXT}
 					onChange={this.props.onBrewChange('style')}
-					enableFolding={true}
 					editorTheme={this.state.editorTheme}
-					rerenderParent={this.rerenderParent}
+					renderer={this.props.brew.renderer}
-					style={{  height: `calc(100% - ${this.state.snippetBarHeight}px)` }} />
+					style={{  height: `calc(100% - ${this.state.snippetBarHeight}px)` }}/>
 			</>;
 		}
 		if(this.isMeta()){
 			return <>
 				<CodeEditor key='codeEditor'
 					view={this.state.view}
-					style={{ display: 'none' }}
+					style={{ display: 'none' }}/>
-					rerenderParent={this.rerenderParent} />
 				<MetadataEditor
 					metadata={this.props.brew}
 					themeBundle={this.props.themeBundle}
@@ -492,8 +292,9 @@ const Editor = createReactClass({
 					onChange={this.props.onBrewChange('snippets')}
 					enableFolding={true}
 					editorTheme={this.state.editorTheme}
+					renderer={this.props.brew.renderer}
 					rerenderParent={this.rerenderParent}
-					style={{  height: `calc(100% -${this.state.snippetBarHeight}px)` }} />
+					style={{  height: `calc(100% - 25px)` }}/>
 			</>;
 		}
 	},
@@ -510,14 +311,13 @@ const Editor = createReactClass({
 		return this.codeEditor.current?.undo();
 	},
 
-	foldCode : function(){
+	foldCode : function() {
-		return this.codeEditor.current?.foldAllCode();
+    	return this.codeEditor.current?.foldAll();
 	},
 
-	unfoldCode : function(){
+	unfoldCode : function() {
-		return this.codeEditor.current?.unfoldAllCode();
+		return this.codeEditor.current?.unfoldAll();
 	},
-
 	render : function(){
 		return (
 			<div className='editor' ref={this.editor}>

client/homebrew/editor/editor.less

@@ -1,88 +1,11 @@
-@import 'themes/codeMirror/customEditorStyles.less';
+@import '@sharedStyles/core.less';
-.editor {
+
-	position  : relative;
+:where(.editor) {
-	width     : 100%;
+	position   : relative;
-	height    : 100%;
+	width      : 100%;
-	container : editor / inline-size;
+	height     : 100%;
-	background:white;
+	container  : editor / inline-size;
-	.codeEditor {
+	background : white;
-		height            : calc(100% - 25px);
-		.CodeMirror { height : 100%; }
-		.pageLine, .snippetLine {
-			background : #33333328;
-			border-top : #333399 solid 1px;
-		}
-		.editor-page-count {
-			float : right;
-			color : grey;
-		}
-		.editor-snippet-count {
-			float : right;
-			color : grey;
-		}
-		.columnSplit {
-			font-style        : italic;
-			color             : grey;
-			background-color  : fade(#229999, 15%);
-			border-bottom     : #229999 solid 1px;
-		}
-		.define {
-			&:not(.term):not(.definition) {
-				font-weight   : bold;
-				color         : #949494;
-				background    : #E5E5E5;
-				border-radius : 3px;
-			}
-			&.term { color : rgb(96, 117, 143); }
-			&.definition { color : rgb(97, 57, 178); }
-		}
-		.block:not(.cm-comment) {
-			font-weight : bold;
-			color       : purple;
-			//font-style: italic;
-		}
-		.inline-block:not(.cm-comment) {
-			font-weight : bold;
-			color       : red;
-			//font-style: italic;
-		}
-		.injection:not(.cm-comment) {
-			font-weight : bold;
-			color       : green;
-		}
-		.emoji:not(.cm-comment) {
-			padding-bottom : 1px;
-			margin-left    : 2px;
-			font-weight    : bold;
-			color          : #360034;
-			outline        : solid 2px #FF96FC;
-			outline-offset : -2px;
-			background     : #FFC8FF;
-			border-radius  : 6px;
-		}
-		.superscript:not(.cm-comment) {
-			font-size      : 0.9em;
-			font-weight    : bold;
-			vertical-align : super;
-			color          : goldenrod;
-		}
-		.subscript:not(.cm-comment) {
-			font-size      : 0.9em;
-			font-weight    : bold;
-			vertical-align : sub;
-			color          : rgb(123, 123, 15);
-		}
-		.dl-highlight {
-			&.dl-colon-highlight {
-				font-weight   : bold;
-				color         : #949494;
-				background    : #E5E5E5;
-				border-radius : 3px;
-			}
-			&.dt-highlight { color : rgb(96, 117, 143); }
-			&.dd-highlight { color : rgb(97, 57, 178); }
-		}		
-	}
 
 	.brewJump {
 		position         : absolute;

client/homebrew/editor/metadataEditor/metadataEditor.jsx

@@ -7,7 +7,8 @@ import request from '../../utils/request-middleware.js';
 import Combobox from '../../../components/combobox.jsx';
 import TagInput from '../tagInput/tagInput.jsx';
 
-import Themes from 'themes/themes.json';
+
+import Themes from '@themes/themes.json';
 import validations from './validations.js';
 
 import homebreweryThumbnail from '../../thumbnail.png';
@@ -337,9 +338,9 @@ const MetadataEditor = createReactClass({
 				{this.renderThumbnail()}
 			</div>
 
-			<div className="field tags">
+			<div className='field tags'>
 				<label>Tags</label>
-				<div className="value" >
+				<div className='value' >
 					<TagInput
 						label='tags'
 						valuePatterns={/^\s*(?:(?:group|meta|system|type)\s*:\s*)?[A-Za-z0-9][A-Za-z0-9 \/\\.&_\-]{0,40}\s*$/}
@@ -362,9 +363,9 @@ const MetadataEditor = createReactClass({
 
 			{this.renderAuthors()}
 
-			<div className="field invitedAuthors">
+			<div className='field invitedAuthors'>
 				<label>Invited authors</label>
-				<div className="value">
+				<div className='value'>
 					<TagInput
 						label='invited authors'
 						valuePatterns={/.+/}

client/homebrew/editor/metadataEditor/metadataEditor.less

@@ -1,4 +1,4 @@
-@import 'naturalcrit/styles/colors.less';
+@import '@sharedStyles/core.less';
 
 .userThemeName {
 	padding-right : 10px;

client/homebrew/editor/snippetbar/snippetbar.jsx

@@ -7,13 +7,13 @@ import _ from 'lodash';
 import cx from 'classnames';
 
 import { loadHistory } from '../../utils/versionHistory.js';
-import { brewSnippetsToJSON } from '../../../../shared/helpers.js';
+import { brewSnippetsToJSON } from '@shared/helpers.js';
 
-import Legacy5ePHB from 'themes/Legacy/5ePHB/snippets.js';
+import Legacy5ePHB from '@themes/Legacy/5ePHB/snippets.js';
-import V3_5ePHB   from 'themes/V3/5ePHB/snippets.js';
+import V3_5ePHB   from '@themes/V3/5ePHB/snippets.js';
-import V3_5eDMG   from 'themes/V3/5eDMG/snippets.js';
+import V3_5eDMG   from '@themes/V3/5eDMG/snippets.js';
-import V3_Journal from 'themes/V3/Journal/snippets.js';
+import V3_Journal from '@themes/V3/Journal/snippets.js';
-import V3_Blank  from 'themes/V3/Blank/snippets.js';
+import V3_Blank  from '@themes/V3/Blank/snippets.js';
 
 const ThemeSnippets = {
 	Legacy_5ePHB : Legacy5ePHB,
@@ -23,7 +23,25 @@ const ThemeSnippets = {
 	V3_Blank     : V3_Blank,
 };
 
-import EditorThemes from 'build/homebrew/codeMirror/editorThemes.json';
+import defaultCM5Theme from '@themes/codeMirror/default.js';
+import darkbrewery from '@themes/codeMirror/darkbrewery.js';
+import cm5Themes from 'codemirror-5-themes';
+
+const themes = { default: defaultCM5Theme, ...cm5Themes, darkbrewery };
+
+const themeNames = Object.entries(themes)
+  .filter(([name, value])=>Array.isArray(value) &&
+    !name.endsWith('Init') &&
+    !name.endsWith('Style')
+  )
+  .map(([name])=>name);
+
+const EditorThemes = [
+	'default',
+	...themeNames
+    .filter((name)=>name !== 'default')
+    .sort((a, b)=>a.localeCompare(b))
+];
 
 const execute = function(val, props){
 	if(_.isFunction(val)) return val(props);
@@ -151,7 +169,7 @@ const Snippetbar = createReactClass({
 		this.props.updateEditorTheme(e.target.value);
 
 		this.setState({
-			showThemeSelector : false,
+			themeSelector : false,
 		});
 	},
 
@@ -232,11 +250,11 @@ const Snippetbar = createReactClass({
 						<i className='fas fa-clock-rotate-left' />
 						{ this.state.showHistory && this.renderHistoryItems() }
 					</div>
-					<div className={`editorTool undo ${this.props.historySize.undo ? 'active' : ''}`}
+					<div className={`editorTool undo ${this.props.historySize.done ? 'active' : ''}`}
 						onClick={this.props.undo} >
 						<i className='fas fa-undo' />
 					</div>
-					<div className={`editorTool redo ${this.props.historySize.redo ? 'active' : ''}`}
+					<div className={`editorTool redo ${this.props.historySize.undone ? 'active' : ''}`}
 						onClick={this.props.redo} >
 						<i className='fas fa-redo' />
 					</div>

client/homebrew/editor/snippetbar/snippetbar.less

@@ -1,5 +1,6 @@
+@import '@sharedStyles/core.less';
 @import (less) './client/icons/customIcons.less';
-@import (less) '././././themes/fonts/5e/fonts.less';
+@import (less) '@themes/fonts/5e/fonts.less';
 
 .snippetBar {
 	@menuHeight      : 25px;

client/homebrew/editor/tagInput/curatedTagSuggestionList.js

@@ -1,210 +1,219 @@
-export default [
+export const tagSuggestionList = [
 	// ############################## Systems
 	// D&D
-	"system:D&D Original",
+	'system:D&D Original',
-	"system:D&D Basic",
+	'system:D&D Basic',
-	"system:AD&D 1e",
+	'system:AD&D 1e',
-	"system:AD&D 2e",
+	'system:AD&D 2e',
-	"system:D&D 3e",
+	'system:D&D 3e',
-	"system:D&D 3.5e",
+	'system:D&D 3.5e',
-	"system:D&D 4e",
+	'system:D&D 4e',
-	"system:D&D 5e",
+	'system:D&D 5e',
-	"system:D&D 5e 2024",
+	'system:D&D 5e 2024',
-	"system:BD&D (B/X)",
+	'system:BD&D (B/X)',
-	"system:D&D Essentials",
+	'system:D&D Essentials',
 
 	// Other Famous RPGs
-	"system:Pathfinder 1e",
+	'system:Pathfinder 1e',
-	"system:Pathfinder 2e",
+	'system:Pathfinder 2e',
-	"system:Vampire: The Masquerade",
+	'system:Vampire: The Masquerade',
-	"system:Werewolf: The Apocalypse",
+	'system:Werewolf: The Apocalypse',
-	"system:Mage: The Ascension",
+	'system:Mage: The Ascension',
-	"system:Call of Cthulhu",
+	'system:Call of Cthulhu',
-	"system:Shadowrun",
+	'system:Shadowrun',
-	"system:Star Wars RPG (D6/D20/Edge of the Empire)",
+	'system:Star Wars RPG (D6/D20/Edge of the Empire)',
-	"system:Warhammer Fantasy Roleplay",
+	'system:Warhammer Fantasy Roleplay',
-	"system:Cyberpunk 2020",
+	'system:Cyberpunk 2020',
-	"system:Blades in the Dark",
+	'system:Blades in the Dark',
-	"system:Daggerheart",
+	'system:Daggerheart',
-	"system:Draw Steel",
+	'system:Draw Steel',
-	"system:Mutants and Masterminds",
+	'system:Mutants and Masterminds',
 
 	// Meta
-	"meta:V3",
+	'meta:V3',
-	"meta:Legacy",
+	'meta:Legacy',
-	"meta:Template",
+	'meta:Template',
-	"meta:Theme",
+	'meta:Theme',
-	"meta:free",
+	'meta:free',
-	"meta:Character Sheet",
+	'meta:Character Sheet',
-	"meta:Documentation",
+	'meta:Documentation',
-	"meta:NPC",
+	'meta:NPC',
-	"meta:Guide",
+	'meta:Guide',
-	"meta:Resource",
+	'meta:Resource',
-	"meta:Notes",
+	'meta:Notes',
-	"meta:Example",
+	'meta:Example',
 
 	// Book type
-	"type:Campaign",
+	'type:Campaign',
-	"type:Campaign Setting",
+	'type:Campaign Setting',
-	"type:Adventure",
+	'type:Adventure',
-	"type:One-Shot",
+	'type:One-Shot',
-	"type:Setting",
+	'type:Setting',
-	"type:World",
+	'type:World',
-	"type:Lore",
+	'type:Lore',
-	"type:History",
+	'type:History',
-	"type:Dungeon Master",
+	'type:Dungeon Master',
-	"type:Encounter Pack",
+	'type:Encounter Pack',
-	"type:Encounter",
+	'type:Encounter',
-	"type:Session Notes",
+	'type:Session Notes',
-	"type:reference",
+	'type:reference',
-	"type:Handbook",
+	'type:Handbook',
-	"type:Manual",
+	'type:Manual',
-	"type:Manuals",
+	'type:Manuals',
-	"type:Compendium",
+	'type:Compendium',
-	"type:Bestiary",
+	'type:Bestiary',
 
 	// ###################################### RPG Keywords
 
 	// Classes / Subclasses / Archetypes
-	"Class",
+	'Class',
-	"Subclass",
+	'Subclass',
-	"Archetype",
+	'Archetype',
-	"Martial",
+	'Martial',
-	"Half-Caster",
+	'Half-Caster',
-	"Full Caster",
+	'Full Caster',
-	"Artificer",
+	'Artificer',
-	"Barbarian",
+	'Barbarian',
-	"Bard",
+	'Bard',
-	"Cleric",
+	'Cleric',
-	"Druid",
+	'Druid',
-	"Fighter",
+	'Fighter',
-	"Monk",
+	'Monk',
-	"Paladin",
+	'Paladin',
-	"Rogue",
+	'Rogue',
-	"Sorcerer",
+	'Sorcerer',
-	"Warlock",
+	'Warlock',
-	"Wizard",
+	'Wizard',
 
 	// Races / Species / Lineages
-	"Race",
+	'Race',
-	"Ancestry",
+	'Ancestry',
-	"Lineage",
+	'Lineage',
-	"Aasimar",
+	'Aasimar',
-	"Beastfolk",
+	'Beastfolk',
-	"Dragonborn",
+	'Dragonborn',
-	"Dwarf",
+	'Dwarf',
-	"Elf",
+	'Elf',
-	"Goblin",
+	'Goblin',
-	"Half-Elf",
+	'Half-Elf',
-	"Half-Orc",
+	'Half-Orc',
-	"Human",
+	'Human',
-	"Kobold",
+	'Kobold',
-	"Lizardfolk",
+	'Lizardfolk',
-	"Lycan",
+	'Lycan',
-	"Orc",
+	'Orc',
-	"Tiefling",
+	'Tiefling',
-	"Vampire",
+	'Vampire',
-	"Yuan-Ti",
+	'Yuan-Ti',
 
 	// Magic / Spells / Items
-	"Magic",
+	'Magic',
-	"Magic Item",
+	'Magic Item',
-	"Magic Items",
+	'Magic Items',
-	"Wondrous Item",
+	'Wondrous Item',
-	"Magic Weapon",
+	'Magic Weapon',
-	"Artifact",
+	'Artifact',
-	"Spell",
+	'Spell',
-	"Spells",
+	'Spells',
-	"Cantrip",
+	'Cantrip',
-	"Cantrips",
+	'Cantrips',
-	"Eldritch",
+	'Eldritch',
-	"Eldritch Invocation",
+	'Eldritch Invocation',
-	"Invocation",
+	'Invocation',
-	"Invocations",
+	'Invocations',
-	"Pact boon",
+	'Pact boon',
-	"Pact Boon",
+	'Pact Boon',
-	"Spellcaster",
+	'Spellcaster',
-	"Spellblade",
+	'Spellblade',
-	"Magical Tattoos",
+	'Magical Tattoos',
-	"Enchantment",
+	'Enchantment',
-	"Enchanted",
+	'Enchanted',
-	"Attunement",
+	'Attunement',
-	"Requires Attunement",
+	'Requires Attunement',
-	"Rune",
+	'Rune',
-	"Runes",
+	'Runes',
-	"Wand",
+	'Wand',
-	"Rod",
+	'Rod',
-	"Scroll",
+	'Scroll',
-	"Potion",
+	'Potion',
-	"Potions",
+	'Potions',
-	"Item",
+	'Item',
-	"Items",
+	'Items',
-	"Bag of Holding",
+	'Bag of Holding',
 
 	// Monsters / Creatures / Enemies
-	"Monster",
+	'Monster',
-	"Creatures",
+	'Creatures',
-	"Creature",
+	'Creature',
-	"Beast",
+	'Beast',
-	"Beasts",
+	'Beasts',
-	"Humanoid",
+	'Humanoid',
-	"Undead",
+	'Undead',
-	"Fiend",
+	'Fiend',
-	"Aberration",
+	'Aberration',
-	"Ooze",
+	'Ooze',
-	"Giant",
+	'Giant',
-	"Dragon",
+	'Dragon',
-	"Monstrosity",
+	'Monstrosity',
-	"Demon",
+	'Demon',
-	"Devil",
+	'Devil',
-	"Elemental",
+	'Elemental',
-	"Construct",
+	'Construct',
-	"Constructs",
+	'Constructs',
-	"Boss",
+	'Boss',
-	"BBEG",
+	'BBEG',
 
 	// ############################# Media / Pop Culture
-	"One Piece",
+	'One Piece',
-	"Dragon Ball",
+	'Dragon Ball',
-	"Dragon Ball Z",
+	'Dragon Ball Z',
-	"Naruto",
+	'Naruto',
-	"Jujutsu Kaisen",
+	'Jujutsu Kaisen',
-	"Fairy Tail",
+	'Fairy Tail',
-	"Final Fantasy",
+	'Final Fantasy',
-	"Kingdom Hearts",
+	'Kingdom Hearts',
-	"Elder Scrolls",
+	'Elder Scrolls',
-	"Skyrim",
+	'Skyrim',
-	"WoW",
+	'WoW',
-	"World of Warcraft",
+	'World of Warcraft',
-	"Marvel Comics",
+	'Marvel Comics',
-	"DC Comics",
+	'DC Comics',
-	"Pokemon",
+	'Pokemon',
-	"League of Legends",
+	'League of Legends',
-	"Runeterra",
+	'Runeterra',
-	"Arcane",
+	'Arcane',
-	"Yu-Gi-Oh",
+	'Yu-Gi-Oh',
-	"Minecraft",
+	'Minecraft',
-	"Don't Starve",
+	'Don\'t Starve',
-	"Witcher",
+	'Witcher',
-	"Witcher 3",
+	'Witcher 3',
-	"Cyberpunk",
+	'Cyberpunk',
-	"Cyberpunk 2077",
+	'Cyberpunk 2077',
-	"Fallout",
+	'Fallout',
-	"Divinity Original Sin 2",
+	'Divinity Original Sin 2',
-	"Fullmetal Alchemist",
+	'Fullmetal Alchemist',
-	"Fullmetal Alchemist Brotherhood",
+	'Fullmetal Alchemist Brotherhood',
-	"Lobotomy Corporation",
+	'Lobotomy Corporation',
-	"Bloodborne",
+	'Bloodborne',
-	"Dragonlance",
+	'Dragonlance',
-	"Shackled City Adventure Path",
+	'Shackled City Adventure Path',
-	"Baldurs Gate 3",
+	'Baldurs Gate 3',
-	"Library of Ruina",
+	'Library of Ruina',
-	"Radiant Citadel",
+	'Radiant Citadel',
-	"Ravenloft",
+	'Ravenloft',
-	"Forgotten Realms",
+	'Forgotten Realms',
-	"Exandria",
+	'Exandria',
-	"Critical Role",
+	'Critical Role',
-	"Star Wars",
+	'Star Wars',
-	"SW5e",
+	'SW5e',
-	"Star Wars 5e",
+	'Star Wars 5e',
+];
+
+// substrings to be normalized to the first value on the array
+export const canonizationList = [
+	['5e 2024', '5.5e', '5e\'24', '5.24', '5e24', '5.5'],
+	['5e', '5th Edition'],
+	['Dungeons & Dragons', 'Dungeons and Dragons', 'Dungeons n dragons'],
+	['D&D', 'DnD', 'dnd', 'Dnd', 'dnD', 'd&d', 'd&D', 'D&d'],
+	['P2e', 'p2e', 'P2E', 'Pathfinder 2e'],
 ];

client/homebrew/editor/tagInput/tagInput.jsx

@@ -1,71 +1,62 @@
-import "./tagInput.less";
+import './tagInput.less';
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect } from 'react';
-import Combobox from "../../../components/combobox.jsx";
+import Combobox from '../../../components/combobox.jsx';
 
-import tagSuggestionList from "./curatedTagSuggestionList.js";
+import { tagSuggestionList, canonizationList } from './curatedTagSuggestionList.js';
 
-const TagInput = ({tooltip, label, valuePatterns, values = [], unique = true, placeholder = "", smallText = "", onChange }) => {
+const TagInput = ({ tooltip, label, valuePatterns, values = [], unique = true, placeholder = '', smallText = '', onChange })=>{
 	const [tagList, setTagList] = useState(
-		values.map((value) => ({
+		values.map((value)=>({
 			value,
-			editing: false,
+			editing : false,
-			draft: "",
+			draft   : '',
 		})),
 	);
 
-	useEffect(() => {
+	useEffect(()=>{
 		const incoming = values || [];
-		const current = tagList.map((t) => t.value);
+		const current = tagList.map((t)=>t.value);
 
-		const changed = incoming.length !== current.length || incoming.some((v, i) => v !== current[i]);
+		const changed = incoming.length !== current.length || incoming.some((v, i)=>v !== current[i]);
 
-		if (changed) {
+		if(changed) {
 			setTagList(
-				incoming.map((value) => ({
+				incoming.map((value)=>({
 					value,
-					editing: false,
+					editing : false,
 				})),
 			);
 		}
 	}, [values]);
 
-	useEffect(() => {
+	useEffect(()=>{
 		onChange?.({
-			target: { value: tagList.map((t) => t.value) },
+			target : { value: tagList.map((t)=>t.value) },
 		});
 	}, [tagList]);
 
-	// substrings to be normalized to the first value on the array
+	const normalizeValue = (input)=>{
-	const duplicateGroups = [
-		["5e 2024", "5.5e", "5e'24", "5.24", "5e24", "5.5"],
-		["5e", "5th Edition"],
-		["Dungeons & Dragons", "Dungeons and Dragons", "Dungeons n dragons"],
-		["D&D", "DnD", "dnd", "Dnd", "dnD", "d&d", "d&D", "D&d"],
-		["P2e", "p2e", "P2E", "Pathfinder 2e"],
-	];
-
-	const normalizeValue = (input) => {
 		const lowerInput = input.toLowerCase();
 		let normalizedTag = input;
 
-		for (const group of duplicateGroups) {
+		for (const group of canonizationList) {
 			for (const tag of group) {
-				if (!tag) continue;
+				if(!tag) continue;
 
 				const index = lowerInput.indexOf(tag.toLowerCase());
-				if (index !== -1) {
+				if(index !== -1) {
 					normalizedTag = input.slice(0, index) + group[0] + input.slice(index + tag.length);
 					break;
 				}
 			}
 		}
 
-		if (normalizedTag.includes(":")) {
+		if(normalizedTag.includes(':')) {
-			const [rawType, rawValue = ""] = normalizedTag.split(":");
+			const [rawType, rawValue = ''] = normalizedTag.split(':');
 			const tagType = rawType.trim().toLowerCase();
 			const tagValue = rawValue.trim();
 
-			if (tagValue.length > 0) {
+			if(tagValue.length > 0) {
 				normalizedTag = `${tagType}:${tagValue[0].toUpperCase()}${tagValue.slice(1)}`;
 			}
 			//trims spaces around colon and capitalizes the first word after the colon
@@ -75,56 +66,56 @@ const TagInput = ({tooltip, label, valuePatterns, values = [], unique = true, pl
 		return normalizedTag;
 	};
 
-	const submitTag = (newValue, index = null) => {
+	const submitTag = (newValue, index = null)=>{
 		const trimmed = newValue?.trim();
-		if (!trimmed) return;
+		if(!trimmed) return;
-		if (!valuePatterns.test(trimmed)) return;
+		if(!valuePatterns.test(trimmed)) return;
 
 		const normalizedTag = normalizeValue(trimmed);
 
-		setTagList((prev) => {
+		setTagList((prev)=>{
-			const existsIndex = prev.findIndex((t) => t.value.toLowerCase() === normalizedTag.toLowerCase());
+			const existsIndex = prev.findIndex((t)=>t.value.toLowerCase() === normalizedTag.toLowerCase());
-			if (unique && existsIndex !== -1) return prev;
+			if(unique && existsIndex !== -1) return prev;
-			if (index !== null) {
+			if(index !== null) {
-				return prev.map((t, i) => (i === index ? { ...t, value: normalizedTag, editing: false } : t));
+				return prev.map((t, i)=>(i === index ? { ...t, value: normalizedTag, editing: false } : t));
 			}
 
 			return [...prev, { value: normalizedTag, editing: false }];
 		});
 	};
 
-	const removeTag = (index) => {
+	const removeTag = (index)=>{
-		setTagList((prev) => prev.filter((_, i) => i !== index));
+		setTagList((prev)=>prev.filter((_, i)=>i !== index));
 	};
 
-	const editTag = (index) => {
+	const editTag = (index)=>{
-		setTagList((prev) => prev.map((t, i) => (i === index ? { ...t, editing: true, draft: t.value } : t)));
+		setTagList((prev)=>prev.map((t, i)=>(i === index ? { ...t, editing: true, draft: t.value } : t)));
 	};
 
-	const stopEditing = (index) => {
+	const stopEditing = (index)=>{
-		setTagList((prev) => prev.map((t, i) => (i === index ? { ...t, editing: false, draft: "" } : t)));
+		setTagList((prev)=>prev.map((t, i)=>(i === index ? { ...t, editing: false, draft: '' } : t)));
 	};
 
-	const suggestionOptions = tagSuggestionList.map((tag) => {
+	const suggestionOptions = tagSuggestionList.map((tag)=>{
-		const tagType = tag.split(":");
+		const tagType = tag.split(':');
 
-		let classes = "item";
+		let classes = 'item';
 		switch (tagType[0]) {
-			case "type":
+		case 'type':
-				classes = "item type";
+			classes = 'item type';
-				break;
+			break;
-			case "group":
+		case 'group':
-				classes = "item group";
+			classes = 'item group';
-				break;
+			break;
-			case "meta":
+		case 'meta':
-				classes = "item meta";
+			classes = 'item meta';
-				break;
+			break;
-			case "system":
+		case 'system':
-				classes = "item system";
+			classes = 'item system';
-				break;
+			break;
-			default:
+		default:
-				classes = "item";
+			classes = 'item';
-				break;
+			break;
 		}
 
 		return (
@@ -135,73 +126,69 @@ const TagInput = ({tooltip, label, valuePatterns, values = [], unique = true, pl
 	});
 
 	return (
-		<div className="tagInputWrap">
+		<div className='tagInputWrap'>
 			<Combobox
-				trigger="click"
+				trigger='click'
-				className="tagInput-dropdown"
+				className='tagInput-dropdown'
-				default=""
+				default=''
 				placeholder={placeholder}
-				options={label === "tags" ? suggestionOptions : []}
+				options={label === 'tags' ? suggestionOptions : []}
 				tooltip={tooltip}
 				autoSuggest={
-					label === "tags"
+					label === 'tags'
 						? {
-								suggestMethod: "startsWith",
+							suggestMethod           : 'startsWith',
-								clearAutoSuggestOnClick: true,
+							clearAutoSuggestOnClick : true,
-								filterOn: ["value", "title"],
+							filterOn                : ['value', 'title'],
-							}
+						}
-						: { suggestMethod: "includes", clearAutoSuggestOnClick: true, filterOn: [] }
+						: { suggestMethod: 'includes', clearAutoSuggestOnClick: true, filterOn: [] }
 				}
 				valuePatterns={valuePatterns.source}
-				onSelect={(value) => submitTag(value)}
+				onSelect={(value)=>submitTag(value)}
-				onEntry={(e) => {
+				onEntry={(e)=>{
-					if (e.key === "Enter") {
+					if(e.key === 'Enter') {
 						e.preventDefault();
 						submitTag(e.target.value);
 					}
 				}}
 			/>
-			<ul className="list">
+			<ul className='list'>
-				{tagList.map((t, i) =>
+				{tagList.map((t, i)=>t.editing ? (
-					t.editing ? (
+					<input
-						<input
+						key={i}
-							key={i}
+						type='text'
-							type="text"
+						value={t.draft} // always use draft
-							value={t.draft} // always use draft
+						pattern={valuePatterns.source}
-							pattern={valuePatterns.source}
+						onChange={(e)=>setTagList((prev)=>prev.map((tag, idx)=>(idx === i ? { ...tag, draft: e.target.value } : tag)),
-							onChange={(e) =>
+						)
-								setTagList((prev) =>
+						}
-									prev.map((tag, idx) => (idx === i ? { ...tag, draft: e.target.value } : tag)),
+						onKeyDown={(e)=>{
-								)
+							if(e.key === 'Enter') {
+								e.preventDefault();
+								submitTag(t.draft, i); // submit draft
+								setTagList((prev)=>prev.map((tag, idx)=>(idx === i ? { ...tag, draft: '' } : tag)),
+								);
 							}
-							onKeyDown={(e) => {
+							if(e.key === 'Escape') {
-								if (e.key === "Enter") {
+								stopEditing(i);
-									e.preventDefault();
+								e.target.blur();
-									submitTag(t.draft, i); // submit draft
+							}
-									setTagList((prev) =>
+						}}
-										prev.map((tag, idx) => (idx === i ? { ...tag, draft: "" } : tag)),
+						autoFocus
-									);
+					/>
-								}
+				) : (
-								if (e.key === "Escape") {
+					<li key={i} className='tag' onClick={()=>editTag(i)}>
-									stopEditing(i);
+						{t.value}
-									e.target.blur();
+						<button
-								}
+							type='button'
-							}}
+							onClick={(e)=>{
-							autoFocus
+								e.stopPropagation();
-						/>
+								removeTag(i);
-					) : (
+							}}>
-						<li key={i} className="tag" onClick={() => editTag(i)}>
+							<i className='fa fa-times fa-fw' />
-							{t.value}
+						</button>
-							<button
+					</li>
-								type="button"
+				),
-								onClick={(e) => {
-									e.stopPropagation();
-									removeTag(i);
-								}}>
-								<i className="fa fa-times fa-fw" />
-							</button>
-						</li>
-					),
 				)}
 			</ul>
 		</div>

client/homebrew/homebrew.jsx

@@ -1,8 +1,7 @@
-
+import 'core-js/es/string/to-well-formed.js'; // Polyfill for older browsers
-import 'core-js/es/string/to-well-formed.js'; //Polyfill for older browsers
 import './homebrew.less';
 import React from 'react';
-import { StaticRouter as Router, Route, Routes, useParams, useSearchParams } from 'react-router';
+import { BrowserRouter as Router, Routes, Route, useParams, useSearchParams } from 'react-router';
 
 import { updateLocalStorage } from './utils/updateLocalStorage/updateLocalStorageKeys.js';
 
@@ -39,28 +38,42 @@ const Homebrew = (props)=>{
 		},
 		userThemes,
 		brews,
-		enable_v4
+		enablev4
 	} = props;
 
 	global.account       = account;
 	global.version       = version;
 	global.config        = config;
-	global.enable_v4     = enable_v4;
+	global.enablev4     = enablev4;
 
 	const backgroundObject = ()=>{
-		if(global.config.deployment || (config.local && config.development)){
+		if(config?.deployment || (config?.local && config?.development)) {
-  			const bgText = global.config.deployment || 'Local';
+			const bgText = config?.deployment || 'Local';
-  			return {
+			return {
-    			backgroundImage : `url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' height='100px' width='200px'><text x='0' y='15' fill='%23fff7' font-size='20'>${bgText}</text></svg>")`
+				backgroundImage : `url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' height='100px' width='200px'><text x='0' y='15' fill='%23fff7' font-size='20'>${bgText}</text></svg>")`
-  			};
+			};
 		}
 		return null;
 	};
+
 	updateLocalStorage();
 
+	if(brew.pureError) {
+		return (
+			<Router>
+				<div className={`homebrew${(config?.deployment || config?.local) ? ' deployment' : ''}`} style={backgroundObject()}>
+					<Routes>
+						<Route path={brew.originalUrl} element={<WithRoute el={ErrorPage} brew={brew} />} />
+					</Routes>
+				</div>
+			</Router>
+		);
+	}
+
+
 	return (
-		<Router location={url}>
+		<Router>
-			<div className={`homebrew${(config.deployment || config.local) ? ' deployment' : ''}`} style={backgroundObject()}>
+			<div className={`homebrew${(config?.deployment || config?.local) ? ' deployment' : ''}`} style={backgroundObject()}>
 				<Routes>
 					<Route path='/edit/:id' element={<WithRoute el={EditPage} brew={brew} userThemes={userThemes}/>} />
 					<Route path='/share/:id' element={<WithRoute el={SharePage} brew={brew} />} />
@@ -82,4 +95,4 @@ const Homebrew = (props)=>{
 	);
 };
 
-module.exports = Homebrew;
+export default Homebrew;

client/homebrew/homebrew.less

@@ -1,4 +1,4 @@
-@import 'naturalcrit/styles/core.less';
+@import '@sharedStyles/core.less';
 .homebrew {
 	height : 100%;
 	background-color:@steel;

client/homebrew/main.jsx

@@ -0,0 +1,6 @@
+import { createRoot } from 'react-dom/client';
+import Homebrew from './homebrew.jsx';
+
+const props = window.__INITIAL_PROPS__ || {};
+
+createRoot(document.getElementById('reactRoot')).render(<Homebrew {...props} />);

client/homebrew/navbar/account.navitem.jsx

@@ -97,7 +97,7 @@ const Account = createReactClass({
 
 		//  Logged out
 		//  LOCAL ONLY
-		if(global.config.local) {
+		if(global.config?.local) {
 			return <Nav.item color='teal' icon='fas fa-sign-in-alt' onClick={this.localLogin}>
 				login
 			</Nav.item>;

client/homebrew/navbar/error-navitem.less

@@ -1,3 +1,5 @@
+@import '@sharedStyles/core.less';
+
 .navItem.error {
 	position         : relative;
 	background-color : @red;

client/homebrew/navbar/metadata.navitem.jsx

@@ -46,11 +46,6 @@ const MetadataNav = createReactClass({
 		</>;
 	},
 
-	getSystems : function(){
-		if(!this.props.brew.systems || this.props.brew.systems.length == 0) return 'No systems';
-		return this.props.brew.systems.join(', ');
-	},
-
 	renderMetaWindow : function(){
 		return <div className={`window ${this.state.showMetaWindow ? 'active' : 'inactive'}`}>
 			<div className='row'>
@@ -65,10 +60,6 @@ const MetadataNav = createReactClass({
 				<h4>Tags</h4>
 				<p>{this.getTags()}</p>
 			</div>
-			<div className='row'>
-				<h4>Systems</h4>
-				<p>{this.getSystems()}</p>
-			</div>
 			<div className='row'>
 				<h4>Updated</h4>
 				<p>{Moment(this.props.brew.updatedAt).fromNow()}</p>

client/homebrew/navbar/navbar.jsx

@@ -8,16 +8,10 @@ import PatreonNavItem from './patreon.navitem.jsx';
 const Navbar = createReactClass({
 	displayName     : 'Navbar',
 	getInitialState : function() {
-		return {
+  		return {
-			//showNonChromeWarning : false,
+			// showNonChromeWarning: false, // uncomment if needed
-			ver : '0.0.0'
+    		ver : global.version || '0.0.0'
-		};
+  		};
-	},
-
-	getInitialState : function() {
-		return {
-			ver : global.version
-		};
 	},
 
 	/*

client/homebrew/navbar/navbar.less

@@ -1,4 +1,4 @@
-@import 'naturalcrit/styles/colors.less';
+@import '@sharedStyles/core.less';
 
 @navbarHeight : 28px;
 @viewerToolsHeight : 32px;

client/homebrew/navbar/newbrew.navitem.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import _ from 'lodash';
 import Nav from './nav.jsx';
-import { splitTextStyleAndMetadata } from '../../../shared/helpers.js';
+import { splitTextStyleAndMetadata } from '@shared/helpers.js';
 
 const BREWKEY  = 'HB_newPage_content';
 const STYLEKEY = 'HB_newPage_style';
@@ -24,7 +24,7 @@ const NewBrew = ()=>{
 				localStorage.setItem(BREWKEY, newBrew.text);
 				localStorage.setItem(STYLEKEY, newBrew.style);
 				localStorage.setItem(METAKEY, JSON.stringify(
-					_.pick(newBrew, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang'])
+					_.pick(newBrew, ['title', 'description', 'tags', 'renderer', 'theme', 'lang'])
 				));
 				window.location.href = '/new';
 				return;

client/homebrew/navbar/print.navitem.jsx

@@ -1,9 +1,25 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import Nav from './nav.jsx';
-import { printCurrentBrew } from '../../../shared/helpers.js';
+import { printCurrentBrew } from '@shared/helpers.js';
 
 export default function(){
+	const [printing, setPrinting] = useState(false);
+
+	// listen for print cycle events to display "loading" message since it can take some time.
+	useEffect(()=>{
+		document.addEventListener('print:startprep', handlePrintStartPrep);
+		document.addEventListener('print:finishedprep', handlePrintPrepFinished);
+		return ()=>{
+			document.removeEventListener('print:startprep', handlePrintStartPrep);
+			document.removeEventListener('print:finishedprep', handlePrintPrepFinished);
+		}
+	}, []);
+
+	const handlePrintStartPrep = ()=>{ setPrinting(true); };
+
+	const handlePrintPrepFinished = ()=>{ setPrinting(false);	};
+
 	return <Nav.item onClick={printCurrentBrew} color='purple' icon='far fa-file-pdf'>
-		get PDF
+		{printing ? 'loading' : 'get PDF'}
 	</Nav.item>;
 };

client/homebrew/navbar/share.navitem.jsx

@@ -17,7 +17,7 @@ const getRedditLink = (brew)=>{
 	return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(brew.title.toWellFormed())}&text=${encodeURIComponent(text)}`;
 };
 
-export default ({ brew })=>(
+export default ({ brew, currentPage })=>(
 	<Nav.dropdown>
 		<Nav.item color='teal' icon='fas fa-share-alt'>
 			share
@@ -28,6 +28,12 @@ export default ({ brew })=>(
 		<Nav.item color='blue' onClick={()=>{navigator.clipboard.writeText(`${global.config.baseUrl}/share/${getShareId(brew)}`);}}>
 			copy url
 		</Nav.item>
+		{currentPage > 1 &&
+			<Nav.item
+				color='blue'
+				onClick={()=>{navigator.clipboard.writeText(`${global.config.baseUrl}/share/${getShareId(brew)}#p${currentPage}`);}}>
+				copy url (page {currentPage})
+			</Nav.item>}
 		<Nav.item color='blue' href={getRedditLink(brew)} newTab rel='noopener noreferrer'>
 			post to reddit
 		</Nav.item>

client/homebrew/pages/basePages/listPage/brewItem/brewItem.less

@@ -1,3 +1,4 @@
+@import '@sharedStyles/core.less';
 
 .brewItem {
 	position                    : relative;

client/homebrew/pages/editPage/editPage.jsx

@@ -4,34 +4,35 @@ import './editPage.less';
 // Common imports
 import React, { useState, useEffect, useRef } from 'react';
 import request                                from '../../utils/request-middleware.js';
-import Markdown                               from '../../../../shared/markdown.js';
+import Markdown                               from '@shared/markdown.js';
 import _                                      from 'lodash';
 
 import { DEFAULT_BREW_LOAD }                  from '../../../../server/brewDefaults.js';
-import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
+import { printCurrentBrew, fetchThemeBundle } from '@shared/helpers.js';
 
 import SplitPane    from '../../../components/splitPane/splitPane.jsx';
 import Editor       from '../../editor/editor.jsx';
 import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
 
-import Nav                       from '../../navbar/nav.jsx';
+import Nav                       from '@navbar/nav.jsx';
-import Navbar                    from '../../navbar/navbar.jsx';
+import Navbar                    from '@navbar/navbar.jsx';
-import NewBrewItem               from '../../navbar/newbrew.navitem.jsx';
+import NewBrewItem               from '@navbar/newbrew.navitem.jsx';
-import AccountNavItem            from '../../navbar/account.navitem.jsx';
+import AccountNavItem            from '@navbar/account.navitem.jsx';
-import ErrorNavItem              from '../../navbar/error-navitem.jsx';
+import ErrorNavItem              from '@navbar/error-navitem.jsx';
-import HelpNavItem               from '../../navbar/help.navitem.jsx';
+import HelpNavItem               from '@navbar/help.navitem.jsx';
-import VaultNavItem              from '../../navbar/vault.navitem.jsx';
+import VaultNavItem              from '@navbar/vault.navitem.jsx';
-import PrintNavItem              from '../../navbar/print.navitem.jsx';
+import PrintNavItem              from '@navbar/print.navitem.jsx';
-import RecentNavItems from '../../navbar/recent.navitem.jsx';
+import RecentNavItems from '@navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
 
 // Page specific imports
-import { Meta }                          from 'vitreum/headtags';
+import Headtags from '../../../../vitreum/headtags.js';
+const Meta = Headtags.Meta;
 import { md5 }                           from 'hash-wasm';
 import { gzipSync, strToU8 }             from 'fflate';
 import { makePatches, stringifyPatches } from '@sanity/diff-match-patch';
 
-import ShareNavItem              from '../../navbar/share.navitem.jsx';
+import ShareNavItem              from '@navbar/share.navitem.jsx';
 import LockNotification from './lockNotification/lockNotification.jsx';
 import { updateHistory, versionHistoryGarbageCollection } from '../../utils/versionHistory.js';
 import googleDriveIcon from '../../googleDrive.svg';
@@ -56,28 +57,28 @@ const EditPage = (props)=>{
 		...props
 	};
 
-	const [currentBrew               , setCurrentBrew               ] = useState(props.brew);
+	const [currentBrew, setCurrentBrew] = useState(props.brew);
-	const [isSaving                  , setIsSaving                  ] = useState(false);
+	const [isSaving, setIsSaving] = useState(false);
-	const [lastSavedTime             , setLastSavedTime             ] = useState(new Date());
+	const [lastSavedTime, setLastSavedTime] = useState(new Date());
-  const [saveGoogle                , setSaveGoogle                ] = useState(!!props.brew.googleId);
+	const [saveGoogle, setSaveGoogle] = useState(!!props.brew.googleId);
-	const [error                     , setError                     ] = useState(null);
+	const [error, setError] = useState(null);
-	const [HTMLErrors                , setHTMLErrors                ] = useState(Markdown.validate(props.brew.text));
+	const [HTMLErrors, setHTMLErrors] = useState(Markdown.validate(props.brew.text));
-	const [currentEditorViewPageNum  , setCurrentEditorViewPageNum  ] = useState(1);
+	const [currentEditorViewPageNum, setCurrentEditorViewPageNum] = useState(1);
 	const [currentEditorCursorPageNum, setCurrentEditorCursorPageNum] = useState(1);
 	const [currentBrewRendererPageNum, setCurrentBrewRendererPageNum] = useState(1);
-	const [themeBundle               , setThemeBundle               ] = useState({});
+	const [themeBundle, setThemeBundle] = useState({});
-	const [unsavedChanges            , setUnsavedChanges            ] = useState(false);
+	const [unsavedChanges, setUnsavedChanges] = useState(false);
-	const [alertTrashedGoogleBrew    , setAlertTrashedGoogleBrew    ] = useState(props.brew.trashed);
+	const [alertTrashedGoogleBrew, setAlertTrashedGoogleBrew] = useState(props.brew.trashed);
-	const [alertLoginToTransfer      , setAlertLoginToTransfer      ] = useState(false);
+	const [alertLoginToTransfer, setAlertLoginToTransfer] = useState(false);
-	const [confirmGoogleTransfer     , setConfirmGoogleTransfer     ] = useState(false);
+	const [confirmGoogleTransfer, setConfirmGoogleTransfer] = useState(false);
-	const [autoSaveEnabled           , setAutoSaveEnabled           ] = useState(true);
+	const [autoSaveEnabled, setAutoSaveEnabled] = useState(true);
-	const [warnUnsavedChanges        , setWarnUnsavedChanges        ] = useState(true);
+	const [warnUnsavedChanges, setWarnUnsavedChanges] = useState(true);
 
 	const editorRef          = useRef(null);
 	const lastSavedBrew      = useRef(_.cloneDeep(props.brew));
 	const saveTimeout        = useRef(null);
 	const warnUnsavedTimeout = useRef(null);
-	const trySaveRef         = useRef(trySave); // CTRL+S listener lives outside React and needs ref to use trySave with latest copy of brew
+	const trySaveRef         = useRef(null); // CTRL+S listener lives outside React and needs ref to use trySave with latest copy of brew
 	const unsavedChangesRef  = useRef(unsavedChanges); // Similarly, onBeforeUnload lives outside React and needs ref to unsavedChanges
 
 	useEffect(()=>{
@@ -89,7 +90,7 @@ const EditPage = (props)=>{
 
 		const handleControlKeys = (e)=>{
 			if(!(e.ctrlKey || e.metaKey)) return;
-			if(e.keyCode === 83) trySaveRef.current(true);
+			if(e.keyCode === 83) trySaveRef.current(true, true, saveGoogle);
 			if(e.keyCode === 80) printCurrentBrew();
 			if([83, 80].includes(e.keyCode)) {
 				e.stopPropagation();
@@ -117,13 +118,9 @@ const EditPage = (props)=>{
 		const hasChange = !_.isEqual(currentBrew, lastSavedBrew.current);
 		setUnsavedChanges(hasChange);
 
-		if(autoSaveEnabled) trySave(false, hasChange);
+		if(autoSaveEnabled) trySave(false, hasChange, saveGoogle);
 	}, [currentBrew]);
 
-	useEffect(()=>{
-		trySave(true);
-	}, [saveGoogle]);
-
 	const handleSplitMove = ()=>{
 		editorRef.current?.update();
 	};
@@ -182,11 +179,13 @@ const EditPage = (props)=>{
 	};
 
 	const toggleGoogleStorage = ()=>{
+		const newSaveGoogle = !saveGoogle;
 		setSaveGoogle((prev)=>!prev);
 		setError(null);
+		trySave(true, true, newSaveGoogle);
 	};
 
-	const trySave = (immediate = false, hasChanges = true)=>{
+	const trySave = (immediate = false, hasChanges = true, saveToGoogle = false)=>{
 		clearTimeout(saveTimeout.current);
 		if(isSaving) return;
 		if(!hasChanges && !immediate) return;
@@ -195,7 +194,7 @@ const EditPage = (props)=>{
 		saveTimeout.current = setTimeout(async ()=>{
 			setIsSaving(true);
 			setError(null);
-			await save(currentBrew, saveGoogle)
+			await save(currentBrew, saveToGoogle)
 			.catch((err)=>{
 				setError(err);
 			});
@@ -215,7 +214,7 @@ const EditPage = (props)=>{
 		const brewToSave = {
 			...brew,
 			text      : brew.text.normalize('NFC'),
-			pageCount : ((brew.renderer === 'legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1,
+			pageCount : ((brew.renderer === 'legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/gm)) || []).length + 1,
 			patches   : stringifyPatches(makePatches(encodeURI(lastSavedBrew.current.text.normalize('NFC')), encodeURI(brew.text.normalize('NFC')))),
 			hash      : await md5(lastSavedBrew.current.text.normalize('NFC')),
 			textBin   : undefined,
@@ -313,7 +312,7 @@ const EditPage = (props)=>{
 
 		// #3 - Unsaved changes exist, click to save, show SAVE NOW
 		if(unsavedChanges)
-			return <Nav.item className='save' onClick={()=>trySave(true)} color='blue' icon='fas fa-save'>save now</Nav.item>;
+			return <Nav.item className='save' onClick={()=>trySave(true, true, saveGoogle)} color='blue' icon='fas fa-save'>save now</Nav.item>;
 
 		// #4 - No unsaved changes, autosave is ON, show AUTO-SAVED
 		if(autoSaveEnabled)
@@ -364,7 +363,7 @@ const EditPage = (props)=>{
 				<PrintNavItem />
 				<HelpNavItem />
 				<VaultNavItem />
-				<ShareNavItem brew={currentBrew} />
+				<ShareNavItem brew={currentBrew} currentPage={currentBrewRendererPageNum} />
 				<RecentNavItem brew={currentBrew} storageKey='edit' />
 				<AccountNavItem/>
 			</Nav.section>

client/homebrew/pages/errorPage/errorPage.jsx

@@ -1,7 +1,7 @@
 import './errorPage.less';
 import React      from 'react';
 import UIPage     from '../basePages/uiPage/uiPage.jsx';
-import Markdown   from '../../../../shared/markdown.js';
+import Markdown   from '@shared/markdown.js';
 import ErrorIndex from './errors/errorIndex.js';
 
 const ErrorPage = ({ brew })=>{

client/homebrew/pages/errorPage/errorPage.less

@@ -1,7 +1,6 @@
 .homebrew {
-	.uiPage.sitePage {
+	.uiPage.sitePage:has(.errorTitle) {
 		.errorTitle {
-			//background-color: @orange;
 			color      : #D02727;
 			text-align : center;
 		}

client/homebrew/pages/homePage/homePage.jsx

@@ -1,33 +1,34 @@
-/* eslint-disable max-lines */
+
 import './homePage.less';
 
 // Common imports
 import React, { useState, useEffect, useRef } from 'react';
 import request                                from '../../utils/request-middleware.js';
-import Markdown                               from '../../../../shared/markdown.js';
+import Markdown                               from '@shared/markdown.js';
 import _                                      from 'lodash';
 
 import { DEFAULT_BREW }                       from '../../../../server/brewDefaults.js';
-import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
+import { printCurrentBrew, fetchThemeBundle } from '@shared/helpers.js';
 
 import SplitPane    from '../../../components/splitPane/splitPane.jsx';
 import Editor       from '../../editor/editor.jsx';
 import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
 
-import Nav                       from '../../navbar/nav.jsx';
+import Nav                       from '@navbar/nav.jsx';
-import Navbar                    from '../../navbar/navbar.jsx';
+import Navbar                    from '@navbar/navbar.jsx';
-import NewBrewItem               from '../../navbar/newbrew.navitem.jsx';
+import NewBrewItem               from '@navbar/newbrew.navitem.jsx';
-import AccountNavItem            from '../../navbar/account.navitem.jsx';
+import AccountNavItem            from '@navbar/account.navitem.jsx';
-import ErrorNavItem              from '../../navbar/error-navitem.jsx';
+import ErrorNavItem              from '@navbar/error-navitem.jsx';
-import HelpNavItem               from '../../navbar/help.navitem.jsx';
+import HelpNavItem               from '@navbar/help.navitem.jsx';
-import VaultNavItem              from '../../navbar/vault.navitem.jsx';
+import VaultNavItem              from '@navbar/vault.navitem.jsx';
-import PrintNavItem              from '../../navbar/print.navitem.jsx';
+import PrintNavItem              from '@navbar/print.navitem.jsx';
-import RecentNavItems from '../../navbar/recent.navitem.jsx';
+import RecentNavItems from '@navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
 
 
 // Page specific imports
-import { Meta }                               from 'vitreum/headtags';
+import Headtags   from '@vitreum/headtags.js';
+const Meta = Headtags.Meta;
 
 const BREWKEY  = 'homebrewery-new';
 const STYLEKEY = 'homebrewery-new-style';
@@ -44,16 +45,16 @@ const HomePage =(props)=>{
 		...props
 	};
 
-	const [currentBrew               , setCurrentBrew]                = useState(props.brew);
+	const [currentBrew, setCurrentBrew]                = useState(props.brew);
-	const [error                     , setError]                      = useState(undefined);
+	const [error, setError]                      = useState(undefined);
-	const [HTMLErrors                , setHTMLErrors]                 = useState(Markdown.validate(props.brew.text));
+	const [HTMLErrors, setHTMLErrors]                 = useState(Markdown.validate(props.brew.text));
-	const [currentEditorViewPageNum  , setCurrentEditorViewPageNum]   = useState(1);
+	const [currentEditorViewPageNum, setCurrentEditorViewPageNum]   = useState(1);
 	const [currentEditorCursorPageNum, setCurrentEditorCursorPageNum] = useState(1);
 	const [currentBrewRendererPageNum, setCurrentBrewRendererPageNum] = useState(1);
-	const [themeBundle               , setThemeBundle]                = useState({});
+	const [themeBundle, setThemeBundle]                = useState({});
-	const [unsavedChanges            , setUnsavedChanges]             = useState(false);
+	const [unsavedChanges, setUnsavedChanges]             = useState(false);
-	const [isSaving                  , setIsSaving]                   = useState(false);
+	const [isSaving, setIsSaving]                   = useState(false);
-	const [autoSaveEnabled           , setAutoSaveEnable]             = useState(false);
+	const [autoSaveEnabled, setAutoSaveEnable]             = useState(false);
 
 	const editorRef         = useRef(null);
 	const lastSavedBrew     = useRef(_.cloneDeep(props.brew));

client/homebrew/pages/homePage/homePage.less

@@ -1,3 +1,5 @@
+@import '@sharedStyles/core.less';
+
 .homePage {
 	position : relative;
 	a.floatingNewButton {

client/homebrew/pages/newPage/newPage.jsx

@@ -4,29 +4,28 @@ import './newPage.less';
 // Common imports
 import React, { useState, useEffect, useRef } from 'react';
 import request                                from '../../utils/request-middleware.js';
-import Markdown                               from '../../../../shared/markdown.js';
+import Markdown                               from '@shared/markdown.js';
 import _                                      from 'lodash';
 
 import { DEFAULT_BREW }                       from '../../../../server/brewDefaults.js';
-import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
+import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '@shared/helpers.js';
 
 import SplitPane    from '../../../components/splitPane/splitPane.jsx';
 import Editor       from '../../editor/editor.jsx';
 import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
 
-import Nav                       from '../../navbar/nav.jsx';
+import Nav                       from '@navbar/nav.jsx';
-import Navbar                    from '../../navbar/navbar.jsx';
+import Navbar                    from '@navbar/navbar.jsx';
-import NewBrewItem               from '../../navbar/newbrew.navitem.jsx';
+import NewBrewItem               from '@navbar/newbrew.navitem.jsx';
-import AccountNavItem            from '../../navbar/account.navitem.jsx';
+import AccountNavItem            from '@navbar/account.navitem.jsx';
-import ErrorNavItem              from '../../navbar/error-navitem.jsx';
+import ErrorNavItem              from '@navbar/error-navitem.jsx';
-import HelpNavItem               from '../../navbar/help.navitem.jsx';
+import HelpNavItem               from '@navbar/help.navitem.jsx';
-import VaultNavItem              from '../../navbar/vault.navitem.jsx';
+import VaultNavItem              from '@navbar/vault.navitem.jsx';
-import PrintNavItem              from '../../navbar/print.navitem.jsx';
+import PrintNavItem              from '@navbar/print.navitem.jsx';
-import RecentNavItems from '../../navbar/recent.navitem.jsx';
+import RecentNavItems from '@navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
 
 // Page specific imports
-import { Meta }                  from 'vitreum/headtags';
 
 const BREWKEY  = 'HB_newPage_content';
 const STYLEKEY = 'HB_newPage_style';
@@ -43,23 +42,23 @@ const NewPage = (props)=>{
 		...props
 	};
 
-	const [currentBrew               , setCurrentBrew               ] = useState(props.brew);
+	const [currentBrew, setCurrentBrew] = useState(props.brew);
-	const [isSaving                  , setIsSaving                  ] = useState(false);
+	const [isSaving, setIsSaving] = useState(false);
-	const [saveGoogle                , setSaveGoogle                ] = useState(global.account?.googleId ? true : false);
+	const [saveGoogle, setSaveGoogle] = useState(global.account?.googleId ? true : false);
-	const [error                     , setError                     ] = useState(null);
+	const [error, setError] = useState(null);
-	const [HTMLErrors                , setHTMLErrors                ] = useState(Markdown.validate(props.brew.text));
+	const [HTMLErrors, setHTMLErrors] = useState(Markdown.validate(props.brew.text));
-	const [currentEditorViewPageNum  , setCurrentEditorViewPageNum  ] = useState(1);
+	const [currentEditorViewPageNum, setCurrentEditorViewPageNum] = useState(1);
 	const [currentEditorCursorPageNum, setCurrentEditorCursorPageNum] = useState(1);
 	const [currentBrewRendererPageNum, setCurrentBrewRendererPageNum] = useState(1);
-	const [themeBundle               , setThemeBundle               ] = useState({});
+	const [themeBundle, setThemeBundle] = useState({});
-	const [unsavedChanges            , setUnsavedChanges            ] = useState(false);
+	const [unsavedChanges, setUnsavedChanges] = useState(false);
-	const [autoSaveEnabled           , setAutoSaveEnabled           ] = useState(false);
+	const [autoSaveEnabled, setAutoSaveEnabled] = useState(false);
 
 	const editorRef     = useRef(null);
 	const lastSavedBrew = useRef(_.cloneDeep(props.brew));
 	// const saveTimeout        = useRef(null);
 	// const warnUnsavedTimeout = useRef(null);
-	const trySaveRef         = useRef(trySave); // CTRL+S listener lives outside React and needs ref to use trySave with latest copy of brew
+	const trySaveRef         = useRef(null); // CTRL+S listener lives outside React and needs ref to use trySave with latest copy of brew
 	const unsavedChangesRef  = useRef(unsavedChanges); // Similarly, onBeforeUnload lives outside React and needs ref to unsavedChanges
 
 	useEffect(()=>{
@@ -157,7 +156,7 @@ const NewPage = (props)=>{
 		const updatedBrew = { ...currentBrew };
 		splitTextStyleAndMetadata(updatedBrew);
 
-		const pageRegex = updatedBrew.renderer === 'legacy' ? /\\page/g : /^\\page$/gm;
+		const pageRegex = updatedBrew.renderer === 'legacy' ? /\\page/g : /^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/gm;
 		updatedBrew.pageCount = (updatedBrew.text.match(pageRegex) || []).length + 1;
 
 		const res = await request

client/homebrew/pages/newPage/newPage.less

@@ -1,3 +1,5 @@
+@import '@sharedStyles/colors.less';
+
 .newPage {
 	.navItem.save {
 		background-color : @orange;

client/homebrew/pages/sharePage/sharePage.jsx

@@ -1,18 +1,19 @@
 import './sharePage.less';
 import React, { useState, useEffect, useCallback } from 'react';
-import { Meta }                          from 'vitreum/headtags';
+import Headtags   from '../../../../vitreum/headtags.js';
+const Meta = Headtags.Meta;
 
-import Nav from '../../navbar/nav.jsx';
+import Nav from '@navbar/nav.jsx';
-import Navbar from '../../navbar/navbar.jsx';
+import Navbar from '@navbar/navbar.jsx';
-import MetadataNav from '../../navbar/metadata.navitem.jsx';
+import MetadataNav from '@navbar/metadata.navitem.jsx';
-import PrintNavItem from '../../navbar/print.navitem.jsx';
+import PrintNavItem from '@navbar/print.navitem.jsx';
-import RecentNavItems from '../../navbar/recent.navitem.jsx';
+import RecentNavItems from '@navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
-import Account from '../../navbar/account.navitem.jsx';
+import Account from '@navbar/account.navitem.jsx';
 import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
 
 import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js';
-import { printCurrentBrew, fetchThemeBundle } from '../../../../shared/helpers.js';
+import { printCurrentBrew, fetchThemeBundle } from '@shared/helpers.js';
 
 const SharePage = (props)=>{
 	const { brew = DEFAULT_BREW_LOAD, disableMeta = false } = props;
@@ -91,6 +92,19 @@ const SharePage = (props)=>{
 								<Nav.item color='blue' icon='fas fa-clone' href={`/new/${processShareId()}`}>
 									clone to new
 								</Nav.item>
+								<Nav.item
+									color='blue'
+									icon='fas fa-link'
+									onClick={()=>{navigator.clipboard.writeText(`${global.config.baseUrl}/share/${processShareId()}`);}}>
+									copy url
+								</Nav.item>
+								{currentBrewRendererPageNum > 1 &&
+									<Nav.item
+										color='blue'
+										icon='fas fa-hashtag'
+										onClick={()=>{navigator.clipboard.writeText(`${global.config.baseUrl}/share/${processShareId()}#p${currentBrewRendererPageNum}`);}}>
+										copy url (page {currentBrewRendererPageNum})
+									</Nav.item>}
 							</Nav.dropdown>
 						</>
 					)}

client/homebrew/pages/userPage/userPage.jsx

@@ -3,15 +3,15 @@ import _ from 'lodash';
 
 import ListPage from '../basePages/listPage/listPage.jsx';
 
-import Nav from '../../navbar/nav.jsx';
+import Nav from '@navbar/nav.jsx';
-import Navbar from '../../navbar/navbar.jsx';
+import Navbar from '@navbar/navbar.jsx';
-import RecentNavItems from '../../navbar/recent.navitem.jsx';
+import RecentNavItems from '@navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
-import Account from '../../navbar/account.navitem.jsx';
+import Account from '@navbar/account.navitem.jsx';
-import NewBrew from '../../navbar/newbrew.navitem.jsx';
+import NewBrew from '@navbar/newbrew.navitem.jsx';
-import HelpNavItem from '../../navbar/help.navitem.jsx';
+import HelpNavItem from '@navbar/help.navitem.jsx';
-import ErrorNavItem from '../../navbar/error-navitem.jsx';
+import ErrorNavItem from '@navbar/error-navitem.jsx';
-import VaultNavitem from '../../navbar/vault.navitem.jsx';
+import VaultNavitem from '@navbar/vault.navitem.jsx';
 
 const UserPage = (props)=>{
 	props = {

client/homebrew/pages/vaultPage/vaultPage.jsx

@@ -3,13 +3,13 @@
 import './vaultPage.less';
 import React, { useState, useEffect, useRef } from 'react';
 
-import Nav          from '../../navbar/nav.jsx';
+import Nav          from '@navbar/nav.jsx';
-import Navbar       from '../../navbar/navbar.jsx';
+import Navbar       from '@navbar/navbar.jsx';
-import RecentNavItems from '../../navbar/recent.navitem.jsx';
+import RecentNavItems from '@navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
-import Account      from '../../navbar/account.navitem.jsx';
+import Account      from '@navbar/account.navitem.jsx';
-import NewBrew      from '../../navbar/newbrew.navitem.jsx';
+import NewBrew      from '@navbar/newbrew.navitem.jsx';
-import HelpNavItem  from '../../navbar/help.navitem.jsx';
+import HelpNavItem  from '@navbar/help.navitem.jsx';
 import BrewItem     from '../basePages/listPage/brewItem/brewItem.jsx';
 import SplitPane    from '../../../components/splitPane/splitPane.jsx';
 import ErrorIndex   from '../errorPage/errors/errorIndex.js';

client/homebrew/pages/vaultPage/vaultPage.less

@@ -1,3 +1,5 @@
+@import '@sharedStyles/core.less';
+
 .vaultPage {
 	height           : 100%;
 	overflow-y       : hidden;

client/template.js

@@ -1,33 +0,0 @@
-const template = async function(name, title='', props = {}){
-	const ogTags = [];
-	const ogMeta = props.ogMeta ?? {};
-	Object.entries(ogMeta).forEach(([key, value])=>{
-		if(!value) return;
-		const tag = `<meta property="og:${key}" content="${value}">`;
-		ogTags.push(tag);
-	});
-	const ogMetaTags = ogTags.join('\n');
-
-	const ssrModule = await import(`../build/${name}/ssr.cjs`);
-
-	return `<!DOCTYPE html>
-	<html>
-		<head>
-			<meta name="viewport" content="width=device-width, initial-scale=1, height=device-height, interactive-widget=resizes-visual" />
-			<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
-			<link href=${`/${name}/bundle.css`} type="text/css" rel='stylesheet' />
-			<link rel="icon" href="/assets/favicon.ico" type="image/x-icon" />
-			${ogMetaTags}
-			<meta name="twitter:card" content="summary">
-			<title>${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'}</title>
-		</head>
-		<body>
-			<main id="reactRoot">${ssrModule.default(props)}</main>
-			<script src=${`/${name}/bundle.js`}></script>
-			<script>start_app(${JSON.stringify(props)})</script>
-		</body>
-	</html>
-	`;
-};
-
-export default template;

config/default.json

@@ -8,5 +8,5 @@
 	"publicUrl" : "https://homebrewery.naturalcrit.com",
 	"hb_images" : null,
 	"hb_fonts" : null,
-	"enable_v4" : true
+	"enablev4" : true
 }

index.html

@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta
+			name="viewport"
+			content="width=device-width, initial-scale=1, height=device-height, interactive-widget=resizes-visual" />
+		<link rel="icon" href="/assets/favicon.ico" type="image/x-icon" />
+
+		<meta name="twitter:card" content="summary" />
+		<title>The Homebrewery - NaturalCrit</title>
+	</head>
+
+	<body>
+		<main id="reactRoot"></main>
+
+		<script type="module">
+  			const props = window.__INITIAL_PROPS__ || {};
+			const url = props.config?.baseUrl;
+			const title = props.brew?.title;
+
+  			let prefix = '';
+
+  			if (url && url?.includes('://homebrewery-stage.')) {
+  				prefix = `Stage `;
+  			} else if (url?.includes('://homebrewery-pr-')) {
+  				const match = url.match(/pr-(\d+)/);
+  				if (match) prefix = `PR-${match[1]} `;
+  			} else if (url?.includes('://localhost')) {
+  				prefix = 'Local ';
+  			}
+
+  			if (title) {
+  				document.title = `${prefix} - ${title} - The Homebrewery`;
+  			} else if (prefix) {
+				document.title = `${prefix} - The Homebrewery`;
+			}
+
+			if (window.location.pathname.startsWith('/admin')) {
+				import('/client/admin/main.jsx');
+			} else {
+				import('/client/homebrew/main.jsx');
+			}
+		</script>
+	</body>
+</html>

package.json

@@ -1,21 +1,19 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "3.20.1",
+  "version": "3.22.0",
   "type": "module",
   "engines": {
-    "npm": "^10.8.x",
+    "npm": ">=10.8 <12",
-    "node": "^20.18.x"
+    "node": ">=20.18 <25"
   },
   "repository": {
     "type": "git",
     "url": "git://github.com/naturalcrit/homebrewery.git"
   },
   "scripts": {
-    "dev": "node --experimental-require-module scripts/dev.js",
+    "start": "node server.js",
-    "quick": "node --experimental-require-module scripts/quick.js",
+    "build": "vite build",
-    "build": "node --experimental-require-module scripts/buildHomebrew.js && node --experimental-require-module scripts/buildAdmin.js",
-    "builddev": "node --experimental-require-module scripts/buildHomebrew.js --dev",
     "lint": "eslint --fix",
     "lint:dry": "eslint",
     "stylelint": "stylelint --fix **/*.{less}",
@@ -44,7 +42,6 @@
     "phb": "node --experimental-require-module scripts/phb.js",
     "prod": "set NODE_ENV=production && npm run build",
     "postinstall": "npm run build",
-    "start": "node --experimental-require-module server.js",
     "docker:build": "docker build -t ${DOCKERID}/homebrewery:$npm_package_version .",
     "docker:publish": "docker login && docker push  ${DOCKERID}/homebrewery:$npm_package_version"
   },
@@ -61,7 +58,7 @@
       "server"
     ],
     "transformIgnorePatterns": [
-      "node_modules/(?!(nanoid|@exodus/bytes|parse5|@asamuzakjp|@csstools)/)"
+      "node_modules/(?!(nanoid|@exodus/bytes|parse5|@asamuzakjp|@csstools|entities)/)"
     ],
     "transform": {
       "^.+\\.[jt]s$": "babel-jest",
@@ -91,32 +88,44 @@
   "dependencies": {
     "@babel/core": "^7.29.0",
     "@babel/plugin-transform-runtime": "^7.29.0",
-    "@babel/preset-env": "^7.29.0",
+    "@babel/preset-env": "^7.29.5",
     "@babel/preset-react": "^7.28.5",
-    "@babel/runtime": "^7.28.4",
+    "@babel/runtime": "^7.29.2",
+    "@codemirror/autocomplete": "^6.20.2",
+    "@codemirror/commands": "^6.10.3",
+    "@codemirror/highlight": "^0.19.8",
+    "@codemirror/lang-css": "^6.3.1",
+    "@codemirror/lang-javascript": "^6.2.5",
+    "@codemirror/lang-markdown": "^6.5.0",
+    "@codemirror/language": "^6.12.2",
+    "@codemirror/language-data": "^6.5.2",
+    "@codemirror/search": "^6.6.0",
+    "@codemirror/state": "^6.6.0",
+    "@codemirror/view": "^6.43.0",
     "@dmsnell/diff-match-patch": "^1.1.0",
     "@googleapis/drive": "^20.1.0",
+    "@lezer/highlight": "^1.2.3",
     "@sanity/diff-match-patch": "^3.2.0",
+    "@vitejs/plugin-react": "^5.1.2",
     "body-parser": "^2.2.0",
     "classnames": "^2.5.1",
-    "codemirror": "^5.65.6",
+    "codemirror-5-themes": "^1.5.1",
     "cookie-parser": "^1.4.7",
-    "core-js": "^3.47.0",
+    "core-js": "^3.49.0",
     "cors": "^2.8.5",
     "create-react-class": "^15.7.0",
     "dedent": "^1.7.1",
-    "expr-eval": "^2.0.2",
     "express": "^5.1.0",
     "express-async-handler": "^1.2.0",
-    "express-static-gzip": "3.0.0",
+    "express-static-gzip": "3.0.1",
     "fflate": "^0.8.2",
-    "fs-extra": "^11.3.3",
+    "fs-extra": "^11.3.5",
     "hash-wasm": "^4.12.0",
     "idb-keyval": "^6.2.2",
     "js-yaml": "^4.1.1",
     "jwt-simple": "^0.5.6",
-    "less": "^3.13.1",
+    "less": "^4.6.4",
-    "lodash": "^4.17.21",
+    "lodash": "^4.18.1",
     "marked": "15.0.12",
     "marked-alignment-paragraphs": "^1.0.0",
     "marked-definition-lists": "^1.0.1",
@@ -129,35 +138,34 @@
     "marked-variables": "^1.0.5",
     "markedLegacy": "npm:marked@^0.3.19",
     "moment": "^2.30.1",
-    "mongoose": "^9.2.1",
+    "mongoose": "^9.6.2",
-    "nanoid": "5.1.6",
+    "nanoid": "5.1.11",
     "nconf": "^0.13.0",
-    "react": "^18.3.1",
+    "node": "^25.9.0",
-    "react-dom": "^18.3.1",
+    "react": "^19.2.6",
-    "react-frame-component": "^4.1.3",
+    "react-dom": "^19.2.6",
-    "react-router": "^7.9.6",
+    "react-frame-component": "^5.3.2",
-    "romans": "^3.1.0",
+    "react-router": "^7.15.1",
-    "sanitize-filename": "1.6.3",
+    "sanitize-filename": "1.6.4",
-    "superagent": "^10.2.1",
+    "superagent": "^10.2.1"
-    "vitreum": "git+https://git@github.com/calculuschild/vitreum.git",
-    "written-number": "^0.11.1"
   },
   "devDependencies": {
-    "@stylistic/stylelint-plugin": "^4.0.0",
+    "@stylistic/stylelint-plugin": "^5.0.1",
-    "babel-jest": "^30.2.0",
+    "babel-jest": "^30.4.1",
     "babel-plugin-transform-import-meta": "^2.3.3",
-    "eslint": "^9.39.1",
+    "eslint": "9.7",
-    "eslint-plugin-jest": "^29.1.0",
+    "eslint-plugin-jest": "^29.15.1",
     "eslint-plugin-react": "^7.37.5",
     "globals": "^16.4.0",
-    "jest": "^30.2.0",
+    "jest": "^30.4.2",
     "jest-expect-message": "^1.1.3",
     "jsdom": "^28.1.0",
     "jsdom-global": "^3.0.2",
     "postcss-less": "^6.0.0",
-    "stylelint": "^16.25.0",
+    "stylelint": "^17.11.1",
-    "stylelint-config-recess-order": "^7.3.0",
+    "stylelint-config-recess-order": "^7.7.0",
-    "stylelint-config-recommended": "^17.0.0",
+    "stylelint-config-recommended": "^18.0.0",
-    "supertest": "^7.1.4"
+    "supertest": "^7.1.4",
+    "vite": "^7.3.1"
   }
 }

scripts/buildAdmin.js

@@ -1,32 +0,0 @@
-
-import fs   from 'fs-extra';
-import Proj from './project.json' with { type: 'json' };
-import vitreum from 'vitreum';
-const { pack } = vitreum;
-
-import lessTransform  from 'vitreum/transforms/less.js';
-import assetTransform from 'vitreum/transforms/asset.js';
-
-const isDev = !!process.argv.find((arg)=>arg=='--dev');
-
-const transforms = {
-	'.less' : lessTransform,
-	'*'     : assetTransform('./build')
-};
-
-const build = async ({ bundle, render, ssr })=>{
-	const css = await lessTransform.generate({ paths: './shared' });
-	await fs.outputFile('./build/admin/bundle.css', css);
-	await fs.outputFile('./build/admin/bundle.js', bundle);
-	await fs.outputFile('./build/admin/ssr.cjs', ssr);
-};
-
-fs.emptyDirSync('./build/admin');
-pack('./client/admin/admin.jsx', {
-	paths : ['./shared'],
-	libs  : Proj.libs,
-	dev   : isDev && build,
-	transforms
-})
-	.then(build)
-	.catch(console.error);

scripts/buildHomebrew.js

@@ -1,169 +0,0 @@
-import fs   from 'fs-extra';
-import zlib from 'zlib';
-import Proj from './project.json' with { type: 'json' };
-import vitreum from 'vitreum';
-const { pack, watchFile, livereload } = vitreum;
-
-import lessTransform  from 'vitreum/transforms/less.js';
-import assetTransform from 'vitreum/transforms/asset.js';
-import babel          from '@babel/core';
-import babelConfig    from '../babel.config.json' with { type : 'json' };
-import less           from 'less';
-
-const isDev = !!process.argv.find((arg)=>arg === '--dev');
-
-const babelify = async (code)=>(await babel.transformAsync(code, babelConfig)).code;
-
-const transforms = {
-	'.js'   : (code, filename, opts)=>babelify(code),
-	'.jsx'  : (code, filename, opts)=>babelify(code),
-	'.less' : lessTransform,
-	'*'     : assetTransform('./build')
-};
-
-const build = async ({ bundle, render, ssr })=>{
-	const css = await lessTransform.generate({ paths: './shared' });
-	//css = `@layer bundle {\n${css}\n}`;
-	await fs.outputFile('./build/homebrew/bundle.css', css);
-	await fs.outputFile('./build/homebrew/bundle.js', bundle);
-	await fs.outputFile('./build/homebrew/ssr.cjs', 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: {} };
-
-	let themeFiles = fs.readdirSync('./themes/Legacy');
-	for (const dir of themeFiles) {
-		const themeData = JSON.parse(fs.readFileSync(`./themes/Legacy/${dir}/settings.json`).toString());
-		themeData.path = dir;
-		themes.Legacy[dir] = (themeData);
-		//fs.copy(`./themes/Legacy/${dir}/dropdownTexture.png`, `./build/themes/Legacy/${dir}/dropdownTexture.png`);
-		const src = `./themes/Legacy/${dir}/style.less`;
-		((outputDirectory)=>{
-			less.render(fs.readFileSync(src).toString(), {
-				compress : !isDev
-			}, function(e, output) {
-				fs.outputFile(outputDirectory, output.css);
-			});
-		})(`./build/themes/Legacy/${dir}/style.css`);
-
-	}
-
-	themeFiles = fs.readdirSync('./themes/V3');
-	for (const dir of themeFiles) {
-		const themeData = JSON.parse(fs.readFileSync(`./themes/V3/${dir}/settings.json`).toString());
-		themeData.path = dir;
-		themes.V3[dir] = (themeData);
-		fs.copy(`./themes/V3/${dir}/dropdownTexture.png`, `./build/themes/V3/${dir}/dropdownTexture.png`);
-		fs.copy(`./themes/V3/${dir}/dropdownPreview.png`, `./build/themes/V3/${dir}/dropdownPreview.png`);
-		const src = `./themes/V3/${dir}/style.less`;
-	  ((outputDirectory)=>{
-			less.render(fs.readFileSync(src).toString(), {
-				compress : !isDev
-			}, function(e, output) {
-				fs.outputFile(outputDirectory, output.css);
-			});
-		})(`./build/themes/V3/${dir}/style.css`);
-	}
-
-	await fs.outputFile('./themes/themes.json', JSON.stringify(themes, null, 2));
-
-	// await less.render(lessCode, {
-	// 	compress  : !dev,
-	// 	sourceMap : (dev ? {
-	// 		sourceMapFileInline: true,
-	// 		outputSourceFiles: true
-	// 	} : false),
-	// })
-
-	// Move assets
-	await fs.copy('./themes/fonts', './build/fonts');
-	await fs.copy('./themes/assets', './build/assets');
-	await fs.copy('./client/icons', './build/icons');
-
-	//v==---------------------------MOVE CM EDITOR THEMES -----------------------------==v//
-
-	const editorThemesBuildDir = './build/homebrew/cm-themes';
-	await fs.copy('./node_modules/codemirror/theme', editorThemesBuildDir);
-	await fs.copy('./themes/codeMirror/customThemes', editorThemesBuildDir);
-	const editorThemeFiles = fs.readdirSync(editorThemesBuildDir);
-
-	const editorThemeFile = './themes/codeMirror/editorThemes.json';
-	if(fs.existsSync(editorThemeFile)) fs.rmSync(editorThemeFile);
-	const stream = fs.createWriteStream(editorThemeFile, { flags: 'a' });
-	stream.write('[\n"default"');
-
-	for (const themeFile of editorThemeFiles) {
-		stream.write(`,\n"${themeFile.slice(0, -4)}"`);
-	}
-	stream.write('\n]\n');
-	stream.end();
-
-
-	await fs.copy('./themes/codeMirror', './build/homebrew/codeMirror');
-
-	//v==----------------------------- BUNDLE PACKAGES --------------------------------==v//
-
-	const bundles = await pack('./client/homebrew/homebrew.jsx', {
-		paths : ['./shared', './'],
-		libs  : Proj.libs,
-		dev   : isDev && build,
-		transforms
-	});
-	build(bundles);
-
-	// Possible method for generating separate bundles for theme snippets: factor-bundle first sending all common files to bundle.js, then again using default settings, keeping only snippet bundles
-	// await fs.outputFile('./build/junk.js', '');
-	// await fs.outputFile('./build/themes/Legacy/5ePHB/snippets.js', '');
-	//
-	// const files = ['./client/homebrew/homebrew.jsx','./themes/Legacy/5ePHB/snippets.js'];
-	//
-	// bundles = await pack(files, {
-	// 	dedupe: false,
-	// 	plugin : [['factor-bundle', { outputs: [ './build/junk.js','./build/themes/Legacy/5ePHB/snippets.js'], threshold : function(row, groups) {
-	// 		console.log(groups);
-	//     if (groups.some(group => /.*homebrew.jsx$/.test(group))) {
-	// 			console.log("found homebrewery")
-	// 			return true;
-	// 		}
-	//     return this._defaultThreshold(row, groups);
-	// 	}}]],
-	// 	paths  : ['./shared','./','./build'],
-	// 	libs   : Proj.libs,
-	// 	dev    : isDev && build,
-	// 	transforms
-	// });
-	// build(bundles);
-	//
-
-	//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
-			ext    : 'js json'                             // Extensions to watch (only .js/.json by default)
-			//watch : ['./server', './themes'],            // Watch additional folders if needed
-		});
-	}
-
-})().catch(console.error);

scripts/dev.js

@@ -1,22 +0,0 @@
-const label = 'dev';
-console.time(label);
-
-const jsx = require('vitreum/steps/jsx.watch.js');
-const less = require('vitreum/steps/less.watch.js');
-const assets = require('vitreum/steps/assets.watch.js');
-const server = require('vitreum/steps/server.watch.js');
-const livereload = require('vitreum/steps/livereload.js');
-
-const Proj = require('./project.json');
-
-Promise.resolve()
-	.then(()=>jsx('homebrew', './client/homebrew/homebrew.jsx', { libs: Proj.libs, shared: ['./shared'] }))
-	.then((deps)=>less('homebrew', { shared: ['./shared'] }, deps))
-	.then(()=>jsx('admin', './client/admin/admin.jsx', { libs: Proj.libs, shared: ['./shared'] }))
-	.then((deps)=>less('admin', { shared: ['./shared'] }, deps))
-
-	.then(()=>assets(Proj.assets, ['./shared', './client']))
-	.then(()=>livereload())
-	.then(()=>server('./server.js', ['server']))
-	.then(console.timeEnd.bind(console, label))
-	.catch(console.error);

scripts/quick.js

@@ -1,17 +0,0 @@
-const label = 'quick';
-console.time(label);
-
-const jsx   = require('vitreum/steps/jsx.js').partial;
-const less  = require('vitreum/steps/less.js').partial;
-const server = require('vitreum/steps/server.watch.js').partial;
-
-const Proj = require('./project.json');
-
-Promise.resolve()
-	.then(jsx('homebrew', './client/homebrew/homebrew.jsx', Proj.libs, ['./shared']))
-	.then(less('homebrew', ['./shared']))
-	.then(jsx('admin', './client/admin/admin.jsx', Proj.libs, ['./shared']))
-	.then(less('admin', ['./shared']))
-	.then(server('./server.js', ['server']))
-	.then(console.timeEnd.bind(console, label))
-	.catch(console.error);

server.js

@@ -1,12 +1,29 @@
-import DB     from './server/db.js';
+import DB from './server/db.js';
-import server from './server/app.js';
+import createApp from './server/app.js';
 import config from './server/config.js';
+import { createServer as createViteServer } from 'vite';
 
-DB.connect(config).then(()=>{
+const isDev = process.env.NODE_ENV === 'local';
-	// Ensure that we have successfully connected to the database
+
-	// before launching server
+async function start() {
-	const PORT = process.env.PORT || config.get('web_port') || 8000;
+	let vite;
-	server.listen(PORT, ()=>{
+
+	if(isDev) {
+		vite = await createViteServer({
+			server  : { middlewareMode: true },
+			appType : 'custom',
+		});
+	}
+
+	await DB.connect(config).catch((err)=>{
+		console.error('Database connection failed:', err);
+		process.exit(1);
+	});
+
+	const app = await createApp(vite);
+
+	const PORT = process.env.PORT || config.get('web_port') || 3000;
+	app.listen(PORT, ()=>{
 		const reset = '\x1b[0m'; // Reset to default style
 		const bright = '\x1b[1m'; // Bright (bold) style
 		const cyan = '\x1b[36m'; // Cyan color
@@ -14,7 +31,10 @@ DB.connect(config).then(()=>{
 
 		console.log(`\n\tserver started at: ${new Date().toLocaleString()}`);
 		console.log(`\tserver on port: ${PORT}`);
-		console.log(`\t${bright + cyan}Open in browser: ${reset}${underline + bright + cyan}http://localhost:${PORT}${reset}\n\n`);
+		console.log(
-
+			`\t${bright + cyan}Open in browser: ${reset}${underline + bright + cyan}http://localhost:${PORT}${reset}\n\n`,
+		);
 	});
-});
+}
+
+start();

server/admin.api.js

@@ -4,64 +4,69 @@ import { model as NotificationModel } from './notifications.model.js';
 import express    from 'express';
 import Moment     from 'moment';
 import zlib       from 'zlib';
-import templateFn from '../client/template.js';
+import config  from './config.js';
+import path from 'path';
+import fs      from 'fs-extra';
+
+const nodeEnv = config.get('node_env');
+const isProd = nodeEnv === 'production';
 
 import HomebrewAPI  from './homebrew.api.js';
 import asyncHandler from 'express-async-handler';
 import { splitTextStyleAndMetadata } from '../shared/helpers.js';
 
-const router = express.Router();
-
-
 process.env.ADMIN_USER = process.env.ADMIN_USER || 'admin';
 process.env.ADMIN_PASS = process.env.ADMIN_PASS || 'password3';
 
-const mw = {
+export default function createAdminApi(vite) {
-	adminOnly : (req, res, next)=>{
+	const router = express.Router();
-		if(!req.get('authorization')){
+
-			return res
+	const mw = {
+		adminOnly : (req, res, next)=>{
+			if(!req.get('authorization')){
+				return res
 				.set('WWW-Authenticate', 'Basic realm="Authorization Required"')
 				.status(401)
 				.send('Authorization Required');
-		}
+			}
-		const [username, password] = Buffer.from(req.get('authorization').split(' ').pop(), 'base64')
+			const [username, password] = Buffer.from(req.get('authorization').split(' ').pop(), 'base64')
 			.toString('ascii')
 			.split(':');
-		if(process.env.ADMIN_USER === username && process.env.ADMIN_PASS === password){
+			if(process.env.ADMIN_USER === username && process.env.ADMIN_PASS === password){
-			return next();
+				return next();
+			}
+			throw { HBErrorCode: '52', code: 401, message: 'Access denied' };
 		}
-		throw { HBErrorCode: '52', code: 401, message: 'Access denied' };
+	};
-	}
-};
 
-const junkBrewPipeline = [
+	const junkBrewPipeline = [
-	{	$match : {
+		{	$match : {
-		updatedAt  : { $lt: Moment().subtract(30, 'days').toDate() },
+			updatedAt  : { $lt: Moment().subtract(30, 'days').toDate() },
-		lastViewed : { $lt: Moment().subtract(30, 'days').toDate() }
+			lastViewed : { $lt: Moment().subtract(30, 'days').toDate() }
-	} },
+		} },
-	{ $project: { textBinSize: { $binarySize: '$textBin' } } },
+		{ $project: { textBinSize: { $binarySize: '$textBin' } } },
-	{ $match: { textBinSize: { $lt: 140 } } },
+		{ $match: { textBinSize: { $lt: 140 } } },
-	{ $limit: 100 }
+		{ $limit: 100 }
-];
+	];
 
-/* Search for brews that aren't compressed (missing the compressed text field) */
+	/* Search for brews that aren't compressed (missing the compressed text field) */
-const uncompressedBrewQuery = HomebrewModel.find({
+	const uncompressedBrewQuery = HomebrewModel.find({
-	'text' : { '$exists': true }
+		'text' : { '$exists': true }
-}).lean().limit(10000).select('_id');
+	}).lean().limit(10000).select('_id');
 
-// Search for up to 100 brews that have not been viewed or updated in 30 days and are shorter than 140 bytes
+	// Search for up to 100 brews that have not been viewed or updated in 30 days and are shorter than 140 bytes
-router.get('/admin/cleanup', mw.adminOnly, (req, res)=>{
+	router.get('/admin/cleanup', mw.adminOnly, (req, res)=>{
-	HomebrewModel.aggregate(junkBrewPipeline).option({ maxTimeMS: 60000 })
+		HomebrewModel.aggregate(junkBrewPipeline).option({ maxTimeMS: 60000 })
 		.then((objs)=>res.json({ count: objs.length }))
 		.catch((error)=>{
 			console.error(error);
 			res.status(500).json({ error: 'Internal Server Error' });
 		});
-});
+	});
 
-// Delete up to 100 brews that have not been viewed or updated in 30 days and are shorter than 140 bytes
+	// Delete up to 100 brews that have not been viewed or updated in 30 days and are shorter than 140 bytes
-router.post('/admin/cleanup', mw.adminOnly, (req, res)=>{
+	router.post('/admin/cleanup', mw.adminOnly, (req, res)=>{
-	HomebrewModel.aggregate(junkBrewPipeline).option({ maxTimeMS: 60000 })
+		HomebrewModel.aggregate(junkBrewPipeline).option({ maxTimeMS: 60000 })
 		.then((docs)=>{
 			const ids = docs.map((doc)=>doc._id);
 			return HomebrewModel.deleteMany({ _id: { $in: ids } });
@@ -71,18 +76,18 @@ router.post('/admin/cleanup', mw.adminOnly, (req, res)=>{
 			console.error(error);
 			res.status(500).json({ error: 'Internal Server Error' });
 		});
-});
+	});
 
-/* Searches for matching edit or share id, also attempts to partial match */
+	/* Searches for matching edit or share id, also attempts to partial match */
-router.get('/admin/lookup/:id', mw.adminOnly, asyncHandler(HomebrewAPI.getBrew('admin', false)), async (req, res, next)=>{
+	router.get('/admin/lookup/:id', mw.adminOnly, asyncHandler(HomebrewAPI.getBrew('admin', false)), async (req, res, next)=>{
-	return res.json(req.brew);
+		return res.json(req.brew);
-});
+	});
 
-/* Find 50 brews that aren't compressed yet */
+	/* Find 50 brews that aren't compressed yet */
-router.get('/admin/finduncompressed', mw.adminOnly, (req, res)=>{
+	router.get('/admin/finduncompressed', mw.adminOnly, (req, res)=>{
-	const query = uncompressedBrewQuery.clone();
+		const query = uncompressedBrewQuery.clone();
 
-	query.exec()
+		query.exec()
 		.then((objs)=>{
 			const ids = objs.map((obj)=>obj._id);
 			res.json({ count: ids.length, ids });
@@ -91,46 +96,46 @@ router.get('/admin/finduncompressed', mw.adminOnly, (req, res)=>{
 			console.error(err);
 			res.status(500).send(err.message || 'Internal Server Error');
 		});
-});
-
-/* Cleans `<script` and `</script>` from the "text" field of a brew */
-router.put('/admin/clean/script/:id', asyncHandler(HomebrewAPI.getBrew('admin', false)), async (req, res)=>{
-	console.log(`[ADMIN: ${req.account?.username || 'Not Logged In'}] Cleaning script tags from ShareID ${req.params.id}`);
-
-	function cleanText(text){return text.replaceAll(/(<\/?s)cript/gi, '');};
-
-	const brew = req.brew;
-
-	const properties = ['text', 'description', 'title'];
-	properties.forEach((property)=>{
-		brew[property] = cleanText(brew[property]);
 	});
 
-	splitTextStyleAndMetadata(brew);
+	/* Cleans `<script` and `</script>` from the "text" field of a brew */
+	router.put('/admin/clean/script/:id', asyncHandler(HomebrewAPI.getBrew('admin', false)), async (req, res)=>{
+		console.log(`[ADMIN: ${req.account?.username || 'Not Logged In'}] Cleaning script tags from ShareID ${req.params.id}`);
 
-	req.body = brew;
+		function cleanText(text){return text.replaceAll(/(<\/?s)cript/gi, '');};
 
-	// Remove Account from request to prevent Admin user from being added to brew as an Author
+		const brew = req.brew;
-	req.account = undefined;
 
-	return await HomebrewAPI.updateBrew(req, res);
+		const properties = ['text', 'description', 'title'];
-});
+		properties.forEach((property)=>{
+			brew[property] = cleanText(brew[property]);
+		});
 
-/* Get list of a user's documents */
+		splitTextStyleAndMetadata(brew);
-router.get('/admin/user/list/:user', mw.adminOnly, async (req, res)=>{
-	const username = req.params.user;
-	const fields = { _id: 0, text: 0, textBin: 0 };		// Remove unnecessary fields from document lists
 
-	console.log(`[ADMIN: ${req.account?.username || 'Not Logged In'}] Get brew list for ${username}`);
+		req.body = brew;
 
-	const brews = await HomebrewModel.getByUser(username, true, fields);
+		// Remove Account from request to prevent Admin user from being added to brew as an Author
+		req.account = undefined;
 
-	return res.json(brews);
+		return await HomebrewAPI.updateBrew(req, res);
-});
+	});
 
-/* Compresses the "text" field of a brew to binary */
+	/* Get list of a user's documents */
-router.put('/admin/compress/:id', (req, res)=>{
+	router.get('/admin/user/list/:user', mw.adminOnly, async (req, res)=>{
-	HomebrewModel.findOne({ _id: req.params.id })
+		const username = req.params.user;
+		const fields = { _id: 0, text: 0, textBin: 0 };		// Remove unnecessary fields from document lists
+
+		console.log(`[ADMIN: ${req.account?.username || 'Not Logged In'}] Get brew list for ${username}`);
+
+		const brews = await HomebrewModel.getByUser(username, true, fields);
+
+		return res.json(brews);
+	});
+
+	/* Compresses the "text" field of a brew to binary */
+	router.put('/admin/compress/:id', (req, res)=>{
+		HomebrewModel.findOne({ _id: req.params.id })
 		.then((brew)=>{
 			if(!brew)
 				return res.status(404).send('Brew not found');
@@ -147,239 +152,252 @@ router.put('/admin/compress/:id', (req, res)=>{
 			console.error(err);
 			res.status(500).send('Error while saving');
 		});
-});
+	});
 
-router.get('/admin/stats', mw.adminOnly, async (req, res)=>{
+	router.get('/admin/stats', mw.adminOnly, async (req, res)=>{
-	try {
+		try {
-		const totalBrewsCount = await HomebrewModel.countDocuments({});
+			const totalBrewsCount = await HomebrewModel.countDocuments({});
-		const publishedBrewsCount = await HomebrewModel.countDocuments({ published: true });
+			const publishedBrewsCount = await HomebrewModel.countDocuments({ published: true });
 
-		return res.json({
+			return res.json({
-			totalBrews          : totalBrewsCount,
+				totalBrews          : totalBrewsCount,
-			totalPublishedBrews : publishedBrewsCount
+				totalPublishedBrews : publishedBrewsCount
-		});
+			});
-	} catch (error) {
+		} catch (error) {
-		console.error(error);
+			console.error(error);
-		return res.status(500).json({ error: 'Internal Server Error' });
+			return res.status(500).json({ error: 'Internal Server Error' });
-	}
+		}
-});
+	});
 
-// #######################   LOCKS
+	// #######################   LOCKS
 
-router.get('/api/lock/count', mw.adminOnly, asyncHandler(async (req, res)=>{
+	router.get('/api/lock/count', mw.adminOnly, asyncHandler(async (req, res)=>{
 
-	const countLocksQuery = {
+		const countLocksQuery = {
-		lock : { $exists: true }
+			lock : { $exists: true }
-	};
+		};
-	const count = await HomebrewModel.countDocuments(countLocksQuery)
+		const count = await HomebrewModel.countDocuments(countLocksQuery)
 		.catch((error)=>{
 			throw { name: 'Lock Count Error', message: 'Unable to get lock count', status: 500, HBErrorCode: '61', error };
 		});
 
-	return res.json({ count });
+		return res.json({ count });
 
-}));
+	}));
 
-router.get('/api/locks', mw.adminOnly, asyncHandler(async (req, res)=>{
+	router.get('/api/locks', mw.adminOnly, asyncHandler(async (req, res)=>{
-	const countLocksPipeline = [
+		const countLocksPipeline = [
-		{
+			{
 			  $match :
 				{
 				  'lock' : { '$exists': 1 }
 				},
-		},
+			},
-		{
+			{
-			$project : {
+				$project : {
-				shareId : 1,
+					shareId : 1,
-				editId  : 1,
+					editId  : 1,
-				title   : 1,
+					title   : 1,
-				lock    : 1
+					lock    : 1
+				}
 			}
-		}
+		];
-	];
+		const lockedDocuments = await HomebrewModel.aggregate(countLocksPipeline)
-	const lockedDocuments = await HomebrewModel.aggregate(countLocksPipeline)
 		.catch((error)=>{
 			throw { name: 'Can Not Get Locked Brews', message: 'Unable to get locked brew collection', status: 500, HBErrorCode: '68', error };
 		});
-	return res.json({
+		return res.json({
-		lockedDocuments
+			lockedDocuments
-	});
+		});
 
-}));
+	}));
 
-router.post('/api/lock/:id', mw.adminOnly, asyncHandler(async (req, res)=>{
+	router.post('/api/lock/:id', mw.adminOnly, asyncHandler(async (req, res)=>{
 
-	const lock = req.body;
+		const lock = req.body;
 
-	lock.applied = new Date;
+		lock.applied = new Date;
 
-	const filter = {
+		const filter = {
-		shareId : req.params.id
+			shareId : req.params.id
-	};
+		};
 
-	const brew = await HomebrewModel.findOne(filter);
+		const brew = await HomebrewModel.findOne(filter);
 
-	if(!brew) throw { name: 'Brew Not Found', message: 'Cannot find brew to lock', shareId: req.params.id, status: 500, HBErrorCode: '63' };
+		if(!brew) throw { name: 'Brew Not Found', message: 'Cannot find brew to lock', shareId: req.params.id, status: 500, HBErrorCode: '63' };
 
-	if(brew.lock && !lock.overwrite) {
+		if(brew.lock && !lock.overwrite) {
-		throw { name: 'Already Locked', message: 'Lock already exists on brew', shareId: req.params.id, title: brew.title, status: 500, HBErrorCode: '64' };
+			throw { name: 'Already Locked', message: 'Lock already exists on brew', shareId: req.params.id, title: brew.title, status: 500, HBErrorCode: '64' };
-	}
+		}
 
-	lock.overwrite = undefined;
+		lock.overwrite = undefined;
 
-	brew.lock = lock;
+		brew.lock = lock;
-	brew.markModified('lock');
+		brew.markModified('lock');
 
-	await brew.save()
+		await brew.save()
 		.catch((error)=>{
 			throw { name: 'Lock Error', message: 'Unable to set lock', shareId: req.params.id, status: 500, HBErrorCode: '62', error };
 		});
 
-	return res.json({ name: 'LOCKED', message: `Lock applied to brew ID ${brew.shareId} - ${brew.title}`, ...lock });
+		return res.json({ name: 'LOCKED', message: `Lock applied to brew ID ${brew.shareId} - ${brew.title}`, ...lock });
 
-}));
+	}));
 
-router.put('/api/unlock/:id', mw.adminOnly, asyncHandler(async (req, res)=>{
+	router.put('/api/unlock/:id', mw.adminOnly, asyncHandler(async (req, res)=>{
 
-	const filter = {
+		const filter = {
-		shareId : req.params.id
+			shareId : req.params.id
-	};
+		};
 
-	const brew = await HomebrewModel.findOne(filter);
+		const brew = await HomebrewModel.findOne(filter);
 
-	if(!brew) throw { name: 'Brew Not Found', message: 'Cannot find brew to unlock', shareId: req.params.id, status: 500, HBErrorCode: '66' };
+		if(!brew) throw { name: 'Brew Not Found', message: 'Cannot find brew to unlock', shareId: req.params.id, status: 500, HBErrorCode: '66' };
 
-	if(!brew.lock) throw { name: 'Not Locked', message: 'Cannot unlock as brew is not locked', shareId: req.params.id, status: 500, HBErrorCode: '67' };
+		if(!brew.lock) throw { name: 'Not Locked', message: 'Cannot unlock as brew is not locked', shareId: req.params.id, status: 500, HBErrorCode: '67' };
 
-	brew.lock = undefined;
+		brew.lock = undefined;
-	brew.markModified('lock');
+		brew.markModified('lock');
 
-	await brew.save()
+		await brew.save()
 		.catch((error)=>{
 			throw { name: 'Cannot Unlock', message: 'Unable to clear lock', shareId: req.params.id, status: 500, HBErrorCode: '65', error };
 		});
 
-	return res.json({ name: 'Unlocked', message: `Lock removed from brew ID ${req.params.id}` });
+		return res.json({ name: 'Unlocked', message: `Lock removed from brew ID ${req.params.id}` });
-}));
+	}));
 
-router.get('/api/lock/reviews', mw.adminOnly, asyncHandler(async (req, res)=>{
+	router.get('/api/lock/reviews', mw.adminOnly, asyncHandler(async (req, res)=>{
-	const countReviewsPipeline = [
+		const countReviewsPipeline = [
-		{
+			{
 			  $match :
 				{
 				  'lock.reviewRequested' : { '$exists': 1 }
 				},
-		},
+			},
-		{
+			{
-			$project : {
+				$project : {
-				shareId : 1,
+					shareId : 1,
-				editId  : 1,
+					editId  : 1,
-				title   : 1,
+					title   : 1,
-				lock    : 1
+					lock    : 1
+				}
 			}
-		}
+		];
-	];
+		const reviewDocuments = await HomebrewModel.aggregate(countReviewsPipeline)
-	const reviewDocuments = await HomebrewModel.aggregate(countReviewsPipeline)
 		.catch((error)=>{
 			throw { name: 'Can Not Get Reviews', message: 'Unable to get review collection', status: 500, HBErrorCode: '68', error };
 		});
-	return res.json({
+		return res.json({
-		reviewDocuments
+			reviewDocuments
-	});
+		});
 
-}));
+	}));
 
-router.put('/api/lock/review/request/:id', asyncHandler(async (req, res)=>{
+	router.put('/api/lock/review/request/:id', asyncHandler(async (req, res)=>{
 	// === This route is NOT Admin only ===
 	// Any user can request a review of their document
-	const filter = {
+		const filter = {
-		shareId : req.params.id,
+			shareId : req.params.id,
-		lock    : { $exists: 1 }
+			lock    : { $exists: 1 }
-	};
+		};
 
-	const brew = await HomebrewModel.findOne(filter);
+		const brew = await HomebrewModel.findOne(filter);
-	if(!brew) { throw { name: 'Brew Not Found', message: `Cannot find a locked brew with ID ${req.params.id}`, code: 500, HBErrorCode: '70' }; };
+		if(!brew) { throw { name: 'Brew Not Found', message: `Cannot find a locked brew with ID ${req.params.id}`, code: 500, HBErrorCode: '70' }; };
 
-	if(brew.lock.reviewRequested){
+		if(brew.lock.reviewRequested){
-		throw { name: 'Review Already Requested', message: `Review already requested for brew ${brew.shareId} - ${brew.title}`, code: 500, HBErrorCode: '71' };
+			throw { name: 'Review Already Requested', message: `Review already requested for brew ${brew.shareId} - ${brew.title}`, code: 500, HBErrorCode: '71' };
-	};
+		};
 
-	brew.lock.reviewRequested = new Date();
+		brew.lock.reviewRequested = new Date();
-	brew.markModified('lock');
+		brew.markModified('lock');
 
-	await brew.save()
+		await brew.save()
 		.catch((error)=>{
 			throw { name: 'Can Not Set Review Request', message: `Unable to set request for review on brew ID ${req.params.id}`, code: 500, HBErrorCode: '69', error };
 		});
 
-	return res.json({ name: 'Review Requested', message: `Review requested on brew ID ${brew.shareId} - ${brew.title}` });
+		return res.json({ name: 'Review Requested', message: `Review requested on brew ID ${brew.shareId} - ${brew.title}` });
 
-}));
+	}));
 
-router.put('/api/lock/review/remove/:id', mw.adminOnly, asyncHandler(async (req, res)=>{
+	router.put('/api/lock/review/remove/:id', mw.adminOnly, asyncHandler(async (req, res)=>{
 
-	const filter = {
+		const filter = {
-		shareId                : req.params.id,
+			shareId                : req.params.id,
-		'lock.reviewRequested' : { $exists: 1 }
+			'lock.reviewRequested' : { $exists: 1 }
-	};
+		};
 
-	const brew = await HomebrewModel.findOne(filter);
+		const brew = await HomebrewModel.findOne(filter);
-	if(!brew) { throw { name: 'Can Not Clear Review Request', message: `Brew ID ${req.params.id} does not have a review pending!`, HBErrorCode: '73' }; };
+		if(!brew) { throw { name: 'Can Not Clear Review Request', message: `Brew ID ${req.params.id} does not have a review pending!`, HBErrorCode: '73' }; };
 
-	brew.lock.reviewRequested = undefined;
+		brew.lock.reviewRequested = undefined;
-	brew.markModified('lock');
+		brew.markModified('lock');
 
-	await brew.save()
+		await brew.save()
 		.catch((error)=>{
 			throw { name: 'Can Not Clear Review Request', message: `Unable to remove request for review on brew ID ${req.params.id}`, HBErrorCode: '72', error };
 		});
 
-	return res.json({ name: 'Review Request Cleared', message: `Review request removed for brew ID ${brew.shareId} - ${brew.title}` });
+		return res.json({ name: 'Review Request Cleared', message: `Review request removed for brew ID ${brew.shareId} - ${brew.title}` });
 
-}));
+	}));
 
-// #######################   NOTIFICATIONS
+	// #######################   NOTIFICATIONS
 
-router.get('/admin/notification/all', async (req, res, next)=>{
+	router.get('/admin/notification/all', async (req, res, next)=>{
-	try {
+		try {
-		const notifications = await NotificationModel.getAll();
+			const notifications = await NotificationModel.getAll();
-		return res.json(notifications);
+			return res.json(notifications);
 
-	} catch (error) {
+		} catch (error) {
-		console.log('Error getting all notifications: ', error.message);
+			console.log('Error getting all notifications: ', error.message);
-		return res.status(500).json({ message: error.message });
+			return res.status(500).json({ message: error.message });
-	}
+		}
-});
-
-router.post('/admin/notification/add', mw.adminOnly, async (req, res, next)=>{
-	try {
-		const notification = await NotificationModel.addNotification(req.body);
-		return res.status(201).json(notification);
-	} catch (error) {
-		console.log('Error adding notification: ', error.message);
-		return res.status(500).json({ message: error.message });
-	}
-});
-
-router.delete('/admin/notification/delete/:id', mw.adminOnly, async (req, res, next)=>{
-	try {
-		const notification = await NotificationModel.deleteNotification(req.params.id);
-		return res.json(notification);
-	} catch (error) {
-		console.error('Error deleting notification: { key: ', req.params.id, ' error: ',  error.message, ' }');
-		return res.status(500).json({ message: error.message });
-	}
-});
-
-router.get('/admin', mw.adminOnly, (req, res)=>{
-	templateFn('admin', {
-		url : req.originalUrl
-	})
-	.then((page)=>res.send(page))
-	.catch((err)=>{
-		console.log(err);
-		res.sendStatus(500);
 	});
-});
 
-export default router;
+	router.post('/admin/notification/add', mw.adminOnly, async (req, res, next)=>{
+		try {
+			const notification = await NotificationModel.addNotification(req.body);
+			return res.status(201).json(notification);
+		} catch (error) {
+			console.log('Error adding notification: ', error.message);
+			return res.status(500).json({ message: error.message });
+		}
+	});
+
+	router.delete('/admin/notification/delete/:id', mw.adminOnly, async (req, res, next)=>{
+		try {
+			const notification = await NotificationModel.deleteNotification(req.params.id);
+			return res.json(notification);
+		} catch (error) {
+			console.error('Error deleting notification: { key: ', req.params.id, ' error: ',  error.message, ' }');
+			return res.status(500).json({ message: error.message });
+		}
+	});
+
+	router.get('/admin', mw.adminOnly, asyncHandler(async (req, res)=>{
+		const props = {
+			url : req.originalUrl
+		};
+
+		const htmlPath = isProd
+			? path.resolve('build', 'index.html')
+			: path.resolve('index.html');
+
+		let html = fs.readFileSync(htmlPath, 'utf-8');
+
+		if(!isProd && vite?.transformIndexHtml) {
+			html = await vite.transformIndexHtml(req.originalUrl, html);
+		}
+
+		res.send(html.replace(
+			'<head>',
+			`<head>\n<script id="props">window.__INITIAL_PROPS__ = ${JSON.stringify(props)}</script>`
+		));
+	}));
+
+
+	return router;
+}
+

server/admin.api.spec.js

@@ -1,42 +1,45 @@
 /*eslint max-lines: ["warn", {"max": 1000, "skipBlankLines": true, "skipComments": true}]*/
 import mongoose from 'mongoose';
 import supertest from 'supertest';
-import HBApp     from './app.js';
+import createApp from './app.js';
 import { model as NotificationModel } from './notifications.model.js';
 import { model as HomebrewModel } from './homebrew.model.js';
 
-
+let app;
-// Mimic https responses to avoid being redirected all the time
+let request;
-const app = supertest.agent(HBApp).set('X-Forwarded-Proto', 'https');
-
 let dbState;
 
+beforeAll(async ()=>{
+	app = await createApp();
+	request = supertest.agent(app).set('X-Forwarded-Proto', 'https');
+});
+
 describe('Tests for admin api', ()=>{
 	beforeEach(()=>{
-		// Mock DB ready (for dbCheck middleware)
 		dbState = mongoose.connection.readyState;
 		mongoose.connection.readyState = 1;
 	});
 
 	afterEach(()=>{
-		// Restore DB ready state
 		mongoose.connection.readyState = dbState;
-
 		jest.resetAllMocks();
 	});
 
+	afterAll(async ()=>{
+		await mongoose.connection.close();
+	});
+
 	describe('Notifications', ()=>{
 		it('should return list of all notifications', async ()=>{
 			const testNotifications = ['a', 'b'];
 
-			jest.spyOn(NotificationModel, 'find')
+			jest.spyOn(NotificationModel, 'find').mockImplementationOnce(()=>{
-			.mockImplementationOnce(()=>{
 				return { exec: jest.fn().mockResolvedValue(testNotifications) };
 			});
 
-			const response = await app
+			const response = await request
-				.get('/admin/notification/all')
+        .get('/admin/notification/all')
-				.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
+        .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
 
 			expect(response.status).toBe(200);
 			expect(response.body).toEqual(testNotifications);
@@ -56,18 +59,17 @@ describe('Tests for admin api', ()=>{
 				_id       : expect.any(String),
 				createdAt : expect.any(String),
 				startAt   : inputNotification.startAt,
-				stopAt    : inputNotification.stopAt,
+				stopAt    : inputNotification.stopAt
 			};
 
-			jest.spyOn(NotificationModel.prototype, 'save')
+			jest.spyOn(NotificationModel.prototype, 'save').mockImplementationOnce(function () {
-				.mockImplementationOnce(function() {
+				return Promise.resolve(this);
-					return Promise.resolve(this);
+			});
-				});
 
-			const response = await app
+			const response = await request
-				.post('/admin/notification/add')
+        .post('/admin/notification/add')
-				.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+        .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
-				.send(inputNotification);
+        .send(inputNotification);
 
 			expect(response.status).toBe(201);
 			expect(response.body).toEqual(savedNotification);
@@ -81,16 +83,14 @@ describe('Tests for admin api', ()=>{
 				stopAt  : new Date().toISOString()
 			};
 
-			//Change 'save' function to just return itself instead of actually interacting with the database
+			jest.spyOn(NotificationModel.prototype, 'save').mockImplementationOnce(function () {
-			jest.spyOn(NotificationModel.prototype, 'save')
+				return Promise.resolve(this);
-				.mockImplementationOnce(function() {
+			});
-					return Promise.resolve(this);
-				});
 
-			const response = await app
+			const response = await request
-				.post('/admin/notification/add')
+        .post('/admin/notification/add')
-				.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+        .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
-				.send(inputNotification);
+        .send(inputNotification);
 
 			expect(response.status).toBe(500);
 			expect(response.body).toEqual({ message: 'Dismiss key is required!' });
@@ -99,15 +99,15 @@ describe('Tests for admin api', ()=>{
 		it('should delete a notification based on its dismiss key', async ()=>{
 			const dismissKey = 'testKey';
 
-			jest.spyOn(NotificationModel, 'findOneAndDelete')
+			jest.spyOn(NotificationModel, 'findOneAndDelete').mockImplementationOnce((key)=>{
-				.mockImplementationOnce((key)=>{
+				return { exec: jest.fn().mockResolvedValue(key) };
-					return { exec: jest.fn().mockResolvedValue(key) };
+			});
-				});
-			const response = await app
-				.delete(`/admin/notification/delete/${dismissKey}`)
-				.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
 
-			expect(NotificationModel.findOneAndDelete).toHaveBeenCalledWith({ 'dismissKey': 'testKey' });
+			const response = await request
+        .delete(`/admin/notification/delete/${dismissKey}`)
+        .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
+
+			expect(NotificationModel.findOneAndDelete).toHaveBeenCalledWith({ dismissKey: 'testKey' });
 			expect(response.status).toBe(200);
 			expect(response.body).toEqual({ dismissKey: 'testKey' });
 		});
@@ -115,15 +115,15 @@ describe('Tests for admin api', ()=>{
 		it('should handle error deleting a notification that doesnt exist', async ()=>{
 			const dismissKey = 'testKey';
 
-			jest.spyOn(NotificationModel, 'findOneAndDelete')
+			jest.spyOn(NotificationModel, 'findOneAndDelete').mockImplementationOnce(()=>{
-				.mockImplementationOnce(()=>{
+				return { exec: jest.fn().mockResolvedValue() };
-					return { exec: jest.fn().mockResolvedValue() };
+			});
-				});
-			const response = await app
-				.delete(`/admin/notification/delete/${dismissKey}`)
-				.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
 
-			expect(NotificationModel.findOneAndDelete).toHaveBeenCalledWith({ 'dismissKey': 'testKey' });
+			const response = await request
+        .delete(`/admin/notification/delete/${dismissKey}`)
+        .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
+
+			expect(NotificationModel.findOneAndDelete).toHaveBeenCalledWith({ dismissKey: 'testKey' });
 			expect(response.status).toBe(500);
 			expect(response.body).toEqual({ message: 'Notification not found' });
 		});
@@ -132,30 +132,24 @@ describe('Tests for admin api', ()=>{
 	describe('Locks', ()=>{
 		describe('Count', ()=>{
 			it('Count of all locked documents', async ()=>{
-				const testNumber = 16777216; // 8^8, because why not
+				const testNumber = 16777216;
 
-				jest.spyOn(HomebrewModel, 'countDocuments')
+				jest.spyOn(HomebrewModel, 'countDocuments').mockImplementationOnce(()=>Promise.resolve(testNumber));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(testNumber);
-					});
 
-				const response = await app
+				const response = await request
-					.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+          .get('/api/lock/count')
-					.get('/api/lock/count');
+          .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
 
 				expect(response.status).toBe(200);
 				expect(response.body).toEqual({ count: testNumber });
 			});
 
 			it('Handle error while fetching count of locked documents', async ()=>{
-				jest.spyOn(HomebrewModel, 'countDocuments')
+				jest.spyOn(HomebrewModel, 'countDocuments').mockImplementationOnce(()=>Promise.reject());
-					.mockImplementationOnce(()=>{
-						return Promise.reject();
-					});
 
-				const response = await app
+				const response = await request
-					.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+          .get('/api/lock/count')
-					.get('/api/lock/count');
+          .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
 
 				expect(response.status).toBe(500);
 				expect(response.body).toEqual({
@@ -163,7 +157,7 @@ describe('Tests for admin api', ()=>{
 					message     : 'Unable to get lock count',
 					name        : 'Lock Count Error',
 					originalUrl : '/api/lock/count',
-					status      : 500,
+					status      : 500
 				});
 			});
 		});
@@ -172,28 +166,22 @@ describe('Tests for admin api', ()=>{
 			it('Get list of all locked documents', async ()=>{
 				const testLocks = ['a', 'b'];
 
-				jest.spyOn(HomebrewModel, 'aggregate')
+				jest.spyOn(HomebrewModel, 'aggregate').mockImplementationOnce(()=>Promise.resolve(testLocks));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(testLocks);
-					});
 
-				const response = await app
+				const response = await request
-				.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+          .get('/api/locks')
-				.get('/api/locks');
+          .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
 
 				expect(response.status).toBe(200);
 				expect(response.body).toEqual({ lockedDocuments: testLocks });
 			});
 
 			it('Handle error while fetching list of all locked documents', async ()=>{
-				jest.spyOn(HomebrewModel, 'aggregate')
+				jest.spyOn(HomebrewModel, 'aggregate').mockImplementationOnce(()=>Promise.reject());
-					.mockImplementationOnce(()=>{
-						return Promise.reject();
-					});
 
-				const response = await app
+				const response = await request
-				.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+          .get('/api/locks')
-				.get('/api/locks');
+          .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
 
 				expect(response.status).toBe(500);
 				expect(response.body).toEqual({
@@ -208,28 +196,22 @@ describe('Tests for admin api', ()=>{
 			it('Get list of all locked documents with pending review requests', async ()=>{
 				const testLocks = ['a', 'b'];
 
-				jest.spyOn(HomebrewModel, 'aggregate')
+				jest.spyOn(HomebrewModel, 'aggregate').mockImplementationOnce(()=>Promise.resolve(testLocks));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(testLocks);
-					});
 
-				const response = await app
+				const response = await request
-				.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+          .get('/api/lock/reviews')
-				.get('/api/lock/reviews');
+          .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
 
 				expect(response.status).toBe(200);
 				expect(response.body).toEqual({ reviewDocuments: testLocks });
 			});
 
 			it('Handle error while fetching list of all locked documents with pending review requests', async ()=>{
-				jest.spyOn(HomebrewModel, 'aggregate')
+				jest.spyOn(HomebrewModel, 'aggregate').mockImplementationOnce(()=>Promise.reject());
-					.mockImplementationOnce(()=>{
-						return Promise.reject();
-					});
 
-				const response = await app
+				const response = await request
-				.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+          .get('/api/lock/reviews')
-				.get('/api/lock/reviews');
+          .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
 
 				expect(response.status).toBe(500);
 				expect(response.body).toEqual({
@@ -247,8 +229,8 @@ describe('Tests for admin api', ()=>{
 				const testBrew = {
 					shareId      : 'shareId',
 					title        : 'title',
-					markModified : ()=>{ return true; },
+					markModified : ()=>true,
-					save         : ()=>{ return Promise.resolve(); }
+					save         : ()=>Promise.resolve()
 				};
 
 				const testLock = {
@@ -257,15 +239,12 @@ describe('Tests for admin api', ()=>{
 					shareMessage : 'share'
 				};
 
-				jest.spyOn(HomebrewModel, 'findOne')
+				jest.spyOn(HomebrewModel, 'findOne').mockImplementationOnce(()=>Promise.resolve(testBrew));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(testBrew);
-					});
 
-				const response = await app
+				const response = await request
-					.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+          .post(`/api/lock/${testBrew.shareId}`)
-					.post(`/api/lock/${testBrew.shareId}`)
+          .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
-					.send(testLock);
+          .send(testLock);
 
 				expect(response.status).toBe(200);
 				expect(response.body).toMatchObject({
@@ -289,24 +268,21 @@ describe('Tests for admin api', ()=>{
 				const testBrew = {
 					shareId      : 'shareId',
 					title        : 'title',
-					markModified : ()=>{ return true; },
+					markModified : ()=>true,
-					save         : ()=>{ return Promise.resolve(); },
+					save         : ()=>Promise.resolve(),
 					lock         : {
 						code         : 1,
 						editMessage  : 'oldEdit',
-						shareMessage : 'oldShare',
+						shareMessage : 'oldShare'
 					}
 				};
 
-				jest.spyOn(HomebrewModel, 'findOne')
+				jest.spyOn(HomebrewModel, 'findOne').mockImplementationOnce(()=>Promise.resolve(testBrew));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(testBrew);
-					});
 
-				const response = await app
+				const response = await request
-					.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+          .post(`/api/lock/${testBrew.shareId}`)
-					.post(`/api/lock/${testBrew.shareId}`)
+          .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
-					.send(testLock);
+          .send(testLock);
 
 				expect(response.status).toBe(200);
 				expect(response.body).toMatchObject({
@@ -329,24 +305,21 @@ describe('Tests for admin api', ()=>{
 				const testBrew = {
 					shareId      : 'shareId',
 					title        : 'title',
-					markModified : ()=>{ return true; },
+					markModified : ()=>true,
-					save         : ()=>{ return Promise.resolve(); },
+					save         : ()=>Promise.resolve(),
 					lock         : {
 						code         : 1,
 						editMessage  : 'oldEdit',
-						shareMessage : 'oldShare',
+						shareMessage : 'oldShare'
 					}
 				};
 
-				jest.spyOn(HomebrewModel, 'findOne')
+				jest.spyOn(HomebrewModel, 'findOne').mockImplementationOnce(()=>Promise.resolve(testBrew));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(testBrew);
-					});
 
-				const response = await app
+				const response = await request
-					.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+          .post(`/api/lock/${testBrew.shareId}`)
-					.post(`/api/lock/${testBrew.shareId}`)
+          .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
-					.send(testLock);
+          .send(testLock);
 
 				expect(response.status).toBe(500);
 				expect(response.body).toEqual({
@@ -364,8 +337,8 @@ describe('Tests for admin api', ()=>{
 				const testBrew = {
 					shareId      : 'shareId',
 					title        : 'title',
-					markModified : ()=>{ return true; },
+					markModified : ()=>true,
-					save         : ()=>{ return Promise.reject(); }
+					save         : ()=>Promise.reject()
 				};
 
 				const testLock = {
@@ -374,15 +347,12 @@ describe('Tests for admin api', ()=>{
 					shareMessage : 'share'
 				};
 
-				jest.spyOn(HomebrewModel, 'findOne')
+				jest.spyOn(HomebrewModel, 'findOne').mockImplementationOnce(()=>Promise.resolve(testBrew));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(testBrew);
-					});
 
-				const response = await app
+				const response = await request
-					.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+          .post(`/api/lock/${testBrew.shareId}`)
-					.post(`/api/lock/${testBrew.shareId}`)
+          .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
-					.send(testLock);
+          .send(testLock);
 
 				expect(response.status).toBe(500);
 				expect(response.body).toEqual({
@@ -408,19 +378,17 @@ describe('Tests for admin api', ()=>{
 				const testBrew = {
 					shareId      : 'shareId',
 					title        : 'title',
-					markModified : ()=>{ return true; },
+					markModified : ()=>true,
-					save         : ()=>{ return Promise.resolve(); },
+					save         : ()=>Promise.resolve(),
 					lock         : testLock
 				};
 
-				jest.spyOn(HomebrewModel, 'findOne')
+				jest.spyOn(HomebrewModel, 'findOne').mockImplementationOnce(()=>Promise.resolve(testBrew));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(testBrew);
-					});
 
-				const response = await app
+				const response = await request.put(`/api/unlock/${testBrew.shareId}`).set(
-					.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+					'Authorization',
-					.put(`/api/unlock/${testBrew.shareId}`);
+					`Basic ${Buffer.from('admin:password3').toString('base64')}`
+				);
 
 				expect(response.status).toBe(200);
 				expect(response.body).toEqual({
@@ -433,18 +401,16 @@ describe('Tests for admin api', ()=>{
 				const testBrew = {
 					shareId      : 'shareId',
 					title        : 'title',
-					markModified : ()=>{ return true; },
+					markModified : ()=>true,
-					save         : ()=>{ return Promise.resolve(); },
+					save         : ()=>Promise.resolve()
 				};
 
-				jest.spyOn(HomebrewModel, 'findOne')
+				jest.spyOn(HomebrewModel, 'findOne').mockImplementationOnce(()=>Promise.resolve(testBrew));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(testBrew);
-					});
 
-				const response = await app
+				const response = await request.put(`/api/unlock/${testBrew.shareId}`).set(
-					.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+					'Authorization',
-					.put(`/api/unlock/${testBrew.shareId}`);
+					`Basic ${Buffer.from('admin:password3').toString('base64')}`
+				);
 
 				expect(response.status).toBe(500);
 				expect(response.body).toEqual({
@@ -453,7 +419,7 @@ describe('Tests for admin api', ()=>{
 					name        : 'Not Locked',
 					originalUrl : `/api/unlock/${testBrew.shareId}`,
 					shareId     : testBrew.shareId,
-					status      : 500,
+					status      : 500
 				});
 			});
 
@@ -468,19 +434,17 @@ describe('Tests for admin api', ()=>{
 				const testBrew = {
 					shareId      : 'shareId',
 					title        : 'title',
-					markModified : ()=>{ return true; },
+					markModified : ()=>true,
-					save         : ()=>{ return Promise.reject(); },
+					save         : ()=>Promise.reject(),
 					lock         : testLock
 				};
 
-				jest.spyOn(HomebrewModel, 'findOne')
+				jest.spyOn(HomebrewModel, 'findOne').mockImplementationOnce(()=>Promise.resolve(testBrew));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(testBrew);
-					});
 
-				const response = await app
+				const response = await request.put(`/api/unlock/${testBrew.shareId}`).set(
-					.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+					'Authorization',
-					.put(`/api/unlock/${testBrew.shareId}`);
+					`Basic ${Buffer.from('admin:password3').toString('base64')}`
+				);
 
 				expect(response.status).toBe(500);
 				expect(response.body).toEqual({
@@ -506,40 +470,28 @@ describe('Tests for admin api', ()=>{
 				const testBrew = {
 					shareId      : 'shareId',
 					title        : 'title',
-					markModified : ()=>{ return true; },
+					markModified : ()=>true,
-					save         : ()=>{ return Promise.resolve(); },
+					save         : ()=>Promise.resolve(),
 					lock         : testLock
 				};
 
-				jest.spyOn(HomebrewModel, 'findOne')
+				jest.spyOn(HomebrewModel, 'findOne').mockImplementationOnce(()=>Promise.resolve(testBrew));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(testBrew);
-					});
 
-				const response = await app
+				const response = await request.put(`/api/lock/review/request/${testBrew.shareId}`);
-					.put(`/api/lock/review/request/${testBrew.shareId}`);
 
 				expect(response.status).toBe(200);
 				expect(response.body).toEqual({
 					message : `Review requested on brew ID ${testBrew.shareId} - ${testBrew.title}`,
-					name    : 'Review Requested',
+					name    : 'Review Requested'
 				});
 			});
 
 			it('Error when cannot find a locked brew', async ()=>{
-				const testBrew = {
+				const testBrew = { shareId: 'shareId' };
-					shareId : 'shareId'
-				};
 
-				jest.spyOn(HomebrewModel, 'findOne')
+				jest.spyOn(HomebrewModel, 'findOne').mockImplementationOnce(()=>Promise.resolve(false));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(false);
-					});
 
-
+				const response = await request.put(`/api/lock/review/request/${testBrew.shareId}`);
-				const response = await app
-					.put(`/api/lock/review/request/${testBrew.shareId}`)
-					.catch((err)=>{return err;});
 
 				expect(response.status).toBe(500);
 				expect(response.body).toEqual({
@@ -569,25 +521,20 @@ describe('Tests for admin api', ()=>{
 				};
 
 				jest.spyOn(HomebrewModel, 'findOne')
-					.mockImplementationOnce(()=>{
+				.mockImplementationOnce(()=>Promise.resolve(testBrew));
-						return Promise.resolve(false);
-					});
 
-
+				const response = await request
-				const response = await app
+				.put(`/api/lock/review/request/${testBrew.shareId}`);
-					.put(`/api/lock/review/request/${testBrew.shareId}`)
-					.catch((err)=>{return err;});
 
 				expect(response.status).toBe(500);
 				expect(response.body).toEqual({
-					HBErrorCode : '70',
+					HBErrorCode : '71',
 					code        : 500,
-					message     : `Cannot find a locked brew with ID ${testBrew.shareId}`,
+					message     : `Review already requested for brew ${testBrew.shareId} - ${testBrew.title}`,
-					name        : 'Brew Not Found',
+					name        : 'Review Already Requested',
 					originalUrl : `/api/lock/review/request/${testBrew.shareId}`
 				});
 			});
-
 			it('Handle error while adding review request to a locked brew', async ()=>{
 				const testLock = {
 					applied      : 'YES',
@@ -599,18 +546,14 @@ describe('Tests for admin api', ()=>{
 				const testBrew = {
 					shareId      : 'shareId',
 					title        : 'title',
-					markModified : ()=>{ return true; },
+					markModified : ()=>true,
-					save         : ()=>{ return Promise.reject(); },
+					save         : ()=>Promise.reject(),
 					lock         : testLock
 				};
 
-				jest.spyOn(HomebrewModel, 'findOne')
+				jest.spyOn(HomebrewModel, 'findOne').mockImplementationOnce(()=>Promise.resolve(testBrew));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(testBrew);
-					});
 
-				const response = await app
+				const response = await request.put(`/api/lock/review/request/${testBrew.shareId}`);
-					.put(`/api/lock/review/request/${testBrew.shareId}`);
 
 				expect(response.status).toBe(500);
 				expect(response.body).toEqual({
@@ -634,19 +577,16 @@ describe('Tests for admin api', ()=>{
 				const testBrew = {
 					shareId      : 'shareId',
 					title        : 'title',
-					markModified : ()=>{ return true; },
+					markModified : ()=>true,
-					save         : ()=>{ return Promise.resolve(); },
+					save         : ()=>Promise.resolve(),
 					lock         : testLock
 				};
 
-				jest.spyOn(HomebrewModel, 'findOne')
+				jest.spyOn(HomebrewModel, 'findOne').mockImplementationOnce(()=>Promise.resolve(testBrew));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(testBrew);
-					});
 
-				const response = await app
+				const response = await request
-					.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+          .put(`/api/lock/review/remove/${testBrew.shareId}`)
-					.put(`/api/lock/review/remove/${testBrew.shareId}`);
+          .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
 
 				expect(response.status).toBe(200);
 				expect(response.body).toEqual({
@@ -656,18 +596,13 @@ describe('Tests for admin api', ()=>{
 			});
 
 			it('Error when clearing review request from a brew with no review request', async ()=>{
-				const testBrew = {
+				const testBrew = { shareId: 'shareId' };
-					shareId : 'shareId',
-				};
 
-				jest.spyOn(HomebrewModel, 'findOne')
+				jest.spyOn(HomebrewModel, 'findOne').mockImplementationOnce(()=>Promise.resolve(false));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(false);
-					});
 
-				const response = await app
+				const response = await request
-					.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+          .put(`/api/lock/review/remove/${testBrew.shareId}`)
-					.put(`/api/lock/review/remove/${testBrew.shareId}`);
+          .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
 
 				expect(response.status).toBe(500);
 				expect(response.body).toEqual({
@@ -690,19 +625,16 @@ describe('Tests for admin api', ()=>{
 				const testBrew = {
 					shareId      : 'shareId',
 					title        : 'title',
-					markModified : ()=>{ return true; },
+					markModified : ()=>true,
-					save         : ()=>{ return Promise.reject(); },
+					save         : ()=>Promise.reject(),
 					lock         : testLock
 				};
 
-				jest.spyOn(HomebrewModel, 'findOne')
+				jest.spyOn(HomebrewModel, 'findOne').mockImplementationOnce(()=>Promise.resolve(testBrew));
-					.mockImplementationOnce(()=>{
-						return Promise.resolve(testBrew);
-					});
 
-				const response = await app
+				const response = await request
-					.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
+          .put(`/api/lock/review/remove/${testBrew.shareId}`)
-					.put(`/api/lock/review/remove/${testBrew.shareId}`);
+          .set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`);
 
 				expect(response.status).toBe(500);
 				expect(response.body).toEqual({

server/brewDefaults.js

@@ -14,7 +14,6 @@ const DEFAULT_BREW = {
 	theme       : '5ePHB',
 	authors     : [],
 	tags        : [],
-	systems     : [],
 	lang        : 'en',
 	thumbnail   : '',
 	views       : 0,

server/googleActions.js

@@ -151,7 +151,6 @@ const GoogleActions = {
 				description : file.description,
 				views       : parseInt(file.properties.views),
 				published   : file.properties.published ? file.properties.published == 'true' : false,
-				systems     : [],
 				lang        : file.properties.lang,
 				thumbnail   : file.properties.thumbnail,
 				webViewLink : file.webViewLink
@@ -298,7 +297,6 @@ const GoogleActions = {
 				text    : file.data,
 
 				description : obj.data.description,
-				systems     : obj.data.properties.systems ? obj.data.properties.systems.split(',') : [],
 				authors     : [],
 				lang        : obj.data.properties.lang,
 				published   : obj.data.properties.published ? obj.data.properties.published == 'true' : false,

server/homebrew.api.js

@@ -31,6 +31,27 @@ const isStaticTheme = (renderer, themeName)=>{
 // 	});
 // };
 
+
+const migrateSystemsToTags = (brew)=>{
+	if(!('systems' in brew)) return brew;
+
+	if(!Array.isArray(brew.systems) || brew.systems.length === 0) {
+		brew.systems = undefined;
+		return brew;
+	}
+	const systemMap = {
+		'5e'         : 'system:D&D 5e',
+		'4e'         : 'system:D&D 4e',
+		'3.5e'       : 'system:D&D 3.5e',
+		'Pathfinder' : 'system:Pathfinder 2e'
+	};
+	const systemTags = brew.systems.map((s)=>systemMap[s]);
+	brew.tags = _.uniq([...(brew.tags || []), ...systemTags]);
+
+	brew.systems = undefined;
+	return brew;
+};
+
 const MAX_TITLE_LENGTH = 100;
 
 const api = {
@@ -167,7 +188,10 @@ const api = {
 			stub.renderer = stub.renderer || undefined; // Clear empty strings
 			stub = _.defaults(stub, DEFAULT_BREW_LOAD); // Fill in blank fields
 
-			req.brew = stub;
+
+
+			const fixedStub = migrateSystemsToTags(stub);
+			req.brew = fixedStub;
 			next();
 		};
 	},
@@ -193,7 +217,7 @@ const api = {
 				`\`\`\`\n\n` +
 				`${text}`;
 		}
-		const metadata = _.pick(brew, ['title', 'description', 'tags', 'systems', 'renderer', 'theme']);
+		const metadata = _.pick(brew, ['title', 'description', 'tags', 'renderer', 'theme']);
 		const snippetsArray = brewSnippetsToJSON('brew_snippets', brew.snippets, null, false).snippets;
 		metadata.snippets = snippetsArray.length > 0 ? snippetsArray : undefined;
 		text = `\`\`\`metadata\n` +
@@ -368,22 +392,29 @@ const api = {
 
 		if(brewFromServer?.hash !== brewFromClient?.hash) {
 			console.log(`Hash mismatch on brew ${brewFromClient.editId}`);
-			//debugTextMismatch(brewFromClient.text, brewFromServer.text, `edit/${brewFromClient.editId}`);
+			debugTextMismatch(brewFromClient.text, brewFromServer.text, `edit/${brewFromClient.editId}`);
 			res.setHeader('Content-Type', 'application/json');
 			return res.status(409).send(JSON.stringify({ message: `The server copy is out of sync with the saved brew. Please save your changes elsewhere, refresh, and try again.` }));
 		}
 
+		let result = [];
 		try {
 			const patches = parsePatch(brewFromClient.patches);
 			// Patch to a throwaway variable while parallelizing - we're more concerned with error/no error.
-			const patchedResult = decodeURI(applyPatches(patches, encodeURI(brewFromServer.text))[0]);
+			result = applyPatches(patches, encodeURI(brewFromServer.text));
-			if(patchedResult != brewFromClient.text)
+			const failedPatches = patches.map((patch, index)=>{if(!result[1][index]){ return patch; }});
+			if(failedPatches > 0){
+				throw (`Patch failure: ${failedPatches}/${result[1].length} did not apply`);
+			}
+			if(decodeURI(result[0]) != brewFromClient.text){
 				throw ('Patches did not apply cleanly, text mismatch detected');
+			}
 			// brew.text = applyPatches(patches, brewFromServer.text)[0];
 		} catch (err) {
-			//debugTextMismatch(brewFromClient.text, brewFromServer.text, `edit/${brewFromClient.editId}`);
+			debugTextMismatch(brewFromClient.text, brewFromServer.text, `edit/${brewFromClient.editId}`);
 			console.error('Failed to apply patches:', {
-				//patches : brewFromClient.patches,
+				// patches : brewFromClient.patches,
+				// result  : result,
 				brewId : brewFromClient.editId || 'unknown',
 				error  : err
 			});
@@ -392,6 +423,9 @@ const api = {
 		}
 
 		let brew         = _.assign(brewFromServer, brewFromClient);
+
+		migrateSystemsToTags(brew);
+
 		brew.title       = brew.title.trim();
 		brew.description = brew.description.trim() || '';
 		brew.text        = api.mergeBrewText(brew);
@@ -481,7 +515,7 @@ const api = {
 				await HomebrewModel.deleteOne({ editId: id });
 				return next();
 			}
-			throw(err);
+			throw (err);
 		}
 
 		let brew = req.brew;

server/homebrew.api.spec.js

@@ -63,7 +63,6 @@ describe('Tests for api', ()=>{
 			title       : 'some title',
 			description : 'this is a description',
 			tags        : ['something', 'fun'],
-			systems     : ['D&D 5e'],
 			lang        : 'en',
 			renderer    : 'v3',
 			theme       : 'phb',
@@ -351,7 +350,6 @@ describe('Tests for api', ()=>{
 				renderer    : 'legacy',
 				lang        : 'en',
 				shareId     : undefined,
-				systems     : [],
 				tags        : [],
 				theme       : '5ePHB',
 				thumbnail   : '',
@@ -390,7 +388,6 @@ describe('Tests for api', ()=>{
 				title       : 'some title',
 				description : 'this is a description',
 				tags        : ['something', 'fun'],
-				systems     : ['D&D 5e'],
 				renderer    : 'v3',
 				theme       : 'phb',
 				googleId    : '12345'
@@ -402,8 +399,6 @@ description: this is a description
 tags:
   - something
   - fun
-systems:
-  - D&D 5e
 renderer: v3
 theme: phb
 
@@ -419,7 +414,6 @@ brew`);
 				title       : 'some title',
 				description : 'this is a description',
 				tags        : ['something', 'fun'],
-				systems     : ['D&D 5e'],
 				renderer    : 'v3',
 				theme       : 'phb',
 				googleId    : '12345'
@@ -431,8 +425,6 @@ description: this is a description
 tags:
   - something
   - fun
-systems:
-  - D&D 5e
 renderer: v3
 theme: phb
 
@@ -463,7 +455,6 @@ brew`);
 
 			expect(sent).toEqual(googleBrew);
 			expect(result.tags).toBeUndefined();
-			expect(result.systems).toBeUndefined();
 			expect(result.published).toBeUndefined();
 			expect(result.authors).toBeUndefined();
 			expect(result.owner).toBeUndefined();
@@ -558,7 +549,6 @@ brew`);
 				lang        : 'en',
 				shareId     : expect.any(String),
 				style       : undefined,
-				systems     : [],
 				tags        : [],
 				text        : undefined,
 				textBin     : expect.objectContaining({}),
@@ -618,7 +608,6 @@ brew`);
 				shareId     : expect.any(String),
 				googleId    : expect.any(String),
 				style       : undefined,
-				systems     : [],
 				tags        : [],
 				text        : undefined,
 				textBin     : undefined,
@@ -1076,7 +1065,6 @@ brew`);
 					'title: title\n' +
 					'description: description\n' +
 					'tags: [ \'tag a\' , \'tag b\' ]\n' +
-					'systems: [ test system ]\n' +
 					'renderer: legacy\n' +
 					'theme: 5ePHB\n' +
 					'lang: en\n' +
@@ -1097,8 +1085,6 @@ brew`);
 			// Metadata
 			expect(testBrew.title).toEqual('title');
 			expect(testBrew.description).toEqual('description');
-			expect(testBrew.tags).toEqual(['tag a', 'tag b']);
-			expect(testBrew.systems).toEqual(['test system']);
 			expect(testBrew.renderer).toEqual('legacy');
 			expect(testBrew.theme).toEqual('5ePHB');
 			expect(testBrew.lang).toEqual('en');
@@ -1107,19 +1093,6 @@ brew`);
 			// Text
 			expect(testBrew.text).toEqual('text\n');
 		});
-
-		it('convert tags string to array', async ()=>{
-			const testBrew = {
-				text : '```metadata\n' +
-					'tags: tag a\n' +
-					'```\n\n'
-			};
-
-			splitTextStyleAndMetadata(testBrew);
-
-			// Metadata
-			expect(testBrew.tags).toEqual(['tag a']);
-		});
 	});
 
 	describe('updateBrew', ()=>{

server/homebrew.model.js

@@ -15,7 +15,7 @@ const HomebrewSchema = mongoose.Schema({
 
 	description    : { type: String, default: '' },
 	tags           : { type: [String], index: true },
-	systems        : [String],
+	systems   		   : { type: [String], default: undefined },
 	lang           : { type: String, default: 'en', index: true },
 	renderer       : { type: String, default: '', index: true },
 	authors        : { type: [String], index: true },

shared/helpers.js

@@ -91,7 +91,7 @@ const splitTextStyleAndMetadata = (brew)=>{
 		const index = brew.text.indexOf('\n```\n\n');
 		const metadataSection = brew.text.slice(11, index + 1);
 		const metadata = yaml.load(metadataSection);
-		Object.assign(brew, _.pick(metadata, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang']));
+		Object.assign(brew, _.pick(metadata, ['title', 'description', 'renderer', 'theme', 'lang']));
 		brew.snippets = yamlSnippetsToText(_.pick(metadata, ['snippets']).snippets || '');
 		brew.text = brew.text.slice(index + 6);
 	}
@@ -105,14 +105,35 @@ const splitTextStyleAndMetadata = (brew)=>{
 	if(typeof brew.tags === 'string') brew.tags = brew.tags ? [brew.tags] : [];
 };
 
-const printCurrentBrew = ()=>{
+const printCurrentBrew = async ()=>{
 	if(window.typeof !== 'undefined') {
-		window.frames['BrewRenderer'].contentWindow.print();
+		// fire a custom event for the print cycle
-		//Force DOM reflow; Print dialog causes a repaint, and @media print CSS somehow makes out-of-view pages disappear
+		document.dispatchEvent(new CustomEvent('print:startprep'));
-		const node = window.frames['BrewRenderer'].contentDocument.getElementsByClassName('brewRenderer').item(0);
+		try {
-		node.style.display='none';
+			const iframeDoc = window.frames['BrewRenderer'].contentDocument;
-		node.offsetHeight; // accessing this is enough to trigger a reflow
+
-		node.style.display='';
+			// get all img elements with lazy loading (currently only elements generated through MarkedJS)
+			const lazyImages = [...iframeDoc.querySelectorAll('img[loading="lazy"]')];
+			lazyImages.forEach((img)=>{ img.loading = 'eager'; });
+
+			// waits for images to load before resolving promise and opening print dialog
+			await Promise.all(
+				lazyImages
+								.filter((img)=>!img.complete)
+								.map((img)=>new Promise((resolve)=>{ img.onload = resolve; img.onerror = resolve; }))
+			);
+
+			window.frames['BrewRenderer'].contentWindow.print();
+
+			//Force DOM reflow; Print dialog causes a repaint, and @media print CSS somehow makes out-of-view pages disappear
+			const node = iframeDoc.getElementsByClassName('brewRenderer').item(0);
+			node.style.display='none';
+			node.offsetHeight; // accessing this is enough to trigger a reflow
+			node.style.display='';
+		} finally {
+			// when lazy load images have all been loaded, and the doc re-rendered for print preview, emit 'finished' event.
+			document.dispatchEvent(new CustomEvent('print:finishedprep'));
+		}
 	}
 };
 
@@ -160,9 +181,35 @@ const debugTextMismatch = (clientTextRaw, serverTextRaw, label)=>{
 	// Char-level diff
 	for (let i = 0; i < Math.min(clientText.length, serverText.length); i++) {
 		if(clientText[i] !== serverText[i]) {
+			const getMismatchContext = (text, index, name, size = 10)=>{
+				const lower = Math.max(index - size, 0);
+				const upper = Math.min(index + size, text.length);
+				const slice = `${JSON.stringify(text.slice(lower, index)).slice(1, -1)}\u001B[31m${JSON.stringify(text[i]).slice(1, -1)}\u001B[0m${JSON.stringify(text.slice(index+1, upper)).slice(1, -1)}`;
+				const lineNo = text.slice(0, index).split('\n').length;
+				const code = `U+${text.charCodeAt(i).toString(16).toUpperCase()}`;
+
+				return {
+					name,
+					lineNo,
+					code,
+					lower,
+					upper,
+					slice
+				};
+			};
+
+			const boundSize = 10;
+
+			const clientContext = getMismatchContext(clientText, i, 'Client', boundSize);
+			const serverContext = getMismatchContext(serverText, i, 'Server', boundSize);
+
+			const logContext = (context)=>{
+				console.log(`  ${context.name} - line ${context.lineNo} : (${context.code})\t${context.slice}`);
+			};
+
 			console.log(`Char mismatch at index ${i}:`);
-			console.log(`  Client: '${clientText[i]}' (U+${clientText.charCodeAt(i).toString(16).toUpperCase()})`);
+			logContext(clientContext);
-			console.log(`  Server: '${serverText[i]}' (U+${serverText.charCodeAt(i).toString(16).toUpperCase()})`);
+			logContext(serverContext);
 			break;
 		}
 	}

shared/markdown.js

@@ -1,4 +1,4 @@
-/* eslint-disable max-depth */
+
 /* eslint-disable max-lines */
 import _                        from 'lodash';
 import { marked as Marked }     from 'marked';
@@ -70,9 +70,9 @@ renderer.link = function (token) {
 	if(title) {
 		out += ` title="${escape(title)}"`;
 	}
-	if(self) {
+	// if(self) {
-		out += ' target="_self"';
+	// 	out += ' target="_self"';
-	}
+	// }
 	out += `>${text}</a>`;
 	return out;
 };
@@ -83,7 +83,7 @@ renderer.image = function (token) {
 	if(href === null)
 		return text;
 
-	let out = `<img src="${href}" alt="${text}" style="--HB_src:url(${href});"`;
+	let out = `<img loading="lazy" src="${href}" alt="${text}" style="--HB_src:url(${href});"`;
 	if(title)
 		out += ` title="${title}"`;
 

shared/markdownLegacy.js

@@ -34,9 +34,9 @@ renderer.link = function (href, title, text) {
 	if(title) {
 		out += ` title="${title}"`;
 	}
-	if(self) {
+	// if(self) {
-		out += ' target="_self"';
+	// 	out += ' target="_self"';
-	}
+	// }
 	out += `>${text}</a>`;
 	return out;
 };

shared/naturalcrit/styles/core.less

@@ -1,17 +1,10 @@
 
-@import 'naturalcrit/styles/reset.less';
+@import './reset.less';
-//@import 'naturalcrit/styles/elements.less';
+//@import './elements.less';
-@import 'naturalcrit/styles/animations.less';
+@import './animations.less';
-@import 'naturalcrit/styles/colors.less';
+@import './colors.less';
-@import 'naturalcrit/styles/tooltip.less';
+@import './tooltip.less';
-@font-face {
+@import './fonts/fonts.css';
-	font-family : 'CodeLight';
-	src         : data-uri('naturalcrit/styles/CODE Light.otf') format('opentype');
-}
-@font-face {
-	font-family : 'CodeBold';
-	src         : data-uri('naturalcrit/styles/CODE Bold.otf') format('opentype');
-}
 html,body, #reactRoot {
 	height      : 100vh;
 	min-height  : 100vh;

shared/naturalcrit/styles/fonts/fonts.css

@@ -0,0 +1,38 @@
+/* open-sans-latin-wght-normal */
+
+@font-face {
+	font-family   : 'Open Sans';
+	font-style    : normal;
+	font-weight   : normal;
+	src           : url('open-sans-latin-400-normal.woff2') format('woff2');
+	font-display  : swap;
+	unicode-range : U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
+}
+
+/*
+* Nowhere is font-weight: 700 actually used with Open Sans, everything is set to 800.
+* But, 800 *is* too bold.  And since we don't have an 800 font file, it's just using the 
+* 700 font file and it looks fine.  Not sure it's worth changing everything to 700?
+*/
+@font-face {
+	font-family   : 'Open Sans';
+	font-style    : normal;
+	font-weight   : bold;
+	src           : url('open-sans-latin-700-normal.woff2') format('woff2');
+	font-display  : swap;
+	unicode-range : U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
+}
+
+@font-face {
+	font-family  : 'CodeLight';
+	font-style   : normal;
+	src          : url('./CODE Light.otf') format('opentype');
+	font-display : block;
+}
+
+@font-face {
+	font-family  : 'CodeBold';
+	font-style   : normal;
+	src          : url('./CODE Bold.otf') format('opentype');
+	font-display : block;
+}

tests/html/safeHTML.test.js

@@ -1,6 +1,6 @@
 import globalJsdom from 'jsdom-global';
 globalJsdom();
-import { safeHTML } from '../../client/homebrew/brewRenderer/safeHTML';
+import safeHTML from '../../client/homebrew/brewRenderer/safeHTML';
 
 test('Exit if no document', function() {
 	const doc = document;

tests/markdown/basic.test.js

@@ -1,6 +1,6 @@
 
 
-import Markdown from 'markdown.js';
+import Markdown from '../../shared/markdown.js';
 
 test('Processes the markdown within an HTML block if its just a class wrapper', function() {
 	const source = '<div>*Bold text*</div>';
@@ -8,8 +8,10 @@ test('Processes the markdown within an HTML block if its just a class wrapper',
 	expect(rendered).toBe('<div> <p><em>Bold text</em></p>\n </div>');
 });
 
-test('Check markdown is using the custom renderer; specifically that it adds target=_self attribute to internal links in HTML blocks', function() {
+// TEST REMOVED AS IT IS NO LONGER REQUIRED
-	const source = '<div>[Has _self Attribute?](#p1)</div>';
+//
-	const rendered = Markdown.render(source);
+// test('Check markdown is using the custom renderer; specifically that it adds target=_self attribute to internal links in HTML blocks', function() {
-	expect(rendered).toBe('<div> <p><a href="#p1" target="_self">Has _self Attribute?</a></p>\n </div>');
+// 	const source = '<div>[Has _self Attribute?](#p1)</div>';
-});
+// 	const rendered = Markdown.render(source);
+// 	expect(rendered).toBe('<div> <p><a href="#p1" target="_self">Has _self Attribute?</a></p>\n </div>');
+// });

tests/markdown/definition-lists.test.js

@@ -1,6 +1,6 @@
 
 
-import Markdown from 'markdown.js';
+import Markdown from '../../shared/markdown.js';
 
 describe('Inline Definition Lists', ()=>{
 	test('No Term 1 Definition', function() {

tests/markdown/emojis.test.js

@@ -1,4 +1,4 @@
-import Markdown from 'markdown.js';
+import Markdown from '../../shared/markdown.js';
 import dedent from 'dedent';
 
 // Marked.js adds line returns after closing tags on some default tokens.

tests/markdown/hard-breaks.test.js

@@ -1,6 +1,6 @@
 
 
-import Markdown from 'markdown.js';
+import Markdown from '../../shared/markdown.js';
 
 describe('Hard Breaks', ()=>{
 	test('Single Break', function() {

tests/markdown/mustache-syntax.test.js

@@ -1,7 +1,7 @@
 /* eslint-disable max-lines */
 
 import dedent from 'dedent';
-import Markdown from 'markdown.js';
+import Markdown from '../../shared/markdown.js';
 
 // Marked.js adds line returns after closing tags on some default tokens.
 // This removes those line returns for comparison sake.
@@ -324,7 +324,7 @@ describe('Injection: When an injection tag follows an element', ()=>{
 		it('Renders an image element with injected style', function() {
 			const source = '![alt text](https://i.imgur.com/hMna6G0.png){position:absolute}';
 			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p><img style="--HB_src:url(https://i.imgur.com/hMna6G0.png); position:absolute;" src="https://i.imgur.com/hMna6G0.png" alt="alt text"></p>');
+			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p><img style="--HB_src:url(https://i.imgur.com/hMna6G0.png); position:absolute;" loading="lazy" src="https://i.imgur.com/hMna6G0.png" alt="alt text"></p>');
 		});
 
 		it('Renders an element modified by only the first of two consecutive injections', function() {
@@ -343,19 +343,19 @@ describe('Injection: When an injection tag follows an element', ()=>{
 		it('Renders an image with added attributes', function() {
 			const source = `![homebrew mug](https://i.imgur.com/hMna6G0.png) {position:absolute,bottom:20px,left:130px,width:220px,a="b and c",d=e}`;
 			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p><img style="--HB_src:url(https://i.imgur.com/hMna6G0.png); position:absolute; bottom:20px; left:130px; width:220px;" src="https://i.imgur.com/hMna6G0.png" alt="homebrew mug" a="b and c" d="e"></p>`);
+			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p><img style="--HB_src:url(https://i.imgur.com/hMna6G0.png); position:absolute; bottom:20px; left:130px; width:220px;" loading="lazy" src="https://i.imgur.com/hMna6G0.png" alt="homebrew mug" a="b and c" d="e"></p>`);
 		});
 
 		it('Renders an image with "=" in the url, and added attributes', function() {
 			const source = `![homebrew mug](https://i.imgur.com/hMna6G0.png?auth=12345&height=1024) {position:absolute,bottom:20px,left:130px,width:220px,a="b and c",d=e}`;
 			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p><img style="--HB_src:url(https://i.imgur.com/hMna6G0.png?auth=12345&height=1024); position:absolute; bottom:20px; left:130px; width:220px;" src="https://i.imgur.com/hMna6G0.png?auth=12345&height=1024" alt="homebrew mug" a="b and c" d="e"></p>`);
+			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p><img style="--HB_src:url(https://i.imgur.com/hMna6G0.png?auth=12345&height=1024); position:absolute; bottom:20px; left:130px; width:220px;" loading="lazy" src="https://i.imgur.com/hMna6G0.png?auth=12345&height=1024" alt="homebrew mug" a="b and c" d="e"></p>`);
 		});
 
 		it('Renders an image and added attributes with "=" in the value, ', function() {
 			const source = `![homebrew mug](https://i.imgur.com/hMna6G0.png) {position:absolute,bottom:20px,left:130px,width:220px,a="b and c",d=e,otherUrl="url?auth=12345"}`;
 			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p><img style="--HB_src:url(https://i.imgur.com/hMna6G0.png); position:absolute; bottom:20px; left:130px; width:220px;" src="https://i.imgur.com/hMna6G0.png" alt="homebrew mug" a="b and c" d="e" otherUrl="url?auth=12345"></p>`);
+			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p><img style="--HB_src:url(https://i.imgur.com/hMna6G0.png); position:absolute; bottom:20px; left:130px; width:220px;" loading="lazy" src="https://i.imgur.com/hMna6G0.png" alt="homebrew mug" a="b and c" d="e" otherUrl="url?auth=12345"></p>`);
 		});
 	});
 

tests/markdown/non-breaking-spaces.test.js

@@ -1,6 +1,6 @@
 
 
-import Markdown from 'markdown.js';
+import Markdown from '../../shared/markdown.js';
 
 describe('Non-Breaking Spaces Interactions', ()=>{
 	test('I am actually a single-line definition list!', function() {

tests/markdown/paragraph-justification.test.js

@@ -1,6 +1,6 @@
 
 
-import Markdown from 'markdown.js';
+import Markdown from '../../shared/markdown.js';
 
 describe('Justification', ()=>{
 	test('Left Justify', function() {

tests/markdown/variables.test.js

@@ -1,7 +1,7 @@
 /* eslint-disable max-lines */
 
 import dedent from 'dedent';
-import Markdown from 'markdown.js';
+import Markdown from '../../shared/markdown.js';
 
 // Marked.js adds line returns after closing tags on some default tokens.
 // This removes those line returns for comparison sake.
@@ -315,21 +315,21 @@ describe('Normal Links and Images', ()=>{
 		const source = `![alt text](url)`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-			<p><img src="url" alt="alt text" style="--HB_src:url(url);"></p>`.trimReturns());
+			<p><img loading="lazy" src="url" alt="alt text" style="--HB_src:url(url);"></p>`.trimReturns());
 	});
 
 	it('Renders normal images with a title', function() {
 		const source = 'An image ![alt text](url "and title")!';
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-			<p>An image <img src="url" alt="alt text" style="--HB_src:url(url);" title="and title">!</p>`.trimReturns());
+			<p>An image <img loading="lazy" src="url" alt="alt text" style="--HB_src:url(url);" title="and title">!</p>`.trimReturns());
 	});
 
 	it('Applies curly injectors to images', function() {
 		const source = `![alt text](url){width:100px}`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-			<p><img style="--HB_src:url(url); width:100px;" src="url" alt="alt text"></p>`.trimReturns());
+			<p><img style="--HB_src:url(url); width:100px;" loading="lazy" src="url" alt="alt text"></p>`.trimReturns());
 	});
 
 	it('Renders normal links', function() {
@@ -438,25 +438,25 @@ describe('Regression Tests', ()=>{
 	it('Handle Extra spaces in image alt-text 1', function(){
 		const source='![ where is my image??](http://i.imgur.com/hMna6G0.png)';
 		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered).toBe('<p><img src=\"http://i.imgur.com/hMna6G0.png\" alt=\"where is my image??\" style=\"--HB_src:url(http://i.imgur.com/hMna6G0.png);\"></p>');
+		expect(rendered).toBe('<p><img loading="lazy" src=\"http://i.imgur.com/hMna6G0.png\" alt=\"where is my image??\" style=\"--HB_src:url(http://i.imgur.com/hMna6G0.png);\"></p>');
 	});
 
 	it('Handle Extra spaces in image alt-text 2', function(){
 		const source='![where  is my image??](http://i.imgur.com/hMna6G0.png)';
 		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered).toBe('<p><img src=\"http://i.imgur.com/hMna6G0.png\" alt=\"where is my image??\" style=\"--HB_src:url(http://i.imgur.com/hMna6G0.png);\"></p>');
+		expect(rendered).toBe('<p><img loading="lazy" src=\"http://i.imgur.com/hMna6G0.png\" alt=\"where is my image??\" style=\"--HB_src:url(http://i.imgur.com/hMna6G0.png);\"></p>');
 	});
 
 	it('Handle Extra spaces in image alt-text 3', function(){
 		const source='![where is my image?? ](http://i.imgur.com/hMna6G0.png)';
 		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered).toBe('<p><img src=\"http://i.imgur.com/hMna6G0.png\" alt=\"where is my image??\" style=\"--HB_src:url(http://i.imgur.com/hMna6G0.png);\"></p>');
+		expect(rendered).toBe('<p><img loading="lazy" src=\"http://i.imgur.com/hMna6G0.png\" alt=\"where is my image??\" style=\"--HB_src:url(http://i.imgur.com/hMna6G0.png);\"></p>');
 	});
 
 	it('Handle Extra spaces in image alt-text 4', function(){
 		const source='![where is my image??](http://i.imgur.com/hMna6G0.png){height=20%,width=20%}';
 		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered).toBe('<p><img style=\"--HB_src:url(http://i.imgur.com/hMna6G0.png);\" src=\"http://i.imgur.com/hMna6G0.png\" alt=\"where is my image??\" height=\"20%\" width=\"20%\"></p>');
+		expect(rendered).toBe('<p><img style=\"--HB_src:url(http://i.imgur.com/hMna6G0.png);\" loading="lazy" src=\"http://i.imgur.com/hMna6G0.png\" alt=\"where is my image??\" height=\"20%\" width=\"20%\"></p>');
 	});
 });
 

tests/routes/static-pages.test.js

@@ -1,27 +1,32 @@
 import supertest from 'supertest';
-import HBApp     from 'app.js';
+import createApp from '../../server/app.js';
 
-// Mimic https responses to avoid being redirected all the time
+let app;
-const app = supertest.agent(HBApp).set('X-Forwarded-Proto', 'https');
+let request;
+
+beforeAll(async ()=>{
+	app = await createApp();
+	request = supertest.agent(app).set('X-Forwarded-Proto', 'https');
+});
 
 describe('Tests for static pages', ()=>{
-	it('Home page works', ()=>{
+	it('Home page works', async ()=>{
-		return app.get('/').expect(200);
+		await request.get('/').expect(200);
 	});
 
-	it('Home page legacy works', ()=>{
+	it('Home page legacy works', async ()=>{
-		return app.get('/legacy').expect(200);
+		await request.get('/legacy').expect(200);
 	});
 
-	it('Changelog page works', ()=>{
+	it('Changelog page works', async ()=>{
-		return app.get('/changelog').expect(200);
+		await request.get('/changelog').expect(200);
 	});
 
-	it('FAQ page works', ()=>{
+	it('FAQ page works', async ()=>{
-		return app.get('/faq').expect(200);
+		await request.get('/faq').expect(200);
 	});
 
-	it('robots.txt works', ()=>{
+	it('robots.txt works', async ()=>{
-		return app.get('/robots.txt').expect(200);
+		await request.get('/robots.txt').expect(200);
 	});
 });

themes/Legacy/5ePHB/snippets.js

@@ -1,12 +1,12 @@
 /* eslint-disable max-lines */
 
-import MagicGen           from './snippets/magic.gen.js';
+import MagicGen from './snippets/magic.gen.js';
 import ClassTableGen      from './snippets/classtable.gen.js';
 import MonsterBlockGen    from './snippets/monsterblock.gen.js';
 import ClassFeatureGen    from './snippets/classfeature.gen.js';
 import CoverPageGen       from './snippets/coverpage.gen.js';
 import TableOfContentsGen from './snippets/tableOfContents.gen.js';
-import dedent             from 'dedent';
+import dedent from 'dedent';
 
 export default [