Merge branch 'master' into node-6-cleanup

Author: hansl

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

@@ -15,7 +15,7 @@ export const BaseBuildCommandOptions: any = [
   { name: 'aot', type: Boolean },
   { name: 'sourcemap', type: Boolean, aliases: ['sm'] },
   { name: 'vendor-chunk', type: Boolean, default: true, aliases: ['vc'] },
-  { name: 'base-href', type: String, default: '/', aliases: ['bh'] },
+  { name: 'base-href', type: String, aliases: ['bh'] },
   { name: 'deploy-url', type: String, aliases: ['d'] },
   { name: 'verbose', type: Boolean, default: false, aliases: ['v'] },
   { name: 'progress', type: Boolean, default: true, aliases: ['pr'] },

packages/@angular/cli/ember-cli/lib/models/command.js

@@ -183,6 +183,7 @@ Command.prototype.mergeDuplicateOption = function(key) {
 */
 Command.prototype.normalizeOption = function(option) {
   option.key = camelize(option.name);
+  option.aliases = (option.aliases || []).concat(camelize(option.name));
   option.required = option.required || false;
   return option;
 };

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

@@ -24,6 +24,9 @@ export default Task.extend({
     const appConfig = projectConfig.apps[0];
 
     const outputPath = serveTaskOptions.outputPath || appConfig.outDir;
+    if (this.project.root === outputPath) {
+      throw new SilentError ('Output path MUST not be project root directory!');
+    }
     rimraf.sync(path.resolve(this.project.root, outputPath));
 
     const serveDefaults = {

tests/e2e/tests/build/aot/aot-i18n.ts

@@ -22,6 +22,8 @@ export default function() {
       '<h1 i18n="An introduction header for this sample">Hello i18n!</h1>'))
     .then(() => ng('build', '--aot', '--i18n-file', 'src/locale/messages.fr.xlf', '--i18n-format',
       'xlf', '--locale', 'fr'))
+    .then(() => ng('build', '--aot', '--i18nFile', 'src/locale/messages.fr.xlf', '--i18nFormat',
+      'xlf', '--locale', 'fr'))
     .then(() => expectFileToMatch('dist/main.bundle.js', /Bonjour i18n!/))
     .then(() => ng('build', '--aot'))
     .then(() => expectToFail(() => expectFileToMatch('dist/main.bundle.js', /Bonjour i18n!/)))

tests/e2e/tests/build/rebuild-css-change.ts

@@ -17,10 +17,10 @@ export default function() {
   return silentExecAndWaitForOutputToMatch('ng', ['serve'], webpackGoodRegEx)
     // Should trigger a rebuild.
     .then(() => exec('touch', 'src/main.ts'))
-    .then(() => waitForAnyProcessOutputToMatch(webpackBadRegEx, 1000))
+    .then(() => waitForAnyProcessOutputToMatch(webpackBadRegEx, 5000))
     .then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 5000))
     .then(() => appendToFile('src/app/app.component.css', ':host { color: blue; }'))
-    .then(() => waitForAnyProcessOutputToMatch(webpackBadRegEx, 1000))
+    .then(() => waitForAnyProcessOutputToMatch(webpackBadRegEx, 5000))
     .then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 5000))
     .then(() => killAllProcesses(), (err: any) => {
       killAllProcesses();

tests/e2e/tests/build/rebuild.ts

@@ -22,7 +22,7 @@ export default function() {
     // Should trigger a rebuild.
     .then(() => exec('touch', 'src/main.ts'))
     .then(() => waitForAnyProcessOutputToMatch(
-        /webpack: bundle is now INVALID|webpack: Compiling.../, 1000))
+        /webpack: bundle is now INVALID|webpack: Compiling.../, 5000))
     .then(() => waitForAnyProcessOutputToMatch(
         /webpack: bundle is now VALID|webpack: Compiled successfully./, 5000))
     // Count the bundles.
@@ -61,7 +61,7 @@ export default function() {
     `))
     // Should trigger a rebuild with a new bundle.
     .then(() => waitForAnyProcessOutputToMatch(
-        /webpack: bundle is now INVALID|webpack: Compiling.../, 1000))
+        /webpack: bundle is now INVALID|webpack: Compiling.../, 5000))
     .then(() => waitForAnyProcessOutputToMatch(
         /webpack: bundle is now VALID|webpack: Compiled successfully./, 5000))
     // Count the bundles.