From e6185879c8a02a7d1a75dbfab578706894c29937 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 29 Aug 2024 17:17:12 +1200 Subject: [PATCH 01/11] Up version to v3.14.3 --- changelog.md | 28 ++++++++++++++++++++++++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index 012663b6a..c3d731d12 100644 --- a/changelog.md +++ b/changelog.md @@ -84,6 +84,34 @@ pre { ## changelog For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery). +### Wednesday 8/28/2024 - v3.14.3 +{{taskList + +##### Calculuschild + +* [x] Image wrapping snippets + +Fixes issue [#380](https://github.com/naturalcrit/homebrewery/issues/380), supersedes [#3126](https://github.com/naturalcrit/homebrewery/issues/3126) + +* [x] Add regex to detext when to interrupt a table + +Fixes v3.14.2 bug with tables and multiple colons + +##### 5e-Cleric + +* [x] Fix Account page error for invalid users + +Fixes issue [#3605](https://github.com/naturalcrit/homebrewery/issues/3605) + +##### dbolack-ab + +* [x] Fix for jump hotkeys + +Fixes v3.14.2 bug; Preview and Source movement shortcuts now use `CTRL+SHIT+META+Arrow` keys + +}} + + ### Tuesday 8/27/2024 - v3.14.2 {{taskList diff --git a/package-lock.json b/package-lock.json index 6dd97c4c4..1ba45d229 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "homebrewery", - "version": "3.14.2", + "version": "3.14.3", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package.json b/package.json index b2ad61958..f62bb7314 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "homebrewery", "description": "Create authentic looking D&D homebrews using only markdown", - "version": "3.14.2", + "version": "3.14.3", "engines": { "npm": "^10.2.x", "node": "^20.8.x" From 6b10e1aacb55f5ea93f8272fccb4cf5bfe287bf6 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 29 Aug 2024 17:19:47 +1200 Subject: [PATCH 02/11] Very important F --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index c3d731d12..5600e0765 100644 --- a/changelog.md +++ b/changelog.md @@ -107,7 +107,7 @@ Fixes issue [#3605](https://github.com/naturalcrit/homebrewery/issues/3605) * [x] Fix for jump hotkeys -Fixes v3.14.2 bug; Preview and Source movement shortcuts now use `CTRL+SHIT+META+Arrow` keys +Fixes v3.14.2 bug; Preview and Source movement shortcuts now use `CTRL+SHIFT+META+Arrow` keys }} From c30404804d1e59fe2f4d88eed1b47a4599de4372 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 29 Aug 2024 17:20:39 +1200 Subject: [PATCH 03/11] Fix typo --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 5600e0765..f50b043e4 100644 --- a/changelog.md +++ b/changelog.md @@ -93,7 +93,7 @@ For a full record of development, visit our [Github Page](https://github.com/nat Fixes issue [#380](https://github.com/naturalcrit/homebrewery/issues/380), supersedes [#3126](https://github.com/naturalcrit/homebrewery/issues/3126) -* [x] Add regex to detext when to interrupt a table +* [x] Add regex to detect when to interrupt a table Fixes v3.14.2 bug with tables and multiple colons From b66ac43b3595fcabc81ef3ff91d45827ea6a24c8 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 29 Aug 2024 17:23:18 +1200 Subject: [PATCH 04/11] Fix Image Wrap icons --- client/icons/customIcons.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/icons/customIcons.less b/client/icons/customIcons.less index 7525d50af..0d462833d 100644 --- a/client/icons/customIcons.less +++ b/client/icons/customIcons.less @@ -53,10 +53,10 @@ mask-image: url('../icons/book-part-cover.svg'); } .image-wrap-left { - content: url('../icons/image-wrap-left.svg'); + mask-image: url('../icons/image-wrap-left.svg'); } .image-wrap-right { - content: url('../icons/image-wrap-right.svg'); + mask-image: url('../icons/image-wrap-right.svg'); } .davek { mask-image: url('../icons/Davek.svg'); From e4c2ffe9739bbe523ed5db0f21a34456acfa9cfc Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 29 Aug 2024 17:46:23 +1200 Subject: [PATCH 05/11] Add image wrap icon fix --- changelog.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changelog.md b/changelog.md index f50b043e4..aa4fbe83f 100644 --- a/changelog.md +++ b/changelog.md @@ -109,6 +109,12 @@ Fixes issue [#3605](https://github.com/naturalcrit/homebrewery/issues/3605) Fixes v3.14.2 bug; Preview and Source movement shortcuts now use `CTRL+SHIFT+META+Arrow` keys +##### G-Ambatte + +* [x] Fix image wrap icons + +Fixes icons for new image wrap snippets + }} From 89583528c2a36cddc702279fa9923ebffeb43d4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 03:53:37 +0000 Subject: [PATCH 06/11] Bump @googleapis/drive from 8.13.1 to 8.14.0 Bumps [@googleapis/drive](https://github.com/googleapis/google-api-nodejs-client) from 8.13.1 to 8.14.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-config.json) - [Commits](https://github.com/googleapis/google-api-nodejs-client/compare/drive-v8.13.1...drive-v8.14.0) --- updated-dependencies: - dependency-name: "@googleapis/drive" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6dd97c4c4..c1b24a6c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@babel/plugin-transform-runtime": "^7.25.4", "@babel/preset-env": "^7.25.4", "@babel/preset-react": "^7.24.7", - "@googleapis/drive": "^8.13.1", + "@googleapis/drive": "^8.14.0", "body-parser": "^1.20.2", "classnames": "^2.5.1", "codemirror": "^5.65.6", @@ -2091,9 +2091,9 @@ } }, "node_modules/@googleapis/drive": { - "version": "8.13.1", - "resolved": "https://registry.npmjs.org/@googleapis/drive/-/drive-8.13.1.tgz", - "integrity": "sha512-ODfl4VUIKNox570DFA6AzAEHQcKI1EQs0xzzupeAIa+S/kFan85TItXU7XywK8mDORnfkgqwXQ5N/u/BFBj5lw==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/@googleapis/drive/-/drive-8.14.0.tgz", + "integrity": "sha512-AOokfpP6pCdcJXWA8khaCEgbGpWYavWTdAAhL4idbbf2VCQcJ2f7vPalAYNu6a4Sfj0Ly4Ehnd1xw9J9TixB1A==", "dependencies": { "googleapis-common": "^7.0.0" }, diff --git a/package.json b/package.json index b2ad61958..17c88f477 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "@babel/plugin-transform-runtime": "^7.25.4", "@babel/preset-env": "^7.25.4", "@babel/preset-react": "^7.24.7", - "@googleapis/drive": "^8.13.1", + "@googleapis/drive": "^8.14.0", "body-parser": "^1.20.2", "classnames": "^2.5.1", "codemirror": "^5.65.6", From afa1e7974ae6629c94e66469e47a8fc004c5039e Mon Sep 17 00:00:00 2001 From: Gazook89 Date: Mon, 2 Sep 2024 21:07:19 -0500 Subject: [PATCH 07/11] Set focus on editor after tab switch This sets the focus on the editor (and thus reveals cursor position) between editor changes (style to text to meta and back). --- client/homebrew/editor/editor.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx index 364ed424a..0cc31cb40 100644 --- a/client/homebrew/editor/editor.jsx +++ b/client/homebrew/editor/editor.jsx @@ -82,6 +82,7 @@ const Editor = createClass({ if(prevProps.moveSource !== this.props.moveSource) { this.sourceJump(); }; + this.codeEditor.current?.codeMirror.focus(); }, handleControlKeys : function(e){ From 702f55bdbdecde98153a14f0cf551269535a4f26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 17:35:36 +0000 Subject: [PATCH 08/11] Bump eslint-plugin-jest from 28.8.0 to 28.8.2 Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 28.8.0 to 28.8.2. - [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/v28.8.0...v28.8.2) --- updated-dependencies: - dependency-name: eslint-plugin-jest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c1b24a6c2..27da64de0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -52,7 +52,7 @@ "devDependencies": { "@stylistic/stylelint-plugin": "^3.0.1", "eslint": "^9.9.1", - "eslint-plugin-jest": "^28.8.0", + "eslint-plugin-jest": "^28.8.2", "eslint-plugin-react": "^7.35.0", "globals": "^15.9.0", "jest": "^29.7.0", @@ -5878,9 +5878,9 @@ } }, "node_modules/eslint-plugin-jest": { - "version": "28.8.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.0.tgz", - "integrity": "sha512-Tubj1hooFxCl52G4qQu0edzV/+EZzPUeN8p2NnW5uu4fbDs+Yo7+qDVDc4/oG3FbCqEBmu/OC3LSsyiU22oghw==", + "version": "28.8.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.2.tgz", + "integrity": "sha512-mC3OyklHmS5i7wYU1rGId9EnxRI8TVlnFG56AE+8U9iRy6zwaNygZR+DsdZuCL0gRG0wVeyzq+uWcPt6yJrrMA==", "dev": true, "dependencies": { "@typescript-eslint/utils": "^6.0.0 || ^7.0.0 || ^8.0.0" diff --git a/package.json b/package.json index 17c88f477..fd990c983 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "devDependencies": { "@stylistic/stylelint-plugin": "^3.0.1", "eslint": "^9.9.1", - "eslint-plugin-jest": "^28.8.0", + "eslint-plugin-jest": "^28.8.2", "eslint-plugin-react": "^7.35.0", "globals": "^15.9.0", "jest": "^29.7.0", From 0d40f4eb162ab5f74cc89634c412947faf767cee Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Tue, 3 Sep 2024 14:06:54 -0400 Subject: [PATCH 09/11] Small Rewording --- changelog.md | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/changelog.md b/changelog.md index aa4fbe83f..7b3ea6384 100644 --- a/changelog.md +++ b/changelog.md @@ -85,42 +85,35 @@ pre { For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery). ### Wednesday 8/28/2024 - v3.14.3 + {{taskList +##### calculuschild, G-Ambatte -##### Calculuschild +* [x] New {{openSans **IMAGES → {{fac,image-wrap-left}} IMAGE WRAP LEFT/RIGHT**}} snippets -* [x] Image wrapping snippets +Fixes issue [#380](https://github.com/naturalcrit/homebrewery/issues/380) -Fixes issue [#380](https://github.com/naturalcrit/homebrewery/issues/380), supersedes [#3126](https://github.com/naturalcrit/homebrewery/issues/3126) - -* [x] Add regex to detect when to interrupt a table - -Fixes v3.14.2 bug with tables and multiple colons +* [x] Fix v3.14.2 bug with `꞉꞉꞉꞉` failing after tables ##### 5e-Cleric -* [x] Fix Account page error for invalid users +* [x] Fix Account page crash when not logged in Fixes issue [#3605](https://github.com/naturalcrit/homebrewery/issues/3605) ##### dbolack-ab -* [x] Fix for jump hotkeys - -Fixes v3.14.2 bug; Preview and Source movement shortcuts now use `CTRL+SHIFT+META+Arrow` keys +* [x] Fix jump hotkeys conflicting with `CTRL + SHIFT`. Preview and Source movement shortcuts now use `CTRL + SHIFT + META + LEFT\RIGHTARROW` ##### G-Ambatte -* [x] Fix image wrap icons - -Fixes icons for new image wrap snippets - +* [x] Fix display issue with image wrap icons }} ### Tuesday 8/27/2024 - v3.14.2 -{{taskList +{{taskList ##### calculuschild * [x] Reroute invalid urls to homepage @@ -153,7 +146,7 @@ Fixes issues [#3572](https://github.com/naturalcrit/homebrewery/issues/3572) Fixes issues [#1430](https://github.com/naturalcrit/homebrewery/issues/1430) -* [x] Fix colon `:::` being parsed in codeblocks +* [x] Fix colon `꞉꞉꞉꞉` being parsed in codeblocks * [x] Prevent crashes when loading undefined renderer or theme bundle @@ -167,12 +160,11 @@ Fixes issues [#1430](https://github.com/naturalcrit/homebrewery/issues/1430) ##### 5e-Cleric, Gazook89 * [x] Viewer tools for zoom/page navigation - }} ### Tuesday 8/13/2024 - v3.14.1 -{{taskList +{{taskList ##### abquintic * [x] Allow Table of Contents to flow across columns @@ -215,16 +207,13 @@ Fixes issues [#3613](https://github.com/naturalcrit/homebrewery/issues/3613) Fixes issues [#3622](https://github.com/naturalcrit/homebrewery/issues/3622) - ##### calculuschild * [x] Fix `/migrate` page using an editor context instead of share context - ##### 5e-Cleric * [x] Fix Monster Stat Blocks losing color in Safari - }} \page From 36b026d89e0fc6fa1af33a193b427b8afa21f7a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:09:47 +0000 Subject: [PATCH 10/11] Bump eslint-plugin-react from 7.35.0 to 7.35.1 Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.35.0 to 7.35.1. - [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases) - [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md) - [Commits](https://github.com/jsx-eslint/eslint-plugin-react/compare/v7.35.0...v7.35.1) --- updated-dependencies: - dependency-name: eslint-plugin-react dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 11 +++++------ package.json | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 843c5314d..de7bf5532 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "homebrewery", - "version": "3.14.2", + "version": "3.14.3", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -53,7 +53,7 @@ "@stylistic/stylelint-plugin": "^3.0.1", "eslint": "^9.9.1", "eslint-plugin-jest": "^28.8.2", - "eslint-plugin-react": "^7.35.0", + "eslint-plugin-react": "^7.35.1", "globals": "^15.9.0", "jest": "^29.7.0", "jest-expect-message": "^1.1.3", @@ -5903,11 +5903,10 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.35.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz", - "integrity": "sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==", + "version": "7.35.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.1.tgz", + "integrity": "sha512-B5ok2JgbaaWn/zXbKCGgKDNL2tsID3Pd/c/yvjcpsd9HQDwyYc/TQv3AZMmOvrJgCs3AnYNUHRCQEMMQAYJ7Yg==", "dev": true, - "license": "MIT", "dependencies": { "array-includes": "^3.1.8", "array.prototype.findlast": "^1.2.5", diff --git a/package.json b/package.json index f7ec1fe72..0350bf5b3 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "@stylistic/stylelint-plugin": "^3.0.1", "eslint": "^9.9.1", "eslint-plugin-jest": "^28.8.2", - "eslint-plugin-react": "^7.35.0", + "eslint-plugin-react": "^7.35.1", "globals": "^15.9.0", "jest": "^29.7.0", "jest-expect-message": "^1.1.3", From 3c6f49aa0a5bd3632ec2187db81d77c97406c8b9 Mon Sep 17 00:00:00 2001 From: Gazook89 Date: Tue, 3 Sep 2024 14:48:45 -0500 Subject: [PATCH 11/11] Move focus method to handleViewChange --- client/homebrew/editor/editor.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx index 0cc31cb40..24e975ebc 100644 --- a/client/homebrew/editor/editor.jsx +++ b/client/homebrew/editor/editor.jsx @@ -82,7 +82,6 @@ const Editor = createClass({ if(prevProps.moveSource !== this.props.moveSource) { this.sourceJump(); }; - this.codeEditor.current?.codeMirror.focus(); }, handleControlKeys : function(e){ @@ -114,7 +113,10 @@ const Editor = createClass({ this.props.setMoveArrows(newView === 'text'); this.setState({ view : newView - }, this.updateEditorSize); //TODO: not sure if updateeditorsize needed + }, ()=>{ + this.codeEditor.current?.codeMirror.focus(); + this.updateEditorSize(); + }); //TODO: not sure if updateeditorsize needed }, getCurrentPage : function(){