From 2f19b7658cb954a8abf1fe291fb7975c208b048b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Fri, 23 Jan 2026 19:10:56 +0100 Subject: [PATCH] dedent-tabs to dedent --- client/homebrew/brewRenderer/brewRenderer.jsx | 2 +- client/homebrew/editor/editor.jsx | 2 +- client/homebrew/navbar/help.navitem.jsx | 2 +- client/homebrew/navbar/share.navitem.jsx | 2 +- .../basePages/listPage/brewItem/brewItem.jsx | 2 +- .../pages/errorPage/errors/errorIndex.js | 2 +- package-lock.json | 17 +---------------- package.json | 2 +- tests/markdown/emojis.test.js | 2 +- tests/markdown/mustache-syntax.test.js | 2 +- tests/markdown/variables.test.js | 2 +- themes/Legacy/5ePHB/snippets.js | 2 +- themes/V3/5ePHB/snippets.js | 2 +- themes/V3/5ePHB/snippets/classfeature.gen.js | 2 +- themes/V3/5ePHB/snippets/classtable.gen.js | 2 +- themes/V3/5ePHB/snippets/coverpage.gen.js | 2 +- themes/V3/5ePHB/snippets/monsterblock.gen.js | 2 +- themes/V3/5ePHB/snippets/script.gen.js | 2 +- themes/V3/Blank/snippets.js | 2 +- themes/V3/Blank/snippets/imageMask.gen.js | 2 +- themes/V3/Blank/snippets/index.gen.js | 2 +- themes/V3/Blank/snippets/tableOfContents.gen.js | 2 +- 22 files changed, 22 insertions(+), 37 deletions(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index ebf008dd1..7188fa70c 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -12,7 +12,7 @@ import ToolBar from './toolBar/toolBar.jsx'; import RenderWarnings from 'client/components/renderWarnings/renderWarnings.jsx'; import NotificationPopup from './notificationPopup/notificationPopup.jsx'; import Frame from 'react-frame-component'; -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; import { printCurrentBrew } from '../../../shared/helpers.js'; import HeaderNav from './headerNav/headerNav.jsx'; diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx index e58d53445..11bf13fc1 100644 --- a/client/homebrew/editor/editor.jsx +++ b/client/homebrew/editor/editor.jsx @@ -3,7 +3,7 @@ import './editor.less'; import React from 'react'; import createReactClass from 'create-react-class'; import _ from 'lodash'; -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; import Markdown from '../../../shared/markdown.js'; import CodeEditor from 'client/components/codeEditor/codeEditor.jsx'; diff --git a/client/homebrew/navbar/help.navitem.jsx b/client/homebrew/navbar/help.navitem.jsx index 145d5bda4..d1f24fbc8 100644 --- a/client/homebrew/navbar/help.navitem.jsx +++ b/client/homebrew/navbar/help.navitem.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; import Nav from 'client/homebrew/navbar/nav.jsx'; diff --git a/client/homebrew/navbar/share.navitem.jsx b/client/homebrew/navbar/share.navitem.jsx index 4e80bc7e3..7804abe0c 100644 --- a/client/homebrew/navbar/share.navitem.jsx +++ b/client/homebrew/navbar/share.navitem.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; import Nav from 'client/homebrew/navbar/nav.jsx'; const getShareId = (brew)=>( diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index 41d992b9d..aadadbd3b 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -5,7 +5,7 @@ import request from '../../../../utils/request-middleware.js'; import googleDriveIcon from '../../../../googleDrive.svg'; import homebreweryIcon from '../../../../thumbnail.svg'; -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; const BrewItem = ({ brew = { diff --git a/client/homebrew/pages/errorPage/errors/errorIndex.js b/client/homebrew/pages/errorPage/errors/errorIndex.js index 67b658325..065512462 100644 --- a/client/homebrew/pages/errorPage/errors/errorIndex.js +++ b/client/homebrew/pages/errorPage/errors/errorIndex.js @@ -1,4 +1,4 @@ -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; const loginUrl = 'https://www.naturalcrit.com/login'; diff --git a/package-lock.json b/package-lock.json index 5f2d1aff7..5422b85f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "core-js": "^3.47.0", "cors": "^2.8.5", "create-react-class": "^15.7.0", - "dedent-tabs": "^0.10.3", + "dedent": "^1.7.1", "expr-eval": "^2.0.2", "express": "^5.1.0", "express-async-handler": "^1.2.0", @@ -10550,21 +10550,6 @@ "node": ">=12" } }, - "node_modules/mongoose/node_modules/gcp-metadata": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz", - "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==", - "license": "Apache-2.0", - "optional": true, - "peer": true, - "dependencies": { - "gaxios": "^5.0.0", - "json-bigint": "^1.0.0" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/mongoose/node_modules/https-proxy-agent": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", diff --git a/package.json b/package.json index 92e856d04..b56adc0a7 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "core-js": "^3.47.0", "cors": "^2.8.5", "create-react-class": "^15.7.0", - "dedent-tabs": "^0.10.3", + "dedent": "^1.7.1", "expr-eval": "^2.0.2", "express": "^5.1.0", "express-async-handler": "^1.2.0", diff --git a/tests/markdown/emojis.test.js b/tests/markdown/emojis.test.js index e5b6ecd47..5f0e102c9 100644 --- a/tests/markdown/emojis.test.js +++ b/tests/markdown/emojis.test.js @@ -1,5 +1,5 @@ import Markdown from 'markdown.js'; -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; // Marked.js adds line returns after closing tags on some default tokens. // This removes those line returns for comparison sake. diff --git a/tests/markdown/mustache-syntax.test.js b/tests/markdown/mustache-syntax.test.js index bdf368414..8562ae412 100644 --- a/tests/markdown/mustache-syntax.test.js +++ b/tests/markdown/mustache-syntax.test.js @@ -1,6 +1,6 @@ /* eslint-disable max-lines */ -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; import Markdown from 'markdown.js'; // Marked.js adds line returns after closing tags on some default tokens. diff --git a/tests/markdown/variables.test.js b/tests/markdown/variables.test.js index aa2117f31..49cd333c8 100644 --- a/tests/markdown/variables.test.js +++ b/tests/markdown/variables.test.js @@ -1,6 +1,6 @@ /* eslint-disable max-lines */ -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; import Markdown from 'markdown.js'; // Marked.js adds line returns after closing tags on some default tokens. diff --git a/themes/Legacy/5ePHB/snippets.js b/themes/Legacy/5ePHB/snippets.js index 3bcdac50e..c5a864e89 100644 --- a/themes/Legacy/5ePHB/snippets.js +++ b/themes/Legacy/5ePHB/snippets.js @@ -6,7 +6,7 @@ import MonsterBlockGen from './snippets/monsterblock.gen.js'; import ClassFeatureGen from './snippets/classfeature.gen.js'; import CoverPageGen from './snippets/coverpage.gen.js'; import TableOfContentsGen from './snippets/tableOfContents.gen.js'; -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; export default [ diff --git a/themes/V3/5ePHB/snippets.js b/themes/V3/5ePHB/snippets.js index 9ab81b2c0..3fcbdd564 100644 --- a/themes/V3/5ePHB/snippets.js +++ b/themes/V3/5ePHB/snippets.js @@ -6,7 +6,7 @@ import scriptGen from './snippets/script.gen.js'; import ClassFeatureGen from './snippets/classfeature.gen.js'; import CoverPageGen from './snippets/coverpage.gen.js'; import QuoteGen from './snippets/quote.gen.js'; -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; export default [ { diff --git a/themes/V3/5ePHB/snippets/classfeature.gen.js b/themes/V3/5ePHB/snippets/classfeature.gen.js index 9ea46785a..e7c5ea795 100644 --- a/themes/V3/5ePHB/snippets/classfeature.gen.js +++ b/themes/V3/5ePHB/snippets/classfeature.gen.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; export default function(classname){ diff --git a/themes/V3/5ePHB/snippets/classtable.gen.js b/themes/V3/5ePHB/snippets/classtable.gen.js index 0f2d2371a..bcd4c65df 100644 --- a/themes/V3/5ePHB/snippets/classtable.gen.js +++ b/themes/V3/5ePHB/snippets/classtable.gen.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; const features = [ 'Astrological Botany', 'Biochemical Sorcery', 'Civil Divination', diff --git a/themes/V3/5ePHB/snippets/coverpage.gen.js b/themes/V3/5ePHB/snippets/coverpage.gen.js index 7cf9cf5cf..9a0adaaa7 100644 --- a/themes/V3/5ePHB/snippets/coverpage.gen.js +++ b/themes/V3/5ePHB/snippets/coverpage.gen.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; const titles = [ 'The Burning Gallows', 'The Ring of Nenlast', diff --git a/themes/V3/5ePHB/snippets/monsterblock.gen.js b/themes/V3/5ePHB/snippets/monsterblock.gen.js index 483c9016d..a686382aa 100644 --- a/themes/V3/5ePHB/snippets/monsterblock.gen.js +++ b/themes/V3/5ePHB/snippets/monsterblock.gen.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; const genList = function(list, max){ return _.sampleSize(list, _.random(0, max)).join(', ') || 'None'; diff --git a/themes/V3/5ePHB/snippets/script.gen.js b/themes/V3/5ePHB/snippets/script.gen.js index ace330255..9f8b927b7 100644 --- a/themes/V3/5ePHB/snippets/script.gen.js +++ b/themes/V3/5ePHB/snippets/script.gen.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; export default { dwarvish : ()=>{ diff --git a/themes/V3/Blank/snippets.js b/themes/V3/Blank/snippets.js index 565e27355..9de2d7f7a 100644 --- a/themes/V3/Blank/snippets.js +++ b/themes/V3/Blank/snippets.js @@ -1,5 +1,5 @@ /* eslint-disable max-lines */ -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; import WatercolorGen from './snippets/watercolor.gen.js'; import ImageMaskGen from './snippets/imageMask.gen.js'; import FooterGen from './snippets/footer.gen.js'; diff --git a/themes/V3/Blank/snippets/imageMask.gen.js b/themes/V3/Blank/snippets/imageMask.gen.js index 761259c19..d84568f35 100644 --- a/themes/V3/Blank/snippets/imageMask.gen.js +++ b/themes/V3/Blank/snippets/imageMask.gen.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; export default { center : ()=>{ diff --git a/themes/V3/Blank/snippets/index.gen.js b/themes/V3/Blank/snippets/index.gen.js index 1321762e9..cf8924119 100644 --- a/themes/V3/Blank/snippets/index.gen.js +++ b/themes/V3/Blank/snippets/index.gen.js @@ -1,4 +1,4 @@ -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; export default ()=>{ return dedent` diff --git a/themes/V3/Blank/snippets/tableOfContents.gen.js b/themes/V3/Blank/snippets/tableOfContents.gen.js index d093d574a..045e15ab3 100644 --- a/themes/V3/Blank/snippets/tableOfContents.gen.js +++ b/themes/V3/Blank/snippets/tableOfContents.gen.js @@ -1,4 +1,4 @@ -import dedent from 'dedent-tabs'; +import dedent from 'dedent'; // Map each actual page to its footer label, accounting for skips or numbering resets const mapPages = (pages)=>{