From cfc88ef5fc3d4748e647ece70d8cc161bb78cb4c Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Thu, 3 May 2018 15:23:48 -0400 Subject: [PATCH] Use module aliases --- .babelrc | 8 ++++++++ package.json | 6 ++---- src/App.js | 8 ++++---- src/Routes.js | 2 +- src/components/Bootstrap/index.js | 14 +++++++------- src/components/Form/FormBlock.js | 2 +- src/components/Form/index.js | 2 +- src/components/index.js | 6 +++--- src/configureStore.js | 2 +- src/constants/index.js | 2 +- src/helpers/index.js | 2 +- src/index.js | 4 ++-- src/reducers/index.js | 4 ++-- src/views/Camera/CameraAddView.js | 4 ++-- src/views/Camera/index.js | 4 ++-- src/views/Film/FilmAddView.js | 4 ++-- src/views/Film/index.js | 2 +- src/views/HomeView.js | 4 ++-- src/views/Lenses/index.js | 2 +- src/views/OopsView.js | 2 +- src/views/index.js | 8 ++++---- yarn.lock | 27 +++++++++++++++++++++++++++ 22 files changed, 76 insertions(+), 43 deletions(-) diff --git a/.babelrc b/.babelrc index 6a9530c..62c7cd9 100644 --- a/.babelrc +++ b/.babelrc @@ -10,5 +10,13 @@ } }], "inferno-app" + ], + "plugins": [ + ["module-resolver", { + "root": ["./src"], + "alias": { + "//": "./" + } + }] ] } diff --git a/package.json b/package.json index 3bdc102..d28bec9 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,7 @@ "author": "Timothy J. Warren", "description": "A cross-platform app to exit exif tags", "version": "0.2.0", - "private": true, - "alias": { - "|": "./src/" - }, + "private": true, "dependencies": { "dotenv": "5.0.1", "dotenv-expand": "4.2.0", @@ -28,6 +25,7 @@ "babel-eslint": "^8.2.2", "babel-jest": "^22.4.3", "babel-loader": "^7.1.4", + "babel-plugin-module-resolver": "^3.1.1", "babel-preset-env": "^1.6.1", "babel-preset-inferno-app": "^7.1.0", "babel-runtime": "6.26.0", diff --git a/src/App.js b/src/App.js index be13f91..4edaf73 100644 --- a/src/App.js +++ b/src/App.js @@ -1,15 +1,15 @@ import * as _ from 'lodash'; import { Component } from 'inferno'; import { BrowserRouter, Link, NavLink } from 'inferno-router'; -import { Loader } from './components'; +import { Loader } from '//components'; import { Container, Nav, Navbar, NavbarBrand, NavItem, -} from './components/Bootstrap'; -import { Routes } from './Routes'; +} from '//components/Bootstrap'; +import { Routes } from '//Routes'; export class App extends Component { constructor (props) { @@ -43,7 +43,7 @@ export class App extends Component { onWebSocketOpen () { this.setState({ - webSocketLoaded: true, + webSocketLoaded: true }); window.clientWS.onmessage = message => { diff --git a/src/Routes.js b/src/Routes.js index dcb6409..decd684 100644 --- a/src/Routes.js +++ b/src/Routes.js @@ -5,7 +5,7 @@ import { FilmAddView, HomeView, OopsView, -} from '~/src/views'; +} from '//views'; export const Routes = (props) => ( diff --git a/src/components/Bootstrap/index.js b/src/components/Bootstrap/index.js index 98f9c3e..b2be375 100644 --- a/src/components/Bootstrap/index.js +++ b/src/components/Bootstrap/index.js @@ -1,7 +1,7 @@ -export * from './Bootstrap'; -export * from './Card'; -export * from './Form'; -export * from './Grid'; -export * from './List'; -export * from './Modal'; -export * from './Navigation'; +export * from '//components/Bootstrap/Bootstrap'; +export * from '//components/Bootstrap/Card'; +export * from '//components/Bootstrap/Form'; +export * from '//components/Bootstrap/Grid'; +export * from '//components/Bootstrap/List'; +export * from '//components/Bootstrap/Modal'; +export * from '//components/Bootstrap/Navigation'; diff --git a/src/components/Form/FormBlock.js b/src/components/Form/FormBlock.js index 6a7c8d0..f03d91b 100644 --- a/src/components/Form/FormBlock.js +++ b/src/components/Form/FormBlock.js @@ -3,7 +3,7 @@ import { FormGroup, Input, Label, -} from '../Bootstrap'; +} from '//components/Bootstrap'; export const FormBlock = ({ children, diff --git a/src/components/Form/index.js b/src/components/Form/index.js index d178283..abc3002 100644 --- a/src/components/Form/index.js +++ b/src/components/Form/index.js @@ -1 +1 @@ -export * from './FormBlock'; +export * from '//components/Form/FormBlock'; diff --git a/src/components/index.js b/src/components/index.js index d21b4b3..c47b49e 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,3 +1,3 @@ -export * from './Bootstrap'; -export * from './Form'; -export * from './Loader'; +export * from '//components/Bootstrap'; +export * from '//components/Form'; +export * from '//components/Loader'; diff --git a/src/configureStore.js b/src/configureStore.js index 04acba5..363faec 100644 --- a/src/configureStore.js +++ b/src/configureStore.js @@ -3,7 +3,7 @@ */ import { combineReducers, createStore } from 'redux'; -import * as reducers from './reducers'; +import * as reducers from '//reducers'; const configureStore = (defaultState = {}) => { return createStore(combineReducers({ diff --git a/src/constants/index.js b/src/constants/index.js index 91d9f43..42eaf89 100644 --- a/src/constants/index.js +++ b/src/constants/index.js @@ -1 +1 @@ -export * from './redux-actions'; +export * from '//constants/redux-actions'; diff --git a/src/helpers/index.js b/src/helpers/index.js index 0fc713a..7e102c0 100644 --- a/src/helpers/index.js +++ b/src/helpers/index.js @@ -1 +1 @@ -export * from './web-socket'; +export * from '//helpers/web-socket'; diff --git a/src/index.js b/src/index.js index 94afb66..6513b94 100644 --- a/src/index.js +++ b/src/index.js @@ -1,8 +1,8 @@ import { render } from 'inferno'; import { Provider } from 'inferno-redux'; -import configureStore from './configureStore'; -import { App } from './App'; +import configureStore from '//configureStore'; +import { App } from '//App'; const store = configureStore(); diff --git a/src/reducers/index.js b/src/reducers/index.js index 573997e..42d0239 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -1,2 +1,2 @@ -export * from './receiveReducer'; -export * from './sendReducer'; +export * from '//reducers/receiveReducer'; +export * from '//reducers/sendReducer'; diff --git a/src/views/Camera/CameraAddView.js b/src/views/Camera/CameraAddView.js index b1c468a..30d8dbe 100644 --- a/src/views/Camera/CameraAddView.js +++ b/src/views/Camera/CameraAddView.js @@ -10,9 +10,9 @@ import { Col, Form, Row, -} from '../../components/Bootstrap'; +} from '//components/Bootstrap'; -import { FormBlock } from '../../components/Form'; +import { FormBlock } from '//components/Form'; export class CameraAddView extends Component { constructor (props) { diff --git a/src/views/Camera/index.js b/src/views/Camera/index.js index 65492d7..02a1ad8 100644 --- a/src/views/Camera/index.js +++ b/src/views/Camera/index.js @@ -1,2 +1,2 @@ -export * from './CameraAddView'; -export * from './CameraListView'; +export * from '//views/Camera/CameraAddView'; +export * from '//views/Camera/CameraListView'; diff --git a/src/views/Film/FilmAddView.js b/src/views/Film/FilmAddView.js index c6a55ec..367144f 100644 --- a/src/views/Film/FilmAddView.js +++ b/src/views/Film/FilmAddView.js @@ -10,9 +10,9 @@ import { Col, Form, Row, -} from '../../components/Bootstrap'; +} from '//components/Bootstrap'; -import { FormBlock } from '../../components/Form'; +import { FormBlock } from '//components/Form'; export class FilmAddView extends Component { constructor (props) { diff --git a/src/views/Film/index.js b/src/views/Film/index.js index e65ce6c..b4381d1 100644 --- a/src/views/Film/index.js +++ b/src/views/Film/index.js @@ -1 +1 @@ -export * from './FilmAddView'; +export * from '//views/Film/FilmAddView'; diff --git a/src/views/HomeView.js b/src/views/HomeView.js index c629b5c..9fc201a 100644 --- a/src/views/HomeView.js +++ b/src/views/HomeView.js @@ -10,8 +10,8 @@ import { ModalFooter, ModalHeader, Row, -} from '../components/Bootstrap'; -import { JSONMessage } from '../helpers/web-socket'; +} from '//components/Bootstrap'; +import { JSONMessage } from '//helpers/web-socket'; export class HomeView extends Component { constructor (props) { diff --git a/src/views/Lenses/index.js b/src/views/Lenses/index.js index 8163038..63d00c8 100644 --- a/src/views/Lenses/index.js +++ b/src/views/Lenses/index.js @@ -1 +1 @@ -export * from './LensesListView'; +export * from '//views/Lenses/LensesListView'; diff --git a/src/views/OopsView.js b/src/views/OopsView.js index 3f0fdc8..b275829 100644 --- a/src/views/OopsView.js +++ b/src/views/OopsView.js @@ -1,4 +1,4 @@ -import { Alert, Row } from '../components/Bootstrap'; +import { Alert, Row } from '//components/Bootstrap'; export const OopsView = (props) => ( diff --git a/src/views/index.js b/src/views/index.js index 14739c2..a9bb49d 100644 --- a/src/views/index.js +++ b/src/views/index.js @@ -1,4 +1,4 @@ -export * from './Camera'; -export * from './Film'; -export * from './HomeView'; -export * from './OopsView'; +export * from '//views/Camera'; +export * from '//views/Film'; +export * from '//views/HomeView'; +export * from '//views/OopsView'; diff --git a/yarn.lock b/yarn.lock index 2d0c201..212137f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -680,6 +680,16 @@ babel-plugin-jest-hoist@^22.4.3: version "22.4.3" resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.3.tgz#7d8bcccadc2667f96a0dcc6afe1891875ee6c14a" +babel-plugin-module-resolver@^3.1.1: + version "3.1.1" + resolved "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.1.1.tgz#881cf67e3d4b8400d5eaaefc1be44d2dc1fe404f" + dependencies: + find-babel-config "^1.1.0" + glob "^7.1.2" + pkg-up "^2.0.0" + reselect "^3.0.1" + resolve "^1.4.0" + babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" resolved "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" @@ -2945,6 +2955,13 @@ fill-range@^4.0.0: repeat-string "^1.6.1" to-regex-range "^2.1.0" +find-babel-config@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.1.0.tgz#acc01043a6749fec34429be6b64f542ebb5d6355" + dependencies: + json5 "^0.5.1" + path-exists "^3.0.0" + find-cache-dir@^0.1.1: version "0.1.1" resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9" @@ -5475,6 +5492,12 @@ pkg-dir@^2.0.0: dependencies: find-up "^2.1.0" +pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" + dependencies: + find-up "^2.1.0" + plist@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz#57ccdb7a0821df21831217a3cad54e3e146a1025" @@ -6188,6 +6211,10 @@ requires-port@1.0.x, requires-port@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" +reselect@^3.0.1: + version "3.0.1" + resolved "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147" + resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"