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

change imports

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -3,13 +3,13 @@ import './brewRenderer.less';
 import React, { useState, useRef, useMemo, useEffect } from 'react';
 import _ from 'lodash';
 
-import MarkdownLegacy from 'markdownLegacy.js';
-import Markdown from 'markdown.js';
+import MarkdownLegacy from '../../../shared/markdownLegacy.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';

client/homebrew/editor/editor.jsx

@@ -6,7 +6,7 @@ import _ from 'lodash';
 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';
 
-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';
-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/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 Navbar from 'client/homebrew/navbar/navbar.jsx';
-import NewBrewItem from 'client/homebrew/navbar/newbrew.navitem.jsx';
-import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx';
-import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx';
+import Nav from '../../../navbar/nav.jsx';
+import Navbar from '../../../navbar/navbar.jsx';
+import NewBrewItem from '../../../navbar/newbrew.navitem.jsx';
+import HelpNavItem from '../../../navbar/help.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 Navbar                    from 'client/homebrew/navbar/navbar.jsx';
-import NewBrewItem               from 'client/homebrew/navbar/newbrew.navitem.jsx';
-import AccountNavItem            from 'client/homebrew/navbar/account.navitem.jsx';
-import ErrorNavItem              from 'client/homebrew/navbar/error-navitem.jsx';
-import HelpNavItem               from 'client/homebrew/navbar/help.navitem.jsx';
-import VaultNavItem              from 'client/homebrew/navbar/vault.navitem.jsx';
-import PrintNavItem              from 'client/homebrew/navbar/print.navitem.jsx';
-import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx';
+import Nav                       from '../../navbar/nav.jsx';
+import Navbar                    from '../../navbar/navbar.jsx';
+import NewBrewItem               from '../../navbar/newbrew.navitem.jsx';
+import AccountNavItem            from '../../navbar/account.navitem.jsx';
+import ErrorNavItem              from '../../navbar/error-navitem.jsx';
+import HelpNavItem               from '../../navbar/help.navitem.jsx';
+import VaultNavItem              from '../../navbar/vault.navitem.jsx';
+import PrintNavItem              from '../../navbar/print.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/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 Navbar                    from 'client/homebrew/navbar/navbar.jsx';
-import NewBrewItem               from 'client/homebrew/navbar/newbrew.navitem.jsx';
-import AccountNavItem            from 'client/homebrew/navbar/account.navitem.jsx';
-import ErrorNavItem              from 'client/homebrew/navbar/error-navitem.jsx';
-import HelpNavItem               from 'client/homebrew/navbar/help.navitem.jsx';
-import VaultNavItem              from 'client/homebrew/navbar/vault.navitem.jsx';
-import PrintNavItem              from 'client/homebrew/navbar/print.navitem.jsx';
-import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx';
+import Nav                       from '../../navbar/nav.jsx';
+import Navbar                    from '../../navbar/navbar.jsx';
+import NewBrewItem               from '../../navbar/newbrew.navitem.jsx';
+import AccountNavItem            from '../../navbar/account.navitem.jsx';
+import ErrorNavItem              from '../../navbar/error-navitem.jsx';
+import HelpNavItem               from '../../navbar/help.navitem.jsx';
+import VaultNavItem              from '../../navbar/vault.navitem.jsx';
+import PrintNavItem              from '../../navbar/print.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 Navbar                    from 'client/homebrew/navbar/navbar.jsx';
-import NewBrewItem               from 'client/homebrew/navbar/newbrew.navitem.jsx';
-import AccountNavItem            from 'client/homebrew/navbar/account.navitem.jsx';
-import ErrorNavItem              from 'client/homebrew/navbar/error-navitem.jsx';
-import HelpNavItem               from 'client/homebrew/navbar/help.navitem.jsx';
-import VaultNavItem              from 'client/homebrew/navbar/vault.navitem.jsx';
-import PrintNavItem              from 'client/homebrew/navbar/print.navitem.jsx';
-import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx';
+import Nav                       from '../../navbar/nav.jsx';
+import Navbar                    from '../../navbar/navbar.jsx';
+import NewBrewItem               from '../../navbar/newbrew.navitem.jsx';
+import AccountNavItem            from '../../navbar/account.navitem.jsx';
+import ErrorNavItem              from '../../navbar/error-navitem.jsx';
+import HelpNavItem               from '../../navbar/help.navitem.jsx';
+import VaultNavItem              from '../../navbar/vault.navitem.jsx';
+import PrintNavItem              from '../../navbar/print.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 Navbar from 'client/homebrew/navbar/navbar.jsx';
-import MetadataNav from 'client/homebrew/navbar/metadata.navitem.jsx';
-import PrintNavItem from 'client/homebrew/navbar/print.navitem.jsx';
-import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx';
+import Nav from '../../navbar/nav.jsx';
+import Navbar from '../../navbar/navbar.jsx';
+import MetadataNav from '../../navbar/metadata.navitem.jsx';
+import PrintNavItem from '../../navbar/print.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 Navbar from 'client/homebrew/navbar/navbar.jsx';
-import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx';
+import Nav from '../../navbar/nav.jsx';
+import Navbar from '../../navbar/navbar.jsx';
+import RecentNavItems from '../../navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
-import Account from 'client/homebrew/navbar/account.navitem.jsx';
-import NewBrew from 'client/homebrew/navbar/newbrew.navitem.jsx';
-import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx';
-import ErrorNavItem from 'client/homebrew/navbar/error-navitem.jsx';
-import VaultNavitem from 'client/homebrew/navbar/vault.navitem.jsx';
+import Account from '../../navbar/account.navitem.jsx';
+import NewBrew from '../../navbar/newbrew.navitem.jsx';
+import HelpNavItem from '../../navbar/help.navitem.jsx';
+import ErrorNavItem from '../../navbar/error-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 Navbar       from 'client/homebrew/navbar/navbar.jsx';
-import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx';
+import Nav          from '../../navbar/nav.jsx';
+import Navbar       from '../../navbar/navbar.jsx';
+import RecentNavItems from '../../navbar/recent.navitem.jsx';
 const { both: RecentNavItem } = RecentNavItems;
-import Account      from 'client/homebrew/navbar/account.navitem.jsx';
-import NewBrew      from 'client/homebrew/navbar/newbrew.navitem.jsx';
-import HelpNavItem  from 'client/homebrew/navbar/help.navitem.jsx';
+import Account      from '../../navbar/account.navitem.jsx';
+import NewBrew      from '../../navbar/newbrew.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

@@ -12105,9 +12105,9 @@
       "license": "MIT"
     },
     "node_modules/react-router": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.12.0.tgz",
-      "integrity": "sha512-kTPDYPFzDVGIIGNLS5VJykK0HfHLY5MF3b+xj0/tTyNYL1gF1qs7u67Z9jEhQk2sQ98SUaHxlG31g1JtF7IfVw==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.13.0.tgz",
+      "integrity": "sha512-PZgus8ETambRT17BUm/LL8lX3Of+oiLaPuVTRH3l1eLvSPpKO3AvhAEb5N7ihAFZQrYDqkvvWfFh9p0z9VsjLw==",
       "license": "MIT",
       "dependencies": {
         "cookie": "^1.0.1",