Merge the latest master into the WebPack feature branch

.appveyor.yml

@@ -1,5 +1,7 @@
 environment:
-  nodejs_version: "5.0"
+  matrix:
+  - nodejs_version: "5.0"
+  - nodejs_version: "6.0"
 
 install:
   - ps: Install-Product node $env:nodejs_version

.travis.yml

@@ -7,6 +7,8 @@ env:
     - NODE_VERSION=5 SCRIPT=lint
     - NODE_VERSION=5 SCRIPT=test
     - NODE_VERSION=5 TARGET=mobile SCRIPT=mobile_test
+    - NODE_VERSION=6 SCRIPT=test
+    - NODE_VERSION=6 TARGET=mobile SCRIPT=mobile_test
 os:
   - linux
   - osx
@@ -16,6 +18,8 @@ matrix:
       env: NODE_VERSION=5 SCRIPT=lint
     - os: osx
       env: NODE_VERSION=5 TARGET=mobile SCRIPT=mobile_test
+    - os: osx
+      env: NODE_VERSION=6 TARGET=mobile SCRIPT=mobile_test
 
 script:
   - npm run-script $SCRIPT

CHANGELOG.md

@@ -1,3 +1,22 @@
+<a name="1.0.0-beta.10"></a>
+# [1.0.0-beta.10](https://github.com/angular/angular-cli/compare/1.0.0-beta.9...v1.0.0-beta.10) (2016-07-19)
+
+
+### Bug Fixes
+
+* **build:** don't ignore js in public ([#1129](https://github.com/angular/angular-cli/issues/1129)) ([00e111a](https://github.com/angular/angular-cli/commit/00e111a)), closes [#540](https://github.com/angular/angular-cli/issues/540)
+* **mobile:** remove app/index.js from concatenated bundle ([#1267](https://github.com/angular/angular-cli/issues/1267)) ([03fd4c4](https://github.com/angular/angular-cli/commit/03fd4c4))
+* Fix all versions of dependencies to Angular-CLI ([#1331](https://github.com/angular/angular-cli/issues/1331)) ([022e7f9](https://github.com/angular/angular-cli/commit/022e7f9)), closes [#1331](https://github.com/angular/angular-cli/issues/1331)
+* fix versions in the shrinkwrap instead of using ranges ([#1350](https://github.com/angular/angular-cli/issues/1350)) ([72bc9d9](https://github.com/angular/angular-cli/commit/72bc9d9)), closes [#1350](https://github.com/angular/angular-cli/issues/1350)
+
+
+### Features
+
+* **router:** upgrade the router version ([#1288](https://github.com/angular/angular-cli/issues/1288)) ([2c9a371](https://github.com/angular/angular-cli/commit/2c9a371))
+* add get-dependent-fils utils ([6590743](https://github.com/angular/angular-cli/commit/6590743))
+
+
+
 **Always follow the [update guide](https://github.com/angular/angular-cli/blob/master/README.md#updating-angular-cli) when updating to a new version. The changelog does not list breaking changes that are fixed via the update procedure.**
 
 ---

README.md

@@ -102,25 +102,9 @@ Enum      | `ng g enum my-new-enum`
 
 ### Generating a route
 
-You can generate a new route with the following command (note the singular
-used in `hero`):
+Generating routes in the CLI has been disabled for the time being. A new router and new route generation blueprints are coming.
 
-```bash
-ng generate route hero
-```
-
-This will create a folder which will contain the hero component and related test and style files.
-
-The generated route will also be registered with the parent component's `@RouteConfig` decorator.
-
-By default the route will be designated as a **lazy** route which means that it will be loaded into the browser when needed, not upfront as part of a bundle.
-
-In order to visually distinguish lazy routes from other routes the folder for the route will be prefixed with a `+` per the above example the folder will be named `+hero`.
-This is done in accordance with the [style guide](https://angular.io/styleguide#!#prefix-lazy-loaded-folders-with-).
-
-The default lazy nature of routes can be turned off via the lazy flag (`--lazy false`)
-
-There is an optional flag for `skip-router-generation` which will not add the route to the parent component's `@RouteConfig` decorator.
+You can read the official documentation for the new Router here: https://angular.io/docs/ts/latest/guide/router.html. Please note that even though route generation is disabled, building your projects with routing is still fully supported.
 
 ### Creating a build
 

addon/ng2/blueprints/ng2/files/__path__/system-config.ts

@@ -1,3 +1,5 @@
+"use strict";
+
 // SystemJS configuration file, see links for more information
 // https://github.com/systemjs/systemjs
 // https://github.com/systemjs/systemjs/blob/master/docs/config-api.md

addon/ng2/blueprints/ng2/files/__path__/typings.d.ts

@@ -2,5 +2,5 @@
 // https://github.com/typings/typings
 // https://www.typescriptlang.org/docs/handbook/writing-declaration-files.html
 
-/// <reference path="<%= refToTypings %>/typings/browser.d.ts" />
+/// <reference path="<%= refToTypings %>/typings/index.d.ts" />
 <% if(!isMobile) { %>declare var module: { id: string };<% } %>

addon/ng2/blueprints/ng2/files/e2e/typings.d.ts

@@ -1 +1 @@
-/// <reference path="../typings/main.d.ts" />
+/// <reference path="../typings/index.d.ts" />

addon/ng2/blueprints/ng2/files/package.json

@@ -47,6 +47,6 @@
     "ts-node": "0.5.5",
     "tslint": "3.11.0",
     "typescript": "1.8.10",
-    "typings": "0.8.1"<%= stylePackage %>
+    "typings": "1.3.1"<%= stylePackage %>
   }
 }

addon/ng2/blueprints/ng2/files/typings.json

@@ -1,11 +1,11 @@
 {
-  "ambientDevDependencies": {
+  "globalDevDependencies": {
     "angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459",
-    "jasmine": "registry:dt/jasmine#2.2.0+20160412134438",
+    "jasmine": "registry:dt/jasmine#2.2.0+20160621224255",
     "selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654"
   },
-  "ambientDependencies": {
-    "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654"<% if (isMobile) {%>,
-    "node": "registry:dt/node#4.0.0+20160509154515" <% } %>
+  "globalDependencies": {
+    "es6-shim": "registry:dt/es6-shim#0.31.2+20160602141504"<% if (isMobile) {%>,
+    "node": "registry:dt/node#6.0.0+20160709114037" <% } %>
   }
 }

addon/ng2/utilities/get-dependent-files.ts

@@ -0,0 +1,124 @@
+'use strict';
+
+import * as fs from 'fs';
+import * as ts from 'typescript';
+import * as glob from 'glob';
+import * as path from 'path';
+import * as denodeify from 'denodeify';
+
+import { Promise } from 'es6-promise';
+
+/**
+ * Interface that represents a module specifier and its position in the source file.
+ * Use for storing a string literal, start position and end posittion of ImportClause node kinds.
+ */
+export interface ModuleImport {
+  specifierText: string;
+  pos: number;
+  end: number;
+};
+
+export interface ModuleMap {
+  [key: string]: ModuleImport[];
+}
+
+/**
+ * Create a SourceFile as defined by Typescript Compiler API.
+ * Generate a AST structure from a source file.
+ * 
+ * @param fileName source file for which AST is to be extracted
+ */
+export function createTsSourceFile(fileName: string): Promise<ts.SourceFile> {
+  const readFile = denodeify(fs.readFile);
+  return readFile(fileName, 'utf8')
+    .then((contents: string) => {
+      return ts.createSourceFile(fileName, contents, ts.ScriptTarget.ES6, true);
+    });
+}
+
+/**
+ * Traverses through AST of a given file of kind 'ts.SourceFile', filters out child
+ * nodes of the kind 'ts.SyntaxKind.ImportDeclaration' and returns import clauses as 
+ * ModuleImport[]
+ * 
+ * @param {ts.SourceFile} node: Typescript Node of whose AST is being traversed
+ * 
+ * @return {ModuleImport[]} traverses through ts.Node and returns an array of moduleSpecifiers.
+ */
+export function getImportClauses(node: ts.SourceFile): ModuleImport[] {
+  return node.statements
+    .filter(node => node.kind === ts.SyntaxKind.ImportDeclaration)  // Only Imports.
+    .map((node: ts.ImportDeclaration) => {
+      let moduleSpecifier = node.moduleSpecifier;
+      return {
+        specifierText: moduleSpecifier.getText().slice(1, -1),
+        pos: moduleSpecifier.pos,
+        end: moduleSpecifier.end
+      };
+    });
+}
+
+/** 
+ * Find the file, 'index.ts' given the directory name and return boolean value
+ * based on its findings.
+ * 
+ * @param dirPath
+ * 
+ * @return a boolean value after it searches for a barrel (index.ts by convention) in a given path
+ */
+export function hasIndexFile(dirPath: string): Promise<Boolean> {
+  const globSearch = denodeify(glob);
+  return globSearch(path.join(dirPath, 'index.ts'), { nodir: true })
+    .then((indexFile: string[]) => {
+      return indexFile.length > 0;
+    });
+}
+
+/**
+ * Returns a map of all dependent file/s' path with their moduleSpecifier object
+ * (specifierText, pos, end)
+ * 
+ * @param fileName file upon which other files depend 
+ * @param rootPath root of the project
+ * 
+ * @return {Promise<ModuleMap>} ModuleMap of all dependent file/s (specifierText, pos, end)
+ * 
+ */
+export function getDependentFiles(fileName: string, rootPath: string): Promise<ModuleMap> {
+  const globSearch = denodeify(glob);
+  return globSearch(path.join(rootPath, '**/*.*.ts'), { nodir: true })
+    .then((files: string[]) => Promise.all(files.map(file => createTsSourceFile(file)))
+    .then((tsFiles: ts.SourceFile[]) => tsFiles.map(file => getImportClauses(file)))
+    .then((moduleSpecifiers: ModuleImport[][]) => {
+      let allFiles: ModuleMap = {};
+      files.forEach((file, index) => {
+        let sourcePath = path.normalize(file);
+        allFiles[sourcePath] = moduleSpecifiers[index];
+      });
+      return allFiles;
+    })
+    .then((allFiles: ModuleMap) => {
+      let relevantFiles: ModuleMap = {};
+      Object.keys(allFiles).forEach(filePath => {
+        const tempModuleSpecifiers: ModuleImport[] = allFiles[filePath]
+          .filter(importClause => {
+            // Filter only relative imports
+            let singleSlash = importClause.specifierText.charAt(0) === '/';
+            let currentDirSyntax = importClause.specifierText.slice(0, 2) === './';
+            let parentDirSyntax = importClause.specifierText.slice(0, 3) === '../';
+            return singleSlash || currentDirSyntax || parentDirSyntax;
+          })
+          .filter(importClause => {
+            let modulePath = path.resolve(path.dirname(filePath), importClause.specifierText);
+            let resolvedFileName = path.resolve(fileName);
+            let fileBaseName = path.basename(resolvedFileName, '.ts');
+            let parsedFilePath = path.join(path.dirname(resolvedFileName), fileBaseName);
+            return (parsedFilePath === modulePath) || (resolvedFileName === modulePath);
+          });
+        if (tempModuleSpecifiers.length > 0) {
+          relevantFiles[filePath] = tempModuleSpecifiers;
+        };
+      });
+      return relevantFiles;
+    }));
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-cli",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-beta.10",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "trackingCode": "UA-8594346-19",
@@ -40,8 +40,10 @@
     "broccoli-uglify-js": "^0.1.3",
     "broccoli-writer": "^0.1.1",
     "chalk": "^1.1.3",
+    "denodeify": "^1.2.1",
     "ember-cli": "2.5.0",
     "ember-cli-string-utils": "^1.0.0",
+    "es6-promise": "^3.2.1",
     "exit": "^0.1.2",
     "fs-extra": "^0.30.0",
     "glob": "^7.0.3",