From 07d31aded680138c71dfeb24a701bef0c6d413d4 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Mon, 1 Jan 2018 13:39:04 -0800 Subject: [PATCH] Clean up import order --- .eslintrc | 10 ++++++++-- js/components/EqualizerWindow/index.test.js | 13 ++++++------- js/components/MainWindow/index.test.js | 14 +++++++------- js/components/MiniTime.js | 3 +-- js/components/PlaylistWindow/MiscMenu.js | 2 +- js/components/PlaylistWindow/PlaylistShade.js | 3 +-- .../PlaylistWindow/PlaylistShade.test.js | 16 ++++++++-------- js/components/PlaylistWindow/index.test.js | 13 ++++++------- js/index.js | 6 +++--- js/reducers/index.test.js | 2 +- js/reducers/playlist.test.js | 2 +- js/selectors.js | 2 +- js/skinParser.js | 2 +- js/store.js | 2 +- webpack.production.config.js | 2 +- 15 files changed, 47 insertions(+), 45 deletions(-) diff --git a/.eslintrc b/.eslintrc index 08946cdf..a95e6567 100644 --- a/.eslintrc +++ b/.eslintrc @@ -148,9 +148,15 @@ "use-isnan": "error", "valid-typeof": "error", "prettier/prettier": "error", - "import/no-unresolved": "error", "import/default": "error", "import/export": "error", - "import/no-extraneous-dependencies": "error" + "import/first": "error", + "import/named": "error", + "import/namespace": "error", + "import/no-duplicates": "error", + "import/no-extraneous-dependencies": "error", + "import/no-named-as-default-member": "error", + "import/no-unresolved": "error", + "import/order": "error" } } diff --git a/js/components/EqualizerWindow/index.test.js b/js/components/EqualizerWindow/index.test.js index 4a8986fe..5cca8001 100644 --- a/js/components/EqualizerWindow/index.test.js +++ b/js/components/EqualizerWindow/index.test.js @@ -1,3 +1,9 @@ +import React from "react"; +import { Provider } from "react-redux"; +import renderer from "react-test-renderer"; +import getStore from "../../store"; + +import EqualizerWindow from "./index"; const media = { addEventListener: jest.fn(), setVolume: jest.fn(), @@ -16,13 +22,6 @@ function createNodeMock(element) { return null; } -import React from "react"; -import { Provider } from "react-redux"; -import renderer from "react-test-renderer"; -import getStore from "../../store"; - -import EqualizerWindow from "./index"; - describe("EqualizerWindow", () => { let store; beforeEach(() => { diff --git a/js/components/MainWindow/index.test.js b/js/components/MainWindow/index.test.js index 061e1050..fbba4638 100644 --- a/js/components/MainWindow/index.test.js +++ b/js/components/MainWindow/index.test.js @@ -1,3 +1,10 @@ +import React from "react"; +import { Provider } from "react-redux"; +import renderer from "react-test-renderer"; +import getStore from "../../store"; + +import MainWindow from "./index"; + const media = { addEventListener: jest.fn(), setVolume: jest.fn(), @@ -16,13 +23,6 @@ function createNodeMock(element) { return null; } -import React from "react"; -import { Provider } from "react-redux"; -import renderer from "react-test-renderer"; -import getStore from "../../store"; - -import MainWindow from "./index"; - describe("MainWindow", () => { let store; beforeEach(() => { diff --git a/js/components/MiniTime.js b/js/components/MiniTime.js index 8e4f8308..08323ecf 100644 --- a/js/components/MiniTime.js +++ b/js/components/MiniTime.js @@ -2,9 +2,8 @@ import React from "react"; import { connect } from "react-redux"; import classnames from "classnames"; import { getTimeObj } from "../utils"; -import Character from "./Character"; - import { TOGGLE_TIME_MODE } from "../actionTypes"; +import Character from "./Character"; import "../../css/mini-time.css"; diff --git a/js/components/PlaylistWindow/MiscMenu.js b/js/components/PlaylistWindow/MiscMenu.js index 944ed2a7..8d6bef60 100644 --- a/js/components/PlaylistWindow/MiscMenu.js +++ b/js/components/PlaylistWindow/MiscMenu.js @@ -7,8 +7,8 @@ import { downloadHtmlPlaylist } from "../../actionCreators"; -import PlaylistMenu from "./PlaylistMenu"; import { ContextMenu, Hr, Node } from "../ContextMenu"; +import PlaylistMenu from "./PlaylistMenu"; /* eslint-disable no-alert */ /* TODO: This should really be kitty-corner to the upper right hand corner of the MiscMenu */ diff --git a/js/components/PlaylistWindow/PlaylistShade.js b/js/components/PlaylistWindow/PlaylistShade.js index bc020da2..166db5b3 100644 --- a/js/components/PlaylistWindow/PlaylistShade.js +++ b/js/components/PlaylistWindow/PlaylistShade.js @@ -1,6 +1,7 @@ import React from "react"; import { connect } from "react-redux"; import classnames from "classnames"; +import { getOrderedTracks, getMediaText } from "../../selectors"; import { getTimeStr } from "../../utils"; import { TOGGLE_PLAYLIST_WINDOW, @@ -18,8 +19,6 @@ import { import CharacterString from "../CharacterString"; import ResizeTarget from "./ResizeTarget"; -import { getOrderedTracks, getMediaText } from "../../selectors"; - class PlaylistShade extends React.Component { _addedWidth() { return this.props.playlistSize[0] * PLAYLIST_RESIZE_SEGMENT_WIDTH; diff --git a/js/components/PlaylistWindow/PlaylistShade.test.js b/js/components/PlaylistWindow/PlaylistShade.test.js index e7c87f57..fed94aa4 100644 --- a/js/components/PlaylistWindow/PlaylistShade.test.js +++ b/js/components/PlaylistWindow/PlaylistShade.test.js @@ -1,11 +1,3 @@ -const media = { - addEventListener: jest.fn(), - loadFromUrl: jest.fn(), - setVolume: jest.fn(), - setBalance: jest.fn(), - _analyser: null -}; - import React from "react"; import { Provider } from "react-redux"; import renderer from "react-test-renderer"; @@ -14,6 +6,14 @@ import { loadMediaFromUrl } from "../../actionCreators"; import PlaylistShade from "./PlaylistShade"; +const media = { + addEventListener: jest.fn(), + loadFromUrl: jest.fn(), + setVolume: jest.fn(), + setBalance: jest.fn(), + _analyser: null +}; + describe("PlaylistShade", () => { let store; beforeEach(() => { diff --git a/js/components/PlaylistWindow/index.test.js b/js/components/PlaylistWindow/index.test.js index 91f6af9a..8710c3e8 100644 --- a/js/components/PlaylistWindow/index.test.js +++ b/js/components/PlaylistWindow/index.test.js @@ -1,16 +1,15 @@ -const media = { - addEventListener: jest.fn(), - setVolume: jest.fn(), - setBalance: jest.fn(), - _analyser: null -}; - import React from "react"; import { Provider } from "react-redux"; import renderer from "react-test-renderer"; import getStore from "../../store"; import PlaylistWindow from "./index"; +const media = { + addEventListener: jest.fn(), + setVolume: jest.fn(), + setBalance: jest.fn(), + _analyser: null +}; describe("PlaylistWindow", () => { let store; diff --git a/js/index.js b/js/index.js index 578599f2..22881486 100644 --- a/js/index.js +++ b/js/index.js @@ -1,6 +1,5 @@ import "babel-polyfill"; -import Winamp from "./winamp"; -import Browser from "./browser"; +import Raven from "raven-js"; import base from "../skins/base-2.91.wsz"; import osx from "../skins/MacOSXAqua1-5.wsz"; import topaz from "../skins/TopazAmp1-2.wsz"; @@ -8,7 +7,8 @@ import visor from "../skins/Vizor1-01.wsz"; import xmms from "../skins/XMMS-Turquoise.wsz"; import zaxon from "../skins/ZaxonRemake1-0.wsz"; import green from "../skins/Green-Dimension-V2.wsz"; -import Raven from "raven-js"; +import Winamp from "./winamp"; +import Browser from "./browser"; import { hideAbout, diff --git a/js/reducers/index.test.js b/js/reducers/index.test.js index d449e82c..b3c338e9 100644 --- a/js/reducers/index.test.js +++ b/js/reducers/index.test.js @@ -1,5 +1,5 @@ -import { userInput } from "./"; import { SET_FOCUS, SET_SCRUB_POSITION, UNSET_FOCUS } from "../actionTypes"; +import { userInput } from "./"; describe("userInput reducer", () => { const state = userInput(undefined, { type: "@@INIT" }); diff --git a/js/reducers/playlist.test.js b/js/reducers/playlist.test.js index bff10718..f5387580 100644 --- a/js/reducers/playlist.test.js +++ b/js/reducers/playlist.test.js @@ -1,9 +1,9 @@ -import reducer from "./playlist"; import { SHIFT_CLICKED_TRACK, CLICKED_TRACK, CTRL_CLICKED_TRACK } from "../actionTypes"; +import reducer from "./playlist"; describe("playlist reducer", () => { it("can handle clicking a track", () => { diff --git a/js/selectors.js b/js/selectors.js index 43fc235d..5a45f07b 100644 --- a/js/selectors.js +++ b/js/selectors.js @@ -1,3 +1,4 @@ +import { createSelector } from "reselect"; import { denormalize, getTimeStr, clamp, percentToIndex } from "./utils"; import { BANDS, @@ -5,7 +6,6 @@ import { TRACK_HEIGHT } from "./constants"; import { createPlaylistURL } from "./playlistHtml"; -import { createSelector } from "reselect"; import * as fromPlaylist from "./reducers/playlist"; export const getEqfData = state => { diff --git a/js/skinParser.js b/js/skinParser.js index 0151284a..d2f10bf7 100644 --- a/js/skinParser.js +++ b/js/skinParser.js @@ -1,5 +1,5 @@ -import SKIN_SPRITES from "./skinSprites"; import JSZip from "../node_modules/jszip/dist/jszip"; // Hack +import SKIN_SPRITES from "./skinSprites"; import regionParser from "./regionParser"; import { parseViscolors, parseIni } from "./utils"; diff --git a/js/store.js b/js/store.js index cd7d4fef..2dd30ea2 100644 --- a/js/store.js +++ b/js/store.js @@ -1,7 +1,7 @@ import { createStore, applyMiddleware } from "redux"; -import reducer from "./reducers"; import thunk from "redux-thunk"; import { composeWithDevTools } from "redux-devtools-extension"; +import reducer from "./reducers"; import mediaMiddleware from "./mediaMiddleware"; import analyticsMiddleware from "./analyticsMiddleware"; import { merge } from "./utils"; diff --git a/webpack.production.config.js b/webpack.production.config.js index a6ee7f2a..b818ad2d 100644 --- a/webpack.production.config.js +++ b/webpack.production.config.js @@ -1,5 +1,5 @@ -const config = require("./webpack.config"); const webpack = require("webpack"); +const config = require("./webpack.config"); const cdnUrl = process.env.CDN_URL || "/";