Merge pull request #4605 from naturalcrit/dedent-tabs-to-dedent

dedent-tabs to dedent
2026-03-22 06:48:11 +00:00 · 2026-01-23 20:40:37 +01:00
parent 776480d6cf df6b4b07cd
commit 7cf277b6a7
22 changed files with 57 additions and 53 deletions
--- 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';
--- 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';
--- 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';

--- 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)=>(
--- 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 = {
--- 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';

--- 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",
@@ -285,16 +285,16 @@
      }
    },
    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.5.tgz",
-      "integrity": "sha512-uJnGFcPsWQK8fvjgGP5LZUZZsYGIoPeRjSF5PGwrelYgq7Q15/Ft9NGFp1zglwgIv//W0uG4BevRuSJRyylZPg==",
+      "version": "0.6.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.6.tgz",
+      "integrity": "sha512-mOAsxeeKkUKayvZR3HeTYD/fICpCPLJrU5ZjelT/PA6WHtNDBOE436YiaEUvHN454bRM3CebhDsIpieCc4texA==",
      "license": "MIT",
      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.27.2",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "debug": "^4.4.1",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "debug": "^4.4.3",
        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.22.10"
+        "resolve": "^1.22.11"
      },
      "peerDependencies": {
        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -3031,9 +3031,9 @@
      }
    },
    "node_modules/@sinclair/typebox": {
-      "version": "0.34.47",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.47.tgz",
-      "integrity": "sha512-ZGIBQ+XDvO5JQku9wmwtabcVTHJsgSWAHYtVuM9pBNNR5E88v6Jcj/llpmsjivig5X8A8HHOb4/mbEKPS5EvAw==",
+      "version": "0.34.48",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.48.tgz",
+      "integrity": "sha512-kKJTNuK3AQOrgjjotVxMrCn1sUJwM76wMszfq1kdU4uYVJjvEWuFQ6HgvLt4Xz3fSmZlTOxJ/Ie13KnIcWQXFA==",
      "dev": true,
      "license": "MIT"
    },
@@ -4200,13 +4200,13 @@
      }
    },
    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.14",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.14.tgz",
-      "integrity": "sha512-Co2Y9wX854ts6U8gAAPXfn0GmAyctHuK8n0Yhfjd6t30g7yvKjspvvOo9yG+z52PZRgFErt7Ka2pYnXCjLKEpg==",
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.15.tgz",
+      "integrity": "sha512-hR3GwrRwHUfYwGfrisXPIDP3JcYfBrW7wKE7+Au6wDYl7fm/ka1NEII6kORzxNU556JjfidZeBsO10kYvtV1aw==",
      "license": "MIT",
      "dependencies": {
-        "@babel/compat-data": "^7.27.7",
-        "@babel/helper-define-polyfill-provider": "^0.6.5",
+        "@babel/compat-data": "^7.28.6",
+        "@babel/helper-define-polyfill-provider": "^0.6.6",
        "semver": "^6.3.1"
      },
      "peerDependencies": {
@@ -4227,12 +4227,12 @@
      }
    },
    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.5.tgz",
-      "integrity": "sha512-ISqQ2frbiNU9vIJkzg7dlPpznPZ4jOiUQ1uSmB0fEHeowtN3COYRsXr/xexn64NpU13P06jc/L5TgiJXOgrbEg==",
+      "version": "0.6.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.6.tgz",
+      "integrity": "sha512-hYm+XLYRMvupxiQzrvXUj7YyvFFVfv5gI0R71AJzudg1g2AI2vyCPPIFEBjk162/wFzti3inBHo7isWFuEVS/A==",
      "license": "MIT",
      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.5"
+        "@babel/helper-define-polyfill-provider": "^0.6.6"
      },
      "peerDependencies": {
        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -4902,9 +4902,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001765",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001765.tgz",
-      "integrity": "sha512-LWcNtSyZrakjECqmpP4qdg0MMGdN368D7X8XvvAqOcqMv0RxnlqVKZl2V6/mBR68oYMxOZPLw/gO7DuisMHUvQ==",
+      "version": "1.0.30001766",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001766.tgz",
+      "integrity": "sha512-4C0lfJ0/YPjJQHagaE9x2Elb69CIqEPZeG0anQt9SIvIoOH4a4uaRl73IavyO+0qZh6MDLH//DrXThEYKHkmYA==",
      "funding": [
        {
          "type": "opencollective",
@@ -5376,9 +5376,9 @@
      "license": "MIT"
    },
    "node_modules/cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "version": "2.8.6",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.6.tgz",
+      "integrity": "sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==",
      "license": "MIT",
      "dependencies": {
        "object-assign": "^4",
@@ -5386,6 +5386,10 @@
      },
      "engines": {
        "node": ">= 0.10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
      }
    },
    "node_modules/cosmiconfig": {
@@ -5978,9 +5982,9 @@
      "license": "MIT"
    },
    "node_modules/electron-to-chromium": {
-      "version": "1.5.277",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.277.tgz",
-      "integrity": "sha512-wKXFZw4erWmmOz5N/grBoJ2XrNJGDFMu2+W5ACHza5rHtvsqrK4gb6rnLC7XxKB9WlJ+RmyQatuEXmtm86xbnw==",
+      "version": "1.5.278",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.278.tgz",
+      "integrity": "sha512-dQ0tM1svDRQOwxnXxm+twlGTjr9Upvt8UFWAgmLsxEzFQxhbti4VwxmMjsDxVC51Zo84swW7FVCXEV+VAkhuPw==",
      "license": "ISC"
    },
    "node_modules/elliptic": {
@@ -10500,9 +10504,9 @@
      }
    },
    "node_modules/mongoose": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.21.0.tgz",
-      "integrity": "sha512-dW2U01gN8EVQT5KAO5AkzjbqWc8A/CsEq15jOzq/M9ISpy8jw3iq7W9ZP135h9zykFOMt3AMxq4+anvt2YNJgw==",
+      "version": "8.21.1",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.21.1.tgz",
+      "integrity": "sha512-1LhrVeHwiyAGxwSaYSq2uf32izQD+qoM2c8wq63W8MIsJBxKQDBnMkhJct55m0qqCsm2Maq8aPpIIfOHSYAqxg==",
      "license": "MIT",
      "dependencies": {
        "bson": "^6.10.4",
--- 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",
--- 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.
--- 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.
--- 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.
--- 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 [

--- 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 [
 	{
--- 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){

--- 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',
--- 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',
--- 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';
--- 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 : ()=>{
--- 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';
--- 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 : ()=>{
--- 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`
--- 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)=>{