Merge branch 'master' into refactor-platform-server

Author: FrozenPandaz

README.md

@@ -57,10 +57,10 @@ ng serve
 ```
 Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
 
-You can configure the default HTTP port and the one used by the LiveReload server with two command-line options :
+You can configure the default HTTP host and port used by the development server with two command-line options :
 
 ```bash
-ng serve --host 0.0.0.0 --port 4201 --live-reload-port 49153
+ng serve --host 0.0.0.0 --port 4201
 ```
 
 ### Generating Components, Directives, Pipes and Services
@@ -88,6 +88,7 @@ Directive | `ng g directive my-new-directive`
 Pipe      | `ng g pipe my-new-pipe`
 Service   | `ng g service my-new-service`
 Class     | `ng g class my-new-class`
+Guard     | `ng g guard my-new-guard`
 Interface | `ng g interface my-new-interface`
 Enum      | `ng g enum my-new-enum`
 Module    | `ng g module my-module`
@@ -111,7 +112,7 @@ npm install -g @angular/cli@latest
 
 Local project package:
 ```bash
-rm -rf node_modules dist # use rmdir on Windows
+rm -rf node_modules dist # use rmdir /S/Q node_modules dist in Windows Command Prompt; use rm -r -fo node_modules,dist in Windows PowerShell
 npm install --save-dev @angular/cli@latest
 npm install
 ```

docs/documentation/build.md

@@ -103,8 +103,8 @@ or `ng serve --prod` will also make use of uglifying and tree-shaking functional
 
 `--target` (`-t`) Defines the build target.
 
-`--vendor-chunk` (`-vb`) Use a separate bundle containing only vendor libraries.
+`--vendor-chunk` (`-vc`) Use a separate bundle containing only vendor libraries.
 
 `--verbose` (`-v`) Adds more details to output logging.
 
-`--watch` (`-w`) Run build when files change.
+`--watch` (`-w`) Run build when files change.

docs/documentation/generate/interface.md

@@ -8,4 +8,4 @@
 ## Options
 `--app` Specifies app name or index to use.
 
-`type` Pptional String to specify the type of interface.
+`type` Optional String to specify the type of interface.

docs/documentation/home.md

@@ -55,4 +55,4 @@ End-to-end tests are run via [Protractor](https://angular.github.io/protractor/)
 
 ### Additional Information
 There are several [stories](stories) which will walk you through setting up
-additional aspects of Angular applciations.
+additional aspects of Angular applications.

docs/documentation/serve.md

@@ -24,4 +24,7 @@ All the build Options are available in serve below are the additional options.
 
 `--ssl-cert` SSL certificate to use for serving HTTPS.
 
-`--ssl-key` SSL key to use for serving HTTPS.
+`--ssl-key` SSL key to use for serving HTTPS.
+
+## Note
+When running `ng serve`, the compiled output is served from memory, not from disk. This means that the application being served is not located on disk in the `dist` folder.

docs/documentation/stories.md

@@ -20,3 +20,4 @@
  - [Routing](stories/routing)
  - [3rd Party Lib](stories/third-party-lib)
  - [Corporate Proxy](stories/using-corporate-proxy)
+ - [Serve from Disk](stories/disk-serve)

docs/documentation/stories/disk-serve.md

@@ -0,0 +1,23 @@
+# Serve from Disk
+
+The CLI supports running a live browser reload experience to users by running `ng serve`. This will compile the application upon file saves and reload the browser with the newly compiled application. This is done by hosting the application in memory and serving it via [webpack-dev-server](https://webpack.js.org/guides/development/#webpack-dev-server).
+
+If you wish to get a similar experience with the application output to disk please use the steps below. This practice will allow you to ensure that serving the contents of your `dist` dir will be closer to how your application will behave when it is deployed.
+
+## Environment Setup
+### Install a web server
+You will not be using webpack-dev-server, so you will need to install a web server for the browser to request the application. There are many to choose from but a good one to try is [lite-server](https://github.com/johnpapa/lite-server) as it will auto-reload your browser when new files are output.
+
+## Usage
+You will need two terminals to get the live-reload experience. The first will run the build in a watch mode to compile the application to the `dist` folder. The second will run the web server against the `dist` folder. The combination of these two processes will mimic the same behavior of ng serve.
+
+### 1st terminal - Start the build
+```bash
+ng build --watch
+```
+
+### 2nd terminal - Start the web server
+```bash
+lite-server --baseDir="dist"
+```
+When using `lite-server` the default browser will open to the appropriate URL.

docs/documentation/stories/include-angular-material.md

@@ -24,7 +24,7 @@ import { MaterialModule } from '@angular/material';
 @NgModule({
   imports: [
     ...
-    MaterialModule.forRoot()
+    MaterialModule
   ],
   ...
 })

docs/documentation/stories/rc-update.md

@@ -320,16 +320,17 @@ Packages in `dependencies`:
 - `@angular/*` packages now have a `^2.4.0` minimum (`^3.4.0` for router)
 - `core-js` remains unchanged at `^2.4.1`
 - `rxjs` to `^5.1.0`
+- `ts-helpers` was **removed**
 - `zone.js` to `^0.7.6`
 
-Packages in `dependencies`:
+Packages in `devDependencies`:
 - `@angular/cli` at `1.0.0-rc.0` replaces `angular-cli`
 - `@angular/compiler-cli` is also at `^2.4.0`
 - `@types/jasmine` remains unchanged and pinned at `2.5.38`
 - `@types/node` was updated to `~6.0.60`
 - `codelyzer` was updated to `~2.0.0`
 - `jasmine-core` was updated to `~2.5.2`
-- `jasmine-spec-reporter` was **removed**
+- `jasmine-spec-reporter` was updated to `~3.2.0`
 - `karma` was updated to `~1.4.1`
 - `karma-chrome-launcher` was updated to `~2.0.0`
 - `karma-cli` was updated to `~1.0.1`
@@ -353,6 +354,7 @@ We also updated the scripts section to make it more simple:
 "scripts": {
   "ng": "ng",
   "start": "ng serve",
+  "build": "ng build",
   "test": "ng test",
   "lint": "ng lint",
   "e2e": "ng e2e"

docs/documentation/test.md

@@ -20,8 +20,6 @@ You can run tests with coverage via `--code-coverage`. The coverage report will
 
 `--browsers` Override which browsers tests are run against.
 
-`--build` Build prior to running tests.
-
 `--code-coverage` Coverage report will be in the coverage/ directory.
 
 `--colors` Enable or disable colors in the output (reporters and logs).

packages/@angular/cli/blueprints/module/files/__path__/__name__-routing.module.ts

@@ -5,7 +5,6 @@ const routes: Routes = [];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-  providers: []
+  exports: [RouterModule]
 })
 export class <%= classifiedModuleName %>RoutingModule { }

packages/@angular/cli/blueprints/ng/files/__path__/app/app-routing.module.ts

@@ -10,7 +10,6 @@ const routes: Routes = [
 
 @NgModule({
   imports: [RouterModule.forRoot(routes)],
-  exports: [RouterModule],
-  providers: []
+  exports: [RouterModule]
 })
 export class AppRoutingModule { }

packages/@angular/cli/blueprints/ng/files/e2e/tsconfig.e2e.json

@@ -10,7 +10,7 @@
     "lib": [
       "es2016"
     ],<% } %>
-    "outDir": "../dist/out-tsc-e2e",
+    "outDir": "../out-tsc/e2e",
     "module": "commonjs",
     "target": "es5",
     "types":[

packages/@angular/cli/blueprints/ng/files/gitignore

@@ -3,6 +3,7 @@
 # compiled output
 /dist
 /tmp
+/out-tsc
 
 # dependencies
 /node_modules

packages/@angular/cli/blueprints/ng/files/package.json

@@ -40,7 +40,7 @@
     "karma-coverage-istanbul-reporter": "^0.2.0",
     "protractor": "~5.1.0",
     "ts-node": "~2.0.0",
-    "tslint": "~4.4.2",
+    "tslint": "~4.5.0",
     "typescript": "<%= ng4 ? '~2.1.0' : '~2.0.0' %>"
   }
 }

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

@@ -78,7 +78,7 @@ const CompletionCommand = Command.extend({
     commandOptions.all = !commandOptions.bash && !commandOptions.zsh;
 
     const commandFiles = fs.readdirSync(__dirname)
-      .filter(file => file.match(/\.ts$/) && !file.match(/\.run.ts$/))
+      .filter(file => file.match(/\.(j|t)s$/) && !file.match(/\.d.ts$/))
       .map(file => path.parse(file).name)
       .filter(file => {
         return commandsToIgnore.indexOf(file) < 0;

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

@@ -57,6 +57,7 @@ const aliasMap: { [alias: string]: string } = {
   'c': 'component',
   'd': 'directive',
   'e': 'enum',
+  'g': 'guard',
   'i': 'interface',
   'm': 'module',
   'p': 'pipe',

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

@@ -64,7 +64,7 @@ const SetCommand = Command.extend({
         case 'number': value = this.asNumber(rawValue); break;
         case 'string': value = rawValue; break;
 
-        default: value = JSON.parse(rawValue);
+        default: value = parseValue(rawValue, jsonPath);
       }
 
       config.set(jsonPath, value);
@@ -74,4 +74,12 @@ const SetCommand = Command.extend({
   }
 });
 
+function parseValue(rawValue: string, path: string) {
+  try {
+    return JSON.parse(rawValue);
+  } catch (error) {
+    throw new SilentError(`No node found at path ${path}`);
+  }
+}
+
 export default SetCommand;

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

@@ -15,7 +15,6 @@ export interface TestOptions {
   log?: string;
   port?: number;
   reporters?: string;
-  build?: boolean;
   sourcemap?: boolean;
   progress?: boolean;
   config: string;
@@ -85,12 +84,6 @@ const TestCommand = EmberTestCommand.extend({
       type: String,
       description: 'List of reporters to use.'
     },
-    {
-      name: 'build',
-      type: Boolean,
-      default: true,
-      description: 'Build prior to running tests.'
-    },
     {
       name: 'sourcemap',
       type: Boolean,

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

@@ -48,8 +48,8 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   const deployUrl = wco.buildOptions.deployUrl;
   const postcssUrlOptions = {
     url: (URL: string) => {
-      // Only convert absolute URLs, which CSS-Loader won't process into require().
-      if (!URL.startsWith('/')) {
+      // Only convert root relative URLs, which CSS-Loader won't process into require().
+      if (!URL.startsWith('/') || URL.startsWith('//')) {
         return URL;
       }
       // Join together base-href, deploy-url and the original URL.

packages/@angular/cli/tasks/extract-i18n.ts

@@ -54,7 +54,6 @@ export const Extracti18nTask = Task.extend({
           this.ui.writeError('\nAn error occured during the i18n extraction:\n'
             + ((err && err.stack) || err));
         }
-        throw err;
       });
   }
 });

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

@@ -33,11 +33,8 @@ export default Task.extend({
     const Linter = tslint.Linter;
     const Configuration = tslint.Configuration;
 
-    let errors = 0;
-    let results = '';
-
-    lintConfigs
-      .forEach((config) => {
+    const result = lintConfigs
+      .map((config) => {
         const program: ts.Program = Linter.createProgram(config.project);
         const files = getFilesToLint(program, config, Linter);
 
@@ -56,19 +53,37 @@ export default Task.extend({
           linter.lint(file, fileContents, configLoad.results);
         });
 
-        const result = linter.getResult();
-        errors += result.failureCount;
-        results = results.concat(result.output.trim().concat('\n'));
+        return linter.getResult();
+      })
+      .reduce((total, current) => {
+        const failures = current.failures
+          .filter((cf: any) => !total.failures.some((ef: any) => ef.equals(cf)));
+        total.failures = total.failures.concat(...failures);
+
+        if (current.fixes) {
+          total.fixes = (total.fixes || []).concat(...current.fixes);
+        }
+        return total;
+      }, {
+        failures: [],
+        fixes: undefined
       });
 
+    const Formatter = tslint.findFormatter(commandOptions.format);
+    const formatter = new Formatter();
+
+    const output = formatter.format(result.failures, result.fixes);
+    if (output) {
+      ui.writeLine(output);
+    }
+
     // print formatter output directly for non human-readable formats
     if (['prose', 'verbose', 'stylish'].indexOf(commandOptions.format) == -1) {
-      ui.writeLine(results.trim());
-      return (errors == 0 || commandOptions.force) ? Promise.resolve(0) : Promise.resolve(2);
+      return (result.failures.length == 0 || commandOptions.force)
+            ? Promise.resolve(0) : Promise.resolve(2);
     }
 
-    if (errors > 0) {
-      ui.writeLine(results.trim());
+    if (result.failures.length > 0) {
       ui.writeLine(chalk.red('Lint errors found in the listed files.'));
       return commandOptions.force ? Promise.resolve(0) : Promise.resolve(2);
     }

packages/@ngtools/json-schema/src/schema-class-factory.ts

@@ -51,7 +51,13 @@ function _getSchemaNodeForPath<T>(rootMetaData: SchemaTreeNode<T>,
   let fragments = _parseJsonPath(path);
   // TODO: make this work with union (oneOf) schemas
   return fragments.reduce((md: SchemaTreeNode<any>, current: string) => {
-    return md && md.children && md.children[current];
+    if (md && md.children) {
+      return md.children[current];
+    } else if (md && md.items) {
+      return md.items[parseInt(current, 10)];
+    } else {
+      return md;
+    }
   }, rootMetaData);
 }
 

packages/@ngtools/webpack/src/extract_i18n_plugin.ts

@@ -181,8 +181,8 @@ export class ExtractI18nPlugin implements Tapable {
         });
       })
       .then(() => cb(), (err: any) => {
-        compilation.errors.push(err);
-        cb();
+        this._compilation.errors.push(err);
+        cb(err);
       });
 
   }

tests/e2e/tests/commands/completion/completion.ts

@@ -0,0 +1,9 @@
+import {silentNg} from '../../../utils/process';
+
+
+export default function() {
+  return Promise.resolve()
+    .then(() => silentNg('completion'))
+    .then(() => process.chdir('/'))
+    .then(() => silentNg('completion'));
+}

tests/e2e/tests/commands/get/get.ts

@@ -0,0 +1,13 @@
+import {ng} from '../../../utils/process';
+import {expectToFail} from '../../../utils/utils';
+
+export default function() {
+  return Promise.resolve()
+    .then(() => expectToFail(() => ng('get', 'apps.zzz.prefix')))
+    .then(() => ng('get', 'apps.0.prefix'))
+    .then(({ stdout }) => {
+      if (!stdout.match(/app/)) {
+        throw new Error(`Expected "app", received "${JSON.stringify(stdout)}".`);
+      }
+    });
+}

tests/e2e/tests/commands/set/set.ts

@@ -0,0 +1,14 @@
+import {ng} from '../../../utils/process';
+import {expectToFail} from '../../../utils/utils';
+
+export default function() {
+  return Promise.resolve()
+    .then(() => expectToFail(() => ng('set', 'apps.zzz.prefix')))
+    .then(() => ng('set', 'apps.0.prefix' , 'new-prefix'))
+    .then(() => ng('get', 'apps.0.prefix'))
+    .then(({ stdout }) => {
+      if (!stdout.match(/new-prefix/)) {
+        throw new Error(`Expected "new-prefix", received "${JSON.stringify(stdout)}".`);
+      }
+    });
+}