diff --git a/.eslintrc b/.eslintrc index 27bc446..2336b10 100644 --- a/.eslintrc +++ b/.eslintrc @@ -14,12 +14,6 @@ "strict": [ 2, "never" - ], - "react/jsx-uses-react": 2, - "react/jsx-uses-vars": 2, - "react/react-in-jsx-scope": 2 - }, - "plugins": [ - "react" - ] + ] + } } diff --git a/package.json b/package.json index c9b890d..c1d993a 100644 --- a/package.json +++ b/package.json @@ -28,18 +28,15 @@ "babel-eslint": "^4.1.3", "babel-loader": "^6.0.1", "babel-preset-es2015": "^6.0.15", - "babel-preset-react": "^6.0.15", "babel-preset-stage-0": "^6.0.15", "css-loader": "^0.23.1", "eslint": "^1.10.3", - "eslint-plugin-react": "^3.6.2", "file-loader": "^0.9.0", "html-loader": "^0.4.3", "html-webpack-plugin": "^2.15.0", "json-loader": "^0.5.4", "ng-annotate-webpack-plugin": "^0.1.3", "node-sass": "^3.8.0", - "react-hot-loader": "^1.3.0", "sass-loader": "^4.0.0", "style-loader": "^0.13.0", "uglify-loader": "^1.3.0", diff --git a/webpack.config.js b/webpack.config.js index b9267b2..dc16cef 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -26,6 +26,17 @@ const commonConfig = { ], module: { loaders: [ + { + test: /\.js$/, + loader: 'babel', + exclude: [/node_modules/], + include: path.join(__dirname, 'src'), + query: { + // https://github.com/babel/babel-loader#options + cacheDirectory: true, + presets: ['es2015'] + } + }, { test: /\.json$/, loader: 'json' }, { @@ -71,21 +82,7 @@ switch (TARGET) { } }) - ], - // without react-hot in prod - module: { - loaders: [ - { - test: /\.js$/, exclude: [/node_modules/], - loader: 'babel', - query: { - // https://github.com/babel/babel-loader#options - cacheDirectory: true, - presets: ['es2015'] - } - } - ] - } + ] }); break; default: @@ -97,16 +94,7 @@ switch (TARGET) { new webpack.DefinePlugin({ DEVELOPMENT: JSON.stringify(true) }) - ], - module: { - loaders: [ - { - test: /\.js$/, - loaders: ['babel'], - include: path.join(__dirname, 'src') - }, - ] - } + ] }); // replace entry instead of merge