From a91404ca36a1eaaf513d5039703ebf99f7bb6f64 Mon Sep 17 00:00:00 2001 From: Henning Jacobs Date: Thu, 11 May 2017 22:47:16 +0200 Subject: [PATCH] Bump JS versions (#140) * bump JS library versions * enable debug for webpack loaders again --- app/package.json | 10 +++++----- app/webpack.config.js | 21 +++++++++------------ 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/app/package.json b/app/package.json index 422d411..489e36b 100644 --- a/app/package.json +++ b/app/package.json @@ -26,13 +26,13 @@ }, "homepage": "https://github.com/hjacobs/kube-ops-view#readme", "dependencies": { - "pixi.js": "^4.3.2", - "babel-runtime": "^6.20.0", - "babel-polyfill": "^6.20.0" + "pixi.js": "^4.5.1", + "babel-runtime": "^6.23.0", + "babel-polyfill": "^6.23.0" }, "devDependencies": { "babel-core": "^6.21.0", - "babel-loader": "^6.2.10", + "babel-loader": "^7.0.0", "babel-preset-es2015": "^6.18.0", "babel-plugin-transform-runtime": "^6.15.0", "brfs": "^1.4.3", @@ -40,6 +40,6 @@ "eslint-loader": "^1.6.1", "rimraf": "^2.5.4", "transform-loader": "^0.2.3", - "webpack": "^1.14.0" + "webpack": "^2.5.1" } } diff --git a/app/webpack.config.js b/app/webpack.config.js index 915284c..b4c5d56 100644 --- a/app/webpack.config.js +++ b/app/webpack.config.js @@ -9,7 +9,6 @@ var path = require('path'), module.exports = { context: path.join(__dirname, './'), entry: entry, - debug: DEBUG, target: 'web', devtool: DEBUG ? 'inline-source-map' : false, output: { @@ -22,23 +21,21 @@ module.exports = { fs: 'empty' }, plugins: [ - new webpack.HotModuleReplacementPlugin() + new webpack.HotModuleReplacementPlugin(), + new webpack.LoaderOptionsPlugin({ + debug: DEBUG + }) ], module: { - preLoaders: [ - {test: /\.js$/, loader: 'eslint-loader', exclude: /node_modules/} - ], - loaders: [ + rules: [ + {enforce: 'pre', test: /\.js$/, loader: 'eslint-loader', exclude: /node_modules/}, {test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader', query: {plugins: ['transform-runtime'], presets: ['es2015']}}, {test: /\.html$/, exclude: /node_modules/, loader: 'file-loader?name=[path][name].[ext]'}, {test: /\.jpe?g$|\.svg$|\.png$/, exclude: /node_modules/, loader: 'file-loader?name=[path][name].[ext]'}, {test: /\.json$/, exclude: /node_modules/, loader: 'json'}, {test: /\.(otf|eot|svg|ttf|woff|woff2)(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=8192&mimetype=application/font-woff'}, - {test: /\.json$/, include: path.join(__dirname, 'node_modules', 'pixi.js'), loader: 'json'} - ], - postLoaders: [{ - include: path.resolve(__dirname, 'node_modules/pixi.js'), - loader: 'transform?brfs' - }] + {test: /\.json$/, include: path.join(__dirname, 'node_modules', 'pixi.js'), loader: 'json'}, + {enforce: 'post', include: path.resolve(__dirname, 'node_modules/pixi.js'), loader: 'transform-loader?brfs'} + ] } }