From c5ebd0352d79843bb8f447e5c02ccc49e5f3caaa Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 29 Oct 2023 11:04:07 +1300 Subject: [PATCH 01/20] Identify API errors and send error response --- server/app.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/app.js b/server/app.js index a19030b3a..03ffd081a 100644 --- a/server/app.js +++ b/server/app.js @@ -489,6 +489,12 @@ app.use(async (err, req, res, next)=>{ }; req.customUrl= '/error'; + if(req.originalUrl.startsWith('/api/')) { + console.log('api error'); + res.status(err?.status || err?.response?.status || 500).send(err.message || err); + return; + } + const page = await renderPage(req, res); if(!page) return; res.send(page); From e07d1d1ddb0776f160591bc3ce006b57e984aa74 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 29 Oct 2023 11:27:03 +1300 Subject: [PATCH 02/20] Add originalUrl to error object --- server/app.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/app.js b/server/app.js index 03ffd081a..4d5f7d8a4 100644 --- a/server/app.js +++ b/server/app.js @@ -472,8 +472,9 @@ const getPureError = (error)=>{ }; app.use(async (err, req, res, next)=>{ - const status = err.status || err.code || 500; + err.originalUrl = req.originalUrl; console.error(err); + const status = err.status || err.code || 500; req.ogMeta = { ...defaultMetaTags, title : 'Error Page', From 70523376690b187e92597bd410f540fc2312b2ea Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 29 Oct 2023 11:43:24 +1300 Subject: [PATCH 03/20] Remove API error message from log --- server/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/app.js b/server/app.js index 4d5f7d8a4..762553337 100644 --- a/server/app.js +++ b/server/app.js @@ -491,7 +491,7 @@ app.use(async (err, req, res, next)=>{ req.customUrl= '/error'; if(req.originalUrl.startsWith('/api/')) { - console.log('api error'); + // console.log('api error'); res.status(err?.status || err?.response?.status || 500).send(err.message || err); return; } From 85b09760828c4e1f1a5ae7c30e3f72f46219321a Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 29 Oct 2023 11:52:02 +1300 Subject: [PATCH 04/20] Move API call error handling --- server/app.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/server/app.js b/server/app.js index 762553337..18c4764d6 100644 --- a/server/app.js +++ b/server/app.js @@ -474,6 +474,14 @@ const getPureError = (error)=>{ app.use(async (err, req, res, next)=>{ err.originalUrl = req.originalUrl; console.error(err); + + if(err.originalUrl?.startsWith('/api/')) { + // console.log('API error'); + res.status(err?.status || err?.response?.status || 500).send(err.message || err); + return; + } + + // console.log('non-API error'); const status = err.status || err.code || 500; req.ogMeta = { ...defaultMetaTags, @@ -490,12 +498,6 @@ app.use(async (err, req, res, next)=>{ }; req.customUrl= '/error'; - if(req.originalUrl.startsWith('/api/')) { - // console.log('api error'); - res.status(err?.status || err?.response?.status || 500).send(err.message || err); - return; - } - const page = await renderPage(req, res); if(!page) return; res.send(page); From 511c38dd1ec87a4391b5a883ca0ae690f7e3eaf9 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 29 Oct 2023 14:16:41 +1300 Subject: [PATCH 05/20] Remove unnecessary nullish coalescing operators --- server/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/app.js b/server/app.js index 18c4764d6..5ae873a1c 100644 --- a/server/app.js +++ b/server/app.js @@ -477,7 +477,7 @@ app.use(async (err, req, res, next)=>{ if(err.originalUrl?.startsWith('/api/')) { // console.log('API error'); - res.status(err?.status || err?.response?.status || 500).send(err.message || err); + res.status(err.status || err.response?.status || 500).send(err.message || err); return; } From 67a4391dcbda8668ce8a01bae6e63c721774b1a4 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Wed, 13 Dec 2023 15:57:00 -0600 Subject: [PATCH 06/20] WIP --- shared/naturalcrit/markdown.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index 7185cab8e..7dbc32f1a 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -234,6 +234,15 @@ const superSubScripts = { } }; +const underline = { + name : 'underline', + level : 'inline', + start(src) { return src.match(/\w_[^_]_/m)?.index;}, + tokenizer(src, tokens) { + const uRegex = /^_(?!\s)(?=([^_]*[^\s]))\1\^/m; + } +} + const definitionLists = { name : 'definitionLists', level : 'block', From 04187cf769fa289ca1a85557b268f99cd7eaac98 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Wed, 13 Dec 2023 17:37:05 -0600 Subject: [PATCH 07/20] Simple Underline token. Overrides __ --- shared/naturalcrit/markdown.js | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index 7dbc32f1a..83badb05e 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -239,9 +239,24 @@ const underline = { level : 'inline', start(src) { return src.match(/\w_[^_]_/m)?.index;}, tokenizer(src, tokens) { - const uRegex = /^_(?!\s)(?=([^_]*[^\s]))\1\^/m; + const uRegex = /^_([^_]*)_/m; + const match = uRegex.exec(src); + console.log('Looking'); + if(match?.length) { + console.log('found!'); + console.log(match); + return { + type : 'underline', + raw : match[0], + tokens : this.lexer.inlineTokens(match[1]) + }; + } + }, + renderer(token) { + console.log() + return `${this.parser.parseInline(token.tokens)}`; } -} +}; const definitionLists = { name : 'definitionLists', @@ -275,7 +290,7 @@ const definitionLists = { } }; -Marked.use({ extensions: [mustacheSpans, mustacheDivs, mustacheInjectInline, definitionLists, superSubScripts] }); +Marked.use({ extensions: [mustacheSpans, mustacheDivs, mustacheInjectInline, definitionLists, superSubScripts, underline] }); Marked.use(mustacheInjectBlock); Marked.use({ renderer: renderer, mangle: false }); Marked.use(MarkedExtendedTables(), MarkedGFMHeadingId(), MarkedSmartypantsLite()); From a88b256b6c0692eb1bf79cd4dfa7461a206869ee Mon Sep 17 00:00:00 2001 From: David Bolack Date: Wed, 13 Dec 2023 21:47:55 -0600 Subject: [PATCH 08/20] A better regex for underlining. --- shared/naturalcrit/markdown.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index 83badb05e..2c2f356c5 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -237,9 +237,9 @@ const superSubScripts = { const underline = { name : 'underline', level : 'inline', - start(src) { return src.match(/\w_[^_]_/m)?.index;}, + start(src) { return src.match(/\b_(?![_\s])(.*?[^_\s])_\b/m)?.index;}, tokenizer(src, tokens) { - const uRegex = /^_([^_]*)_/m; + const uRegex = /^\b_(?![_\s])(.*?[^_\s])_\b/m; const match = uRegex.exec(src); console.log('Looking'); if(match?.length) { From 1861c7db695e8e0147f633eff672cc13334bae1e Mon Sep 17 00:00:00 2001 From: David Bolack Date: Wed, 13 Dec 2023 21:59:02 -0600 Subject: [PATCH 09/20] Remove stray console.logs. --- shared/naturalcrit/markdown.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index 2c2f356c5..3b7981435 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -241,10 +241,7 @@ const underline = { tokenizer(src, tokens) { const uRegex = /^\b_(?![_\s])(.*?[^_\s])_\b/m; const match = uRegex.exec(src); - console.log('Looking'); if(match?.length) { - console.log('found!'); - console.log(match); return { type : 'underline', raw : match[0], @@ -253,7 +250,6 @@ const underline = { } }, renderer(token) { - console.log() return `${this.parser.parseInline(token.tokens)}`; } }; From 7c28f60e0ac08bdb69b0fe9da9575ac322b9631a Mon Sep 17 00:00:00 2001 From: Gazook89 Date: Sat, 13 Jan 2024 15:19:38 -0600 Subject: [PATCH 10/20] fix z-index layering issue --- client/homebrew/editor/metadataEditor/metadataEditor.less | 2 +- client/homebrew/editor/snippetbar/snippetbar.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.less b/client/homebrew/editor/metadataEditor/metadataEditor.less index 5678c2554..7f7ce3060 100644 --- a/client/homebrew/editor/metadataEditor/metadataEditor.less +++ b/client/homebrew/editor/metadataEditor/metadataEditor.less @@ -2,7 +2,7 @@ .metadataEditor{ position : absolute; - z-index : 10000; + z-index : 5; box-sizing : border-box; width : 100%; padding : 25px; diff --git a/client/homebrew/editor/snippetbar/snippetbar.less b/client/homebrew/editor/snippetbar/snippetbar.less index ec83c3fc5..0cbd388fc 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.less +++ b/client/homebrew/editor/snippetbar/snippetbar.less @@ -82,7 +82,7 @@ position : absolute; top : 25px; right : 0; - z-index : 1; + z-index : 10; display : flex; align-items : center; justify-content : center; From 4424a331d51f709a4994299206c46309d64e1a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Tue, 16 Jan 2024 18:38:38 +0100 Subject: [PATCH 11/20] first commit --- themes/V3/5ePHB/snippets/classfeature.gen.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/V3/5ePHB/snippets/classfeature.gen.js b/themes/V3/5ePHB/snippets/classfeature.gen.js index 2597c3ee8..e2e9148b5 100644 --- a/themes/V3/5ePHB/snippets/classfeature.gen.js +++ b/themes/V3/5ePHB/snippets/classfeature.gen.js @@ -42,8 +42,8 @@ module.exports = function(classname){ #### Equipment You start with the following equipment, in addition to the equipment granted by your background: - - *(a)* a martial weapon and a shield or *(b)* two martial weapons - - *(a)* five javelins or *(b)* any simple melee weapon + - (*a*) a martial weapon and a shield or (*b*) two martial weapons + - (*a*) five javelins or (*b*) any simple melee weapon - ${_.sample(['10 lint fluffs', '1 button', 'a cherished lost sock'])} `; }; From 539cd1d2b989876e8dcbb9a6602809944ef22d79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jan 2024 03:45:33 +0000 Subject: [PATCH 12/20] Bump @googleapis/drive from 8.5.0 to 8.6.0 Bumps [@googleapis/drive](https://github.com/googleapis/google-api-nodejs-client) from 8.5.0 to 8.6.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.5.0...drive-v8.6.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 c4b70d07e..2b50c894d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@babel/plugin-transform-runtime": "^7.23.7", "@babel/preset-env": "^7.23.8", "@babel/preset-react": "^7.23.3", - "@googleapis/drive": "^8.5.0", + "@googleapis/drive": "^8.6.0", "body-parser": "^1.20.2", "classnames": "^2.3.2", "codemirror": "^5.65.6", @@ -1966,9 +1966,9 @@ } }, "node_modules/@googleapis/drive": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@googleapis/drive/-/drive-8.5.0.tgz", - "integrity": "sha512-5SIODqhdxcimwR06peQcvqAf0tEpj14oEi8dcFB/KvNaev5NRf2MqMMWA3G6dgDPdLKAX/HTmwGz8OD7oGpe8Q==", + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/@googleapis/drive/-/drive-8.6.0.tgz", + "integrity": "sha512-Af3/5i6h7gbjHnwFuO9zMTpYOy2yhhfZlNciUEjb14L3ZdT1WNIDM038viIAb9ovFzkrIDqLSfUbFCgh1pywkw==", "dependencies": { "googleapis-common": "^7.0.0" }, diff --git a/package.json b/package.json index f8777da3f..ffeba6e96 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "@babel/plugin-transform-runtime": "^7.23.7", "@babel/preset-env": "^7.23.8", "@babel/preset-react": "^7.23.3", - "@googleapis/drive": "^8.5.0", + "@googleapis/drive": "^8.6.0", "body-parser": "^1.20.2", "classnames": "^2.3.2", "codemirror": "^5.65.6", From 1fc3573087ff5aaa47de64dd0605baa763c5da35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jan 2024 19:10:35 +0000 Subject: [PATCH 13/20] Bump mongoose from 8.0.4 to 8.1.0 Bumps [mongoose](https://github.com/Automattic/mongoose) from 8.0.4 to 8.1.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.0.4...8.1.0) --- updated-dependencies: - dependency-name: mongoose dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 64 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2b50c894d..8d8d3945e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,7 @@ "marked-smartypants-lite": "^1.0.2", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.30.1", - "mongoose": "^8.0.4", + "mongoose": "^8.1.0", "nanoid": "3.3.4", "nconf": "^0.12.1", "react": "^18.2.0", @@ -2794,9 +2794,9 @@ } }, "node_modules/@mongodb-js/saslprep": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.1.tgz", - "integrity": "sha512-t7c5K033joZZMspnHg/gWPE4kandgc2OxE74aYOtGKfgB9VPuVJPix0H6fhmm2erj5PBJ21mqcx34lpIGtUCsQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.4.tgz", + "integrity": "sha512-8zJ8N1x51xo9hwPh6AWnKdLGEC5N3lDa6kms1YHmFBoRhTpJR6HG8wWk0td1MVCu9cD4YBrvjZEtd5Obw0Fbnw==", "dependencies": { "sparse-bitfield": "^3.0.3" } @@ -2957,7 +2957,8 @@ "node_modules/@types/node": { "version": "18.15.5", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.5.tgz", - "integrity": "sha512-Ark2WDjjZO7GmvsyFFf81MXuGTA/d6oP38anyxWOL6EREyBKAxKoFHwBhaZxCfLRLpO8JgVXwqOwSwa7jRcjew==" + "integrity": "sha512-Ark2WDjjZO7GmvsyFFf81MXuGTA/d6oP38anyxWOL6EREyBKAxKoFHwBhaZxCfLRLpO8JgVXwqOwSwa7jRcjew==", + "dev": true }, "node_modules/@types/normalize-package-data": { "version": "2.4.1", @@ -2983,11 +2984,10 @@ "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" }, "node_modules/@types/whatwg-url": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz", - "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.4.tgz", + "integrity": "sha512-lXCmTWSHJvf0TRSO58nm978b8HJ/EdsSsEKLd3ODHFjo+3VGAyyTp4v50nWvwtzBxSMQrVOK7tcuN0zGPLICMw==", "dependencies": { - "@types/node": "*", "@types/webidl-conversions": "*" } }, @@ -10444,22 +10444,22 @@ } }, "node_modules/mongodb-connection-string-url": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz", - "integrity": "sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.0.tgz", + "integrity": "sha512-t1Vf+m1I5hC2M5RJx/7AtxgABy1cZmIPQRMXw+gEIPn/cZNF3Oiy+l0UIypUwVB5trcWHq3crg2g3uAR9aAwsQ==", "dependencies": { - "@types/whatwg-url": "^8.2.1", - "whatwg-url": "^11.0.0" + "@types/whatwg-url": "^11.0.2", + "whatwg-url": "^13.0.0" } }, "node_modules/mongoose": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.0.4.tgz", - "integrity": "sha512-wN9qvdevX3+922VnLT7CpaZRT3jmVCBOK2QMHMGeScQxDRnFMPpkuI9StEPpZo/3x8t+kbzH7F8RMPsyNwyM4w==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.1.0.tgz", + "integrity": "sha512-kOA4Xnq2goqNpN9EmYElGNWfxA9H80fxcr7UdJKWi3UMflza0R7wpTihCpM67dE/0MNFljoa0sjQtlXVkkySAQ==", "dependencies": { "bson": "^6.2.0", "kareem": "2.5.1", - "mongodb": "6.2.0", + "mongodb": "6.3.0", "mpath": "0.9.0", "mquery": "5.0.0", "ms": "2.1.3", @@ -10531,13 +10531,13 @@ } }, "node_modules/mongoose/node_modules/mongodb": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.2.0.tgz", - "integrity": "sha512-d7OSuGjGWDZ5usZPqfvb36laQ9CPhnWkAGHT61x5P95p/8nMVeH8asloMwW6GcYFeB0Vj4CB/1wOTDG2RA9BFA==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.3.0.tgz", + "integrity": "sha512-tt0KuGjGtLUhLoU263+xvQmPHEGTw5LbcNC73EoFRYgSHwZt5tsoJC110hDyO1kjQzpgNrpdcSza9PknWN4LrA==", "dependencies": { "@mongodb-js/saslprep": "^1.1.0", "bson": "^6.2.0", - "mongodb-connection-string-url": "^2.6.0" + "mongodb-connection-string-url": "^3.0.0" }, "engines": { "node": ">=16.20.1" @@ -13843,14 +13843,14 @@ } }, "node_modules/tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", + "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", "dependencies": { - "punycode": "^2.1.1" + "punycode": "^2.3.0" }, "engines": { - "node": ">=12" + "node": ">=14" } }, "node_modules/trim-newlines": { @@ -14760,15 +14760,15 @@ } }, "node_modules/whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz", + "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==", "dependencies": { - "tr46": "^3.0.0", + "tr46": "^4.1.1", "webidl-conversions": "^7.0.0" }, "engines": { - "node": ">=12" + "node": ">=16" } }, "node_modules/which": { diff --git a/package.json b/package.json index ffeba6e96..8040f6316 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "marked-smartypants-lite": "^1.0.2", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.30.1", - "mongoose": "^8.0.4", + "mongoose": "^8.1.0", "nanoid": "3.3.4", "nconf": "^0.12.1", "react": "^18.2.0", From b8ca837c02c0dde3ca2c61449d0e72aaaeb7ef3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jan 2024 19:10:57 +0000 Subject: [PATCH 14/20] Bump eslint-plugin-jest from 27.6.2 to 27.6.3 Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 27.6.2 to 27.6.3. - [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/v27.6.2...v27.6.3) --- 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 2b50c894d..dc3bf3dd4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,7 +48,7 @@ }, "devDependencies": { "eslint": "^8.56.0", - "eslint-plugin-jest": "^27.6.2", + "eslint-plugin-jest": "^27.6.3", "eslint-plugin-react": "^7.33.2", "jest": "^29.7.0", "jest-expect-message": "^1.1.3", @@ -5642,9 +5642,9 @@ } }, "node_modules/eslint-plugin-jest": { - "version": "27.6.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.6.2.tgz", - "integrity": "sha512-CI1AlKrsNhYFoP48VU8BVWOi7+qHTq4bRxyUlGjeU8SfFt8abjXhjOuDzUoMp68DoXIx17KpNpIkMrl4s4ZW0g==", + "version": "27.6.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.6.3.tgz", + "integrity": "sha512-+YsJFVH6R+tOiO3gCJon5oqn4KWc+mDq2leudk8mrp8RFubLOo9CVyi3cib4L7XMpxExmkmBZQTPDYVBzgpgOA==", "dev": true, "dependencies": { "@typescript-eslint/utils": "^5.10.0" diff --git a/package.json b/package.json index ffeba6e96..002ae2fd0 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ }, "devDependencies": { "eslint": "^8.56.0", - "eslint-plugin-jest": "^27.6.2", + "eslint-plugin-jest": "^27.6.3", "eslint-plugin-react": "^7.33.2", "jest": "^29.7.0", "jest-expect-message": "^1.1.3", From 8b31966c2ba7962fa4086b4dd71e0cd0dd39fe4d Mon Sep 17 00:00:00 2001 From: David Bolack Date: Thu, 18 Jan 2024 09:51:07 -0600 Subject: [PATCH 15/20] Revert "Remove stray console.logs." This reverts commit 1861c7db695e8e0147f633eff672cc13334bae1e. --- shared/naturalcrit/markdown.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index 03020705c..9297717c1 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -241,7 +241,10 @@ const underline = { tokenizer(src, tokens) { const uRegex = /^\b_(?![_\s])(.*?[^_\s])_\b/m; const match = uRegex.exec(src); + console.log('Looking'); if(match?.length) { + console.log('found!'); + console.log(match); return { type : 'underline', raw : match[0], @@ -250,6 +253,7 @@ const underline = { } }, renderer(token) { + console.log() return `${this.parser.parseInline(token.tokens)}`; } }; From ac9fc720f7a77eb903bc41410198929e6d088175 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Thu, 18 Jan 2024 09:51:11 -0600 Subject: [PATCH 16/20] Revert "A better regex for underlining." This reverts commit a88b256b6c0692eb1bf79cd4dfa7461a206869ee. --- shared/naturalcrit/markdown.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index 9297717c1..2c7c95375 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -237,9 +237,9 @@ const superSubScripts = { const underline = { name : 'underline', level : 'inline', - start(src) { return src.match(/\b_(?![_\s])(.*?[^_\s])_\b/m)?.index;}, + start(src) { return src.match(/\w_[^_]_/m)?.index;}, tokenizer(src, tokens) { - const uRegex = /^\b_(?![_\s])(.*?[^_\s])_\b/m; + const uRegex = /^_([^_]*)_/m; const match = uRegex.exec(src); console.log('Looking'); if(match?.length) { From 0c6c9fce4d3e8f7dbcb14a68bd4a070026a93c92 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Thu, 18 Jan 2024 09:51:14 -0600 Subject: [PATCH 17/20] Revert "Simple Underline token." This reverts commit 04187cf769fa289ca1a85557b268f99cd7eaac98. --- shared/naturalcrit/markdown.js | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index 2c7c95375..cc18d3135 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -239,24 +239,9 @@ const underline = { level : 'inline', start(src) { return src.match(/\w_[^_]_/m)?.index;}, tokenizer(src, tokens) { - const uRegex = /^_([^_]*)_/m; - const match = uRegex.exec(src); - console.log('Looking'); - if(match?.length) { - console.log('found!'); - console.log(match); - return { - type : 'underline', - raw : match[0], - tokens : this.lexer.inlineTokens(match[1]) - }; - } - }, - renderer(token) { - console.log() - return `${this.parser.parseInline(token.tokens)}`; + const uRegex = /^_(?!\s)(?=([^_]*[^\s]))\1\^/m; } -}; +} const definitionLists = { name : 'definitionLists', @@ -290,7 +275,7 @@ const definitionLists = { } }; -Marked.use({ extensions: [mustacheSpans, mustacheDivs, mustacheInjectInline, definitionLists, superSubScripts, underline] }); +Marked.use({ extensions: [mustacheSpans, mustacheDivs, mustacheInjectInline, definitionLists, superSubScripts] }); Marked.use(mustacheInjectBlock); Marked.use({ renderer: renderer, mangle: false }); Marked.use(MarkedExtendedTables(), MarkedGFMHeadingId(), MarkedSmartypantsLite()); From 0c010a0a87ddd044a284f2a7be14be278a7145d9 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Thu, 18 Jan 2024 09:51:17 -0600 Subject: [PATCH 18/20] Revert "WIP" This reverts commit 67a4391dcbda8668ce8a01bae6e63c721774b1a4. --- shared/naturalcrit/markdown.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index cc18d3135..5be80ac97 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -234,15 +234,6 @@ const superSubScripts = { } }; -const underline = { - name : 'underline', - level : 'inline', - start(src) { return src.match(/\w_[^_]_/m)?.index;}, - tokenizer(src, tokens) { - const uRegex = /^_(?!\s)(?=([^_]*[^\s]))\1\^/m; - } -} - const definitionLists = { name : 'definitionLists', level : 'block', From b0ea34cc3f67b646077edf91eab492ab37a0cc19 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Thu, 18 Jan 2024 17:20:31 -0500 Subject: [PATCH 19/20] Add custom error messages. --- client/homebrew/navbar/error-navitem.jsx | 44 +++++++++++++++++++++--- server/app.js | 2 +- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/client/homebrew/navbar/error-navitem.jsx b/client/homebrew/navbar/error-navitem.jsx index eb2872c22..8551408c5 100644 --- a/client/homebrew/navbar/error-navitem.jsx +++ b/client/homebrew/navbar/error-navitem.jsx @@ -21,10 +21,11 @@ const ErrorNavItem = createClass({ this.props.parent.setState(state); }; - const error = this.props.error; - const response = error.response; - const status = response.status; - const message = response.body?.message; + const error = this.props.error; + const response = error.response; + const status = response.status; + const HBErrorCode = response.body?.HBErrorCode; + const message = response.body?.message; let errMsg = ''; try { errMsg += `${error.toString()}\n\n`; @@ -40,7 +41,9 @@ const ErrorNavItem = createClass({ {message ?? 'Conflict: please refresh to get latest changes'} ; - } else if(status === 412) { + } + + if(status === 412) { return Oops!
@@ -48,6 +51,36 @@ const ErrorNavItem = createClass({
; } + + if(HBErrorCode === '04') { + return + Oops! +
+ You are no longer signed in as an author of + this brew! Were you signed out from a different + window? Visit our log in page, then try again! +

+ +
+ Sign In +
+ +
+ Not Now +
+
+ ; + } + + if(response.body?.errors?.[0].reason == 'storageQuotaExceeded') { + return + Oops! +
+ Can't save because your Google Drive seems to be full! +
+ ; + } if(response.req.url.match(/^\/api.*Google.*$/m)){ return @@ -57,6 +90,7 @@ const ErrorNavItem = createClass({ expired! Visit our log in page to sign out and sign back in with Google, then try saving again! +

diff --git a/server/app.js b/server/app.js index 5ae873a1c..970c2cd9c 100644 --- a/server/app.js +++ b/server/app.js @@ -477,7 +477,7 @@ app.use(async (err, req, res, next)=>{ if(err.originalUrl?.startsWith('/api/')) { // console.log('API error'); - res.status(err.status || err.response?.status || 500).send(err.message || err); + res.status(err.status || err.response?.status || 500).send(err); return; } From d36e0524785c306e5ff29da885050f3df0c32d5d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 03:08:19 +0000 Subject: [PATCH 20/20] Bump react-router-dom from 6.21.2 to 6.21.3 Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.21.2 to 6.21.3. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@6.21.3/packages/react-router-dom) --- updated-dependencies: - dependency-name: react-router-dom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 57a6e2600..00c5c0ec8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-frame-component": "^4.1.3", - "react-router-dom": "6.21.2", + "react-router-dom": "6.21.3", "sanitize-filename": "1.6.3", "superagent": "^8.1.2", "vitreum": "git+https://git@github.com/calculuschild/vitreum.git" @@ -11873,9 +11873,9 @@ "dev": true }, "node_modules/react-router": { - "version": "6.21.2", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.2.tgz", - "integrity": "sha512-jJcgiwDsnaHIeC+IN7atO0XiSRCrOsQAHHbChtJxmgqG2IaYQXSnhqGb5vk2CU/wBQA12Zt+TkbuJjIn65gzbA==", + "version": "6.21.3", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.3.tgz", + "integrity": "sha512-a0H638ZXULv1OdkmiK6s6itNhoy33ywxmUFT/xtSoVyf9VnC7n7+VT4LjVzdIHSaF5TIh9ylUgxMXksHTgGrKg==", "dependencies": { "@remix-run/router": "1.14.2" }, @@ -11887,12 +11887,12 @@ } }, "node_modules/react-router-dom": { - "version": "6.21.2", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.2.tgz", - "integrity": "sha512-tE13UukgUOh2/sqYr6jPzZTzmzc70aGRP4pAjG2if0IP3aUT+sBtAKUJh0qMh0zylJHGLmzS+XWVaON4UklHeg==", + "version": "6.21.3", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.3.tgz", + "integrity": "sha512-kNzubk7n4YHSrErzjLK72j0B5i969GsuCGazRl3G6j1zqZBLjuSlYBdVdkDOgzGdPIffUOc9nmgiadTEVoq91g==", "dependencies": { "@remix-run/router": "1.14.2", - "react-router": "6.21.2" + "react-router": "6.21.3" }, "engines": { "node": ">=14.0.0" diff --git a/package.json b/package.json index cd5cbc546..50251c118 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-frame-component": "^4.1.3", - "react-router-dom": "6.21.2", + "react-router-dom": "6.21.3", "sanitize-filename": "1.6.3", "superagent": "^8.1.2", "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"