diff --git a/.babelrc b/.babelrc index a7a75085a..38b247ae1 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,5 @@ { - "presets": ["@babel/env", "@babel/react", "stage-2"], + "presets": ["@babel/preset-env", "@babel/preset-react", "stage-2"], "plugins": [ "@babel/plugin-transform-runtime", "react-hot-loader/babel", diff --git a/.eslintrc b/.eslintrc index a3a7c1ee4..cf1d520c4 100644 --- a/.eslintrc +++ b/.eslintrc @@ -68,6 +68,9 @@ "babel/object-curly-spacing": 0 }, "env": { - "jest/globals": true + "es6": true, + "jest": true, + "browser": true, + "node": true } } diff --git a/package.json b/package.json index 48a416e9c..ba8c3e79d 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,7 @@ "precommit": "lint-staged" }, "lint-staged": { - "*.{js,json,css,md}": ["prettier --write --single-quote", "git add"], - "*.{jsx, js}": [ + "*.{js,jsx,json,css,md}": [ "prettier --write --single-quote", "eslint --fix", "git add" @@ -69,6 +68,7 @@ "eslint-plugin-prettier": "2.6.0", "eslint-plugin-react": "7.7.0", "eslint-watch": "3.1.4", + "file-loader": "^1.1.11", "html-webpack-plugin": "3.2.0", "husky": "0.14.3", "identity-obj-proxy": "3.0.0", diff --git a/webpack.config.js b/webpack.config.js index 5150db767..9c44b8bbd 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -19,6 +19,22 @@ module.exports = { test: /\.css$/, use: ['style-loader', 'css-loader'], }, + { + test: /\.(png|jpg|gif|svg)$/, + use: [ + { + loader: 'file-loader', + }, + ], + }, + { + test: /\.(woff2|ttf|woff|eot)$/, + use: [ + { + loader: 'file-loader', + }, + ], + }, ], }, resolve: { @@ -29,6 +45,7 @@ module.exports = { filename: 'bundle.js', }, plugins: [ + new webpack.ProgressPlugin(), new HtmlWebpackPlugin({ filename: 'index.html', template: `${__dirname}/src/template.html`,