Merge pull request #276 from angular/master

Update to nodejs rules

Author: GulajavaMinistudio

packages/angular/cli/commands/config-impl.ts

@@ -86,12 +86,12 @@ const validCliPaths = new Map<string, ((arg: string) => JsonValue)>([
  * by the path. For example, a path of "a[3].foo.bar[2]" would give you a fragment array of
  * ["a", 3, "foo", "bar", 2].
  * @param path The JSON string to parse.
- * @returns {string[]} The fragments for the string.
+ * @returns {(string|number)[]} The fragments for the string.
  * @private
  */
-function parseJsonPath(path: string): string[] {
+function parseJsonPath(path: string): (string|number)[] {
   const fragments = (path || '').split(/\./g);
-  const result: string[] = [];
+  const result: (string|number)[] = [];
 
   while (fragments.length > 0) {
     const fragment = fragments.shift();
@@ -106,12 +106,15 @@ function parseJsonPath(path: string): string[] {
 
     result.push(match[1]);
     if (match[2]) {
-      const indices = match[2].slice(1, -1).split('][');
+      const indices = match[2]
+        .slice(1, -1)
+        .split('][')
+        .map(x => /^\d$/.test(x) ? +x : x.replace(/\"|\'/g, ''));
       result.push(...indices);
     }
   }
 
-  return result.filter(fragment => !!fragment);
+  return result.filter(fragment => fragment != null);
 }
 
 function getValueFromPath<T extends JsonArray | JsonObject>(

packages/angular/cli/commands/generate-impl.ts

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-// tslint:disable:no-global-tslint-disable no-any
 import { terminal } from '@angular-devkit/core';
 import { Arguments, SubCommandDescription } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
@@ -18,10 +17,12 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
   longSchematicName: string|undefined;
 
   async initialize(options: GenerateCommandSchema & Arguments) {
-    await super.initialize(options);
-
     // Fill up the schematics property of the command description.
     const [collectionName, schematicName] = this.parseSchematicInfo(options);
+    this.collectionName = collectionName;
+    this.schematicName = schematicName;
+
+    await super.initialize(options);
 
     const collection = this.getCollection(collectionName);
     const subcommands: { [name: string]: SubCommandDescription } = {};
@@ -60,15 +61,13 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
   }
 
   public async run(options: GenerateCommandSchema & Arguments) {
-    const [collectionName, schematicName] = this.parseSchematicInfo(options);
-
-    if (!schematicName || !collectionName) {
+    if (!this.schematicName || !this.collectionName) {
       return this.printHelp(options);
     }
 
     return this.runSchematic({
-      collectionName,
-      schematicName,
+      collectionName: this.collectionName,
+      schematicName: this.schematicName,
       schematicOptions: options['--'] || [],
       debug: !!options.debug || false,
       dryRun: !!options.dryRun || false,

packages/angular/cli/commands/new-impl.ts

@@ -16,22 +16,25 @@ export class NewCommand extends SchematicCommand<NewCommandSchema> {
   public readonly allowMissingWorkspace = true;
   schematicName = 'ng-new';
 
-  public async run(options: NewCommandSchema & Arguments) {
-    let collectionName: string;
+  async initialize(options: NewCommandSchema & Arguments) {
     if (options.collection) {
-      collectionName = options.collection;
+      this.collectionName = options.collection;
     } else {
-      collectionName = this.parseCollectionName(options);
+      this.collectionName = this.parseCollectionName(options);
     }
 
+    return super.initialize(options);
+  }
+
+  public async run(options: NewCommandSchema & Arguments) {
     // Register the version of the CLI in the registry.
     const packageJson = require('../package.json');
     const version = packageJson.version;
 
     this._workflow.registry.addSmartDefaultProvider('ng-cli-version', () => version);
 
     return this.runSchematic({
-      collectionName: collectionName,
+      collectionName: this.collectionName,
       schematicName: this.schematicName,
       schematicOptions: options['--'] || [],
       debug: !!options.debug,

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

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {
-  analytics,
   experimental,
   json,
   logging,
@@ -76,7 +75,8 @@ export abstract class SchematicCommand<
   private _workspace: experimental.workspace.Workspace;
   protected _workflow: NodeWorkflow;
 
-  protected collectionName = '@schematics/angular';
+  private readonly defaultCollectionName = '@schematics/angular';
+  protected collectionName = this.defaultCollectionName;
   protected schematicName?: string;
 
   constructor(
@@ -373,7 +373,7 @@ export abstract class SchematicCommand<
       }
     }
 
-    return this.collectionName;
+    return this.defaultCollectionName;
   }
 
   protected async runSchematic(options: RunSchematicOptions) {
@@ -400,7 +400,7 @@ export abstract class SchematicCommand<
     schematicName = schematic.description.name;
 
     // TODO: Remove warning check when 'targets' is default
-    if (collectionName !== this.collectionName) {
+    if (collectionName !== this.defaultCollectionName) {
       const [ast, configPath] = getWorkspaceRaw('local');
       if (ast) {
         const projectsKeyValue = ast.properties.find(p => p.key.value === 'projects');

packages/angular_devkit/architect/testing/index2.ts

@@ -19,7 +19,7 @@
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
-    "core-js": "3.1.2",
+    "core-js": "3.1.3",
     "file-loader": "3.0.1",
     "glob": "7.1.4",
     "istanbul-instrumenter-loader": "3.0.1",
@@ -28,7 +28,7 @@
     "less-loader": "5.0.0",
     "license-webpack-plugin": "2.1.1",
     "loader-utils": "1.2.3",
-    "mini-css-extract-plugin": "0.6.0",
+    "mini-css-extract-plugin": "0.7.0",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
     "open": "6.3.0",
@@ -47,7 +47,7 @@
     "stylus": "0.54.5",
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
-    "terser-webpack-plugin": "1.2.4",
+    "terser-webpack-plugin": "1.3.0",
     "webpack": "4.32.2",
     "webpack-dev-middleware": "3.7.0",
     "webpack-dev-server": "3.4.1",

packages/angular_devkit/build_angular/package.json

@@ -102,7 +102,7 @@
       "description": "Generate a library project for Angular."
     },
     "webWorker": {
-      "aliases": ["web-worker", "worker"],
+      "aliases": ["web-worker"],
       "factory": "./web-worker",
       "schema": "./web-worker/schema.json",
       "description": "Create a Web Worker."

packages/schematics/angular/collection.json

@@ -12,7 +12,7 @@ import { updatePackageJson, updateTsLintConfig } from './codelyzer-5';
 import { updateES5Projects } from './differential-loading';
 import { dropES2015Polyfills } from './drop-es6-polyfills';
 import { removeAngularHttp } from './remove-angular-http';
-import { updateBuilders } from './update-builders';
+import { updateDependencies } from './update-dependencies';
 
 export { updateLazyModulePaths } from './update-lazy-module-paths';
 
@@ -23,7 +23,7 @@ export default function(): Rule {
       updatePackageJson(),
       dropES2015Polyfills(),
       updateES5Projects(),
-      updateBuilders(),
+      updateDependencies(),
       removeAngularHttp(),
       (tree, context) => {
         const packageChanges = tree.actions.some(a => a.path.endsWith('/package.json'));

packages/schematics/angular/migrations/update-8/index.ts

@@ -9,7 +9,7 @@ import { Tree } from '@angular-devkit/schematics';
 import { addPackageJsonDependency, getPackageJsonDependency } from '../../utility/dependencies';
 import { latestVersions } from '../../utility/latest-versions';
 
-export function updateBuilders() {
+export function updateDependencies() {
   return (host: Tree) => {
     let current = getPackageJsonDependency(host, '@angular-devkit/build-angular');
     if (current && current.version !== latestVersions.DevkitBuildAngular) {
@@ -49,5 +49,20 @@ export function updateBuilders() {
         },
       );
     }
+
+    // FIXME: change to ^2.3.2 as soon as it's released with the pr208 fix
+    const webAnimationsJsVersion = 'github:angular/web-animations-js#release_pr208';
+    current = getPackageJsonDependency(host, 'web-animations-js');
+    if (current && current.version !== webAnimationsJsVersion) {
+      addPackageJsonDependency(
+        host,
+        {
+          type: current.type,
+          name: 'web-animations-js',
+          version: webAnimationsJsVersion,
+          overwrite: true,
+        },
+      );
+    }
   };
 }

packages/schematics/angular/migrations/update-8/update-builders.ts renamed to packages/schematics/angular/migrations/update-8/update-dependencies.ts

@@ -23,6 +23,7 @@
     "webpack-subresource-integrity"
   ],
   "packageFiles": [
+    "WORKSPACE",
     "package.json",
     "packages/**/package.json",
     "tests/legacy-cli/e2e/ng-snapshot/package.json"

renovate.json

@@ -19,5 +19,17 @@ export default function() {
         throw new Error(`Expected "true", received "${JSON.stringify(stdout)}".`);
       }
     })
-    .then(() => ng('config', 'schematics.@schematics/angular.component.inlineStyle', 'false'));
+    .then(() => ng('config', 'schematics.@schematics/angular.component.inlineStyle', 'false'))
+    .then(() => ng('config', `projects.test-project.architect.build.options.assets[0]`))
+    .then(({ stdout }) => {
+      if (!stdout.includes('src/favicon.ico')) {
+        throw new Error(`Expected "src/favicon.ico", received "${JSON.stringify(stdout)}".`);
+      }
+    })
+    .then(() => ng('config', `projects["test-project"].architect.build.options.assets[0]`))
+    .then(({ stdout }) => {
+      if (!stdout.includes('src/favicon.ico')) {
+        throw new Error(`Expected "src/favicon.ico", received "${JSON.stringify(stdout)}".`);
+      }
+    });
 }

tests/legacy-cli/e2e/tests/commands/config/config-get.ts

@@ -22,7 +22,7 @@ export default function() {
             "factory": "./fake",
             "description": "Fake schematic",
             "schema": "./fake-schema.json"
-          }
+          },
         }
       }`,
       [join(genRoot, 'fake-schema.json')]: `
@@ -94,6 +94,33 @@ export default function() {
       if (!/opt-a[\s\S]*opt-b[\s\S]*opt-c/.test(stdout)) {
         throw new Error('Help signature options are incorrect.');
       }
+    })
+
+    // should print all the available schematics in a collection
+    // when a collection has more than 1 schematic
+    .then(() => writeMultipleFiles({
+      [join(genRoot, 'collection.json')]: `
+      {
+        "schematics": {
+          "fake": {
+            "factory": "./fake",
+            "description": "Fake schematic",
+            "schema": "./fake-schema.json"
+          },
+          "fake-two": {
+            "factory": "./fake",
+            "description": "Fake schematic",
+            "schema": "./fake-schema.json"
+          },
+        }
+      }`,
+    }))
+    .then(() => ng('generate', '--help'))
+    .then(({stdout}) => {
+      if (!/Collection \"fake-schematics\" \(default\):[\s\S]*fake[\s\S]*fake-two/.test(stdout)) {
+        throw new Error(
+          `Help result is wrong, it didn't contain all the schematics.`);
+      }
     });
 
 }