Merge pull request #4607 from naturalcrit/change-imports-from-absolute-to-relative

change imports

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -3,16 +3,16 @@ import './brewRenderer.less';
 import React, { useState, useRef, useMemo, useEffect } from 'react';
 import _ from 'lodash';
 
-import MarkdownLegacy from 'markdownLegacy.js';
+import MarkdownLegacy from '../../../shared/markdownLegacy.js';
-import Markdown from 'markdown.js';
+import Markdown from '../../../shared/markdown.js';
 import ErrorBar from './errorBar/errorBar.jsx';
 import ToolBar  from './toolBar/toolBar.jsx';
 
 //TODO: move to the brew renderer
-import RenderWarnings from 'client/components/renderWarnings/renderWarnings.jsx';
+import RenderWarnings from '../../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';

client/homebrew/editor/editor.jsx

@@ -3,10 +3,10 @@ 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';
+import CodeEditor from '../../components/codeEditor/codeEditor.jsx';
 import SnippetBar from './snippetbar/snippetbar.jsx';
 import MetadataEditor from './metadataEditor/metadataEditor.jsx';
 

client/homebrew/editor/metadataEditor/metadataEditor.jsx

@@ -4,10 +4,9 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import _ from 'lodash';
 import request from '../../utils/request-middleware.js';
-import Combobox from 'client/components/combobox.jsx';
+import Combobox from '../../../components/combobox.jsx';
 import TagInput from '../tagInput/tagInput.jsx';
 
-
 import Themes from 'themes/themes.json';
 import validations from './validations.js';
 

client/homebrew/navbar/account.navitem.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import createReactClass from 'create-react-class';
 import request from 'superagent';
-import Nav from 'client/homebrew/navbar/nav.jsx';
+import Nav from './nav.jsx';
 
 const Account = createReactClass({
 	displayName     : 'AccountNavItem',

client/homebrew/navbar/error-navitem.jsx

@@ -1,6 +1,6 @@
 import './error-navitem.less';
 import React from 'react';
-import Nav from 'client/homebrew/navbar/nav.jsx';
+import Nav from './nav.jsx';
 
 const ErrorNavItem = ({ error = '', clearError })=>{
 	const response    = error.response;

client/homebrew/navbar/help.navitem.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
-import dedent from 'dedent-tabs';
+import dedent from 'dedent';
 
-import Nav from 'client/homebrew/navbar/nav.jsx';
+import Nav from './nav.jsx';
 
 export default function(props){
 	return <Nav.dropdown>

client/homebrew/navbar/metadata.navitem.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import Moment from 'moment';
 
-import Nav from 'client/homebrew/navbar/nav.jsx';
+import Nav from './nav.jsx';
 
 
 const MetadataNav = createReactClass({

client/homebrew/navbar/nav.jsx

@@ -1,10 +1,10 @@
-import 'client/homebrew/navbar/navbar.less';
+import './navbar.less';
 import React, { useState, useRef, useEffect } from 'react';
 import createReactClass from 'create-react-class';
 import _ from 'lodash';
 import cx from 'classnames';
 
-import NaturalCritIcon from 'client/components/svg/naturalcrit-d20.svg.jsx';
+import NaturalCritIcon from '../../components/svg/naturalcrit-d20.svg.jsx';
 
 const Nav = {
 	base : createReactClass({

client/homebrew/navbar/navbar.jsx

@@ -2,7 +2,7 @@ import './navbar.less';
 import React from 'react';
 import createReactClass from 'create-react-class';
 
-import Nav from 'client/homebrew/navbar/nav.jsx';
+import Nav from './nav.jsx';
 import PatreonNavItem from './patreon.navitem.jsx';
 
 const Navbar = createReactClass({

client/homebrew/navbar/newbrew.navitem.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import _ from 'lodash';
-import Nav from 'client/homebrew/navbar/nav.jsx';
+import Nav from './nav.jsx';
 import { splitTextStyleAndMetadata } from '../../../shared/helpers.js';
 
 const BREWKEY  = 'HB_newPage_content';

client/homebrew/navbar/patreon.navitem.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import Nav from 'client/homebrew/navbar/nav.jsx';
+import Nav from './nav.jsx';
 
 export default function(props){
 	return <Nav.item

client/homebrew/navbar/print.navitem.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import Nav from 'client/homebrew/navbar/nav.jsx';
+import Nav from './nav.jsx';
 import { printCurrentBrew } from '../../../shared/helpers.js';
 
 export default function(){

client/homebrew/navbar/recent.navitem.jsx

@@ -3,7 +3,7 @@ import createReactClass from 'create-react-class';
 import _ from 'lodash';
 import Moment from 'moment';
 
-import Nav from 'client/homebrew/navbar/nav.jsx';
+import Nav from './nav.jsx';
 
 const EDIT_KEY = 'HB_nav_recentlyEdited';
 const VIEW_KEY = 'HB_nav_recentlyViewed';

client/homebrew/navbar/share.navitem.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import dedent from 'dedent-tabs';
+import dedent from 'dedent';
-import Nav from 'client/homebrew/navbar/nav.jsx';
+import Nav from './nav.jsx';
 
 const getShareId = (brew)=>(
 	brew.googleId && !brew.stubbed

client/homebrew/navbar/vault.navitem.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import Nav from 'client/homebrew/navbar/nav.jsx';
+import Nav from './nav.jsx';
 
 export default function (props) {
 	return (

client/homebrew/pages/accountPage/accountPage.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import moment from 'moment';
 import UIPage from '../basePages/uiPage/uiPage.jsx';
-import NaturalCritIcon from 'client/components/svg/naturalcrit-d20.svg.jsx';
+import NaturalCritIcon from '../../../components/svg/naturalcrit-d20.svg.jsx';
 
 let SAVEKEY = '';
 

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 = {

client/homebrew/pages/basePages/uiPage/uiPage.jsx

@@ -2,13 +2,13 @@ import './uiPage.less';
 import React from 'react';
 import createReactClass from 'create-react-class';
 
-import Nav from 'client/homebrew/navbar/nav.jsx';
+import Nav from '../../../navbar/nav.jsx';
-import Navbar from 'client/homebrew/navbar/navbar.jsx';
+import Navbar from '../../../navbar/navbar.jsx';
-import NewBrewItem from 'client/homebrew/navbar/newbrew.navitem.jsx';
+import NewBrewItem from '../../../navbar/newbrew.navitem.jsx';
-import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx';
+import HelpNavItem from '../../../navbar/help.navitem.jsx';
-import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx';
+import RecentNavItems from '../../../navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
-import Account from 'client/homebrew/navbar/account.navitem.jsx';
+import Account from '../../../navbar/account.navitem.jsx';
 
 
 const UIPage = createReactClass({

client/homebrew/pages/editPage/editPage.jsx

@@ -4,25 +4,25 @@ import './editPage.less';
 // Common imports
 import React, { useState, useEffect, useRef } from 'react';
 import request                                from '../../utils/request-middleware.js';
-import Markdown                               from 'markdown.js';
+import Markdown                               from '../../../../shared/markdown.js';
 import _                                      from 'lodash';
 
 import { DEFAULT_BREW_LOAD }                  from '../../../../server/brewDefaults.js';
 import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
 
-import SplitPane    from 'client/components/splitPane/splitPane.jsx';
+import SplitPane    from '../../../components/splitPane/splitPane.jsx';
 import Editor       from '../../editor/editor.jsx';
 import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
 
-import Nav                       from 'client/homebrew/navbar/nav.jsx';
+import Nav                       from '../../navbar/nav.jsx';
-import Navbar                    from 'client/homebrew/navbar/navbar.jsx';
+import Navbar                    from '../../navbar/navbar.jsx';
-import NewBrewItem               from 'client/homebrew/navbar/newbrew.navitem.jsx';
+import NewBrewItem               from '../../navbar/newbrew.navitem.jsx';
-import AccountNavItem            from 'client/homebrew/navbar/account.navitem.jsx';
+import AccountNavItem            from '../../navbar/account.navitem.jsx';
-import ErrorNavItem              from 'client/homebrew/navbar/error-navitem.jsx';
+import ErrorNavItem              from '../../navbar/error-navitem.jsx';
-import HelpNavItem               from 'client/homebrew/navbar/help.navitem.jsx';
+import HelpNavItem               from '../../navbar/help.navitem.jsx';
-import VaultNavItem              from 'client/homebrew/navbar/vault.navitem.jsx';
+import VaultNavItem              from '../../navbar/vault.navitem.jsx';
-import PrintNavItem              from 'client/homebrew/navbar/print.navitem.jsx';
+import PrintNavItem              from '../../navbar/print.navitem.jsx';
-import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx';
+import RecentNavItems from '../../navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
 
 // Page specific imports
@@ -31,7 +31,7 @@ import { md5 }                           from 'hash-wasm';
 import { gzipSync, strToU8 }             from 'fflate';
 import { makePatches, stringifyPatches } from '@sanity/diff-match-patch';
 
-import ShareNavItem              from 'client/homebrew/navbar/share.navitem.jsx';
+import ShareNavItem              from '../../navbar/share.navitem.jsx';
 import LockNotification from './lockNotification/lockNotification.jsx';
 import { updateHistory, versionHistoryGarbageCollection } from '../../utils/versionHistory.js';
 import googleDriveIcon from '../../googleDrive.svg';

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';
 

client/homebrew/pages/homePage/homePage.jsx

@@ -4,25 +4,25 @@ import './homePage.less';
 // Common imports
 import React, { useState, useEffect, useRef } from 'react';
 import request                                from '../../utils/request-middleware.js';
-import Markdown                               from 'markdown.js';
+import Markdown                               from '../../../../shared/markdown.js';
 import _                                      from 'lodash';
 
 import { DEFAULT_BREW }                       from '../../../../server/brewDefaults.js';
 import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
 
-import SplitPane    from 'client/components/splitPane/splitPane.jsx';
+import SplitPane    from '../../../components/splitPane/splitPane.jsx';
 import Editor       from '../../editor/editor.jsx';
 import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
 
-import Nav                       from 'client/homebrew/navbar/nav.jsx';
+import Nav                       from '../../navbar/nav.jsx';
-import Navbar                    from 'client/homebrew/navbar/navbar.jsx';
+import Navbar                    from '../../navbar/navbar.jsx';
-import NewBrewItem               from 'client/homebrew/navbar/newbrew.navitem.jsx';
+import NewBrewItem               from '../../navbar/newbrew.navitem.jsx';
-import AccountNavItem            from 'client/homebrew/navbar/account.navitem.jsx';
+import AccountNavItem            from '../../navbar/account.navitem.jsx';
-import ErrorNavItem              from 'client/homebrew/navbar/error-navitem.jsx';
+import ErrorNavItem              from '../../navbar/error-navitem.jsx';
-import HelpNavItem               from 'client/homebrew/navbar/help.navitem.jsx';
+import HelpNavItem               from '../../navbar/help.navitem.jsx';
-import VaultNavItem              from 'client/homebrew/navbar/vault.navitem.jsx';
+import VaultNavItem              from '../../navbar/vault.navitem.jsx';
-import PrintNavItem              from 'client/homebrew/navbar/print.navitem.jsx';
+import PrintNavItem              from '../../navbar/print.navitem.jsx';
-import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx';
+import RecentNavItems from '../../navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
 
 

client/homebrew/pages/newPage/newPage.jsx

@@ -4,25 +4,25 @@ import './newPage.less';
 // Common imports
 import React, { useState, useEffect, useRef } from 'react';
 import request                                from '../../utils/request-middleware.js';
-import Markdown                               from 'markdown.js';
+import Markdown                               from '../../../../shared/markdown.js';
 import _                                      from 'lodash';
 
 import { DEFAULT_BREW }                       from '../../../../server/brewDefaults.js';
 import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
 
-import SplitPane    from 'client/components/splitPane/splitPane.jsx';
+import SplitPane    from '../../../components/splitPane/splitPane.jsx';
 import Editor       from '../../editor/editor.jsx';
 import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
 
-import Nav                       from 'client/homebrew/navbar/nav.jsx';
+import Nav                       from '../../navbar/nav.jsx';
-import Navbar                    from 'client/homebrew/navbar/navbar.jsx';
+import Navbar                    from '../../navbar/navbar.jsx';
-import NewBrewItem               from 'client/homebrew/navbar/newbrew.navitem.jsx';
+import NewBrewItem               from '../../navbar/newbrew.navitem.jsx';
-import AccountNavItem            from 'client/homebrew/navbar/account.navitem.jsx';
+import AccountNavItem            from '../../navbar/account.navitem.jsx';
-import ErrorNavItem              from 'client/homebrew/navbar/error-navitem.jsx';
+import ErrorNavItem              from '../../navbar/error-navitem.jsx';
-import HelpNavItem               from 'client/homebrew/navbar/help.navitem.jsx';
+import HelpNavItem               from '../../navbar/help.navitem.jsx';
-import VaultNavItem              from 'client/homebrew/navbar/vault.navitem.jsx';
+import VaultNavItem              from '../../navbar/vault.navitem.jsx';
-import PrintNavItem              from 'client/homebrew/navbar/print.navitem.jsx';
+import PrintNavItem              from '../../navbar/print.navitem.jsx';
-import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx';
+import RecentNavItems from '../../navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
 
 // Page specific imports

client/homebrew/pages/sharePage/sharePage.jsx

@@ -2,13 +2,13 @@ import './sharePage.less';
 import React, { useState, useEffect, useCallback } from 'react';
 import { Meta }                          from 'vitreum/headtags';
 
-import Nav from 'client/homebrew/navbar/nav.jsx';
+import Nav from '../../navbar/nav.jsx';
-import Navbar from 'client/homebrew/navbar/navbar.jsx';
+import Navbar from '../../navbar/navbar.jsx';
-import MetadataNav from 'client/homebrew/navbar/metadata.navitem.jsx';
+import MetadataNav from '../../navbar/metadata.navitem.jsx';
-import PrintNavItem from 'client/homebrew/navbar/print.navitem.jsx';
+import PrintNavItem from '../../navbar/print.navitem.jsx';
-import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx';
+import RecentNavItems from '../../navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
-import Account from 'client/homebrew/navbar/account.navitem.jsx';
+import Account from '../../navbar/account.navitem.jsx';
 import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
 
 import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js';

client/homebrew/pages/userPage/userPage.jsx

@@ -3,15 +3,15 @@ import _ from 'lodash';
 
 import ListPage from '../basePages/listPage/listPage.jsx';
 
-import Nav from 'client/homebrew/navbar/nav.jsx';
+import Nav from '../../navbar/nav.jsx';
-import Navbar from 'client/homebrew/navbar/navbar.jsx';
+import Navbar from '../../navbar/navbar.jsx';
-import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx';
+import RecentNavItems from '../../navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
-import Account from 'client/homebrew/navbar/account.navitem.jsx';
+import Account from '../../navbar/account.navitem.jsx';
-import NewBrew from 'client/homebrew/navbar/newbrew.navitem.jsx';
+import NewBrew from '../../navbar/newbrew.navitem.jsx';
-import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx';
+import HelpNavItem from '../../navbar/help.navitem.jsx';
-import ErrorNavItem from 'client/homebrew/navbar/error-navitem.jsx';
+import ErrorNavItem from '../../navbar/error-navitem.jsx';
-import VaultNavitem from 'client/homebrew/navbar/vault.navitem.jsx';
+import VaultNavitem from '../../navbar/vault.navitem.jsx';
 
 const UserPage = (props)=>{
 	props = {

client/homebrew/pages/vaultPage/vaultPage.jsx

@@ -3,15 +3,15 @@
 import './vaultPage.less';
 import React, { useState, useEffect, useRef } from 'react';
 
-import Nav          from 'client/homebrew/navbar/nav.jsx';
+import Nav          from '../../navbar/nav.jsx';
-import Navbar       from 'client/homebrew/navbar/navbar.jsx';
+import Navbar       from '../../navbar/navbar.jsx';
-import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx';
+import RecentNavItems from '../../navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
-import Account      from 'client/homebrew/navbar/account.navitem.jsx';
+import Account      from '../../navbar/account.navitem.jsx';
-import NewBrew      from 'client/homebrew/navbar/newbrew.navitem.jsx';
+import NewBrew      from '../../navbar/newbrew.navitem.jsx';
-import HelpNavItem  from 'client/homebrew/navbar/help.navitem.jsx';
+import HelpNavItem  from '../../navbar/help.navitem.jsx';
 import BrewItem     from '../basePages/listPage/brewItem/brewItem.jsx';
-import SplitPane    from 'client/components/splitPane/splitPane.jsx';
+import SplitPane    from '../../../components/splitPane/splitPane.jsx';
 import ErrorIndex   from '../errorPage/errors/errorIndex.js';
 
 import request from '../../utils/request-middleware.js';

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",
+      "version": "0.6.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.6.tgz",
-      "integrity": "sha512-uJnGFcPsWQK8fvjgGP5LZUZZsYGIoPeRjSF5PGwrelYgq7Q15/Ft9NGFp1zglwgIv//W0uG4BevRuSJRyylZPg==",
+      "integrity": "sha512-mOAsxeeKkUKayvZR3HeTYD/fICpCPLJrU5ZjelT/PA6WHtNDBOE436YiaEUvHN454bRM3CebhDsIpieCc4texA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-compilation-targets": "^7.28.6",
-        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.28.6",
-        "debug": "^4.4.1",
+        "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",
+      "version": "0.34.48",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.47.tgz",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.48.tgz",
-      "integrity": "sha512-ZGIBQ+XDvO5JQku9wmwtabcVTHJsgSWAHYtVuM9pBNNR5E88v6Jcj/llpmsjivig5X8A8HHOb4/mbEKPS5EvAw==",
+      "integrity": "sha512-kKJTNuK3AQOrgjjotVxMrCn1sUJwM76wMszfq1kdU4uYVJjvEWuFQ6HgvLt4Xz3fSmZlTOxJ/Ie13KnIcWQXFA==",
       "dev": true,
       "license": "MIT"
     },
@@ -4200,13 +4200,13 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.14",
+      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.14.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.15.tgz",
-      "integrity": "sha512-Co2Y9wX854ts6U8gAAPXfn0GmAyctHuK8n0Yhfjd6t30g7yvKjspvvOo9yG+z52PZRgFErt7Ka2pYnXCjLKEpg==",
+      "integrity": "sha512-hR3GwrRwHUfYwGfrisXPIDP3JcYfBrW7wKE7+Au6wDYl7fm/ka1NEII6kORzxNU556JjfidZeBsO10kYvtV1aw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.27.7",
+        "@babel/compat-data": "^7.28.6",
-        "@babel/helper-define-polyfill-provider": "^0.6.5",
+        "@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",
+      "version": "0.6.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.5.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.6.tgz",
-      "integrity": "sha512-ISqQ2frbiNU9vIJkzg7dlPpznPZ4jOiUQ1uSmB0fEHeowtN3COYRsXr/xexn64NpU13P06jc/L5TgiJXOgrbEg==",
+      "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",
+      "version": "1.0.30001766",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001765.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001766.tgz",
-      "integrity": "sha512-LWcNtSyZrakjECqmpP4qdg0MMGdN368D7X8XvvAqOcqMv0RxnlqVKZl2V6/mBR68oYMxOZPLw/gO7DuisMHUvQ==",
+      "integrity": "sha512-4C0lfJ0/YPjJQHagaE9x2Elb69CIqEPZeG0anQt9SIvIoOH4a4uaRl73IavyO+0qZh6MDLH//DrXThEYKHkmYA==",
       "funding": [
         {
           "type": "opencollective",
@@ -5376,9 +5376,9 @@
       "license": "MIT"
     },
     "node_modules/cors": {
-      "version": "2.8.5",
+      "version": "2.8.6",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.6.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "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",
+      "version": "1.5.278",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.277.tgz",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.278.tgz",
-      "integrity": "sha512-wKXFZw4erWmmOz5N/grBoJ2XrNJGDFMu2+W5ACHza5rHtvsqrK4gb6rnLC7XxKB9WlJ+RmyQatuEXmtm86xbnw==",
+      "integrity": "sha512-dQ0tM1svDRQOwxnXxm+twlGTjr9Upvt8UFWAgmLsxEzFQxhbti4VwxmMjsDxVC51Zo84swW7FVCXEV+VAkhuPw==",
       "license": "ISC"
     },
     "node_modules/elliptic": {
@@ -10500,9 +10504,9 @@
       }
     },
     "node_modules/mongoose": {
-      "version": "8.21.0",
+      "version": "8.21.1",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.21.1.tgz",
-      "integrity": "sha512-dW2U01gN8EVQT5KAO5AkzjbqWc8A/CsEq15jOzq/M9ISpy8jw3iq7W9ZP135h9zykFOMt3AMxq4+anvt2YNJgw==",
+      "integrity": "sha512-1LhrVeHwiyAGxwSaYSq2uf32izQD+qoM2c8wq63W8MIsJBxKQDBnMkhJct55m0qqCsm2Maq8aPpIIfOHSYAqxg==",
       "license": "MIT",
       "dependencies": {
         "bson": "^6.10.4",
@@ -12101,9 +12105,9 @@
       "license": "MIT"
     },
     "node_modules/react-router": {
-      "version": "7.12.0",
+      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.13.0.tgz",
-      "integrity": "sha512-kTPDYPFzDVGIIGNLS5VJykK0HfHLY5MF3b+xj0/tTyNYL1gF1qs7u67Z9jEhQk2sQ98SUaHxlG31g1JtF7IfVw==",
+      "integrity": "sha512-PZgus8ETambRT17BUm/LL8lX3Of+oiLaPuVTRH3l1eLvSPpKO3AvhAEb5N7ihAFZQrYDqkvvWfFh9p0z9VsjLw==",
       "license": "MIT",
       "dependencies": {
         "cookie": "^1.0.1",

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",

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.

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.

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.

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 [
 

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

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

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',

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',

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';

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

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';

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

themes/V3/Blank/snippets/index.gen.js

@@ -1,4 +1,4 @@
-import dedent from 'dedent-tabs';
+import dedent from 'dedent';
 
 export default ()=>{
 	return dedent`

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