Merge branch 'master' into e2e-suite-option

Author: Gotik

.eslintignore

@@ -1,4 +1,3 @@
-# /node_modules and /bower_components ignored by default
 dist/
 .git/
 tmp/

CHANGELOG.md

@@ -1,3 +1,80 @@
+<a name="1.0.0-beta.24"></a>
+# [1.0.0-beta.24](https://github.com/angular/angular-cli/compare/v1.0.0-beta.23...v1.0.0-beta.24) (2016-12-20)
+
+
+### Bug Fixes
+
+* **@ngtools/webpack:** report errors during codegen ([#3608](https://github.com/angular/angular-cli/issues/3608)) ([0f604ac](https://github.com/angular/angular-cli/commit/0f604ac))
+* **build:** hashes in prod builds now changes when ID change. ([#3609](https://github.com/angular/angular-cli/issues/3609)) ([8e9abf9](https://github.com/angular/angular-cli/commit/8e9abf9))
+* **test:** exclude non spec files from test.ts ([#3538](https://github.com/angular/angular-cli/issues/3538)) ([bcb324f](https://github.com/angular/angular-cli/commit/bcb324f))
+* **tests:** serve `assets` files from `ng test` ([#3628](https://github.com/angular/angular-cli/issues/3628)) ([3459300](https://github.com/angular/angular-cli/commit/3459300))
+* **webpack:** correctly load component stylesheets ([#3511](https://github.com/angular/angular-cli/issues/3511)) ([d4da7bd](https://github.com/angular/angular-cli/commit/d4da7bd))
+
+
+### Features
+
+* **generate:** Show files updated when generating ([#3642](https://github.com/angular/angular-cli/issues/3642)) ([c011b04](https://github.com/angular/angular-cli/commit/c011b04)), closes [#3624](https://github.com/angular/angular-cli/issues/3624)
+* **version:** display versions of [@angular](https://github.com/angular)/* and [@ngtools](https://github.com/ngtools)/* ([#3592](https://github.com/angular/angular-cli/issues/3592)) ([123f74d](https://github.com/angular/angular-cli/commit/123f74d)), closes [#3589](https://github.com/angular/angular-cli/issues/3589)
+
+
+
+<a name="1.0.0-beta.23"></a>
+# [1.0.0-beta.23](https://github.com/angular/angular-cli/compare/v1.0.0-beta.22-1...v1.0.0-beta.23) (2016-12-15)
+
+This beta was abandoned and unpublished due to a breaking bug.
+
+### Bug Fixes
+
+* **@ngtools/webpack:** keep the decorators in. ([#3583](https://github.com/angular/angular-cli/issues/3583)) ([db25183](https://github.com/angular/angular-cli/commit/db25183))
+* **@ngtools/webpack:** use tsconfig declaration flag to report decl errors ([#3499](https://github.com/angular/angular-cli/issues/3499)) ([c46de15](https://github.com/angular/angular-cli/commit/c46de15))
+* **blueprints:** remove app root barrel ([#3530](https://github.com/angular/angular-cli/issues/3530)) ([3329d46](https://github.com/angular/angular-cli/commit/3329d46)), closes [#3369](https://github.com/angular/angular-cli/issues/3369)
+* **build:** added autoprefixer to prod ([1648d51](https://github.com/angular/angular-cli/commit/1648d51)), closes [#3156](https://github.com/angular/angular-cli/issues/3156) [#3164](https://github.com/angular/angular-cli/issues/3164)
+* **build:** pin [@types](https://github.com/types)/lodash ([#3465](https://github.com/angular/angular-cli/issues/3465)) ([9b65481](https://github.com/angular/angular-cli/commit/9b65481))
+* **completion:** Update with the new help command ([#3479](https://github.com/angular/angular-cli/issues/3479)) ([0b5dc74](https://github.com/angular/angular-cli/commit/0b5dc74))
+* **dependencies:** reduce the dependencies further. ([#3488](https://github.com/angular/angular-cli/issues/3488)) ([901a64f](https://github.com/angular/angular-cli/commit/901a64f))
+* **deploy:** gh-pages checkout initial branch on error ([#3378](https://github.com/angular/angular-cli/issues/3378)) ([c5cd095](https://github.com/angular/angular-cli/commit/c5cd095)), closes [#3030](https://github.com/angular/angular-cli/issues/3030) [#2663](https://github.com/angular/angular-cli/issues/2663) [#1259](https://github.com/angular/angular-cli/issues/1259)
+* **deploy:** gh-pages deploy fail after repo create ([#3386](https://github.com/angular/angular-cli/issues/3386)) ([0a68cc5](https://github.com/angular/angular-cli/commit/0a68cc5)), closes [#3385](https://github.com/angular/angular-cli/issues/3385)
+* **gitignore:** No longer ignore VSCode settings ([#3477](https://github.com/angular/angular-cli/issues/3477)) ([8d88446](https://github.com/angular/angular-cli/commit/8d88446))
+* **help:** fix `ng help <command>` ([#3442](https://github.com/angular/angular-cli/issues/3442)) ([51659b9](https://github.com/angular/angular-cli/commit/51659b9))
+* **new:** Make sure the project name is valid. ([#3478](https://github.com/angular/angular-cli/issues/3478)) ([e836f92](https://github.com/angular/angular-cli/commit/e836f92))
+* **webpack:** fix some problems with errors not reported. ([#3444](https://github.com/angular/angular-cli/issues/3444)) ([09f9aa9](https://github.com/angular/angular-cli/commit/09f9aa9))
+* **webpack:** remove usage of __dirname from the config. ([#3422](https://github.com/angular/angular-cli/issues/3422)) ([8597786](https://github.com/angular/angular-cli/commit/8597786))
+
+
+### Features
+
+* Make CLI available without install ([761e86f](https://github.com/angular/angular-cli/commit/761e86f)), closes [#3126](https://github.com/angular/angular-cli/issues/3126)
+* **build:** add lazy styles/scripts ([#3402](https://github.com/angular/angular-cli/issues/3402)) ([20bb864](https://github.com/angular/angular-cli/commit/20bb864)), closes [#3401](https://github.com/angular/angular-cli/issues/3401) [#3400](https://github.com/angular/angular-cli/issues/3400)
+* **deps:** Unblock the version of Angular to >= 2.3 ([#3569](https://github.com/angular/angular-cli/issues/3569)) ([bd03100](https://github.com/angular/angular-cli/commit/bd03100))
+* **generate:** change generate --prefix option type from Boolean to string ([#3457](https://github.com/angular/angular-cli/issues/3457)) ([8d5a915](https://github.com/angular/angular-cli/commit/8d5a915))
+* **i18n:** add i18n command line options ([#3098](https://github.com/angular/angular-cli/issues/3098)) ([2a0a42d](https://github.com/angular/angular-cli/commit/2a0a42d))
+* **module:** component optional when generating module ([#3389](https://github.com/angular/angular-cli/issues/3389)) ([2fb2d13](https://github.com/angular/angular-cli/commit/2fb2d13))
+* **serve:** Add support to open with ssl. ([#3432](https://github.com/angular/angular-cli/issues/3432)) ([83dfc96](https://github.com/angular/angular-cli/commit/83dfc96))
+
+
+### Performance Improvements
+
+* **install time:** Remove dependency to zopfli. ([#3414](https://github.com/angular/angular-cli/issues/3414)) ([e6364a9](https://github.com/angular/angular-cli/commit/e6364a9))
+
+
+### BREAKING CHANGES
+
+* blueprints: The app root module and component must now be imported directly. (e.g., use `import { AppModule } from './app/app.module';` instead of `import { AppModule } from './app/';`)
+
+
+
+<a name="1.0.0-beta.22-1"></a>
+# [1.0.0-beta.22-1](https://github.com/angular/angular-cli/compare/v1.0.0-beta.22...v1.0.0-beta.22-1) (2016-12-05)
+
+
+### Bug Fixes
+
+* **@ngtools/webpack:** performance improvement. ([#3360](https://github.com/angular/angular-cli/issues/3360)) ([4dcfe27](https://github.com/angular/angular-cli/commit/4dcfe27))
+* **deploy:** clean up gh-pages obsolete files ([#3081](https://github.com/angular/angular-cli/issues/3081)) ([#3333](https://github.com/angular/angular-cli/issues/3333)) ([51869fb](https://github.com/angular/angular-cli/commit/51869fb))
+* change apiFilter querystring to query in ng doc([#3383](https://github.com/angular/angular-cli/issues/3383)) ([5b2a0fb](https://github.com/angular/angular-cli/commit/5b2a0fb)), closes [#3363](https://github.com/angular/angular-cli/issues/3363)
+
+
+
 <a name="1.0.0-beta.22"></a>
 # [1.0.0-beta.22](https://github.com/angular/angular-cli/compare/v1.0.0-beta.21...v1.0.0-beta.22) (2016-12-02)
 

docs/design/third-party-libraries.md

@@ -126,7 +126,7 @@ Example:
       "url": {
         "prompt": "URL of your website:",
         "defaultValue": "${homepage}"
-      },
+      }
     }
   }
 }
@@ -196,4 +196,4 @@ a migration hook for `postinstall`.
 # Remaining Problems
 
 1. Installing dependencies of packages need to be further sketched out.
-2. Need to add a full fledged example with Firebase.
+2. Need to add a fully fledged example with Firebase.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-cli",
-  "version": "1.0.0-beta.22",
+  "version": "1.0.0-beta.24",
   "description": "CLI tool for Angular",
   "main": "packages/angular-cli/lib/cli/index.js",
   "trackingCode": "UA-8594346-19",
@@ -42,10 +42,10 @@
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
     "@angular-cli/ast-tools": "^1.0.0",
-    "@angular/compiler": "2.2.3",
-    "@angular/compiler-cli": "2.2.3",
-    "@angular/core": "2.2.3",
-    "@angular/tsc-wrapped": "0.4.0",
+    "@angular/compiler": "^2.3.1",
+    "@angular/compiler-cli": "^2.3.1",
+    "@angular/core": "^2.3.1",
+    "@angular/tsc-wrapped": "^0.5.0",
     "async": "^2.1.4",
     "autoprefixer": "^6.5.3",
     "chalk": "^1.1.3",
@@ -75,15 +75,14 @@
     "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",
+    "minimatch": "^3.0.3",
     "node-modules-path": "^1.0.0",
     "node-sass": "^3.10.1",
     "nopt": "^3.0.1",
@@ -101,7 +100,7 @@
     "resolve": "^1.1.7",
     "rimraf": "^2.5.3",
     "rsvp": "^3.0.17",
-    "rxjs": "5.0.0-beta.12",
+    "rxjs": "^5.0.1",
     "sass-loader": "^4.0.1",
     "script-loader": "^0.7.0",
     "semver": "^5.1.0",
@@ -114,18 +113,18 @@
     "stylus-loader": "^2.1.0",
     "temp": "0.8.3",
     "through": "^2.3.6",
-    "tslint": "^3.15.1",
+    "tslint": "^4.0.2",
     "tslint-loader": "^3.3.0",
     "typescript": "~2.0.3",
     "url-loader": "^0.5.7",
     "uuid": "^3.0.0",
     "walk-sync": "^0.2.6",
     "webpack": "2.1.0-beta.25",
     "webpack-dev-server": "2.1.0-beta.9",
-    "webpack-md5-hash": "0.0.5",
     "webpack-merge": "^0.14.0",
     "webpack-sources": "^0.1.3",
-    "yam": "0.0.18"
+    "yam": "0.0.18",
+    "zone.js": "^0.7.2"
   },
   "ember-addon": {
     "paths": [
@@ -156,7 +155,7 @@
     "express": "^4.14.0",
     "jasmine": "^2.4.1",
     "jasmine-spec-reporter": "^2.7.0",
-    "minimatch": "^3.0.0",
+    "minimatch": "^3.0.3",
     "minimist": "^1.2.0",
     "mocha": "^2.4.5",
     "mock-fs": "3.10.0",
@@ -170,7 +169,7 @@
     "through": "^2.3.8",
     "tree-kill": "^1.0.0",
     "ts-node": "^1.3.0",
-    "tslint": "^3.11.0",
+    "tslint": "^4.0.2",
     "walk-sync": "^0.2.6"
   }
 }

packages/@angular-cli/ast-tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-cli/ast-tools",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "CLI tool for Angular",
   "main": "./src/index.js",
   "keywords": [
@@ -24,8 +24,8 @@
     "npm": ">= 3.0.0"
   },
   "dependencies": {
-    "@angular/tsc-wrapped": "^0.3.0",
-    "rxjs": "5.0.0-beta.12",
+    "@angular/tsc-wrapped": "^0.5.0",
+    "rxjs": "^5.0.1",
     "denodeify": "^1.2.1",
     "typescript": "~2.0.3"
   }

packages/@angular-cli/base-href-webpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-cli/base-href-webpack",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Base HREF Webpack plugin",
   "main": "./src/index.js",
   "keywords": [

packages/@ngtools/webpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "1.1.9",
+  "version": "1.2.1",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",
@@ -31,10 +31,10 @@
     "source-map": "^0.5.6"
   },
   "peerDependencies": {
-    "@angular/compiler": "2.2.3",
-    "@angular/compiler-cli": "2.2.3",
-    "@angular/core": "2.2.3",
-    "@angular/tsc-wrapped": "0.4.0",
+    "@angular/compiler": "^2.3.1",
+    "@angular/compiler-cli": "^2.3.1",
+    "@angular/core": "^2.3.1",
+    "@angular/tsc-wrapped": "^0.5.0",
     "typescript": "^2.0.2",
     "reflect-metadata": "^0.1.8",
     "webpack": "^2.1.0-beta.25"

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

@@ -17,9 +17,10 @@ function _getContentOfKeyLiteral(source: ts.SourceFile, node: ts.Node): string {
 }
 
 function _removeDecorators(refactor: TypeScriptFileRefactor) {
+  // TODO: replace this by tsickle.
   // Find all decorators.
-  refactor.findAstNodes(refactor.sourceFile, ts.SyntaxKind.Decorator)
-    .forEach(d => refactor.removeNode(d));
+  // refactor.findAstNodes(refactor.sourceFile, ts.SyntaxKind.Decorator)
+  //   .forEach(d => refactor.removeNode(d));
 }
 
 
@@ -86,6 +87,27 @@ function _replaceBootstrap(plugin: AotPlugin, refactor: TypeScriptFileRefactor)
   refactor.insertImport(entryModule.className + 'NgFactory', ngFactoryPath);
 }
 
+export function removeModuleIdOnlyForTesting(refactor: TypeScriptFileRefactor) {
+  _removeModuleId(refactor);
+}
+
+function _removeModuleId(refactor: TypeScriptFileRefactor) {
+  const sourceFile = refactor.sourceFile;
+
+  refactor.findAstNodes(sourceFile, ts.SyntaxKind.ObjectLiteralExpression, true)
+    // Get all their property assignments.
+    .filter((node: ts.ObjectLiteralExpression) =>
+      node.properties.some(prop => prop.name.getText() == 'moduleId'))
+    .forEach((node: ts.ObjectLiteralExpression) => {
+      const moduleIdProp = node.properties.filter((prop: ts.ObjectLiteralElement, idx: number) => {
+        return prop.name.getText() == 'moduleId';
+      })[0];
+      // get the trailing comma
+      const moduleIdCommaProp = moduleIdProp.parent.getChildAt(1).getChildren()[1];
+      refactor.removeNodes(moduleIdProp, moduleIdCommaProp);
+    });
+}
+
 function _replaceResources(refactor: TypeScriptFileRefactor): void {
   const sourceFile = refactor.sourceFile;
 
@@ -162,7 +184,9 @@ export function ngcLoader(source: string) {
             .then(() => _removeDecorators(refactor))
             .then(() => _replaceBootstrap(plugin, refactor));
         } else {
-          return _replaceResources(refactor);
+          return Promise.resolve()
+            .then(() => _replaceResources(refactor))
+            .then(() => _removeModuleId(refactor));
         }
       })
       .then(() => {