From cc51131515f2dd3708696e4bc43002cce0aac4fe Mon Sep 17 00:00:00 2001 From: Leon Chen Date: Sat, 24 Sep 2016 15:16:10 -0400 Subject: [PATCH] use webpack 2 --- demos/webpack.dev.config.js | 11 +++++--- demos/webpack.prod.config.js | 11 +++++--- package.json | 50 ++++++++++++++++++------------------ webpack.dev.config.js | 2 +- webpack.prod.config.js | 2 +- 5 files changed, 41 insertions(+), 35 deletions(-) diff --git a/demos/webpack.dev.config.js b/demos/webpack.dev.config.js index 1cd210f..4d69e31 100644 --- a/demos/webpack.dev.config.js +++ b/demos/webpack.dev.config.js @@ -24,13 +24,16 @@ module.exports = { } ] }, - postcss: [ - autoprefixer({ browsers: ['last 2 versions'] }) - ], resolve: { - extensions: ['', '.js'] + extensions: ['.js'] }, plugins: [ + new webpack.LoaderOptionsPlugin({ + options: { + context: __dirname, + postcss: [autoprefixer] + } + }), new webpack.DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify('development') }) diff --git a/demos/webpack.prod.config.js b/demos/webpack.prod.config.js index 56e5fc9..9fa3f46 100644 --- a/demos/webpack.prod.config.js +++ b/demos/webpack.prod.config.js @@ -23,13 +23,16 @@ module.exports = { } ] }, - postcss: [ - autoprefixer({ browsers: ['last 2 versions'] }) - ], resolve: { - extensions: ['', '.js'] + extensions: ['.js'] }, plugins: [ + new webpack.LoaderOptionsPlugin({ + options: { + context: __dirname, + postcss: [autoprefixer] + } + }), new webpack.DefinePlugin({ 'process.env': { NODE_ENV: JSON.stringify('production') diff --git a/package.json b/package.json index e9665fd..2b20712 100644 --- a/package.json +++ b/package.json @@ -34,33 +34,33 @@ }, "homepage": "https://github.com/transcranial/keras-js#readme", "dependencies": { - "cwise": "1.0.9", - "lodash": "4.16.1", - "ndarray": "1.0.18", - "ndarray-blas-level2": "1.1.0", - "ndarray-concat-rows": "1.0.1", - "ndarray-gemm": "1.0.0", - "ndarray-ops": "1.2.2", - "ndarray-squeeze": "1.0.2", - "ndarray-tile": "1.0.3", - "ndarray-unpack": "1.0.0", - "ndarray-unsqueeze": "1.0.3" + "cwise": "^1.0.9", + "lodash": "^4.16.1", + "ndarray": "^1.0.18", + "ndarray-blas-level2": "^1.1.0", + "ndarray-concat-rows": "^1.0.1", + "ndarray-gemm": "^1.0.0", + "ndarray-ops": "^1.2.2", + "ndarray-squeeze": "^1.0.2", + "ndarray-tile": "^1.0.3", + "ndarray-unpack": "^1.0.0", + "ndarray-unsqueeze": "^1.0.3" }, "devDependencies": { - "autoprefixer": "6.4.1", - "babel-core": "6.14.0", - "babel-eslint": "6.1.2", - "babel-loader": "6.2.5", - "babel-plugin-transform-class-properties": "6.11.5", - "babel-plugin-transform-object-rest-spread": "6.8.0", - "babel-polyfill": "6.13.0", - "babel-preset-latest": "6.14.0", - "css-loader": "0.25.0", - "http-server": "0.9.0", - "postcss-loader": "0.13.0", - "standard": "8.1.0", - "style-loader": "0.13.1", - "webpack": "1.13.2" + "autoprefixer": "^6.4.1", + "babel-core": "^6.14.0", + "babel-eslint": "^6.1.2", + "babel-loader": "^6.2.5", + "babel-plugin-transform-class-properties": "^6.11.5", + "babel-plugin-transform-object-rest-spread": "^6.8.0", + "babel-polyfill": "^6.13.0", + "babel-preset-latest": "^6.14.0", + "css-loader": "^0.25.0", + "http-server": "^0.9.0", + "postcss-loader": "^0.13.0", + "standard": "^8.1.0", + "style-loader": "^0.13.1", + "webpack": "^2.1.0-beta.25" }, "standard": { "parser": "babel-eslint", diff --git a/webpack.dev.config.js b/webpack.dev.config.js index 4d61f57..afca668 100644 --- a/webpack.dev.config.js +++ b/webpack.dev.config.js @@ -23,7 +23,7 @@ module.exports = { ] }, resolve: { - extensions: ['', '.js'] + extensions: ['.js'] }, plugins: [ new webpack.DefinePlugin({ diff --git a/webpack.prod.config.js b/webpack.prod.config.js index c5c0932..2b560c2 100644 --- a/webpack.prod.config.js +++ b/webpack.prod.config.js @@ -22,7 +22,7 @@ module.exports = { ] }, resolve: { - extensions: ['', '.js'] + extensions: ['.js'] }, plugins: [ new webpack.DefinePlugin({