Merge branch 'master' into prefix-string-option

Author: nlm-pro

CONTRIBUTING.md

@@ -222,7 +222,7 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
 [github]: https://github.com/angular/angular-cli
 [gitter]: https://gitter.im/angular/angular-cli
 [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
-[js-style-guide]: http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml
+[js-style-guide]: https://google.github.io/styleguide/jsguide.html
 [jsfiddle]: http://jsfiddle.net/
 [plunker]: http://plnkr.co/edit
 [runnable]: http://runnable.com/

README.md

@@ -16,7 +16,7 @@ This project is very much still a work in progress.
 The CLI is now in beta.
 If you wish to collaborate while the project is still young, check out [our issue list](https://github.com/angular/angular-cli/issues).
 
-Before submitting new issues, have a look at [issues marked with the `type: faq` label](https://github.com/angular/angular-cli/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3A%22type%3A%20faq%22%20).  
+Before submitting new issues, have a look at [issues marked with the `type: faq` label](https://github.com/angular/angular-cli/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3A%22type%3A%20faq%22%20).
 
 ## Webpack update
 
@@ -67,7 +67,7 @@ npm install -g angular-cli
 ## Usage
 
 ```bash
-ng --help
+ng help
 ```
 
 ### Generating and serving an Angular2 project via a development server
@@ -161,7 +161,7 @@ ng build
 
 You can also add your own env files other than `dev` and `prod` by doing the following:
 - create a `src/environments/environment.NAME.ts`
-- add `{ "NAME": 'src/environments/environment.NAME.ts' }` to the the `apps[0].environments` object in `angular-cli.json`
+- add `{ "NAME": 'src/environments/environment.NAME.ts' }` to the `apps[0].environments` object in `angular-cli.json`
 - use them via the `--env=NAME` flag on the build/serve commands.
 
 ### Base tag handling in index.html
@@ -187,6 +187,10 @@ ng test
 
 Tests will execute after a build is executed via [Karma](http://karma-runner.github.io/0.13/index.html), and it will automatically watch your files for changes. You can run tests a single time via `--watch=false` or `--single-run`.
 
+You can run tests with coverage via `--code-coverage`. The coverage report will be in the `coverage/` directory.
+
+Linting during tests is also available via the `--lint` flag. See [Linting and formatting code](#linting-and-formatting-code) chapter for more informations.
+
 ### Running end-to-end tests
 
 ```bash
@@ -319,7 +323,7 @@ Angular-CLI supports all major CSS preprocessors:
 - less ([http://lesscss.org/](http://lesscss.org/))
 - stylus ([http://stylus-lang.com/](http://stylus-lang.com/))
 
-To use these prepocessors simply add the file to your component's `styleUrls`:
+To use these preprocessors simply add the file to your component's `styleUrls`:
 
 ```javascript
 @Component({

package.json

@@ -12,12 +12,13 @@
     "build": "node ./scripts/publish/build.js",
     "build:patch": "node ./scripts/patch.js",
     "build:packages": "for PKG in packages/*; do echo Building $PKG...; tsc -p $PKG; done",
-    "test": "npm-run-all -c test:packages test:cli",
+    "test": "npm-run-all -c test:packages test:cli test:deps",
     "e2e": "npm run test:e2e",
     "e2e:nightly": "node tests/e2e_runner.js --nightly",
     "mobile_test": "mocha tests/e2e/e2e_workflow.spec.js",
     "test:e2e": "node tests/e2e_runner.js",
     "test:cli": "node tests/runner",
+    "test:deps": "node scripts/publish/validate_dependencies.js",
     "test:inspect": "node --inspect --debug-brk tests/runner",
     "test:packages": "node scripts/run-packages-spec.js",
     "build-config-interface": "dtsgen packages/angular-cli/lib/config/schema.json --out packages/angular-cli/lib/config/schema.d.ts",
@@ -45,13 +46,11 @@
     "@angular/compiler-cli": "2.2.3",
     "@angular/core": "2.2.3",
     "@angular/tsc-wrapped": "0.4.0",
-    "angular2-template-loader": "^0.5.0",
     "async": "^2.1.4",
     "autoprefixer": "^6.5.3",
     "chalk": "^1.1.3",
     "common-tags": "^1.3.1",
     "configstore": "^2.0.0",
-    "core-js": "^2.4.0",
     "css-loader": "^0.23.1",
     "debug": "^2.1.3",
     "denodeify": "^1.2.1",
@@ -73,31 +72,27 @@
     "inquirer": "^0.12.0",
     "is-git-url": "^0.2.0",
     "isbinaryfile": "^2.0.3",
-    "istanbul-instrumenter-loader": "^0.2.0",
     "json-loader": "^0.5.4",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.8.0",
     "leek": "0.0.21",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
+    "loader-utils": "^0.2.16",
     "lodash": "^4.11.1",
     "magic-string": "^0.16.0",
     "markdown-it": "4.3.0",
     "markdown-it-terminal": "0.0.3",
     "minimatch": "^3.0.0",
-    "mkdirp": "^0.5.1",
     "node-modules-path": "^1.0.0",
     "node-sass": "^3.10.1",
     "nopt": "^3.0.1",
-    "npm-run-all": "^3.0.0",
     "offline-plugin": "^3.4.1",
     "opn": "4.0.1",
     "ora": "^0.2.0",
-    "parse5": "^2.1.5",
     "portfinder": "1.0.9",
     "postcss-discard-comments": "^2.0.4",
     "postcss-loader": "^0.9.1",
-    "protractor": "^3.3.0",
     "quick-temp": "0.1.5",
     "raw-loader": "^0.5.1",
     "readline2": "0.1.1",
@@ -107,22 +102,20 @@
     "rimraf": "^2.5.3",
     "rsvp": "^3.0.17",
     "rxjs": "5.0.0-beta.12",
-    "sass-loader": "^3.2.0",
+    "sass-loader": "^4.0.1",
     "script-loader": "^0.7.0",
     "semver": "^5.1.0",
     "silent-error": "^1.0.0",
     "source-map": "^0.5.6",
     "source-map-loader": "^0.1.5",
     "sourcemap-istanbul-instrumenter-loader": "^0.2.0",
-    "string-replace-loader": "^1.0.5",
     "style-loader": "^0.13.1",
     "stylus": "^0.54.5",
     "stylus-loader": "^2.1.0",
     "temp": "0.8.3",
     "through": "^2.3.6",
-    "ts-loader": "^0.8.2",
     "tslint": "^3.15.1",
-    "tslint-loader": "^2.1.4",
+    "tslint-loader": "^3.3.0",
     "typescript": "~2.0.3",
     "url-loader": "^0.5.7",
     "uuid": "^3.0.0",
@@ -131,8 +124,8 @@
     "webpack-dev-server": "2.1.0-beta.9",
     "webpack-md5-hash": "0.0.5",
     "webpack-merge": "^0.14.0",
-    "yam": "0.0.18",
-    "zone.js": "^0.6.23"
+    "webpack-sources": "^0.1.3",
+    "yam": "0.0.18"
   },
   "ember-addon": {
     "paths": [
@@ -148,7 +141,7 @@
     "@types/fs-extra": "^0.0.31",
     "@types/glob": "^5.0.29",
     "@types/jasmine": "^2.2.32",
-    "@types/lodash": "^4.0.25-alpha",
+    "@types/lodash": "^4.14.43",
     "@types/mock-fs": "3.6.28",
     "@types/node": "^6.0.36",
     "@types/request": "0.0.30",
@@ -168,6 +161,7 @@
     "mocha": "^2.4.5",
     "mock-fs": "3.10.0",
     "npm-run": "^4.1.0",
+    "npm-run-all": "^3.0.0",
     "object-assign": "^4.0.1",
     "request": "^2.74.0",
     "resolve-bin": "^0.4.0",

packages/@ngtools/webpack/package.json

@@ -25,14 +25,18 @@
     "npm": ">= 3.0.0"
   },
   "dependencies": {
-    "@angular-cli/ast-tools": "^1.0.0",
+    "enhanced-resolve": "^2.3.0",
+    "loader-utils": "^0.2.16",
     "magic-string": "^0.16.0",
     "source-map": "^0.5.6"
   },
   "peerDependencies": {
-    "typescript": "^2.0.2",
+    "@angular/compiler": "2.2.3",
     "@angular/compiler-cli": "2.2.3",
     "@angular/core": "2.2.3",
-    "reflect-metadata": "^0.1.8"
+    "@angular/tsc-wrapped": "0.4.0",
+    "typescript": "^2.0.2",
+    "reflect-metadata": "^0.1.8",
+    "webpack": "^2.1.0-beta.25"
   }
 }

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

@@ -48,14 +48,20 @@ export class TypeScriptFileRefactor {
     this._sourceString = new MagicString(this._sourceText);
   }
 
+  /**
+   * Collates the diagnostic messages for the current source file
+   */
   getDiagnostics(): ts.Diagnostic[] {
     if (!this._program) {
       return [];
     }
-
-    return this._program.getSyntacticDiagnostics(this._sourceFile)
-      .concat(this._program.getSemanticDiagnostics(this._sourceFile))
-      .concat(this._program.getDeclarationDiagnostics(this._sourceFile));
+    let diagnostics: ts.Diagnostic[] = this._program.getSyntacticDiagnostics(this._sourceFile)
+                              .concat(this._program.getSemanticDiagnostics(this._sourceFile));
+    // only concat the declaration diagnostics if the tsconfig config sets it to true.
+    if (this._program.getCompilerOptions().declaration == true) {
+      diagnostics = diagnostics.concat(this._program.getDeclarationDiagnostics(this._sourceFile));
+    }
+    return diagnostics;
   }
 
   /**

packages/@ngtools/webpack/tsconfig.json

@@ -15,7 +15,6 @@
     "sourceRoot": "/",
     "baseUrl": "./",
     "paths": {
-      "@angular-cli/ast-tools": [ "../../../dist/ast-tools/src" ]
     },
     "typeRoots": [
       "../../node_modules/@types"

packages/angular-cli/blueprints/module/index.js

@@ -59,16 +59,18 @@ module.exports = {
 
   afterInstall: function (options) {
     // Note that `this.generatePath` already contains `this.dasherizedModuleName`
-    // So, the path will end like `name/name`, 
+    // So, the path will end like `name/name`,
     //  which is correct for `name.component.ts` created in module `name`
-    var componentPath = path.join(this.generatePath, this.dasherizedModuleName);
-    options.entity.name = path.relative(this.dynamicPath.appRoot, componentPath);
-    options.flat = true;
-    options.route = false;
-    options.inlineTemplate = false;
-    options.inlineStyle = false;
-    options.prefix = null;
-    options.spec = true;
-    return Blueprint.load(path.join(__dirname, '../component')).install(options);
+    if (this.options && this.options.routing) {
+      var componentPath = path.join(this.generatePath, this.dasherizedModuleName);
+      options.entity.name = path.relative(this.dynamicPath.appRoot, componentPath);
+      options.flat = true;
+      options.route = false;
+      options.inlineTemplate = false;
+      options.inlineStyle = false;
+      options.prefix = null;
+      options.spec = true;
+      return Blueprint.load(path.join(__dirname, '../component')).install(options);
+    }
   }
 };

packages/angular-cli/blueprints/ng2/files/README.md

@@ -28,4 +28,4 @@ Run `ng github-pages:deploy` to deploy to Github Pages.
 
 ## Further help
 
-To get more help on the `angular-cli` use `ng --help` or go check out the [Angular-CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
+To get more help on the `angular-cli` use `ng help` or go check out the [Angular-CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

packages/angular-cli/blueprints/ng2/files/__path__/app/index.ts

@@ -3,7 +3,7 @@ import './polyfills.ts';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { enableProdMode } from '@angular/core';
 import { environment } from './environments/environment';
-import { AppModule } from './app/';
+import { AppModule } from './app/app.module';
 
 if (environment.production) {
   enableProdMode();

packages/angular-cli/blueprints/ng2/files/__path__/main.ts

@@ -10,13 +10,19 @@
 
 # IDEs and editors
 /.idea
-/.vscode
 .project
 .classpath
 .c9/
 *.launch
 .settings/
 
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
 # misc
 /.sass-cache
 /connect.lock

packages/angular-cli/blueprints/ng2/files/gitignore

@@ -4,10 +4,11 @@
   "license": "MIT",
   "angular-cli": {},
   "scripts": {
+    "ng": "ng",
     "start": "ng serve",
     "lint": "tslint \"<%= sourceDir %>/**/*.ts\"",
     "test": "ng test",
-    "pree2e": "webdriver-manager update",
+    "pree2e": "webdriver-manager update --standalone false --gecko false",
     "e2e": "protractor"
   },
   "private": true,
@@ -25,14 +26,7 @@
     "ts-helpers": "^1.1.1",
     "zone.js": "^0.6.23"
   },
-  "devDependencies": {<% if(isMobile) { %>
-    "@angular/platform-server": "2.2.3",
-    "@angular/service-worker": "0.2.0",
-    "@angular/app-shell": "0.0.0",
-    "angular2-universal":"0.104.5",
-    "angular2-universal-polyfills": "0.4.1",
-    "preboot": "2.1.2",
-    "parse5": "1.5.1",<% } %>
+  "devDependencies": {
     "@angular/compiler-cli": "2.2.3",
     "@types/jasmine": "2.5.38",
     "@types/node": "^6.0.42",
@@ -45,10 +39,9 @@
     "karma-cli": "^1.0.1",
     "karma-jasmine": "^1.0.2",
     "karma-remap-istanbul": "^0.2.1",
-    "protractor": "4.0.9",
+    "protractor": "~4.0.13",
     "ts-node": "1.2.1",
     "tslint": "^4.0.2",
-    "typescript": "~2.0.3",
-    "webdriver-manager": "10.2.5"
+    "typescript": "~2.0.3"
   }
 }

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

@@ -1,5 +1,6 @@
 import * as chalk from 'chalk';
 import InitCommand from './init';
+import {oneLine} from 'common-tags';
 
 const Command = require('../ember-cli/lib/models/command');
 const Project = require('../ember-cli/lib/models/project');
@@ -37,6 +38,12 @@ const NewCommand = Command.extend({
         `The "ng ${this.name}" command requires a name argument to be specified. ` +
         `For more details, use "ng help".`));
     }
+    if (!packageName.match(/^[a-zA-Z][.0-9a-zA-Z]*(-[a-zA-Z][.0-9a-zA-Z]*)*$/)) {
+      return Promise.reject(new SilentError(oneLine`
+        Project name "${packageName}" is not valid. New project names must
+        start with a letter, and must contain only alphanumeric characters or dashes.
+      `));
+    }
 
     commandOptions.name = packageName;
     if (commandOptions.dryRun) {

packages/angular-cli/commands/new.ts

@@ -1,8 +1,8 @@
-import * as assign from 'lodash/assign';
 import * as denodeify from 'denodeify';
-const Command = require('../ember-cli/lib/models/command');
+const assign = require('lodash/assign');
 const SilentError = require('silent-error');
 const PortFinder = require('portfinder');
+const Command = require('../ember-cli/lib/models/command');
 import ServeWebpackTask from '../tasks/serve-webpack';
 
 PortFinder.basePort = 49152;