diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 3c45d73..0000000 --- a/.babelrc +++ /dev/null @@ -1,7 +0,0 @@ -{ - "presets": [ - "es2015", - "react", - "stage-0" - ] -} diff --git a/config/webpack/webpack.test.config.js b/config/webpack/webpack.test.config.js index cbfec08..f98d299 100644 --- a/config/webpack/webpack.test.config.js +++ b/config/webpack/webpack.test.config.js @@ -6,7 +6,7 @@ module.exports = { libraryTarget: 'commonjs2', }, resolve: { - extensions: ['', '.js', '.jsx'], + extensions: ['', '.js', '.jsx', '.json'], alias: { components: path.resolve(ROOT_PATH, 'app/src/components'), containers: path.resolve(ROOT_PATH, 'app/src/containers'), diff --git a/package.json b/package.json index bf88f18..5dc4059 100644 --- a/package.json +++ b/package.json @@ -11,19 +11,19 @@ ], "plugins": [ "babel-plugin-webpack-alias" - ], - "env": { - "test": { - "plugins": [ - [ - "babel-plugin-webpack-loaders", { - "config": "./config/testing/webpack.test.config.js", - "verbose": false - } - ], - ["transform-es2015-modules-commonjs"] - ] - } + ] + }, + "env": { + "test": { + "plugins": [ + [ + "babel-plugin-webpack-loaders", { + "config": "./config/testing/webpack.test.config.js", + "verbose": false + } + ], + ["transform-es2015-modules-commonjs"] + ] } }, "jest": { diff --git a/server.js b/server.js index 29510c0..64a16a0 100644 --- a/server.js +++ b/server.js @@ -1,3 +1,4 @@ +/* eslint-disable */ require('babel-core/register'); require('./config/webpack/ignoreAssets'); var app = require('./server/app'); diff --git a/server/app.js b/server/app.js index bfd7910..59d528b 100644 --- a/server/app.js +++ b/server/app.js @@ -56,9 +56,9 @@ app.use((req, res) => { const html = ( ); diff --git a/server/utils/Html.js b/server/utils/Html.js index 60b0cca..80a6f25 100644 --- a/server/utils/Html.js +++ b/server/utils/Html.js @@ -9,12 +9,12 @@ function Html({ content, state, scriptHash, vendorHash, cssHash }) { Scalable React Boilerplate - +
-