Merge pull request #1 from angular/master

Update upstream

Author: GulajavaMinistudio

lib/bootstrap-local.js

@@ -9,7 +9,7 @@ const ts = require('typescript');
 Error.stackTraceLimit = Infinity;
 
 global.angularCliIsLocal = true;
-global.angularCliPackages = require('./packages');
+global.angularCliPackages = require('./packages').packages;
 
 const compilerOptions = JSON.parse(fs.readFileSync(path.join(__dirname, '../tsconfig.json')));
 
@@ -48,7 +48,7 @@ require.extensions['.ts'] = function (m, filename) {
 
 // If we're running locally, meaning npm linked. This is basically "developer mode".
 if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
-  const packages = require('./packages');
+  const packages = require('./packages').packages;
 
   // We mock the module loader so that we can fake our packages when running locally.
   const Module = require('module');

lib/packages.js

@@ -5,6 +5,9 @@ const glob = require('glob');
 const path = require('path');
 
 const packageRoot = path.join(__dirname, '../packages');
+const toolsRoot = path.join(__dirname, '../tools');
+const distRoot = path.join(__dirname, '../dist');
+
 
 // All the supported packages. Go through the packages directory and create a map of
 // name => fullPath.
@@ -20,7 +23,7 @@ const packages =
       let name = pkgJson['name'];
 
       packages[name] = {
-        dist: path.join(__dirname, '../dist', pkg.name),
+        dist: path.join(distRoot, pkg.name),
         packageJson: path.join(pkg.root, 'package.json'),
         root: pkg.root,
         relative: path.relative(path.dirname(__dirname), pkg.root),
@@ -29,12 +32,38 @@ const packages =
       return packages;
     }, {});
 
+const tools = glob.sync(path.join(toolsRoot, '**/package.json'))
+  .map(toolPath => path.relative(toolsRoot, path.dirname(toolPath)))
+  .map(toolName => {
+    const root = path.join(toolsRoot, toolName);
+    const pkgJson = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8'));
+    const name = pkgJson['name'];
+    const dist = path.join(distRoot, toolName);
+
+    return {
+      name,
+      main: path.join(dist, pkgJson['main']),
+      mainTs: path.join(toolsRoot, toolName, pkgJson['main'].replace(/\.js$/, '.ts')),
+      root,
+      packageJson: path.join(toolsRoot, toolName, 'package.json'),
+      dist
+    };
+  })
+  .reduce((tools, tool) => {
+    tools[tool.name] = tool;
+    return tools;
+  }, {});
+
 
-module.exports = packages;
+module.exports = { packages, tools };
 
 
 // If we run this from the command line, just output the list of modules neatly formatted.
 if (require.main === module) {
-  // eslint-disable-next-line no-console
+  /* eslint-disable no-console */
+  console.log('Packages:');
   console.log(JSON.stringify(packages, null, 2));
+  console.log('');
+  console.log('Tools:');
+  console.log(JSON.stringify(tools, null, 2));
 }

package.json

@@ -9,9 +9,7 @@
   },
   "keywords": [],
   "scripts": {
-    "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",
+    "build": "node scripts/run-tool.js publish build",
     "test": "npm-run-all -c test:packages test:cli test:deps test:licenses test:messages",
     "e2e": "npm run test:e2e",
     "e2e:nightly": "node tests/run_e2e.js --nightly",
@@ -24,7 +22,8 @@
     "test:packages": "node scripts/run-packages-spec.js",
     "eslint": "eslint .",
     "tslint": "tslint \"**/*.ts\" -c tslint.json -e \"**/config/schema.d.ts\" -e \"**/tests/**\" -e \"**/blueprints/*/files/**/*.ts\" -e \"node_modules/**\" -e \"tmp/**\" -e \"dist/**\"",
-    "lint": "npm-run-all -c eslint tslint"
+    "lint": "npm-run-all -c eslint tslint",
+    "tool": "node scripts/run-tool.js"
   },
   "repository": {
     "type": "git",
@@ -107,9 +106,9 @@
     ]
   },
   "devDependencies": {
-    "@angular/compiler": "^4.0.0-rc.5",
-    "@angular/compiler-cli": "^4.0.0-rc.5",
-    "@angular/core": "^4.0.0-rc.5",
+    "@angular/compiler": "^4.0.0",
+    "@angular/compiler-cli": "^4.0.0",
+    "@angular/core": "^4.0.0",
     "@types/chai": "^3.4.32",
     "@types/chalk": "^0.4.28",
     "@types/common-tags": "^1.2.4",
@@ -119,6 +118,7 @@
     "@types/glob": "^5.0.29",
     "@types/jasmine": "~2.2.0",
     "@types/lodash": "4.14.50",
+    "@types/minimist": "^1.2.0",
     "@types/mock-fs": "^3.6.30",
     "@types/node": "^6.0.36",
     "@types/request": "0.0.39",

packages/@angular/cli/package.json

@@ -83,7 +83,7 @@
     "webpack": "~2.2.0",
     "webpack-dev-server": "~2.3.0",
     "webpack-merge": "^2.4.0",
-    "zone.js": "^0.7.2"
+    "zone.js": "^0.8.4"
   },
   "optionalDependencies": {
     "node-sass": "^4.3.0"

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

@@ -78,7 +78,7 @@ export interface SchemaClass<JsonType> extends Object {
   // Direct access to the schema.
   $$schema(): RootSchemaTreeNode;
 
-  $$serialize(mimetype?: string): string;
+  $$serialize(mimetype?: string, ...args: any[]): string;
 }
 
 

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

@@ -361,8 +361,8 @@ export class AotPlugin implements Tapable {
 
       const original = consumer.originalPositionFor({ line, column: character });
       return {
-        line: original.line,
-        character: original.column,
+        line: typeof original.line == 'number' ? original.line : line,
+        character: typeof original.column == 'number' ? original.column : character,
         fileName: original.source || fileName
       };
     } catch (e) {
@@ -390,19 +390,25 @@ export class AotPlugin implements Tapable {
       );
 
     if (diagnostics.length > 0) {
-      const message = diagnostics
-        .map(diagnostic => {
-          const position = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
-
-          const sourceText = diagnostic.file.getFullText();
-          let {line, character, fileName} = this._translateSourceMap(sourceText,
-            diagnostic.file.fileName, position);
-
-          const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
-          return `${fileName} (${line + 1},${character + 1}): ${message}`;
-        })
-        .join('\n');
-      this._compilation.errors.push(message);
+      diagnostics.forEach(diagnostic => {
+        const position = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+
+        const sourceText = diagnostic.file.getFullText();
+        let {line, character, fileName} = this._translateSourceMap(sourceText,
+          diagnostic.file.fileName, position);
+
+        const messageText = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
+        const message = `${fileName} (${line + 1},${character + 1}): ${messageText}`;
+
+        switch (diagnostic.category) {
+          case ts.DiagnosticCategory.Error:
+            this._compilation.errors.push(message);
+            break;
+
+          default:
+            this._compilation.warnings.push(message);
+        }
+      });
     }
   }