Merge pull request #4352 from G-Ambatte/experimentalGoogleServiceAccountChange

Add Google service account to file permissions
Merge branch 'master' into experimentalGoogleServiceAccountChange
2026-01-25 07:33:00 +00:00 · 2025-11-24 17:52:21 +01:00 · 2025-11-24 15:23:18 +01:00 · 2025-11-21 15:21:48 -05:00 · 2025-11-21 19:04:00 +00:00 · 2025-11-21 14:02:34 -05:00
15 changed files with 209 additions and 385 deletions
--- a/client/components/codeEditor/codeEditor.jsx
+++ b/client/components/codeEditor/codeEditor.jsx
@@ -8,36 +8,36 @@ const autoCompleteEmoji = require('./autocompleteEmoji');

 let CodeMirror;
 if(typeof window !== 'undefined'){
-	CodeMirror = require('codemirror5');
+	CodeMirror = require('codemirror');

 	//Language Modes
-	require('codemirror5/mode/gfm/gfm.js'); //Github flavoured markdown
-	require('codemirror5/mode/css/css.js');
-	require('codemirror5/mode/javascript/javascript.js');
+	require('codemirror/mode/gfm/gfm.js'); //Github flavoured markdown
+	require('codemirror/mode/css/css.js');
+	require('codemirror/mode/javascript/javascript.js');

 	//Addons
 	//Code folding
-	require('codemirror5/addon/fold/foldcode.js');
-	require('codemirror5/addon/fold/foldgutter.js');
+	require('codemirror/addon/fold/foldcode.js');
+	require('codemirror/addon/fold/foldgutter.js');
 	//Search and replace
-	require('codemirror5/addon/search/search.js');
-	require('codemirror5/addon/search/searchcursor.js');
-	require('codemirror5/addon/search/jump-to-line.js');
-	require('codemirror5/addon/search/match-highlighter.js');
-	require('codemirror5/addon/search/matchesonscrollbar.js');
-	require('codemirror5/addon/dialog/dialog.js');
+	require('codemirror/addon/search/search.js');
+	require('codemirror/addon/search/searchcursor.js');
+	require('codemirror/addon/search/jump-to-line.js');
+	require('codemirror/addon/search/match-highlighter.js');
+	require('codemirror/addon/search/matchesonscrollbar.js');
+	require('codemirror/addon/dialog/dialog.js');
 	//Trailing space highlighting
 	// require('codemirror/addon/edit/trailingspace.js');
 	//Active line highlighting
 	// require('codemirror/addon/selection/active-line.js');
 	//Scroll past last line
-	require('codemirror5/addon/scroll/scrollpastend.js');
+	require('codemirror/addon/scroll/scrollpastend.js');
 	//Auto-closing
 	//XML code folding is a requirement of the auto-closing tag feature and is not enabled
-	require('codemirror5/addon/fold/xml-fold.js');
-	require('codemirror5/addon/edit/closetag.js');
+	require('codemirror/addon/fold/xml-fold.js');
+	require('codemirror/addon/edit/closetag.js');
 	//Autocompletion
-	require('codemirror5/addon/hint/show-hint.js');
+	require('codemirror/addon/hint/show-hint.js');

 	const foldPagesCode = require('./fold-pages');
 	foldPagesCode.registerHomebreweryHelper(CodeMirror);
@@ -462,3 +462,4 @@ const CodeEditor = createClass({
 });

 module.exports = CodeEditor;
+
--- a/client/components/codeEditor/codeEditor.less
+++ b/client/components/codeEditor/codeEditor.less
@@ -1,8 +1,8 @@
-@import (less) 'codemirror5/lib/codemirror.css';
-@import (less) 'codemirror5/addon/fold/foldgutter.css';
-@import (less) 'codemirror5/addon/search/matchesonscrollbar.css';
-@import (less) 'codemirror5/addon/dialog/dialog.css';
-@import (less) 'codemirror5/addon/hint/show-hint.css';
+@import (less) 'codemirror/lib/codemirror.css';
+@import (less) 'codemirror/addon/fold/foldgutter.css';
+@import (less) 'codemirror/addon/search/matchesonscrollbar.css';
+@import (less) 'codemirror/addon/dialog/dialog.css';
+@import (less) 'codemirror/addon/hint/show-hint.css';

 //Icon fonts included so they can appear in emoji autosuggest dropdown
@import (less) './themes/fonts/iconFonts/diceFont.less';
@@ -57,4 +57,4 @@
 .emojiPreview {
 	font-size   : 1.5em;
 	line-height : 1.2em;
-}
+}
--- a/client/components/codeEditor/codeEditorV6.jsx
+++ b/client/components/codeEditor/codeEditorV6.jsx
@@ -1,191 +0,0 @@
-import './codeEditor.less';
-import React, { useEffect, useImperativeHandle, useMemo, useRef } from 'react';
-import { Compartment, EditorSelection, EditorState } from '@codemirror/state';
-import { EditorView, keymap, highlightActiveLine, lineNumbers, highlightActiveLineGutter } from '@codemirror/view';
-import { history, historyKeymap, undo as historyUndo, redo as historyRedo, undoDepth, redoDepth } from '@codemirror/history';
-import { defaultKeymap, indentWithTab } from '@codemirror/commands';
-import { searchKeymap, highlightSelectionMatches } from '@codemirror/search';
-import { closeBrackets, closeBracketsKeymap } from '@codemirror/autocomplete';
-import { defaultHighlightStyle } from '@codemirror/language';
-import { syntaxHighlighting } from '@codemirror/language';
-import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
-import { languages } from '@codemirror/language-data';
-import { javascript } from '@codemirror/lang-javascript';
-import { css } from '@codemirror/lang-css';
-
-const baseExtensions = [
-	lineNumbers(),
-	highlightActiveLineGutter(),
-	EditorView.lineWrapping,
-	history(),
-	keymap.of([
-		indentWithTab,
-		...closeBracketsKeymap,
-		...searchKeymap,
-		...historyKeymap,
-		...defaultKeymap
-	]),
-	closeBrackets(),
-	highlightSelectionMatches(),
-	highlightActiveLine(),
-	syntaxHighlighting(defaultHighlightStyle, { fallback: true })
-];
-
-const languageExtension = (language)=>{
-	switch(language){
-	case 'css':
-		return css();
-	case 'javascript':
-		return javascript({ jsx: true, typescript: true });
-	case 'gfm':
-	default:
-		return markdown({ base: markdownLanguage, codeLanguages: languages });
-	}
-};
-
-const CodeEditorV6 = React.forwardRef(({
-	value = '',
-	onChange = ()=>{},
-	language = 'gfm',
-	readOnly = false,
-	style = {},
-	editorTheme,
-	onSelectionChange = ()=>{},
-	onScroll = ()=>{}
-}, ref)=>{
-	const containerRef = useRef(null);
-	const viewRef = useRef(null);
-	const languageCompartment = useMemo(()=>new Compartment(), []);
-	const readOnlyCompartment = useMemo(()=>new Compartment(), []);
-
-	useImperativeHandle(ref, ()=>({
-		focus : ()=>viewRef.current?.focus(),
-		getView : ()=>viewRef.current,
-		getCM6View : ()=>viewRef.current,
-		getCursorPosition : ()=>{
-			const view = viewRef.current;
-			if(!view) return { line: 0, ch: 0 };
-			const { head } = view.state.selection.main;
-			const lineInfo = view.state.doc.lineAt(head);
-			return { line: lineInfo.number - 1, ch: head - lineInfo.from };
-		},
-		setCursorPosition : ({ line = 0, ch = 0 })=>{
-			const view = viewRef.current;
-			if(!view) return;
-			const docLine = view.state.doc.line(Math.max(1, line + 1));
-			const pos = Math.min(docLine.from + ch, docLine.to);
-			view.dispatch({ selection: EditorSelection.cursor(pos), scrollIntoView: true });
-		},
-		getTopVisibleLine : ()=>{
-			const view = viewRef.current;
-			if(!view) return 0;
-			const top = view.scrollDOM.scrollTop;
-			const block = view.lineBlockAtHeight(top);
-			const lineInfo = view.state.doc.lineAt(block.from);
-			return lineInfo.number - 1;
-		},
-		updateSize : ()=>viewRef.current?.requestMeasure(),
-		injectText : (text, overwrite=true)=>{
-			const view = viewRef.current;
-			if(!view) return;
-			const { from, to } = view.state.selection.main;
-			const insertFrom = overwrite ? from : from;
-			const insertTo = overwrite ? to : from;
-			view.dispatch({
-				changes   : { from: insertFrom, to: insertTo, insert: text },
-				selection : EditorSelection.cursor(insertFrom + text.length),
-				scrollIntoView : true
-			});
-			view.focus();
-		},
-		undo : ()=>{
-			const view = viewRef.current;
-			if(!view) return;
-			historyUndo(view);
-		},
-		redo : ()=>{
-			const view = viewRef.current;
-			if(!view) return;
-			historyRedo(view);
-		},
-		historySize : ()=>{
-			const view = viewRef.current;
-			if(!view) return { undo: 0, redo: 0 };
-			return {
-				undo : undoDepth(view.state),
-				redo : redoDepth(view.state)
-			};
-		},
-		foldAllCode : ()=>{},
-		unfoldAllCode : ()=>{}
-	}), []);
-
-	useEffect(()=>{
-		if(!containerRef.current) return;
-
-		const initialExtensions = [
-			...baseExtensions,
-			languageCompartment.of(languageExtension(language)),
-			readOnlyCompartment.of(EditorState.readOnly.of(readOnly)),
-			EditorView.updateListener.of((update)=>{
-				if(update.docChanged) onChange(update.state.doc.toString());
-				if(update.selectionSet) onSelectionChange(update.view);
-			})
-		];
-
-		const state = EditorState.create({
-			doc        : value,
-			extensions : initialExtensions
-		});
-
-		const view = new EditorView({
-			state,
-			parent : containerRef.current
-		});
-		viewRef.current = view;
-
-		const handleScroll = ()=>onScroll(view);
-		view.scrollDOM.addEventListener('scroll', handleScroll);
-
-		return ()=>{
-			view.scrollDOM.removeEventListener('scroll', handleScroll);
-			view.destroy();
-			viewRef.current = null;
-		};
-	}, []);
-
-	useEffect(()=>{
-		const view = viewRef.current;
-		if(!view) return;
-		view.dispatch({
-			effects : languageCompartment.reconfigure(languageExtension(language))
-		});
-	}, [language, languageCompartment]);
-
-	useEffect(()=>{
-		const view = viewRef.current;
-		if(!view) return;
-		view.dispatch({
-			effects : readOnlyCompartment.reconfigure(EditorState.readOnly.of(readOnly))
-		});
-	}, [readOnly, readOnlyCompartment]);
-
-	useEffect(()=>{
-		const view = viewRef.current;
-		if(!view) return;
-		const currentValue = view.state.doc.toString();
-		if(value === currentValue) return;
-		const transaction = view.state.update({
-			changes : { from: 0, to: currentValue.length, insert: value }
-		});
-		view.dispatch(transaction);
-	}, [value]);
-
-	return (
-		<div className='codeEditor' ref={containerRef} style={style} data-editor='cm6'></div>
-	);
-});
-
-CodeEditorV6.displayName = 'CodeEditorV6';
-
-export default CodeEditorV6;
--- a/client/homebrew/editor/editor.jsx
+++ b/client/homebrew/editor/editor.jsx
@@ -7,9 +7,6 @@ const dedent = require('dedent-tabs').default;
 import Markdown from '../../../shared/markdown.js';

 const CodeEditor = require('client/components/codeEditor/codeEditor.jsx');
-import CodeEditorV6 from 'client/components/codeEditor/codeEditorV6.jsx';
-
-const USE_CM6 = global?.config?.enable_CM6 === true;
 const SnippetBar = require('./snippetbar/snippetbar.jsx');
 const MetadataEditor = require('./metadataEditor/metadataEditor.jsx');

@@ -61,38 +58,12 @@ const Editor = createClass({
 		return {
 			editorTheme      : this.props.editorTheme,
 			view             : 'text', //'text', 'style', 'meta', 'snippet'
-			snippetbarHeight : 25
+			snippetBarHeight : 26,
 		};
 	},

-	editor       : React.createRef(null),
-	codeEditor   : React.createRef(null),
-	codeEditorV6 : React.createRef(null),
-
-	getActiveEditor : function(){
-		return USE_CM6 ? this.codeEditorV6.current : this.codeEditor.current;
-	},
-
-	focusActiveEditor : function(){
-		const editor = this.getActiveEditor();
-		if(!editor) return;
-		if(USE_CM6) editor.focus?.();
-		else editor.codeMirror?.focus();
-	},
-
-	handleCM6SelectionChange : function(view){
-		if(!USE_CM6 || !view) return;
-		const { head } = view.state.selection.main;
-		const lineInfo = view.state.doc.lineAt(head);
-		this.updateCurrentCursorPage({ line: lineInfo.number - 1 });
-	},
-
-	handleCM6Scroll : function(){
-		if(!USE_CM6) return;
-		const topLine = this.codeEditorV6.current?.getTopVisibleLine?.();
-		if(topLine == null) return;
-		this.updateCurrentViewPage(topLine);
-	},
+	editor     : React.createRef(null),
+	codeEditor : React.createRef(null),

 	isText  : function() {return this.state.view == 'text';},
 	isStyle : function() {return this.state.view == 'style';},
@@ -105,10 +76,8 @@ const Editor = createClass({
 		document.getElementById('BrewRenderer').addEventListener('keydown', this.handleControlKeys);
 		document.addEventListener('keydown', this.handleControlKeys);

-		if(!USE_CM6) {
-			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));
-		}
+		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) {
@@ -116,12 +85,20 @@ const Editor = createClass({
 				editorTheme : editorTheme
 			});
 		}
-		this.setState({ snippetbarHeight: document.querySelector('.editor > .snippetBar').offsetHeight });
+		const snippetBar = document.querySelector('.editor > .snippetBar');
+		if (!snippetBar) return;
+
+		this.resizeObserver = new ResizeObserver(entries => {
+			const height = document.querySelector('.editor > .snippetBar').offsetHeight;
+			this.setState({ snippetBarHeight: height });
+		});
+
+		this.resizeObserver.observe(snippetBar);
 	},

 	componentDidUpdate : function(prevProps, prevState, snapshot) {

-		if(!USE_CM6) this.highlightCustomMarkdown();
+		this.highlightCustomMarkdown();
 		if(prevProps.moveBrew !== this.props.moveBrew)
 			this.brewJump();

@@ -139,6 +116,10 @@ const Editor = createClass({
 		}
 	},

+	componentWillUnmount() {
+		if (this.resizeObserver) this.resizeObserver.disconnect();
+	},
+
 	handleControlKeys : function(e){
 		if(!(e.ctrlKey && e.metaKey && e.shiftKey)) return;
 		const LEFTARROW_KEY = 37;
@@ -152,8 +133,7 @@ const Editor = createClass({
 	},

 	updateCurrentCursorPage : function(cursor) {
-		const cursorLine = cursor.line ?? cursor;
-		const lines = this.props.brew.text.split('\n').slice(1, cursorLine + 1);
+		const lines = this.props.brew.text.split('\n').slice(1, cursor.line + 1);
 		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);
@@ -440,11 +420,7 @@ const Editor = createClass({
 	},

 	//Called when there are changes to the editor's dimensions
-	update : function(){
-		const snipHeight = document.querySelector('.editor > .snippetBar').offsetHeight;
-		if(snipHeight !== this.state.snippetbarHeight)
-			this.setState({ snippetbarHeight: snipHeight });
-	},
+	update : function(){},

 	updateEditorTheme : function(newTheme){
 		window.localStorage.setItem(EDITOR_THEME_KEY, newTheme);
@@ -469,7 +445,7 @@ const Editor = createClass({
 					onChange={this.props.onBrewChange('text')}
 					editorTheme={this.state.editorTheme}
 					rerenderParent={this.rerenderParent}
-					style={{  height: `calc(100% - ${this.state.snippetbarHeight}px)` }} />
+					style={{  height: `calc(100% - ${this.state.snippetBarHeight}px)` }} />
 			</>;
 		}
 		if(this.isStyle()){
@@ -483,7 +459,7 @@ const Editor = createClass({
 					enableFolding={true}
 					editorTheme={this.state.editorTheme}
 					rerenderParent={this.rerenderParent}
-					style={{  height: `calc(100% - ${this.state.snippetbarHeight}px)` }} />
+					style={{  height: `calc(100% - ${this.state.snippetBarHeight}px)` }} />
 			</>;
 		}
 		if(this.isMeta()){
@@ -500,7 +476,6 @@ const Editor = createClass({
 					userThemes={this.props.userThemes}/>
 			</>;
 		}
-
 		if(this.isSnip()){
 			if(!this.props.brew.snippets) { this.props.brew.snippets = DEFAULT_SNIPPET_TEXT; }
 			return <>
@@ -513,7 +488,7 @@ const Editor = createClass({
 					enableFolding={true}
 					editorTheme={this.state.editorTheme}
 					rerenderParent={this.rerenderParent}
-					style={{  height: `calc(100% - ${this.state.snippetbarHeight}px)` }} />
+					style={{  height: `calc(100% -${this.state.snippetBarHeight}px)` }} />
 			</>;
 		}
 	},
--- a/client/homebrew/editor/snippetbar/snippetbar.less
+++ b/client/homebrew/editor/snippetbar/snippetbar.less
@@ -14,7 +14,7 @@
 	.snippets {
 		display         : flex;
 		justify-content : flex-start;
-		min-width       : 432.18px;  //must be controlled every time an item is added, must be hardcoded for the wrapping as it is applied
+		min-width       : 499.35px;  //must be controlled every time an item is added, must be hardcoded for the wrapping as it is applied
 	}

 	.editors {
@@ -237,7 +237,7 @@
 	}

 }
-@container editor (width < 683px) {
+@container editor (width < 750px) {
 	.snippetBar {
 		.editors { 
 			flex            : 1;
--- a/client/homebrew/navbar/newbrew.navitem.jsx
+++ b/client/homebrew/navbar/newbrew.navitem.jsx
@@ -3,19 +3,16 @@ const _ = require('lodash');
 const Nav = require('client/homebrew/navbar/nav.jsx');
 const { splitTextStyleAndMetadata } = require('../../../shared/helpers.js'); // Importing the function from helpers.js

-const BREWKEY  = 'homebrewery-new';
-const STYLEKEY = 'homebrewery-new-style';
-const METAKEY = 'homebrewery-new-meta';
+const BREWKEY  = 'HB_newPage_content';
+const STYLEKEY = 'HB_newPage_style';
+const METAKEY = 'HB_newPage_meta';

 const NewBrew = ()=>{
 	const handleFileChange = (e)=>{
 		const file = e.target.files[0];
 		if(!file) return;

-		const currentNew = localStorage.getItem(BREWKEY);
-		if(currentNew && !confirm(
-			`You have some text in the new brew space, if you load a file that text will be lost, are you sure you want to load the file?`
-		)) return;
+		if(!confirmLocalStorageChange()) return;

 		const reader = new FileReader();
 		reader.onload = (e)=>{
@@ -37,12 +34,35 @@ const NewBrew = ()=>{

 			alert(`This file is invalid: ${!type ? 'Missing file extension' :`.${type} files are not supported`}. Only .txt files exported from the Homebrewery are allowed.`);

-
 			console.log(file);
 		};
 		reader.readAsText(file);
 	};

+	const confirmLocalStorageChange = ()=>{
+		const currentText  = localStorage.getItem(BREWKEY);
+		const currentStyle = localStorage.getItem(STYLEKEY);
+		const currentMeta  = localStorage.getItem(METAKEY);
+
+		// TRUE if no data in any local storage key
+		// TRUE if data in any local storage key AND approval given
+		// FALSE if data in any local storage key AND approval declined
+		return (!(currentText || currentStyle || currentMeta) || confirm(
+			`You have made changes in the new brew space. If you continue, that information will be PERMANENTLY LOST.\nAre you sure you wish to continue?`
+		));
+	};
+
+	const clearLocalStorage = ()=>{
+		if(!confirmLocalStorageChange()) return;
+
+		localStorage.removeItem(BREWKEY);
+		localStorage.removeItem(STYLEKEY);
+		localStorage.removeItem(METAKEY);
+
+		window.location.href = '/new';
+		return;
+	};
+

 	return (
 		<Nav.dropdown>
@@ -50,24 +70,31 @@ const NewBrew = ()=>{
 				className='new'
 				color='purple'
 				icon='fa-solid fa-plus-square'>
-                new
+					new
 			</Nav.item>
 			<Nav.item
-				className='fromBlank'
+				className='new'
 				href='/new'
 				newTab={true}
 				color='purple'
 				icon='fa-solid fa-file'>
-                from blank
+					resume draft
+			</Nav.item>
+			<Nav.item
+				className='fromBlank'
+				newTab={true}
+				color='yellow'
+				icon='fa-solid fa-file-circle-plus'
+				onClick={()=>{ clearLocalStorage(); }}>
+					from blank
 			</Nav.item>
-
 			<Nav.item
 				className='fromFile'
-				color='purple'
+				color='green'
 				icon='fa-solid fa-upload'
 				onClick={()=>{ document.getElementById('uploadTxt').click(); }}>
 				<input id='uploadTxt' className='newFromLocal' type='file' onChange={handleFileChange} style={{ display: 'none' }} />
-                from file
+					from file
 			</Nav.item>
 		</Nav.dropdown>
 	);
--- a/client/homebrew/pages/newPage/newPage.less
+++ b/client/homebrew/pages/newPage/newPage.less
@@ -1,12 +1,15 @@
 .newPage {
 	.navItem.save {
-		.fadeInRight();
-		.transition(opacity);
 		background-color : @orange;
+		transition:all 0.2s;
 		&:hover { background-color : @green; }
+		
 		&.neverSaved {
-			.fadeOutRight();
+			translate:-100%;
 			opacity: 0;
+			background-color :#333;
+			cursor:auto;
 		}
 	}
 }
+
--- a/config/default.json
+++ b/config/default.json
@@ -7,6 +7,5 @@
 	"local_environments" : ["docker", "local"],
 	"publicUrl" : "https://homebrewery.naturalcrit.com",
 	"hb_images" : null,
-	"hb_fonts" : null,
-	"enable_CM6" : true
+	"hb_fonts" : null
 }
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,16 +13,16 @@
        "@babel/core": "^7.28.4",
        "@babel/plugin-transform-runtime": "^7.28.3",
        "@babel/preset-env": "^7.28.3",
-        "@babel/preset-react": "^7.27.1",
+        "@babel/preset-react": "^7.28.5",
        "@babel/runtime": "^7.28.4",
        "@dmsnell/diff-match-patch": "^1.1.0",
-        "@googleapis/drive": "^18.0.0",
+        "@googleapis/drive": "^19.2.0",
        "@sanity/diff-match-patch": "^3.2.0",
        "body-parser": "^2.2.0",
        "classnames": "^2.5.1",
        "codemirror": "^5.65.6",
        "cookie-parser": "^1.4.7",
-        "core-js": "^3.46.0",
+        "core-js": "^3.47.0",
        "cors": "^2.8.5",
        "create-react-class": "^15.7.0",
        "dedent-tabs": "^0.10.3",
@@ -34,29 +34,29 @@
        "fs-extra": "11.3.2",
        "hash-wasm": "^4.12.0",
        "idb-keyval": "^6.2.2",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
        "jwt-simple": "^0.5.6",
        "less": "^3.13.1",
        "lodash": "^4.17.21",
        "marked": "15.0.12",
        "marked-alignment-paragraphs": "^1.0.0",
        "marked-definition-lists": "^1.0.1",
-        "marked-emoji": "^2.0.1",
+        "marked-emoji": "^2.0.2",
        "marked-extended-tables": "^2.0.1",
-        "marked-gfm-heading-id": "^4.1.2",
+        "marked-gfm-heading-id": "^4.1.3",
        "marked-nonbreaking-spaces": "^1.0.1",
        "marked-smartypants-lite": "^1.0.3",
        "marked-subsuper-text": "^1.0.4",
        "marked-variables": "^1.0.4",
        "markedLegacy": "npm:marked@^0.3.19",
        "moment": "^2.30.1",
-        "mongoose": "^8.19.1",
+        "mongoose": "^8.20.0",
        "nanoid": "5.1.6",
        "nconf": "^0.13.0",
        "react": "^18.3.1",
        "react-dom": "^18.3.1",
        "react-frame-component": "^4.1.3",
-        "react-router": "^7.9.4",
+        "react-router": "^7.9.6",
        "romans": "^3.1.0",
        "sanitize-filename": "1.6.3",
        "superagent": "^10.2.1",
@@ -66,8 +66,8 @@
      "devDependencies": {
        "@stylistic/stylelint-plugin": "^4.0.0",
        "babel-plugin-transform-import-meta": "^2.3.3",
-        "eslint": "^9.37.0",
-        "eslint-plugin-jest": "^29.0.1",
+        "eslint": "^9.39.1",
+        "eslint-plugin-jest": "^29.1.0",
        "eslint-plugin-react": "^7.37.5",
        "globals": "^16.4.0",
        "jest": "^30.2.0",
@@ -1427,9 +1427,9 @@
      }
    },
    "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.27.1.tgz",
-      "integrity": "sha512-p9+Vl3yuHPmkirRrg021XiP+EETmPMQTLr6Ayjj85RLNEbb3Eya/4VI0vAdzQG9SEAl2Lnt7fy5lZyMzjYoZQQ==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.28.0.tgz",
+      "integrity": "sha512-D6Eujc2zMxKjfa4Zxl4GHMsmhKKZ9VpcqIchJLvwTxad9zWIYulwYItBovpDOoNLISpcZSXoDJ5gaGbQUDqViA==",
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.27.1"
@@ -1795,14 +1795,14 @@
      }
    },
    "node_modules/@babel/preset-react": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.27.1.tgz",
-      "integrity": "sha512-oJHWh2gLhU9dW9HHr42q0cI0/iHHXTLGe39qvpAZZzagHy0MzYLCnCVV0symeRvzmjHyVU7mw2K06E6u/JwbhA==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.28.5.tgz",
+      "integrity": "sha512-Z3J8vhRq7CeLjdC58jLv4lnZ5RKFUJWqH5emvxmv9Hv3BD1T9R/Im713R4MTKwvFaV74ejZ3sM01LyEKk4ugNQ==",
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.27.1",
        "@babel/helper-validator-option": "^7.27.1",
-        "@babel/plugin-transform-react-display-name": "^7.27.1",
+        "@babel/plugin-transform-react-display-name": "^7.28.0",
        "@babel/plugin-transform-react-jsx": "^7.27.1",
        "@babel/plugin-transform-react-jsx-development": "^7.27.1",
        "@babel/plugin-transform-react-pure-annotations": "^7.27.1"
@@ -2258,9 +2258,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "9.39.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.0.tgz",
-      "integrity": "sha512-BIhe0sW91JGPiaF1mOuPy5v8NflqfjIcDNpC+LbW9f609WVRX1rArrhi6Z2ymvrAry9jw+5POTj4t2t62o8Bmw==",
+      "version": "9.39.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.1.tgz",
+      "integrity": "sha512-S26Stp4zCy88tH94QbBv3XCuzRQiZ9yXofEILmglYTh/Ug/a9/umqvgFtYBAo3Lp0nsI/5/qH1CCrbdK3AP1Tw==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -2295,9 +2295,9 @@
      }
    },
    "node_modules/@googleapis/drive": {
-      "version": "18.0.0",
-      "resolved": "https://registry.npmjs.org/@googleapis/drive/-/drive-18.0.0.tgz",
-      "integrity": "sha512-nk4TirsHttwZSOjBEBjltCPDKUqwFso59G3WitNE+EGNVSVseSEq981f8Dmjq2ah0/fk3i206wuCU4PUCwcoTQ==",
+      "version": "19.2.0",
+      "resolved": "https://registry.npmjs.org/@googleapis/drive/-/drive-19.2.0.tgz",
+      "integrity": "sha512-XzhQ+CNwW54umLecZLzQ5Q2RborJD1+u2YzJIT/BOpne+VJfsCyxWVG0nxYQmcGdiFXJPeW5+V3sdP/A/nt3eA==",
      "license": "Apache-2.0",
      "dependencies": {
        "googleapis-common": "^8.0.0"
@@ -5343,9 +5343,9 @@
      }
    },
    "node_modules/core-js": {
-      "version": "3.46.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.46.0.tgz",
-      "integrity": "sha512-vDMm9B0xnqqZ8uSBpZ8sNtRtOdmfShrvT6h2TuQGLs0Is+cR0DYbj/KWP6ALVNbWPpqA/qPLoOuppJN07humpA==",
+      "version": "3.47.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.47.0.tgz",
+      "integrity": "sha512-c3Q2VVkGAUyupsjRnaNX6u8Dq2vAdzm9iuPj5FW0fRxzlxgq9Q39MDq10IvmQSpLgHQNyQzQmOo6bgGHmH3NNg==",
      "hasInstallScript": true,
      "license": "MIT",
      "funding": {
@@ -6259,9 +6259,9 @@
      }
    },
    "node_modules/eslint": {
-      "version": "9.39.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.0.tgz",
-      "integrity": "sha512-iy2GE3MHrYTL5lrCtMZ0X1KLEKKUjmK0kzwcnefhR66txcEmXZD2YWgR5GNdcEwkNx3a0siYkSvl0vIC+Svjmg==",
+      "version": "9.39.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.1.tgz",
+      "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -6271,7 +6271,7 @@
        "@eslint/config-helpers": "^0.4.2",
        "@eslint/core": "^0.17.0",
        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.39.0",
+        "@eslint/js": "9.39.1",
        "@eslint/plugin-kit": "^0.4.1",
        "@humanfs/node": "^0.16.6",
        "@humanwhocodes/module-importer": "^1.0.1",
@@ -6319,9 +6319,9 @@
      }
    },
    "node_modules/eslint-plugin-jest": {
-      "version": "29.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-29.0.1.tgz",
-      "integrity": "sha512-EE44T0OSMCeXhDrrdsbKAhprobKkPtJTbQz5yEktysNpHeDZTAL1SfDTNKmcFfJkY6yrQLtTKZALrD3j/Gpmiw==",
+      "version": "29.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-29.1.0.tgz",
+      "integrity": "sha512-LabxXbASXVjguqL+kBHTPMf3gUeSqwH4fsrEyHTY/MCs42I/p9+ctg09SJpYiD8eGaIsP6GwYr5xW6xWS9XgZg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -9466,9 +9466,9 @@
      "license": "MIT"
    },
    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
      "license": "MIT",
      "dependencies": {
        "argparse": "^2.0.1"
@@ -10026,12 +10026,12 @@
      }
    },
    "node_modules/marked-emoji": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/marked-emoji/-/marked-emoji-2.0.1.tgz",
-      "integrity": "sha512-P+nRr02dD+yPOFhtGdaVBzp0qzwlksI2f5GumIdHW/3UadzJ5sVi78CZikiSLr9PmdtUOZodZUBNIO6k38pDMQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/marked-emoji/-/marked-emoji-2.0.2.tgz",
+      "integrity": "sha512-EFnLQn4wTyf+6pXfptkm83Z2mt3VbdEYedHBAsDpwUas5n5satsj42RGqAijBpmetgGerI1EzUuzf7NIccINUQ==",
      "license": "MIT",
      "peerDependencies": {
-        "marked": ">=4 <17"
+        "marked": ">=4 <18"
      }
    },
    "node_modules/marked-extended-tables": {
@@ -10044,15 +10044,15 @@
      }
    },
    "node_modules/marked-gfm-heading-id": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/marked-gfm-heading-id/-/marked-gfm-heading-id-4.1.2.tgz",
-      "integrity": "sha512-EQ1WiEGHJh0C8viU+hbXbhHyWTDgEia2i96fiSemm2wdYER6YBw/9QI5TB6YFTqFfmMOxBFXPcPJtlgD0fVV2w==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/marked-gfm-heading-id/-/marked-gfm-heading-id-4.1.3.tgz",
+      "integrity": "sha512-aR0i63LmFbuxU/gAgrgz1Ir+8HK6zAIFXMlckeKHpV+qKbYaOP95L4Ux5Gi+sKmCZU5qnN2rdKpvpb7PnUBIWg==",
      "license": "MIT",
      "dependencies": {
        "github-slugger": "^2.0.0"
      },
      "peerDependencies": {
-        "marked": ">=13 <17"
+        "marked": ">=13 <18"
      }
    },
    "node_modules/marked-nonbreaking-spaces": {
@@ -10436,9 +10436,9 @@
      }
    },
    "node_modules/mongoose": {
-      "version": "8.19.2",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.19.2.tgz",
-      "integrity": "sha512-ww2T4dBV+suCbOfG5YPwj9pLCfUVyj8FEA1D3Ux1HHqutpLxGyOYEPU06iPRBW4cKr3PJfOSYsIpHWPTkz5zig==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.20.0.tgz",
+      "integrity": "sha512-SxqNb8yx+VOjIOx2l7HqkGvYuLC/T85d+jPvqGDdUbKJFz/5PVSsVxQzypQsX7chenYvq5bd8jIr4LtunedE7g==",
      "license": "MIT",
      "dependencies": {
        "bson": "^6.10.4",
@@ -12065,9 +12065,9 @@
      "license": "MIT"
    },
    "node_modules/react-router": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.9.5.tgz",
-      "integrity": "sha512-JmxqrnBZ6E9hWmf02jzNn9Jm3UqyeimyiwzD69NjxGySG6lIz/1LVPsoTCwN7NBX2XjCEa1LIX5EMz1j2b6u6A==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.9.6.tgz",
+      "integrity": "sha512-Y1tUp8clYRXpfPITyuifmSoE2vncSME18uVLgaqyxh9H35JWpIfzHo+9y3Fzh5odk/jxPW29IgLgzcdwxGqyNA==",
      "license": "MIT",
      "dependencies": {
        "cookie": "^1.0.1",
@@ -14742,7 +14742,8 @@
    },
    "node_modules/vitreum": {
      "version": "6.0.4",
-      "resolved": "git+https://git@github.com/calculuschild/vitreum.git#9d55fd6fb7e85e7070de798c4f9d5b983c1b7dba",
+      "resolved": "git+https://git@github.com/calculuschild/vitreum.git#929c351881c4229550374421c7e2890a94f4dca7",
+      "integrity": "sha512-dclfZIgvZU4pOeju1U7CjfGcAMNY+HwhYxF5O1cB6j9EtBrUXQh5+8XlYvNrw2XIcjWIxWcWaCpAQgJxKssfbQ==",
      "hasInstallScript": true,
      "license": "MIT",
      "dependencies": {
--- a/package.json
+++ b/package.json
@@ -88,32 +88,16 @@
    "@babel/core": "^7.28.4",
    "@babel/plugin-transform-runtime": "^7.28.3",
    "@babel/preset-env": "^7.28.3",
-    "@babel/preset-react": "^7.27.1",
+    "@babel/preset-react": "^7.28.5",
    "@babel/runtime": "^7.28.4",
    "@dmsnell/diff-match-patch": "^1.1.0",
-    "@googleapis/drive": "^18.0.0",
+    "@googleapis/drive": "^19.2.0",
    "@sanity/diff-match-patch": "^3.2.0",
    "body-parser": "^2.2.0",
    "classnames": "^2.5.1",
-    "@codemirror/autocomplete": "^6.18.2",
-    "@codemirror/commands": "^6.7.2",
-    "@codemirror/fold": "^6.7.1",
-    "@codemirror/history": "^6.3.0",
-    "@codemirror/lang-css": "^6.3.0",
-    "@codemirror/lang-html": "^6.4.7",
-    "@codemirror/lang-javascript": "^6.2.2",
-    "@codemirror/lang-markdown": "^6.2.3",
-    "@codemirror/language": "^6.10.2",
-    "@codemirror/lint": "^6.8.0",
-    "@codemirror/search": "^6.5.6",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.27.0",
-    "@lezer/common": "^1.2.1",
-    "@lezer/highlight": "^1.2.0",
-    "codemirror": "^6.0.1",
-    "codemirror5": "npm:codemirror@^5.65.19",
+    "codemirror": "^5.65.6",
    "cookie-parser": "^1.4.7",
-    "core-js": "^3.46.0",
+    "core-js": "^3.47.0",
    "cors": "^2.8.5",
    "create-react-class": "^15.7.0",
    "dedent-tabs": "^0.10.3",
@@ -125,29 +109,29 @@
    "fs-extra": "11.3.2",
    "hash-wasm": "^4.12.0",
    "idb-keyval": "^6.2.2",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
    "jwt-simple": "^0.5.6",
    "less": "^3.13.1",
    "lodash": "^4.17.21",
    "marked": "15.0.12",
    "marked-alignment-paragraphs": "^1.0.0",
    "marked-definition-lists": "^1.0.1",
-    "marked-emoji": "^2.0.1",
+    "marked-emoji": "^2.0.2",
    "marked-extended-tables": "^2.0.1",
-    "marked-gfm-heading-id": "^4.1.2",
+    "marked-gfm-heading-id": "^4.1.3",
    "marked-nonbreaking-spaces": "^1.0.1",
    "marked-smartypants-lite": "^1.0.3",
    "marked-subsuper-text": "^1.0.4",
    "marked-variables": "^1.0.4",
    "markedLegacy": "npm:marked@^0.3.19",
    "moment": "^2.30.1",
-    "mongoose": "^8.19.1",
+    "mongoose": "^8.20.0",
    "nanoid": "5.1.6",
    "nconf": "^0.13.0",
    "react": "^18.3.1",
    "react-dom": "^18.3.1",
    "react-frame-component": "^4.1.3",
-    "react-router": "^7.9.4",
+    "react-router": "^7.9.6",
    "romans": "^3.1.0",
    "sanitize-filename": "1.6.3",
    "superagent": "^10.2.1",
@@ -157,8 +141,8 @@
  "devDependencies": {
    "@stylistic/stylelint-plugin": "^4.0.0",
    "babel-plugin-transform-import-meta": "^2.3.3",
-    "eslint": "^9.37.0",
-    "eslint-plugin-jest": "^29.0.1",
+    "eslint": "^9.39.1",
+    "eslint-plugin-jest": "^29.1.0",
    "eslint-plugin-react": "^7.37.5",
    "globals": "^16.4.0",
    "jest": "^30.2.0",
--- a/scripts/project.json
+++ b/scripts/project.json
@@ -8,24 +8,24 @@
 		"create-react-class",
 		"lodash",
 		"classnames",
-		"codemirror5",
-		"codemirror5/mode/gfm/gfm.js",
-		"codemirror5/mode/css/css.js",
-		"codemirror5/mode/javascript/javascript.js",
-		"codemirror5/addon/fold/foldcode.js",
-		"codemirror5/addon/fold/foldgutter.js",
-		"codemirror5/addon/fold/xml-fold.js",
-		"codemirror5/addon/scroll/scrollpastend.js",
-		"codemirror5/addon/search/search.js",
-		"codemirror5/addon/search/searchcursor.js",
-		"codemirror5/addon/search/jump-to-line.js",
-		"codemirror5/addon/search/match-highlighter.js",
-		"codemirror5/addon/search/matchesonscrollbar.js",
-		"codemirror5/addon/dialog/dialog.js",
-		"codemirror5/addon/edit/closetag.js",
-		"codemirror5/addon/edit/trailingspace.js",
-		"codemirror5/addon/selection/active-line.js",
-		"codemirror5/addon/hint/show-hint.js",
+		"codemirror",
+		"codemirror/mode/gfm/gfm.js",
+		"codemirror/mode/css/css.js",
+		"codemirror/mode/javascript/javascript.js",
+		"codemirror/addon/fold/foldcode.js",
+		"codemirror/addon/fold/foldgutter.js",
+		"codemirror/addon/fold/xml-fold.js",
+		"codemirror/addon/scroll/scrollpastend.js",
+		"codemirror/addon/search/search.js",
+		"codemirror/addon/search/searchcursor.js",
+		"codemirror/addon/search/jump-to-line.js",
+		"codemirror/addon/search/match-highlighter.js",
+		"codemirror/addon/search/matchesonscrollbar.js",
+		"codemirror/addon/dialog/dialog.js",
+		"codemirror/addon/edit/closetag.js",
+		"codemirror/addon/edit/trailingspace.js",
+		"codemirror/addon/selection/active-line.js",
+		"codemirror/addon/hint/show-hint.js",
 		"moment",
 		"superagent",
 		"@sanity/diff-match-patch",
--- a/server/app.js
+++ b/server/app.js
@@ -554,8 +554,7 @@ const renderPage = async (req, res)=>{
 		publicUrl   : config.get('publicUrl') ?? '',
 		baseUrl     : `${req.protocol}://${req.get('host')}`,
 		environment : nodeEnv,
-		deployment  : config.get('heroku_app_name') ?? '',
-		enable_CM6  : config.get('enable_CM6') ?? false
+		deployment  : config.get('heroku_app_name') ?? ''
 	};
 	const props = {
 		version       : version,
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -6,6 +6,7 @@ import config      from './config.js';


 let serviceAuth;
+let clientEmail;
 if(!config.get('service_account')){
 	const reset = '\x1b[0m'; // Reset to default style
 	const yellow = '\x1b[33m'; // yellow color
@@ -15,6 +16,10 @@ if(!config.get('service_account')){
 		JSON.parse(config.get('service_account')) :
 		config.get('service_account');

+	if(keys?.client_email) {
+		clientEmail = keys.client_email;
+	}
+
 	try {
 		serviceAuth = googleDrive.auth.fromJSON(keys);
 		serviceAuth.scopes = ['https://www.googleapis.com/auth/drive'];
@@ -227,14 +232,30 @@ const GoogleActions = {

 		if(!obj) return;

+		if(clientEmail) {
+			await drive.permissions.create({
+				resource : {
+					type         : 'user',
+					emailAddress : clientEmail,
+					role         : 'writer'
+				},
+				fileId : obj.data.id,
+				fields : 'id',
+			})
+			.catch((err)=>{
+				console.log('Error adding Service Account permissions on Google Drive file');
+				console.error(err);
+			});
+		}
+
 		await drive.permissions.create({
 			resource : { type : 'anyone',
-									 role : 'writer' },
+			             role : 'writer' },
 			fileId : obj.data.id,
 			fields : 'id',
 		})
 		.catch((err)=>{
-			console.log('Error updating permissions');
+			console.log('Error adding "Anyone" permissions on Google Drive file');
 			console.error(err);
 		});

--- a/shared/markdown.js
+++ b/shared/markdown.js
@@ -31,7 +31,12 @@ renderer.html = function (token) {
 		const openTag = html.substring(0, html.indexOf('>')+1);
 		html = html.substring(html.indexOf('>')+1);
 		html = html.substring(0, html.lastIndexOf('</div>'));
-		return `${openTag} ${Marked.parse(html)} </div>`;
+
+		// Repeat the markdown processing for content inside the div, minus the preprocessing and postprocessing hooks which should only run once globally
+		const opts = Marked.defaults;
+		const tokens = Marked.lexer(html, opts);
+		Marked.walkTokens(tokens, opts.walkTokens);
+		return `${openTag} ${Marked.parser(tokens, opts)} </div>`;
 	}
 	return html;
 };
--- a/themes/V3/Blank/style.less
+++ b/themes/V3/Blank/style.less
@@ -492,7 +492,7 @@ body { counter-reset : page-numbers 0; }
 		.pageNumber { left : 30px; }
 	}

-	.resetCounting { counter-set : page-numbers 1; }
+	&:has(.resetCounting) { counter-set : page-numbers 1; }

 	&:not(:has(.skipCounting)) { counter-increment : page-numbers; }
Author	SHA1	Message	Date
Víctor Losada Hernández	6c85484f78	Merge pull request #4352 from G-Ambatte/experimentalGoogleServiceAccountChange Add Google service account to file permissions	2025-11-24 17:52:21 +01:00
Víctor Losada Hernández	50ebab21ce	Merge branch 'master' into experimentalGoogleServiceAccountChange	2025-11-24 15:23:18 +01:00
Trevor Buckner	d79c4d9566	Merge pull request #4544 from naturalcrit/dependabot/npm_and_yarn/vitreum-929c351 Bump vitreum from `9d55fd6` to `929c351`	2025-11-21 15:21:48 -05:00
dependabot[bot]	d04434fdd8	Bump vitreum from `9d55fd6` to `929c351` Bumps [vitreum](https://github.com/calculuschild/vitreum) from `9d55fd6` to `929c351`. - [Commits](`9d55fd6fb7...929c351881`) --- updated-dependencies: - dependency-name: vitreum dependency-version: 929c351881c4229550374421c7e2890a94f4dca7 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2025-11-21 19:04:00 +00:00
Trevor Buckner	755d8bb77f	Merge pull request #4543 from naturalcrit/dependabot/npm_and_yarn/googleapis/drive-19.2.0 Bump @googleapis/drive from 18.0.0 to 19.2.0	2025-11-21 14:02:34 -05:00
dependabot[bot]	fd8ffe8747	Bump @googleapis/drive from 18.0.0 to 19.2.0 Bumps [@googleapis/drive](https://github.com/googleapis/google-api-nodejs-client) from 18.0.0 to 19.2.0. - [Release notes](https://github.com/googleapis/google-api-nodejs-client/releases) - [Changelog](https://github.com/googleapis/google-api-nodejs-client/blob/main/.release-please-manifest.json) - [Commits](https://github.com/googleapis/google-api-nodejs-client/compare/run-v18.0.0...drive-v19.2.0) --- updated-dependencies: - dependency-name: "@googleapis/drive" dependency-version: 19.2.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-11-21 03:02:38 +00:00
G.Ambatte	a504a2acfe	Merge branch 'master' into experimentalGoogleServiceAccountChange	2025-11-21 10:26:49 +13:00
Trevor Buckner	4fcde805ce	Merge pull request #4525 from naturalcrit/dependabot/npm_and_yarn/dev-dependencies-d8b0a98ef9 Bump the dev-dependencies group across 1 directory with 2 updates	2025-11-20 11:28:08 -05:00
Trevor Buckner	8d6438feda	Merge branch 'master' into dependabot/npm_and_yarn/dev-dependencies-d8b0a98ef9	2025-11-20 11:24:38 -05:00
Trevor Buckner	e85a980ee0	Merge pull request #4536 from naturalcrit/dependabot/npm_and_yarn/prod-dependencies-3bcb05f39f Bump the prod-dependencies group across 1 directory with 7 updates	2025-11-20 11:24:22 -05:00
Trevor Buckner	106de864ff	Merge branch 'master' into dependabot/npm_and_yarn/prod-dependencies-3bcb05f39f	2025-11-20 11:15:43 -05:00
Trevor Buckner	d398cabb52	Merge pull request #4538 from 5e-Cleric/fix-counter-reset fix .resetCounter	2025-11-20 11:15:05 -05:00
Trevor Buckner	13550c0267	Merge branch 'master' into fix-counter-reset	2025-11-20 11:08:47 -05:00
Trevor Buckner	3997ebfbdf	Merge pull request #4540 from naturalcrit/ReworkHTMLRenderer Rework Marked custom HTML renderer to skip preprocess step	2025-11-19 23:57:07 -05:00
Trevor Buckner	31c034c029	Rework Marked custom HTML renderer to skip preprocess step Marked Variables are getting cleared when the custom HTML renderer runs, because Marked.parse re-runs the whole pipeline, including the preprocessor. Preprocess should only be run once globally during the pipeline, or the original results get overwritten (Marked Variables clears its global array of variables each time it is run)	2025-11-19 23:53:39 -05:00
Víctor Losada Hernández	f991235694	fix .resetCounter	2025-11-19 23:36:43 +01:00
dependabot[bot]	9970dd0699	Bump the prod-dependencies group across 1 directory with 7 updates Bumps the prod-dependencies group with 7 updates in the / directory: \| Package \| From \| To \| \| --- \| --- \| --- \| \| [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) \| `7.27.1` \| `7.28.5` \| \| [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) \| `3.46.0` \| `3.47.0` \| \| [js-yaml](https://github.com/nodeca/js-yaml) \| `4.1.0` \| `4.1.1` \| \| [marked-emoji](https://github.com/UziTech/marked-emoji) \| `2.0.1` \| `2.0.2` \| \| [marked-gfm-heading-id](https://github.com/markedjs/marked-gfm-heading-id) \| `4.1.2` \| `4.1.3` \| \| [mongoose](https://github.com/Automattic/mongoose) \| `8.19.2` \| `8.20.0` \| \| [react-router](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router) \| `7.9.5` \| `7.9.6` \| Updates `@babel/preset-react` from 7.27.1 to 7.28.5 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.28.5/packages/babel-preset-react) Updates `core-js` from 3.46.0 to 3.47.0 - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/commits/v3.47.0/packages/core-js) Updates `js-yaml` from 4.1.0 to 4.1.1 - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/4.1.0...4.1.1) Updates `marked-emoji` from 2.0.1 to 2.0.2 - [Release notes](https://github.com/UziTech/marked-emoji/releases) - [Changelog](https://github.com/UziTech/marked-emoji/blob/main/release.config.cjs) - [Commits](https://github.com/UziTech/marked-emoji/compare/v2.0.1...v2.0.2) Updates `marked-gfm-heading-id` from 4.1.2 to 4.1.3 - [Release notes](https://github.com/markedjs/marked-gfm-heading-id/releases) - [Changelog](https://github.com/markedjs/marked-gfm-heading-id/blob/main/release.config.cjs) - [Commits](https://github.com/markedjs/marked-gfm-heading-id/compare/v4.1.2...v4.1.3) Updates `mongoose` from 8.19.2 to 8.20.0 - [Release notes](https://github.com/Automattic/mongoose/releases) - [Changelog](https://github.com/Automattic/mongoose/blob/master/CHANGELOG.md) - [Commits](https://github.com/Automattic/mongoose/compare/8.19.2...8.20.0) Updates `react-router` from 7.9.5 to 7.9.6 - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router@7.9.6/packages/react-router) --- updated-dependencies: - dependency-name: "@babel/preset-react" dependency-version: 7.28.5 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod-dependencies - dependency-name: core-js dependency-version: 3.47.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod-dependencies - dependency-name: js-yaml dependency-version: 4.1.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-dependencies - dependency-name: marked-emoji dependency-version: 2.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-dependencies - dependency-name: marked-gfm-heading-id dependency-version: 4.1.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-dependencies - dependency-name: mongoose dependency-version: 8.20.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod-dependencies - dependency-name: react-router dependency-version: 7.9.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2025-11-19 03:02:34 +00:00
dependabot[bot]	9f721ff2fc	Bump the dev-dependencies group across 1 directory with 2 updates Bumps the dev-dependencies group with 2 updates in the / directory: [eslint](https://github.com/eslint/eslint) and [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest). Updates `eslint` from 9.39.0 to 9.39.1 - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](https://github.com/eslint/eslint/compare/v9.39.0...v9.39.1) Updates `eslint-plugin-jest` from 29.0.1 to 29.1.0 - [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases) - [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v29.0.1...v29.1.0) --- updated-dependencies: - dependency-name: eslint dependency-version: 9.39.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-dependencies - dependency-name: eslint-plugin-jest dependency-version: 29.1.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2025-11-19 03:01:21 +00:00
Trevor Buckner	6a02ed410b	Merge pull request #4534 from G-Ambatte/fixNewNavItem Update New Item on NavBar	2025-11-17 23:49:42 -05:00
Trevor Buckner	429ad4d63b	Linting and move checkLocalStorage inside confirmLocalStorageChange	2025-11-17 23:48:56 -05:00
Trevor Buckner	033893361d	Merge branch 'master' into fixNewNavItem	2025-11-17 23:25:44 -05:00
Trevor Buckner	f1ae7e4d26	Merge pull request #4533 from naturalcrit/fix-editor-issues Fix small bugs towards 3.20	2025-11-17 23:22:04 -05:00
Trevor Buckner	059d6d7939	Lint	2025-11-17 23:09:47 -05:00
G.Ambatte	73b7d6887b	Fix typo in state property name for snippet bar height	2025-11-17 17:09:23 +13:00
Víctor Losada Hernández	f1891d9250	use state instead	2025-11-16 19:02:37 +01:00
G.Ambatte	a17ccdb2a2	Merge branch 'master' into fixNewNavItem	2025-11-16 13:19:08 +13:00
G.Ambatte	c784e2e63b	Fix New item on Nav Bar	2025-11-16 13:12:40 +13:00
Víctor Losada Hernández	1d061e6d3f	Merge branch 'master' of https://github.com/naturalcrit/homebrewery into fix-editor-issues	2025-11-15 23:41:10 +01:00
Víctor Losada Hernández	5e7fdb34a9	Revert "remove new brew nav item from new page" This reverts commit `b6478f3964`.	2025-11-15 23:40:01 +01:00
Víctor Losada Hernández	b6478f3964	remove new brew nav item from new page	2025-11-15 17:25:25 +01:00
Víctor Losada Hernández	f18a73e1ff	fix glitch in newPage	2025-11-15 17:25:05 +01:00
Víctor Losada Hernández	b78f5079df	bring back update native func	2025-11-15 16:59:32 +01:00
Víctor Losada Hernández	7bc41f9b0d	fix snippetbar hidden	2025-11-15 16:49:48 +01:00
Víctor Losada Hernández	a217779e76	fix snippetbar wrap	2025-11-15 16:05:21 +01:00
Trevor Buckner	a0cfec7668	test change	2025-11-15 04:35:23 +00:00
G.Ambatte	435c6dcc6f	Merge branch 'master' into experimentalGoogleServiceAccountChange	2025-11-15 16:40:47 +13:00
G.Ambatte	e063eab4e7	Make error messages more distinctive	2025-11-15 15:40:55 +13:00
G.Ambatte	1adbbc2ced	Updated error message on failure to set permissions on Google Drive file	2025-11-15 15:37:01 +13:00
G.Ambatte	7547454084	Merge branch 'master' into experimentalGoogleServiceAccountChange	2025-11-15 15:33:54 +13:00
Víctor Losada Hernández	ba2449f3d6	Merge branch 'master' into experimentalGoogleServiceAccountChange	2025-11-10 23:57:25 +01:00
G.Ambatte	14ea286aa2	Remove Google permissions check function	2025-11-10 06:07:37 +00:00
G.Ambatte	de85c84685	Remove permissionsCheck from brew listing	2025-11-10 06:05:58 +00:00
G.Ambatte	35d93582d7	Remove unnecessary async map function	2025-11-10 06:04:10 +00:00
G.Ambatte	c2ceba2ff6	Merge branch 'master' into experimentalGoogleServiceAccountChange	2025-11-10 19:00:06 +13:00
G.Ambatte	06d1652f51	Merge branch 'master' into experimentalGoogleServiceAccountChange	2025-08-26 07:32:29 +12:00
G.Ambatte	8e2abb9f78	Basic Google file permission checking	2025-07-25 12:04:41 +12:00
G.Ambatte	b447d81b4c	Add service account to file permissions	2025-07-22 18:23:11 +12:00