Merge pull request #183 from angular/master

Update upstream

Author: GulajavaMinistudio

.appveyor.yml

@@ -9,18 +9,17 @@ matrix:
 install:
   - ps: Install-Product node $env:nodejs_version
   - yarn install --frozen-lockfile
-  # Appveyor (via chocolatey) cannot use older versions of Chrome:
-  # https://github.com/chocolatey/chocolatey-coreteampackages/tree/master/automatic/googlechrome
   - npm run webdriver-update-appveyor
 
 test_script:
   - node --version
-  - npm --version
-  - npm test
-  - npm run test-large
+  - yarn --version
+  - yarn test
+  - node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,build/styles}/**"
 
 build: off
 deploy: off
 
 cache:
   - node_modules -> yarn.lock
+  - "%LOCALAPPDATA%\\Yarn"

package.json

@@ -1,4 +1,6 @@
 {
+  "name": "@angular/devkit-repo",
+  "version": "0.0.0",
   "private": true,
   "description": "Software Development Kit for Angular",
   "bin": {

packages/angular/cli/bin/ng

@@ -3,8 +3,14 @@
 
 // Provide a title to the process in `ps`.
 // Due to an obscure Mac bug, do not start this title with any symbol.
-process.title = 'ng';
+try {
+  process.title = 'ng ' + Array.from(process.argv).slice(2).join(' ');
+} catch(_) {
+  // If an error happened above, use the most basic title.
+  process.title = 'ng';
+}
 
+// Some older versions of Node do not support let or const.
 var version = process.version.substr(1).split('.');
 if (Number(version[0]) < 8 || (Number(version[0]) === 8 && Number(version[1]) < 9)) {
   process.stderr.write(

packages/angular/cli/models/command-runner.ts

@@ -9,19 +9,16 @@
 // tslint:disable:no-global-tslint-disable no-any
 import {
   JsonObject,
-  Path,
   deepCopy,
-  dirname,
-  join,
   logging,
-  normalize,
   parseJson,
   schema,
   strings as coreStrings,
   tags,
 } from '@angular-devkit/core';
 import { ExportStringRef } from '@angular-devkit/schematics/tools';
 import { readFileSync } from 'fs';
+import { dirname, join } from 'path';
 import { of, throwError } from 'rxjs';
 import { concatMap } from 'rxjs/operators';
 import * as yargsParser from 'yargs-parser';
@@ -37,8 +34,8 @@ import { insideProject } from '../utilities/project';
 import { convertSchemaToOptions, parseSchema } from './json-schema';
 
 
-export interface CommandMap {
-  [key: string]: Path;
+interface CommandMap {
+  [key: string]: string;
 }
 
 interface CommandMetadata {
@@ -111,7 +108,7 @@ export async function runCommand(
 
       return 1;
     }
-    const cliDir = dirname(normalize(commandMapPath));
+    const cliDir = dirname(commandMapPath);
     const commandsText = readFileSync(commandMapPath).toString('utf-8');
     const commandJson = JSON.parse(commandsText) as { [name: string]: string };
 
@@ -410,7 +407,7 @@ async function createCommand(metadata: CommandLocation,
     throw new Error('Implementation path is incorrect');
   }
 
-  const implRef = new ExportStringRef(implPath, dirname(normalize(metadata.path)));
+  const implRef = new ExportStringRef(implPath, dirname(metadata.path));
 
   const ctor = implRef.ref as CommandConstructor;
 

packages/angular/cli/models/json-schema.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { JsonObject, JsonValue, parseJson } from '@angular-devkit/core';
+import { JsonObject, isJsonObject, parseJson } from '@angular-devkit/core';
 import * as jsonSchemaTraverse from 'json-schema-traverse';
 import { Option, OptionSmartDefault } from './command';
 
@@ -42,7 +42,7 @@ function getOptions(schemaText: string, onlyRootProperties = true): Promise<Opti
           }
         }
         let $default: OptionSmartDefault | undefined = undefined;
-        if (schema.$default !== null && JsonValue.isJsonObject(schema.$default)) {
+        if (schema.$default !== null && isJsonObject(schema.$default)) {
           $default = <OptionSmartDefault> schema.$default;
         }
         let required = false;
@@ -98,7 +98,7 @@ function isPropertyNested(jsonPath: string): boolean {
 
 export function parseSchema(schema: string): JsonObject | null {
   const parsedSchema = parseJson(schema);
-  if (parsedSchema === null || !JsonValue.isJsonObject(parsedSchema)) {
+  if (parsedSchema === null || !isJsonObject(parsedSchema)) {
     return null;
   }
 

packages/angular/pwa/pwa/index.ts

@@ -93,7 +93,7 @@ function updateIndexFile(options: PwaOptions): Rule {
       ...itemsToAddToHead.map(line => headIndent + line),
       ...lines.slice(closingHeadTagLineIndex, closingBodyTagLineIndex),
       ...itemsToAddToBody.map(line => bodyIndent + line),
-      ...lines.slice(closingHeadTagLineIndex),
+      ...lines.slice(closingBodyTagLineIndex),
     ].join('\n');
 
     host.overwrite(path, updatedIndex);

packages/angular_devkit/build_angular/package.json

@@ -79,9 +79,8 @@
     "jquery": "^3.3.1",
     "jasmine-core": "~2.8.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~2.0.0",
+    "karma": "~3.0.0",
     "karma-chrome-launcher": "~2.2.0",
-    "karma-cli": "~1.0.1",
     "karma-coverage-istanbul-reporter": "~2.0.0",
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",

packages/angular_devkit/core/src/index.ts

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as experimental from './experimental';
+import * as json from './json';
 import * as logging from './logger';
 import * as terminal from './terminal';
 
@@ -16,6 +17,7 @@ export * from './virtual-fs';
 
 export {
   experimental,
+  json,
   logging,
   terminal,
 };

packages/angular_devkit/core/src/json/interface.ts

@@ -110,8 +110,10 @@ export interface JsonAstComment extends JsonAstNodeBase {
 
 export type JsonValue = JsonAstNode['value'];
 
-export const JsonValue = {
-  isJsonObject(value: JsonValue): value is JsonObject {
-    return value != null && typeof value === 'object' && !Array.isArray(value);
-  },
-};
+export function isJsonObject(value: JsonValue): value is JsonObject {
+  return value != null && typeof value === 'object' && !Array.isArray(value);
+}
+
+export function isJsonArray(value: JsonValue): value is JsonArray {
+  return Array.isArray(value);
+}

packages/angular_devkit/core/src/json/schema/transforms.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { JsonObject, JsonValue } from '../interface';
+import { JsonObject, JsonValue, isJsonObject } from '../interface';
 import { JsonPointer } from './interface';
 
 const allTypes = ['string', 'integer', 'number', 'object', 'array', 'boolean', 'null'];
@@ -24,7 +24,7 @@ function findTypes(schema: JsonObject): Set<string> {
     potentials = new Set(allTypes);
   }
 
-  if (JsonValue.isJsonObject(schema.not)) {
+  if (isJsonObject(schema.not)) {
     const notTypes = findTypes(schema.not);
     potentials = new Set([...potentials].filter(p => !notTypes.has(p)));
   }
@@ -97,13 +97,13 @@ export function addUndefinedDefaults(
     let newValue;
     if (value == undefined) {
       newValue = {} as JsonObject;
-    } else if (JsonValue.isJsonObject(value)) {
+    } else if (isJsonObject(value)) {
       newValue = value;
     } else {
       return value;
     }
 
-    if (!JsonValue.isJsonObject(schema.properties)) {
+    if (!isJsonObject(schema.properties)) {
       return newValue;
     }
 

packages/angular_devkit/schematics/src/rules/base.ts

@@ -96,9 +96,9 @@ export function noop(): Rule {
 export function filter(predicate: FilePredicate<boolean>): Rule {
   return ((tree: Tree) => {
     // TODO: Remove VirtualTree usage in 7.0
-    if (tree instanceof VirtualTree) {
+    if (VirtualTree.isVirtualTree(tree)) {
       return new FilteredTree(tree, predicate);
-    } else if (tree instanceof HostTree) {
+    } else if (HostTree.isHostTree(tree)) {
       return new FilterHostTree(tree, predicate);
     } else {
       throw new SchematicsException('Tree type is not supported.');

packages/angular_devkit/schematics/src/tree/host-tree.ts

@@ -109,6 +109,18 @@ export class HostTree implements Tree {
     return this;
   }
 
+  static isHostTree(tree: Tree): tree is HostTree {
+    if (tree instanceof HostTree) {
+      return true;
+    }
+
+    if (typeof tree === 'object' && typeof (tree as HostTree)._ancestry === 'object') {
+      return true;
+    }
+
+    return false;
+  }
+
   constructor(protected _backend: virtualFs.ReadonlyHost<{}> = new virtualFs.Empty()) {
     this._record = new virtualFs.CordHost(new virtualFs.SafeReadonlyHost(_backend));
     this._recordSync = new virtualFs.SyncDelegateHost(this._record);

packages/angular_devkit/schematics/src/tree/virtual.ts

@@ -104,7 +104,6 @@ export class VirtualDirEntry implements DirEntry {
   }
 }
 
-
 /**
  * The root class of most trees.
  */
@@ -114,6 +113,18 @@ export class VirtualTree implements Tree {
   protected _root = new VirtualDirEntry(this);
   protected _tree = new Map<Path, FileEntry>();
 
+  static isVirtualTree(tree: Tree): tree is VirtualTree {
+    if (tree instanceof VirtualTree) {
+      return true;
+    }
+
+    if (typeof tree === 'object' && typeof (tree as VirtualTree)._copyTo === 'function') {
+      return true;
+    }
+
+    return false;
+  }
+
   /**
    * Normalize the path. Made available to subclasses to overload.
    * @param path The path to normalize.

packages/schematics/angular/workspace/files/package.json

@@ -34,7 +34,7 @@
     "codelyzer": "~4.3.0",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~1.7.1",
+    "karma": "~3.0.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
     "karma-jasmine": "~1.1.2",

scripts/validate-licenses.ts

@@ -61,6 +61,8 @@ const licenseReplacements: { [key: string]: string } = {
 
 // Specific packages to ignore, add a reason in a comment. Format: package-name@version.
 const ignoredPackages = [
+  // Us.
+  '@angular/[email protected]',  // Hey, that's us!
   // * Development only
   '[email protected]',  // CC0 but it's content only (index.json, no code) and not distributed.
   '[email protected]', // LGPL-3.0 but only used as a tool, not linked in the build.

tests/legacy-cli/e2e/tests/basic/npm-audit.ts renamed to tests/legacy-cli/e2e/tests/misc/npm-audit.ts

@@ -0,0 +1,16 @@
+import { execAndWaitForOutputToMatch, execWithEnv, killAllProcesses } from '../../utils/process';
+
+
+export default async function() {
+  try {
+    await execAndWaitForOutputToMatch('ng', ['build', '--watch'], /./);
+
+    const output = await execWithEnv('ps', ['x'], { COLUMNS: '200' });
+
+    if (!output.stdout.match(/ng build --watch/)) {
+      throw new Error('Title of the process was not properly set.');
+    }
+  } finally {
+    await killAllProcesses();
+  }
+}

tests/legacy-cli/e2e/tests/misc/title.ts

@@ -1,3 +1,4 @@
+import { SpawnOptions } from "child_process";
 import * as child_process from 'child_process';
 import { terminal } from '@angular-devkit/core';
 import { Observable, concat, defer, EMPTY, from} from 'rxjs';
@@ -11,6 +12,7 @@ const treeKill = require('tree-kill');
 interface ExecOptions {
   silent?: boolean;
   waitForMatch?: RegExp;
+  env?: { [varname: string]: string };
 }
 
 
@@ -26,6 +28,7 @@ function  _exec(options: ExecOptions, cmd: string, args: string[]): Promise<Proc
   let stdout = '';
   let stderr = '';
   const cwd = process.cwd();
+  const env = options.env;
   console.log(
     `==========================================================================================`
   );
@@ -41,7 +44,7 @@ function  _exec(options: ExecOptions, cmd: string, args: string[]): Promise<Proc
 
   console.log(terminal.blue(`Running \`${cmd} ${args.map(x => `"${x}"`).join(' ')}\`${flags}...`));
   console.log(terminal.blue(`CWD: ${cwd}`));
-  const spawnOptions: any = {cwd};
+  const spawnOptions: SpawnOptions = {cwd, env};
 
   if (process.platform.startsWith('win')) {
     args.unshift('/c', cmd);
@@ -146,6 +149,10 @@ export function silentExec(cmd: string, ...args: string[]) {
   return _exec({ silent: true }, cmd, args);
 }
 
+export function execWithEnv(cmd: string, args: string[], env: { [varname: string]: string }) {
+  return _exec({ env }, cmd, args);
+}
+
 export function execAndWaitForOutputToMatch(cmd: string, args: string[], match: RegExp) {
   if (cmd === 'ng' && args[0] === 'serve') {
     // Accept matches up to 20 times after the initial match.