From 8dce934f62f7f5f2dc2231487d05727e4fee73a9 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Fri, 13 Jan 2017 20:59:11 -0800 Subject: [PATCH] Autoload jsx files --- js/__tests__/Band-test.js | 2 +- js/__tests__/EqGraph-test.js | 2 +- js/__tests__/Marquee-test.js | 2 +- js/components/CharacterString.jsx | 2 +- js/components/EqualizerWindow.jsx | 8 +++---- js/components/Kbps.jsx | 2 +- js/components/Khz.jsx | 2 +- js/components/MainWindow.jsx | 40 +++++++++++++++---------------- js/components/Marquee.jsx | 2 +- js/components/ShadeTime.jsx | 2 +- js/index.js | 10 ++++---- webpack.config.js | 3 +++ 12 files changed, 40 insertions(+), 37 deletions(-) diff --git a/js/__tests__/Band-test.js b/js/__tests__/Band-test.js index 17a687f2..b4872ebc 100644 --- a/js/__tests__/Band-test.js +++ b/js/__tests__/Band-test.js @@ -1,7 +1,7 @@ import { spriteNumber, spriteOffsets -} from '../components/Band.jsx'; +} from '../components/Band'; describe('spriteNumber', () => { it('gives the first sprite', () => { diff --git a/js/__tests__/EqGraph-test.js b/js/__tests__/EqGraph-test.js index 5c79106f..74cf29d9 100644 --- a/js/__tests__/EqGraph-test.js +++ b/js/__tests__/EqGraph-test.js @@ -1,6 +1,6 @@ import { roundToEven -} from '../components/EqGraph.jsx'; +} from '../components/EqGraph'; describe('roundToEven', () => { it('leaves even numbers as is', () => { diff --git a/js/__tests__/Marquee-test.js b/js/__tests__/Marquee-test.js index 0cc9bab2..5e2c567f 100644 --- a/js/__tests__/Marquee-test.js +++ b/js/__tests__/Marquee-test.js @@ -7,7 +7,7 @@ import { stepOffset, negativePixels, loopText -} from '../components/Marquee.jsx'; +} from '../components/Marquee'; describe('getBalanceText', () => { it('treats negative numbers as left', () => { diff --git a/js/components/CharacterString.jsx b/js/components/CharacterString.jsx index 9419d762..1f99245f 100644 --- a/js/components/CharacterString.jsx +++ b/js/components/CharacterString.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import Character from './Character.jsx'; +import Character from './Character'; module.exports = (props) => { const text = `${props.children}`; diff --git a/js/components/EqualizerWindow.jsx b/js/components/EqualizerWindow.jsx index 76566542..c76dbfdb 100644 --- a/js/components/EqualizerWindow.jsx +++ b/js/components/EqualizerWindow.jsx @@ -15,10 +15,10 @@ import { SET_FOCUSED_WINDOW } from '../actionTypes'; -import Band from './Band.jsx'; -import EqOn from './EqOn.jsx'; -import EqAuto from './EqAuto.jsx'; -import EqGraph from './EqGraph.jsx'; +import Band from './Band'; +import EqOn from './EqOn'; +import EqAuto from './EqAuto'; +import EqGraph from './EqGraph'; import '../../css/equalizer-window.css'; diff --git a/js/components/Kbps.jsx b/js/components/Kbps.jsx index 30f332f0..79fb425b 100644 --- a/js/components/Kbps.jsx +++ b/js/components/Kbps.jsx @@ -1,7 +1,7 @@ import React from 'react'; import {connect} from 'react-redux'; -import CharacterString from './CharacterString.jsx'; +import CharacterString from './CharacterString'; const Kbps = (props) => diff --git a/js/components/Khz.jsx b/js/components/Khz.jsx index d1249c9e..3a94f84c 100644 --- a/js/components/Khz.jsx +++ b/js/components/Khz.jsx @@ -1,7 +1,7 @@ import React from 'react'; import {connect} from 'react-redux'; -import CharacterString from './CharacterString.jsx'; +import CharacterString from './CharacterString'; const Khz = (props) => diff --git a/js/components/MainWindow.jsx b/js/components/MainWindow.jsx index e745d118..def8da7d 100644 --- a/js/components/MainWindow.jsx +++ b/js/components/MainWindow.jsx @@ -4,26 +4,26 @@ import classnames from 'classnames'; import {WINDOWS} from '../constants'; -import ActionButtons from './ActionButtons.jsx'; -import Balance from './Balance.jsx'; -import Close from './Close.jsx'; -import ClutterBar from './ClutterBar.jsx'; -import ContextMenu from './ContextMenu.jsx'; -//import DragTarget from './DragTarget.jsx'; -import Eject from './Eject.jsx'; -import EqToggleButton from './EqToggleButton.jsx'; -import Kbps from './Kbps.jsx'; -import Khz from './Khz.jsx'; -import Marquee from './Marquee.jsx'; -import MonoStereo from './MonoStereo.jsx'; -import Position from './Position.jsx'; -import Repeat from './Repeat.jsx'; -import Shade from './Shade.jsx'; -import ShadeTime from './ShadeTime.jsx'; -import Shuffle from './Shuffle.jsx'; -import Time from './Time.jsx'; -import Visualizer from './Visualizer.jsx'; -import Volume from './Volume.jsx'; +import ActionButtons from './ActionButtons'; +import Balance from './Balance'; +import Close from './Close'; +import ClutterBar from './ClutterBar'; +import ContextMenu from './ContextMenu'; +//import DragTarget from './DragTarget'; +import Eject from './Eject'; +import EqToggleButton from './EqToggleButton'; +import Kbps from './Kbps'; +import Khz from './Khz'; +import Marquee from './Marquee'; +import MonoStereo from './MonoStereo'; +import Position from './Position'; +import Repeat from './Repeat'; +import Shade from './Shade'; +import ShadeTime from './ShadeTime'; +import Shuffle from './Shuffle'; +import Time from './Time'; +import Visualizer from './Visualizer'; +import Volume from './Volume'; import { SET_FOCUSED_WINDOW diff --git a/js/components/Marquee.jsx b/js/components/Marquee.jsx index 9850df0c..52c4abc0 100644 --- a/js/components/Marquee.jsx +++ b/js/components/Marquee.jsx @@ -41,7 +41,7 @@ const negativePixels = (pixels) => `-${pixels}px`; // If text is wider than the marquee, it needs to loop const loopText = (text) => isLong(text) ? text + text : text; -import CharacterString from './CharacterString.jsx'; +import CharacterString from './CharacterString'; class Marquee extends React.Component { constructor(props) { diff --git a/js/components/ShadeTime.jsx b/js/components/ShadeTime.jsx index b7559ac5..d73604b8 100644 --- a/js/components/ShadeTime.jsx +++ b/js/components/ShadeTime.jsx @@ -1,7 +1,7 @@ import React from 'react'; import {connect} from 'react-redux'; import {getTimeObj} from '../utils'; -import Character from './Character.jsx'; +import Character from './Character'; import {TOGGLE_TIME_MODE} from '../actionTypes'; diff --git a/js/index.js b/js/index.js index f21d4566..38f6c1b9 100644 --- a/js/index.js +++ b/js/index.js @@ -3,14 +3,14 @@ import {render} from 'react-dom'; import {Provider} from 'react-redux'; import getStore from './store'; -import WindowManager from './components/WindowManager.jsx'; +import WindowManager from './components/WindowManager'; import Browser from './browser'; -import MainWindow from './components/MainWindow.jsx'; -import PlaylistWindow from './components/PlaylistWindow.jsx'; -import EqualizerWindow from './components/EqualizerWindow.jsx'; +import MainWindow from './components/MainWindow'; +import PlaylistWindow from './components/PlaylistWindow'; +import EqualizerWindow from './components/EqualizerWindow'; import Winamp from './winamp'; import Hotkeys from './hotkeys'; -import Skin from './components/Skin.jsx'; +import Skin from './components/Skin'; if (new Browser(window).isCompatible) { const hash = window.location.hash; diff --git a/webpack.config.js b/webpack.config.js index add904ef..bad07973 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,6 +1,9 @@ const path = require('path'); module.exports = { + resolve: { + extensions: ['', '.js', '.jsx'] + }, module: { loaders: [ {