fix(@angular/cli): sourcemaps should be the main option, sourcemap an alias

Author: hansl

packages/@angular/cli/commands/build.ts

@@ -35,9 +35,9 @@ export const baseBuildCommandOptions: any = [
     description: 'Build using Ahead of Time compilation.'
   },
   {
-    name: 'sourcemap',
+    name: 'sourcemaps',
     type: Boolean,
-    aliases: ['sm', 'sourcemaps'],
+    aliases: ['sm', 'sourcemap'],
     description: 'Output sourcemaps.'
   },
   {

packages/@angular/cli/commands/test.ts

@@ -15,7 +15,7 @@ export interface TestOptions {
   log?: string;
   port?: number;
   reporters?: string;
-  sourcemap?: boolean;
+  sourcemaps?: boolean;
   progress?: boolean;
   config: string;
   poll?: number;
@@ -85,10 +85,10 @@ const TestCommand = EmberTestCommand.extend({
       description: 'List of reporters to use.'
     },
     {
-      name: 'sourcemap',
+      name: 'sourcemaps',
       type: Boolean,
       default: true,
-      aliases: ['sm'],
+      aliases: ['sm', 'sourcemap'],
       description: 'Output sourcemaps.'
     },
     {

packages/@angular/cli/models/build-options.ts

@@ -3,7 +3,7 @@ export interface BuildOptions {
   environment?: string;
   outputPath?: string;
   aot?: boolean;
-  sourcemap?: boolean;
+  sourcemaps?: boolean;
   vendorChunk?: boolean;
   baseHref?: string;
   deployUrl?: string;

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

@@ -73,18 +73,18 @@ export class NgCliWebpackConfig {
   }
 
   // Fill in defaults for build targets
-  public addTargetDefaults(buildOptions: BuildOptions) {
-    const targetDefaults: any = {
+  public addTargetDefaults(buildOptions: BuildOptions): BuildOptions {
+    const targetDefaults: { [target: string]: BuildOptions } = {
       development: {
         environment: 'dev',
         outputHashing: 'media',
-        sourcemap: true,
+        sourcemaps: true,
         extractCss: false
       },
       production: {
         environment: 'prod',
         outputHashing: 'all',
-        sourcemap: false,
+        sourcemaps: false,
         extractCss: true,
         aot: true
       }

packages/@angular/cli/models/webpack-configs/common.ts

@@ -64,7 +64,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
   }
 
   return {
-    devtool: buildOptions.sourcemap ? 'source-map' : false,
+    devtool: buildOptions.sourcemaps ? 'source-map' : false,
     resolve: {
       extensions: ['.ts', '.js'],
       modules: [nodeModules],

packages/@angular/cli/models/webpack-configs/production.ts

@@ -89,7 +89,7 @@ export const getProdConfig = function (wco: WebpackConfigOptions) {
       new webpack.optimize.UglifyJsPlugin(<any>{
         mangle: { screw_ie8: true },
         compress: { screw_ie8: true, warnings: buildOptions.verbose },
-        sourceMap: buildOptions.sourcemap
+        sourceMap: buildOptions.sourcemaps
       })
     ].concat(extraPlugins)
   };

packages/@angular/cli/models/webpack-configs/styles.ts

@@ -38,7 +38,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   // style-loader does not support sourcemaps without absolute publicPath, so it's
   // better to disable them when not extracting css
   // https://github.com/webpack-contrib/style-loader#recommended-configuration
-  const cssSourceMap = buildOptions.extractCss && buildOptions.sourcemap;
+  const cssSourceMap = buildOptions.extractCss && buildOptions.sourcemaps;
 
   // Minify/optimize css in production.
   const cssnanoPlugin = cssnano({ safe: true, autoprefixer: false });

packages/@angular/cli/models/webpack-configs/test.ts

@@ -46,7 +46,7 @@ export function getTestConfig(testConfig: WebpackTestOptions) {
   }
 
   return {
-    devtool: testConfig.sourcemap ? 'inline-source-map' : 'eval',
+    devtool: testConfig.sourcemaps ? 'inline-source-map' : 'eval',
     entry: {
       test: path.resolve(projectRoot, appConfig.root, appConfig.test)
     },

packages/@angular/cli/plugins/karma.ts

@@ -45,7 +45,7 @@ const init: any = (config: any) => {
   const testConfig: WebpackTestOptions = Object.assign({
     environment: 'dev',
     codeCoverage: false,
-    sourcemap: true,
+    sourcemaps: true,
     progress: true,
   }, config.angularCli);
 

packages/@angular/cli/tasks/test.ts

@@ -31,7 +31,7 @@ export default Task.extend({
 
       karmaOptions.angularCli = {
         codeCoverage: options.codeCoverage,
-        sourcemap: options.sourcemap,
+        sourcemap: options.sourcemaps,
         progress: options.progress,
         poll: options.poll,
         app: options.app