diff --git a/app/static/app/bundles/.gitignore b/app/static/app/bundles/.gitignore
deleted file mode 100644
index f59ec20a..00000000
--- a/app/static/app/bundles/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*
\ No newline at end of file
diff --git a/app/templates/app/base.html b/app/templates/app/base.html
index 32141bf4..d7ece283 100644
--- a/app/templates/app/base.html
+++ b/app/templates/app/base.html
@@ -22,7 +22,7 @@
{% block extra-headers %}{% endblock %}
-
+
diff --git a/package.json b/package.json
index a217f977..6008b1d1 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
"babel-preset-react": "^6.16.0",
"css-loader": "^0.25.0",
"d3": "^3.5.5",
- "extract-text-webpack-plugin": "^1.0.1",
+ "extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^0.9.0",
"gl-matrix": "^2.3.2",
"immutability-helper": "^2.0.0",
@@ -50,7 +50,7 @@
"style-loader": "^0.13.1",
"tween.js": "^16.6.0",
"url-loader": "^0.5.7",
- "webpack": "^1.15.0",
+ "webpack": "^3.3.0",
"webpack-bundle-tracker": "0.0.93",
"webpack-dev-server": "^1.16.5",
"webpack-livereload-plugin": "^0.9.0"
diff --git a/webpack.config.js b/webpack.config.js
index 72299814..e64b178a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -34,23 +34,29 @@ module.exports = {
],
module: {
- loaders: [
+ rules: [
{
test: /\.jsx?$/,
exclude: /(node_modules|bower_components)/,
- loader: 'babel-loader',
- query: {
- "plugins": [
- 'syntax-class-properties',
- 'transform-class-properties'
- // 'react-hot-loader/babel'
- ],
- presets: ['es2015', 'react']
- }
+ use: [
+ {
+ loader: 'babel-loader',
+ query: {
+ "plugins": [
+ 'syntax-class-properties',
+ 'transform-class-properties'
+ // 'react-hot-loader/babel'
+ ],
+ presets: ['es2015', 'react']
+ }
+ }
+ ],
},
{
test: /\.s?css$/,
- loader: ExtractTextPlugin.extract('css!sass')
+ use: ExtractTextPlugin.extract({
+ use: 'css-loader!sass-loader'
+ })
},
{
test: /\.(png|jpg|jpeg|svg)/,
@@ -65,8 +71,8 @@ module.exports = {
},
resolve: {
- modulesDirectories: ['node_modules', 'bower_components'],
- extensions: ['', '.js', '.jsx']
+ modules: ['node_modules', 'bower_components'],
+ extensions: ['.js', '.jsx']
},
externals: {