From 27f4019ce52dcd80a190d8c706d25ca0fbd5439c Mon Sep 17 00:00:00 2001 From: Sean Larkin Date: Wed, 17 Aug 2016 12:08:16 -0500 Subject: [PATCH 1/4] Revert changes where sourcemaps were not ignored in dev, instead ignoring them across the board --- addon/ng2/models/webpack-build-common.ts | 10 ++++++++++ addon/ng2/models/webpack-build-development.ts | 9 --------- addon/ng2/models/webpack-build-production.ts | 11 ----------- addon/ng2/models/webpack-build-utils.ts | 3 +-- addon/ng2/tasks/serve-webpack.ts | 9 +++++++++ 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/addon/ng2/models/webpack-build-common.ts b/addon/ng2/models/webpack-build-common.ts index 2e888f72b429..26e1ba73171d 100644 --- a/addon/ng2/models/webpack-build-common.ts +++ b/addon/ng2/models/webpack-build-common.ts @@ -7,6 +7,7 @@ import { CliConfig } from './config'; export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) { return { + bail: true, devtool: 'source-map', resolve: { extensions: ['', '.ts', '.js'], @@ -22,6 +23,15 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) { filename: '[name].bundle.js' }, module: { + preLoaders: [ + { + test: /\.js$/, + loader: 'source-map-loader', + exclude: [ + /node_modules/ + ] + } + ], loaders: [ { test: /\.ts$/, diff --git a/addon/ng2/models/webpack-build-development.ts b/addon/ng2/models/webpack-build-development.ts index 15feea54287b..001d45dd705e 100644 --- a/addon/ng2/models/webpack-build-development.ts +++ b/addon/ng2/models/webpack-build-development.ts @@ -3,7 +3,6 @@ const path = require('path') export const getWebpackDevConfigPartial = function(projectRoot: string, sourceDir: string) { return { - debug: true, devtool: 'source-map', output: { path: path.resolve(projectRoot, './dist'), @@ -11,14 +10,6 @@ export const getWebpackDevConfigPartial = function(projectRoot: string, sourceDi sourceMapFilename: '[name].map', chunkFilename: '[id].chunk.js' }, - module: { - preLoaders: [ - { - test: /\.js$/, - loader: 'source-map-loader' - } - ] - }, tslint: { emitErrors: false, failOnHint: false, diff --git a/addon/ng2/models/webpack-build-production.ts b/addon/ng2/models/webpack-build-production.ts index ba7b1ef4fcb6..9866b7add430 100644 --- a/addon/ng2/models/webpack-build-production.ts +++ b/addon/ng2/models/webpack-build-production.ts @@ -15,17 +15,6 @@ export const getWebpackProdConfigPartial = function(projectRoot: string, sourceD sourceMapFilename: '[name].[chunkhash].bundle.map', chunkFilename: '[id].[chunkhash].chunk.js' }, - module: { - preLoaders: [ - { - test: /\.js$/, - loader: 'source-map-loader', - exclude: [ - /node_modules/ // don't pull in vendor sourcemaps for production builds, increased speed for build - ] - } - ] - }, plugins: [ new WebpackMd5Hash(), new webpack.optimize.DedupePlugin(), diff --git a/addon/ng2/models/webpack-build-utils.ts b/addon/ng2/models/webpack-build-utils.ts index 579ee34662cd..dcaa15558593 100644 --- a/addon/ng2/models/webpack-build-utils.ts +++ b/addon/ng2/models/webpack-build-utils.ts @@ -19,6 +19,5 @@ export const webpackDevServerOutputOptions = { hash: true, timings: true, chunks: false, - chunkModules: false, - warnings: false + chunkModules: false } diff --git a/addon/ng2/tasks/serve-webpack.ts b/addon/ng2/tasks/serve-webpack.ts index 60589e48c011..b2b087449a5b 100644 --- a/addon/ng2/tasks/serve-webpack.ts +++ b/addon/ng2/tasks/serve-webpack.ts @@ -8,6 +8,11 @@ import { webpackDevServerOutputOptions } from '../models/'; import { NgCliWebpackConfig } from '../models/webpack-config'; import { ServeTaskOptions } from '../commands/serve'; import { CliConfig } from '../models/config'; +var heapdump = require('heapdump'); + +heapdump.writeSnapshot(Date.now() + '-initial.heapsnapshot', function(err, filename) { + console.log('HEAPSHOT DUMP!!!!!', filename); +}); module.exports = Task.extend({ run: function(commandOptions: ServeTaskOptions) { @@ -38,6 +43,10 @@ module.exports = Task.extend({ return new Promise((resolve, reject) => { server.listen(commandOptions.port, `${commandOptions.host}`, function(err, stats) { + heapdump.writeSnapshot(Date.now() + '.heapsnapshot', function(err, filename) { + console.log('HEAPSHOT DUMP!!!!!', filename); + }); + if(err) { lastHash = null; console.error(err.stack || err); From 5f72a453d97fd5c5499d4b5ca53385b9413b0c59 Mon Sep 17 00:00:00 2001 From: Sean Larkin Date: Wed, 17 Aug 2016 12:09:14 -0500 Subject: [PATCH 2/4] Revert changes where sourcemaps were not ignored in dev, instead ignoring them across the board --- addon/ng2/models/webpack-build-common.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/addon/ng2/models/webpack-build-common.ts b/addon/ng2/models/webpack-build-common.ts index 26e1ba73171d..923ed3857a88 100644 --- a/addon/ng2/models/webpack-build-common.ts +++ b/addon/ng2/models/webpack-build-common.ts @@ -7,7 +7,6 @@ import { CliConfig } from './config'; export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) { return { - bail: true, devtool: 'source-map', resolve: { extensions: ['', '.ts', '.js'], From c4dd6965db0fa5213326c06b5360ca27f61fed44 Mon Sep 17 00:00:00 2001 From: Sean Larkin Date: Wed, 17 Aug 2016 12:10:24 -0500 Subject: [PATCH 3/4] Revert changes where sourcemaps were not ignored in dev, instead ignoring them across the board --- addon/ng2/tasks/serve-webpack.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/addon/ng2/tasks/serve-webpack.ts b/addon/ng2/tasks/serve-webpack.ts index b2b087449a5b..a8c7af0db7a7 100644 --- a/addon/ng2/tasks/serve-webpack.ts +++ b/addon/ng2/tasks/serve-webpack.ts @@ -8,11 +8,6 @@ import { webpackDevServerOutputOptions } from '../models/'; import { NgCliWebpackConfig } from '../models/webpack-config'; import { ServeTaskOptions } from '../commands/serve'; import { CliConfig } from '../models/config'; -var heapdump = require('heapdump'); - -heapdump.writeSnapshot(Date.now() + '-initial.heapsnapshot', function(err, filename) { - console.log('HEAPSHOT DUMP!!!!!', filename); -}); module.exports = Task.extend({ run: function(commandOptions: ServeTaskOptions) { @@ -43,9 +38,6 @@ module.exports = Task.extend({ return new Promise((resolve, reject) => { server.listen(commandOptions.port, `${commandOptions.host}`, function(err, stats) { - heapdump.writeSnapshot(Date.now() + '.heapsnapshot', function(err, filename) { - console.log('HEAPSHOT DUMP!!!!!', filename); - }); if(err) { lastHash = null; From 8155cc8548ac55aa2f0a9548dcdc12a8a83c91c3 Mon Sep 17 00:00:00 2001 From: Sean Larkin Date: Thu, 18 Aug 2016 09:15:18 -0500 Subject: [PATCH 4/4] remove extra return --- addon/ng2/tasks/serve-webpack.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/addon/ng2/tasks/serve-webpack.ts b/addon/ng2/tasks/serve-webpack.ts index a8c7af0db7a7..60589e48c011 100644 --- a/addon/ng2/tasks/serve-webpack.ts +++ b/addon/ng2/tasks/serve-webpack.ts @@ -38,7 +38,6 @@ module.exports = Task.extend({ return new Promise((resolve, reject) => { server.listen(commandOptions.port, `${commandOptions.host}`, function(err, stats) { - if(err) { lastHash = null; console.error(err.stack || err);