Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit 20b28c2

Browse files
Merge pull request #24 from thefringeninja/fix-imports
Remove Relative Imports
2 parents 7a431f3 + 5b5f2e1 commit 20b28c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+219
-220
lines changed

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
NODE_PATH=src/

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
"@types/remarkable": "^1.7.1",
2828
"@types/uuid": "^3.4.4",
2929
"babel-plugin-module-resolver": "3.1.1",
30-
"prettier": "1.14.2",
30+
"prettier": "1.15.1",
3131
"react-scripts-ts": "3.1.0",
3232
"source-map-explorer": "1.6.0",
3333
"tslint-config-prettier": "1.15.0",
3434
"tslint-immutable": "4.8.0",
3535
"tslint-react": "3.6.0",
36-
"typescript": "3.1.3",
36+
"typescript": "3.1.6",
3737
"typesync": "0.4.0"
3838
},
3939
"dependencies": {

src/SqlStreamStoreBrowser.tsx

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,23 @@ import {
1010
} from '@material-ui/core';
1111
import { MuiThemeProvider } from '@material-ui/core/styles';
1212
import { SvgIconProps } from '@material-ui/core/SvgIcon';
13-
import { JSONSchema7 } from 'json-schema';
14-
import React, { ComponentType, createElement } from 'react';
15-
import { Observable as obs } from 'rxjs';
1613
import {
1714
AuthorizationProvider,
1815
Loading,
1916
mount,
2017
NavigationProvider,
2118
Notifications,
2219
withAuthorization,
23-
} from './components';
24-
import {
25-
LightbulbFull,
26-
LightbulbOutline,
27-
SqlStreamStore,
28-
} from './components/Icons';
29-
import { connect, createState } from './reactive';
30-
import { actions, store, Viewer } from './stream-store';
31-
import themes from './themes';
32-
import { AuthorizationProps, HalLink, HalLinks } from './types';
33-
import { mediaTypes, preventDefault } from './utils';
20+
} from 'components';
21+
import { LightbulbFull, LightbulbOutline, SqlStreamStore } from 'icons';
22+
import { JSONSchema7 } from 'json-schema';
23+
import React, { ComponentType, createElement } from 'react';
24+
import { connect, createState } from 'reactive';
25+
import { Observable as obs } from 'rxjs';
26+
import { actions, store, Viewer } from 'stream-store';
27+
import themes from 'themes';
28+
import { AuthorizationProps, HalLink, HalLinks } from 'types';
29+
import { mediaTypes, preventDefault } from 'utils';
3430

3531
const getSelfAlias = (links: HalLinks) =>
3632
Object.keys(links)

src/components/AuthorizationProvider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { ComponentType, ReactNode, StatelessComponent } from 'react';
2-
import { AuthorizationProps } from '../types';
2+
import { AuthorizationProps } from 'types';
33
import getDisplayName from './getDisplayName';
44

55
const { Consumer, Provider } = React.createContext<string | undefined>(

src/components/HyperMediaControls/Dialog.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import {
1010
WithStyles,
1111
} from '@material-ui/core';
1212
import { SlideProps } from '@material-ui/core/Slide';
13+
import RelIcon from 'components/RelIcon';
1314
import React, { FormEvent, PureComponent, StatelessComponent } from 'react';
14-
import { HalLink } from '../../types';
15-
import RelIcon from '../RelIcon';
15+
import { HalLink } from 'types';
1616
import HelpButton from './HelpButton';
1717
import RelButton from './RelButton';
1818

src/components/HyperMediaControls/FormButton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { withAuthorization } from 'components/AuthorizationProvider';
12
import { JSONSchema7 } from 'json-schema';
23
import React, { FormEvent, PureComponent } from 'react';
34
import { SchemaForm } from 'react-schema-form';
4-
import { AuthorizationProps, FormActions, HalLink } from '../../types';
5-
import { withAuthorization } from '../AuthorizationProvider';
5+
import { AuthorizationProps, FormActions, HalLink } from 'types';
66
import Dialog from './Dialog';
77
import TextAreaField from './TextAreaField';
88
import UuidField from './UuidField';

src/components/HyperMediaControls/HelpButton.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import {
55
WithStyles,
66
withStyles,
77
} from '@material-ui/core';
8+
import { withAuthorization } from 'components/AuthorizationProvider';
9+
import { Help } from 'icons';
810
import React, { ComponentType, PureComponent, ReactNode } from 'react';
911
import Remarkable from 'react-remarkable';
12+
import { HalLink } from 'types';
1013
import uriTemplate from 'uri-template';
11-
import { HalLink } from '../../types';
12-
import { http } from '../../utils';
13-
import { withAuthorization } from '../AuthorizationProvider';
14-
import { Help } from '../Icons';
14+
import { http } from 'utils';
1515

1616
const getCurie = (rel: string, curies: HalLink[]): HalLink => {
1717
const [prefix, rest] = rel.split(':', 2);

src/components/HyperMediaControls/LinkButton.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { PropTypes, TextField } from '@material-ui/core';
2+
import { withNavigation } from 'components/NavigationProvider';
23
import React, { ComponentType, FormEventHandler, PureComponent } from 'react';
4+
import { HalLink, NavigatableProps } from 'types';
35
import uriTemplate from 'uri-template';
4-
import { HalLink, NavigatableProps } from '../../types';
5-
import { preventDefault } from '../../utils';
6-
import { withNavigation } from '../NavigationProvider';
6+
import { preventDefault } from 'utils';
77
import Dialog from './Dialog';
88
import RelButton from './RelButton';
99
import Color = PropTypes.Color;

src/components/HyperMediaControls/RelButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Button } from '@material-ui/core';
22
import { ButtonProps } from '@material-ui/core/Button';
3+
import RelIcon from 'components/RelIcon';
34
import React, { StatelessComponent } from 'react';
4-
import RelIcon from '../RelIcon';
55

66
interface RelButtonProps {
77
rel: string;

src/components/HyperMediaControls/UuidField.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Button, TextField } from '@material-ui/core';
2+
import { SpaceBar } from 'icons';
23
import React from 'react';
34
import {
45
ComposedComponent,
56
ReactSchemaFormInputProps,
67
} from 'react-schema-form';
78
import uuid from 'uuid';
8-
import { SpaceBar } from '../Icons';
99

1010
class UuidField extends React.PureComponent<ReactSchemaFormInputProps> {
1111
constructor(props: ReactSchemaFormInputProps) {

0 commit comments

Comments
 (0)