Merge branch 'master' into live-reload

Author: hansl

.travis.yml

@@ -25,6 +25,9 @@ matrix:
     - node_js: "6"
       os: linux
       env: NODE_SCRIPT="tests/run_e2e.js --glob=tests/build/**"
+    - node_js: "6"
+      os: linux
+      env: NODE_SCRIPT="tests/run_e2e.js --eject --glob=tests/build/**"
     - node_js: "6"
       os: linux
       env: NODE_SCRIPT="tests/run_e2e.js --ignore=**/tests/build/**"

README.md

@@ -35,7 +35,7 @@ with NPM 3 or higher.
 
 * [Installation](#installation)
 * [Usage](#usage)
-* [Generating a New Project](#generating-and-serving-an-angular2-project-via-a-development-server)
+* [Generating a New Project](#generating-and-serving-an-angular-project-via-a-development-server)
 * [Generating Components, Directives, Pipes and Services](#generating-components-directives-pipes-and-services)
 * [Updating Angular CLI](#updating-angular-cli)
 * [Development Hints for hacking on Angular CLI](#development-hints-for-hacking-on-angular-cli)
@@ -54,7 +54,7 @@ npm install -g @angular/cli
 ng help
 ```
 
-### Generating and serving an Angular2 project via a development server
+### Generating and serving an Angular project via a development server
 
 ```bash
 ng new PROJECT_NAME

docs/documentation/build.md

@@ -22,8 +22,8 @@ By default, the development build target and environment are used.
 The mapping used to determine which environment file is used can be found in `.angular-cli.json`:
 
 ```json
+"environmentSource": "environments/environment.ts",
 "environments": {
-  "source": "environments/environment.ts",
   "dev": "environments/environment.ts",
   "prod": "environments/environment.prod.ts"
 }

package.json

@@ -117,7 +117,7 @@
     "@types/express": "^4.0.32",
     "@types/fs-extra": "0.0.37",
     "@types/glob": "^5.0.29",
-    "@types/jasmine": "^2.2.32",
+    "@types/jasmine": "~2.2.0",
     "@types/lodash": "4.14.50",
     "@types/mock-fs": "^3.6.30",
     "@types/node": "^6.0.36",

packages/@angular/cli/addon/index.js

@@ -21,6 +21,7 @@ module.exports = {
     return {
       'build': require('../commands/build').default,
       'serve': require('../commands/serve').default,
+      'eject': require('../commands/eject').default,
       'new': require('../commands/new').default,
       'generate': require('../commands/generate').default,
       'destroy': require('../commands/destroy').default,

packages/@angular/cli/blueprints/ng2/files/__path__/polyfills.ts

@@ -53,7 +53,7 @@ import 'core-js/es7/reflect';
 /***************************************************************************************************
  * Zone JS is required by Angular itself.
  */
-import 'zone.js/dist/zone';  // Included with Angular-CLI.
+import 'zone.js/dist/zone';  // Included with Angular CLI.
 
 
 

packages/@angular/cli/blueprints/ng2/files/angular-cli.json

@@ -22,8 +22,8 @@
         "styles.<%= styleExt %>"
       ],
       "scripts": [],
+      "environmentSource": "environments/environment.ts",
       "environments": {
-        "source": "environments/environment.ts",
         "dev": "environments/environment.ts",
         "prod": "environments/environment.prod.ts"
       }

packages/@angular/cli/blueprints/ng2/files/protractor.conf.js

@@ -20,7 +20,6 @@ exports.config = {
     defaultTimeoutInterval: 30000,
     print: function() {}
   },
-  useAllAngular2AppRoots: true,
   beforeLaunch: function() {
     require('ts-node').register({
       project: 'e2e'

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

@@ -35,7 +35,6 @@ export const baseBuildCommandOptions: any = [
     description: 'define the output filename cache-busting hashing mode',
     aliases: ['oh']
   },
-  { name: 'stats-json', type: Boolean, default: false },
   {
     name: 'poll',
     type: Number,
@@ -55,7 +54,8 @@ const BuildCommand = Command.extend({
   aliases: ['b'],
 
   availableOptions: baseBuildCommandOptions.concat([
-    { name: 'watch', type: Boolean, default: false, aliases: ['w'] }
+    { name: 'watch', type: Boolean, default: false, aliases: ['w'] },
+    { name: 'stats-json', type: Boolean, default: false }
   ]),
 
   run: function (commandOptions: BuildTaskOptions) {

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

@@ -0,0 +1,37 @@
+import { BuildOptions } from '../models/build-options';
+import { Version } from '../upgrade/version';
+import {baseBuildCommandOptions} from './build';
+
+const Command = require('../ember-cli/lib/models/command');
+
+// defaults for BuildOptions
+export const baseEjectCommandOptions: any = [
+  ...baseBuildCommandOptions,
+  { name: 'force', 'type': Boolean }
+];
+
+export interface EjectTaskOptions extends BuildOptions {
+  force?: boolean;
+}
+
+
+const EjectCommand = Command.extend({
+  name: 'eject',
+  description: 'Ejects your app and output the proper webpack configuration and scripts.',
+
+  availableOptions: baseEjectCommandOptions,
+
+  run: function (commandOptions: EjectTaskOptions) {
+    const project = this.project;
+    const EjectTask = require('../tasks/eject').default;
+    const ejectTask = new EjectTask({
+      cliProject: project,
+      ui: this.ui,
+    });
+
+    return ejectTask.run(commandOptions);
+  }
+});
+
+
+export default EjectCommand;