Skip to content

Commit 6f9d2c1

Browse files
filipesilvafilipesilva
authored
feat(build): add sourcemap option (#3113)
Add `--no-sourcemap` option to `ng build/serve/test`. Disabling sourcemaps can help with build speeds. My tests on a medium project shoul a 11.5% improvement on initial builds, and a 37% improvement on rebuilds. Disabling sourcemaps will make debugging harder, since it makes line information very innacurate. Partially address #1980
1 parent 71bf855 commit 6f9d2c1

14 files changed

Lines changed: 63 additions & 21 deletions

File tree

‎packages/angular-cli/commands/build.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export interface BuildOptions {
1111
supressSizes: boolean;
1212
baseHref?: string;
1313
aot?: boolean;
14+
sourcemap?: boolean;
1415
}
1516

1617
const BuildCommand = Command.extend({
@@ -31,7 +32,8 @@ const BuildCommand = Command.extend({
3132
{ name: 'watcher', type: String },
3233
{ name: 'suppress-sizes', type: Boolean, default: false },
3334
{ name: 'base-href', type: String, default: null, aliases: ['bh'] },
34-
{ name: 'aot', type: Boolean, default: false }
35+
{ name: 'aot', type: Boolean, default: false },
36+
{ name: 'sourcemap', type: Boolean, default: true, aliases: ['sm'] }
3537
],
3638

3739
run: function (commandOptions: BuildOptions) {

‎packages/angular-cli/commands/serve.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export interface ServeTaskOptions {
2626
sslKey?: string;
2727
sslCert?: string;
2828
aot?: boolean;
29+
sourcemap?: boolean;
2930
open?: boolean;
3031
}
3132

@@ -81,6 +82,7 @@ const ServeCommand = Command.extend({
8182
{ name: 'ssl-key', type: String, default: 'ssl/server.key' },
8283
{ name: 'ssl-cert', type: String, default: 'ssl/server.crt' },
8384
{ name: 'aot', type: Boolean, default: false },
85+
{ name: 'sourcemap', type: Boolean, default: true, aliases: ['sm'] },
8486
{
8587
name: 'open',
8688
type: Boolean,

‎packages/angular-cli/commands/test.ts‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@ const TestCommand = require('../ember-cli/lib/commands/test');
22
import TestTask from '../tasks/test';
33
import {CliConfig} from '../models/config';
44

5+
export interface TestOptions {
6+
watch?: boolean;
7+
codeCoverage?: boolean;
8+
lint?: boolean;
9+
singleRun?: boolean;
10+
browsers?: string;
11+
colors?: boolean;
12+
log?: string;
13+
port?: number;
14+
reporters?: string;
15+
build?: boolean;
16+
sourcemap?: boolean;
17+
}
18+
19+
520
const NgCliTestCommand = TestCommand.extend({
621
availableOptions: [
722
{ name: 'watch', type: Boolean, default: true, aliases: ['w'] },
@@ -13,10 +28,11 @@ const NgCliTestCommand = TestCommand.extend({
1328
{ name: 'log-level', type: String },
1429
{ name: 'port', type: Number },
1530
{ name: 'reporters', type: String },
16-
{ name: 'build', type: Boolean, default: true }
31+
{ name: 'build', type: Boolean, default: true },
32+
{ name: 'sourcemap', type: Boolean, default: true, aliases: ['sm'] }
1733
],
1834

19-
run: function(commandOptions: any) {
35+
run: function(commandOptions: TestOptions) {
2036
this.project.ngConfig = this.project.ngConfig || CliConfig.fromProject();
2137

2238
const testTask = new TestTask({

‎packages/angular-cli/models/webpack-build-common.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ export function getWebpackCommonConfig(
1111
projectRoot: string,
1212
environment: string,
1313
appConfig: any,
14-
baseHref: string
14+
baseHref: string,
15+
sourcemap: boolean
1516
) {
1617

1718
const appRoot = path.resolve(projectRoot, appConfig.root);
@@ -32,7 +33,7 @@ export function getWebpackCommonConfig(
3233
if (appConfig.scripts.length > 0) { entry['scripts'] = scripts; }
3334

3435
return {
35-
devtool: 'source-map',
36+
devtool: sourcemap ? 'source-map' : 'eval',
3637
resolve: {
3738
extensions: ['.ts', '.js'],
3839
modules: [path.resolve(projectRoot, 'node_modules')]
@@ -41,7 +42,9 @@ export function getWebpackCommonConfig(
4142
entry: entry,
4243
output: {
4344
path: path.resolve(projectRoot, appConfig.outDir),
44-
filename: '[name].bundle.js'
45+
filename: '[name].bundle.js',
46+
sourceMapFilename: '[name].bundle.map',
47+
chunkFilename: '[id].chunk.js'
4548
},
4649
module: {
4750
rules: [

‎packages/angular-cli/models/webpack-build-development.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ export const getWebpackDevConfigPartial = function(projectRoot: string, appConfi
77
: [];
88
const cssLoaders = ['style-loader', 'css-loader?sourcemap', 'postcss-loader'];
99
return {
10-
devtool: 'source-map',
1110
output: {
1211
path: path.resolve(projectRoot, appConfig.outDir),
1312
filename: '[name].bundle.js',
14-
sourceMapFilename: '[name].map',
13+
sourceMapFilename: '[name].bundle.map',
1514
chunkFilename: '[id].chunk.js'
1615
},
1716
module: {

‎packages/angular-cli/models/webpack-build-production.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export const getWebpackProdConfigPartial = function(projectRoot: string, appConf
2121
: [];
2222
const cssLoaders = ['css-loader?sourcemap&minimize', 'postcss-loader'];
2323
return {
24-
devtool: 'source-map',
2524
output: {
2625
path: path.resolve(projectRoot, appConfig.outDir),
2726
filename: '[name].[chunkhash].bundle.js',

‎packages/angular-cli/models/webpack-build-test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const getWebpackTestConfig = function (projectRoot, environment, appConfig, test
4343
}
4444

4545
return {
46-
devtool: 'inline-source-map',
46+
devtool: testConfig.sourcemap ? 'inline-source-map' : 'eval',
4747
context: path.resolve(__dirname, './'),
4848
resolve: {
4949
extensions: ['.ts', '.js'],

‎packages/angular-cli/models/webpack-config.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ export class NgCliWebpackConfig {
2323
public environment: string,
2424
outputDir?: string,
2525
baseHref?: string,
26-
isAoT = false
26+
isAoT = false,
27+
sourcemap = true,
2728
) {
2829
const config: CliConfig = CliConfig.fromProject();
2930
const appConfig = config.config.apps[0];
@@ -34,7 +35,8 @@ export class NgCliWebpackConfig {
3435
this.ngCliProject.root,
3536
environment,
3637
appConfig,
37-
baseHref
38+
baseHref,
39+
sourcemap
3840
);
3941
let targetConfigPartial = this.getTargetConfig(this.ngCliProject.root, appConfig);
4042
const typescriptConfigPartial = isAoT

‎packages/angular-cli/plugins/karma.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ const init = (config) => {
1212
const environment = config.angularCli.environment || 'dev';
1313
const testConfig = {
1414
codeCoverage: config.angularCli.codeCoverage || false,
15-
lint: config.angularCli.lint || false
15+
lint: config.angularCli.lint || false,
16+
sourcemap: config.angularCli.sourcemap
1617
}
1718

1819
// add webpack config

‎packages/angular-cli/tasks/build-webpack-watch.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ export default Task.extend({
2424
runTaskOptions.environment,
2525
outputDir,
2626
runTaskOptions.baseHref,
27-
runTaskOptions.aot
27+
runTaskOptions.aot,
28+
runTaskOptions.sourcemap
2829
).config;
2930
const webpackCompiler: any = webpack(config);
3031

0 commit comments

Comments
 (0)