fixing comments

Author: hansl

package.json

@@ -119,7 +119,7 @@
   "devDependencies": {
     "@types/chai": "^3.4.32",
     "@types/chalk": "^0.4.28",
-    "@types/common-tags": "^1.2.3",
+    "@types/common-tags": "^1.2.4",
     "@types/denodeify": "^1.2.29",
     "@types/express": "^4.0.32",
     "@types/fs-extra": "^0.0.31",

packages/angular-cli/addon/index.js

@@ -24,6 +24,7 @@ module.exports = {
       'init': require('../commands/init').default,
       'test': require('../commands/test').default,
       'e2e': require('../commands/e2e').default,
+      'help': require('../commands/help').default,
       'lint': require('../commands/lint').default,
       'version': require('../commands/version').default,
       'completion': require('../commands/completion').default,

addon/ng2/commands/help.ts renamed to packages/angular-cli/commands/help.ts

@@ -25,7 +25,6 @@
     }
   },
   "exclude": [
-    "blueprints/*/files/**/*",
-    "**/*.spec.ts"
+    "blueprints/*/files/**/*"
   ]
 }

packages/angular-cli/tsconfig.json

@@ -1 +1,4 @@
+// This file is necessary when using a linked angular-cli to this repo, meaning that
+// require('angular-cli/plugins/karma') will load this file, and we just forward to
+// the actual published file.
 module.exports = require('../packages/angular-cli/plugins/karma');

plugins/karma.js

@@ -30,19 +30,10 @@ function copy(from, to) {
 }
 
 
-function patch() {
-  const filePath = path.join(__dirname, '../../node_modules/@types/common-tags/common-tags.d.ts');
-  const content = fs.readFileSync(filePath, 'utf8')
-    .replace(/literals: string\[\]/, 'literals: TemplateStringsArray');
-  fs.writeFileSync(filePath, content, 'utf8');
-}
-
 // First delete the dist folder.
 Promise.resolve()
   .then(() => console.log('Deleting dist folder...'))
   .then(() => rimraf(dist))
-  .then(() => console.log('Patching node_modules typings...'))
-  .then(() => patch())
   .then(() => console.log('Compiling packages...'))
   .then(() => {
     const packages = require('../../lib/packages');
@@ -64,7 +55,7 @@ Promise.resolve()
     return files
       .map((fileName) => path.relative(packagesRoot, fileName))
       .filter((fileName) => {
-        if (/^angular-cli.blueprints/.test(fileName)) {
+        if (/^angular-cli[\\\/]blueprints/.test(fileName)) {
           return true;
         }
         if (/\.d\.ts$/.test(fileName)) {

scripts/publish/build.js

@@ -90,6 +90,10 @@ export function execAndWaitForOutputToMatch(cmd: string, args: string[], match:
   return _exec({ waitForMatch: match }, cmd, args);
 }
 
+export function silentExecAndWaitForOutputToMatch(cmd: string, args: string[], match: RegExp) {
+  return _exec({ silent: true, waitForMatch: match }, cmd, args);
+}
+
 export function ng(...args: string[]) {
   if (args[0] == 'build') {
     return _exec({silent: true}, 'ng', args);

tests/e2e/utils/process.ts

@@ -1,5 +1,5 @@
 import {readFile, writeFile} from './fs';
-import {execAndWaitForOutputToMatch} from './process';
+import {silentExecAndWaitForOutputToMatch} from './process';
 
 const tsConfigPath = 'src/tsconfig.json';
 
@@ -21,5 +21,6 @@ export function updateTsConfig(fn: (json: any) => any | void) {
 
 
 export function ngServe(...args: string[]) {
-  return execAndWaitForOutputToMatch('ng', ['serve', ...args], /webpack: bundle is now VALID/);
+  return silentExecAndWaitForOutputToMatch('ng',
+    ['serve', ...args], /webpack: bundle is now VALID/);
 }

tests/e2e/utils/project.ts

@@ -6,7 +6,7 @@
     "moduleResolution": "node",
     "noEmitOnError": true,
     "noImplicitAny": true,
-    "outDir": "./dist/asd",
+    "outDir": "./dist",
     "rootDir": ".",
     "sourceMap": true,
     "sourceRoot": "",