Skip to content

Commit b6a717d

Browse files
authored
Merge pull request #4607 from naturalcrit/change-imports-from-absolute-to-relative
change imports
2 parents 7cf277b + 9d03385 commit b6a717d

File tree

24 files changed

+83
-84
lines changed

24 files changed

+83
-84
lines changed

client/homebrew/brewRenderer/brewRenderer.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import './brewRenderer.less';
33
import React, { useState, useRef, useMemo, useEffect } from 'react';
44
import _ from 'lodash';
55

6-
import MarkdownLegacy from 'markdownLegacy.js';
7-
import Markdown from 'markdown.js';
6+
import MarkdownLegacy from '../../../shared/markdownLegacy.js';
7+
import Markdown from '../../../shared/markdown.js';
88
import ErrorBar from './errorBar/errorBar.jsx';
99
import ToolBar from './toolBar/toolBar.jsx';
1010

1111
//TODO: move to the brew renderer
12-
import RenderWarnings from 'client/components/renderWarnings/renderWarnings.jsx';
12+
import RenderWarnings from '../../components/renderWarnings/renderWarnings.jsx';
1313
import NotificationPopup from './notificationPopup/notificationPopup.jsx';
1414
import Frame from 'react-frame-component';
1515
import dedent from 'dedent';

client/homebrew/editor/editor.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import _ from 'lodash';
66
import dedent from 'dedent';
77
import Markdown from '../../../shared/markdown.js';
88

9-
import CodeEditor from 'client/components/codeEditor/codeEditor.jsx';
9+
import CodeEditor from '../../components/codeEditor/codeEditor.jsx';
1010
import SnippetBar from './snippetbar/snippetbar.jsx';
1111
import MetadataEditor from './metadataEditor/metadataEditor.jsx';
1212

client/homebrew/editor/metadataEditor/metadataEditor.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ import React from 'react';
44
import createReactClass from 'create-react-class';
55
import _ from 'lodash';
66
import request from '../../utils/request-middleware.js';
7-
import Combobox from 'client/components/combobox.jsx';
7+
import Combobox from '../../../components/combobox.jsx';
88
import TagInput from '../tagInput/tagInput.jsx';
99

10-
1110
import Themes from 'themes/themes.json';
1211
import validations from './validations.js';
1312

client/homebrew/navbar/account.navitem.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import createReactClass from 'create-react-class';
33
import request from 'superagent';
4-
import Nav from 'client/homebrew/navbar/nav.jsx';
4+
import Nav from './nav.jsx';
55

66
const Account = createReactClass({
77
displayName : 'AccountNavItem',

client/homebrew/navbar/error-navitem.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import './error-navitem.less';
22
import React from 'react';
3-
import Nav from 'client/homebrew/navbar/nav.jsx';
3+
import Nav from './nav.jsx';
44

55
const ErrorNavItem = ({ error = '', clearError })=>{
66
const response = error.response;

client/homebrew/navbar/help.navitem.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import dedent from 'dedent';
33

4-
import Nav from 'client/homebrew/navbar/nav.jsx';
4+
import Nav from './nav.jsx';
55

66
export default function(props){
77
return <Nav.dropdown>

client/homebrew/navbar/metadata.navitem.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import createReactClass from 'create-react-class';
33
import Moment from 'moment';
44

5-
import Nav from 'client/homebrew/navbar/nav.jsx';
5+
import Nav from './nav.jsx';
66

77

88
const MetadataNav = createReactClass({

client/homebrew/navbar/nav.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import 'client/homebrew/navbar/navbar.less';
1+
import './navbar.less';
22
import React, { useState, useRef, useEffect } from 'react';
33
import createReactClass from 'create-react-class';
44
import _ from 'lodash';
55
import cx from 'classnames';
66

7-
import NaturalCritIcon from 'client/components/svg/naturalcrit-d20.svg.jsx';
7+
import NaturalCritIcon from '../../components/svg/naturalcrit-d20.svg.jsx';
88

99
const Nav = {
1010
base : createReactClass({

client/homebrew/navbar/navbar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import './navbar.less';
22
import React from 'react';
33
import createReactClass from 'create-react-class';
44

5-
import Nav from 'client/homebrew/navbar/nav.jsx';
5+
import Nav from './nav.jsx';
66
import PatreonNavItem from './patreon.navitem.jsx';
77

88
const Navbar = createReactClass({

client/homebrew/navbar/newbrew.navitem.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import _ from 'lodash';
3-
import Nav from 'client/homebrew/navbar/nav.jsx';
3+
import Nav from './nav.jsx';
44
import { splitTextStyleAndMetadata } from '../../../shared/helpers.js';
55

66
const BREWKEY = 'HB_newPage_content';

0 commit comments

Comments
 (0)