From 1f4f688bc429a604e3a1c712c6512aa600711438 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Mon, 29 Aug 2016 07:35:47 +0300 Subject: [PATCH] Update webpack configs --- build/webpack.dev.js | 2 +- build/webpack.prod.js | 13 ++++++------- build/webpack.test.js | 7 +++++-- package.json | 3 ++- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/build/webpack.dev.js b/build/webpack.dev.js index bdd0deb4..3f687a21 100644 --- a/build/webpack.dev.js +++ b/build/webpack.dev.js @@ -26,7 +26,7 @@ module.exports = { } }, externals: { - "jquery": "jQuery" + "jquery": "jQuery" }, node: { fs: "empty" diff --git a/build/webpack.prod.js b/build/webpack.prod.js index 6943e7d1..edcaf3b2 100644 --- a/build/webpack.prod.js +++ b/build/webpack.prod.js @@ -7,7 +7,6 @@ const CopyWebpackPlugin = require('copy-webpack-plugin'); module.exports = { context: root(), - debug: false, devtool: 'cheap-module-source-map', resolve: { @@ -24,7 +23,7 @@ module.exports = { } }, externals: { - "jquery": "jQuery" + "jquery": "jQuery" }, node: { fs: "empty" @@ -43,10 +42,10 @@ module.exports = { }, module: { - // preLoaders: [{ - // test: /\.js$/, - // loader: 'source-map' - // // }, + preLoaders: [{ + test: /\.js$/, + loader: 'source-map' + }], loaders: [{ test: /\.ts$/, loader: 'awesome-typescript-loader', @@ -71,7 +70,7 @@ module.exports = { output: { comments: false }, - sourceMap: false + sourceMap: true }), new webpack.DefinePlugin({ diff --git a/build/webpack.test.js b/build/webpack.test.js index 9cea6f9e..5afb43ef 100644 --- a/build/webpack.test.js +++ b/build/webpack.test.js @@ -8,7 +8,6 @@ const VERSION = JSON.stringify(require('../package.json').version); module.exports = { //context: root(), devtool: 'inline-source-map', - debug: true, resolve: { extensions: ['', '.ts', '.js', '.json', '.css', '.scss', '.html'], root: root('lib'), @@ -24,7 +23,7 @@ module.exports = { } }, externals: { - "jquery": "jQuery" + "jquery": "jQuery" }, node: { fs: "empty" @@ -38,6 +37,10 @@ module.exports = { }, module: { + preLoaders: [{ + test: /\.js$/, + loader: 'source-map' + }], loaders: [ { test: /\.ts$/, loaders: [ diff --git a/package.json b/package.json index b31f515e..b519334e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "e2e": "npm run build:prod && npm run e2e-copy && npm run webdriver && protractor", "deploy": "node ./build/prepare_deploy.js && deploy-to-gh-pages --update demo", "ngc": "ngc -p .", - "webpack:prod": "webpack --config build/webpack.prod.js --progress --profile --bail", + "webpack:prod": "webpack --config build/webpack.prod.js --profile --bail", "build:sass": "node-sass -o lib lib", "build:prod": "npm run build:sass && npm run ngc && npm run webpack:prod", "build-dist": "npm run build:prod", @@ -74,6 +74,7 @@ "shelljs": "^0.7.0", "should": "^9.0.2", "sinon": "^1.17.2", + "source-map-loader": "^0.1.5", "style-loader": "^0.13.1", "ts-helpers": "^1.1.1", "tslint": "^3.15.0-dev.0",