@angular/cli 8.3.1 → 8.3.5

package/bin/postinstall/analytics-prompt.js

@@ -1,16 +1,14 @@
 'use strict';
-// This file is ES6 because it needs to be executed as is.
+// This file is ES5 because it needs to be executed as is.
 
-if ('NG_CLI_ANALYTICS' in process.env) {
+if (process.env['NG_CLI_ANALYTICS'] !== undefined) {
   return;
 }
 
-(async () => {
-  try {
-    const analytics = require('../../models/analytics');
+try {
+  var analytics = require('../../models/analytics');
 
-    if (!analytics.hasGlobalAnalyticsConfiguration()) {
-      await analytics.promptGlobalAnalytics();
-    }
-  } catch (_) {}
-})();
+  if (!analytics.hasGlobalAnalyticsConfiguration()) {
+    analytics.promptGlobalAnalytics().catch(function() { });
+  }
+} catch (_) {}

package/commands/update-impl.js

@@ -121,25 +121,25 @@ class UpdateCommand extends schematic_command_1.SchematicCommand {
                 this.logger.warn('"next" option has no effect when using "migrate-only" option.');
             }
             const packageName = packages[0].name;
-            let packageNode = rootDependencies[packageName];
-            if (typeof packageNode === 'string') {
+            const packageDependency = rootDependencies[packageName];
+            let packageNode = packageDependency && packageDependency.node;
+            if (packageDependency && !packageNode) {
                 this.logger.error('Package found in package.json but is not installed.');
                 return 1;
             }
-            else if (!packageNode) {
+            else if (!packageDependency) {
                 // Allow running migrations on transitively installed dependencies
                 // There can technically be nested multiple versions
                 // TODO: If multiple, this should find all versions and ask which one to use
                 const child = packageTree.children.find(c => c.name === packageName);
                 if (child) {
-                    // A link represents a symlinked package so use the actual in this case
-                    packageNode = child.isLink ? child.target : child;
-                }
-                if (!packageNode) {
-                    this.logger.error('Package is not installed.');
-                    return 1;
+                    packageNode = child;
                 }
             }
+            if (!packageNode) {
+                this.logger.error('Package is not installed.');
+                return 1;
+            }
             const updateMetadata = packageNode.package['ng-update'];
             let migrations = updateMetadata && updateMetadata.migrations;
             if (migrations === undefined) {
@@ -200,7 +200,7 @@ class UpdateCommand extends schematic_command_1.SchematicCommand {
         const requests = [];
         // Validate packages actually are part of the workspace
         for (const pkg of packages) {
-            const node = rootDependencies[pkg.name];
+            const node = rootDependencies[pkg.name] && rootDependencies[pkg.name].node;
             if (!node) {
                 this.logger.error(`Package '${pkg.name}' is not a dependency.`);
                 return 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "8.3.1",
+  "version": "8.3.5",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,11 +28,11 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.803.1",
-    "@angular-devkit/core": "8.3.1",
-    "@angular-devkit/schematics": "8.3.1",
-    "@schematics/angular": "8.3.1",
-    "@schematics/update": "0.803.1",
+    "@angular-devkit/architect": "0.803.5",
+    "@angular-devkit/core": "8.3.5",
+    "@angular-devkit/schematics": "8.3.5",
+    "@schematics/angular": "8.3.5",
+    "@schematics/update": "0.803.5",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "^4.1.1",
@@ -50,10 +50,10 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "8.3.1",
-      "@angular-devkit/build-angular": "0.803.1",
-      "@angular-devkit/build-ng-packagr": "0.803.1",
-      "@angular-devkit/build-webpack": "0.803.1"
+      "@angular/cli": "8.3.5",
+      "@angular-devkit/build-angular": "0.803.5",
+      "@angular-devkit/build-ng-packagr": "0.803.5",
+      "@angular-devkit/build-webpack": "0.803.5"
     }
   },
   "engines": {

package/utilities/package-metadata.js

@@ -39,9 +39,7 @@ function readOptions(logger, yarn = false, showPotentials = false) {
         path.join(globalPrefix, 'etc', baseFilename),
         path.join(os_1.homedir(), dotFilename),
     ];
-    const projectConfigLocations = [
-        path.join(cwd, dotFilename),
-    ];
+    const projectConfigLocations = [path.join(cwd, dotFilename)];
     const root = path.parse(cwd).root;
     for (let curDir = path.dirname(cwd); curDir && curDir !== root; curDir = path.dirname(curDir)) {
         projectConfigLocations.unshift(path.join(curDir, dotFilename));

package/utilities/package-tree.d.ts

@@ -18,21 +18,25 @@ export interface PackageTreeNodeBase {
         dependencies?: Record<string, string>;
         devDependencies?: Record<string, string>;
         peerDependencies?: Record<string, string>;
+        optionalDependencies?: Record<string, string>;
         'ng-update'?: {
             migrations?: string;
         };
     };
+    parent?: PackageTreeNode;
     children: PackageTreeNode[];
 }
 export interface PackageTreeActual extends PackageTreeNodeBase {
     isLink: false;
-    parent?: PackageTreeActual;
 }
 export interface PackageTreeLink extends PackageTreeNodeBase {
     isLink: true;
-    parent: null;
     target: PackageTreeActual;
 }
 export declare type PackageTreeNode = PackageTreeActual | PackageTreeLink;
 export declare function readPackageTree(path: string): Promise<PackageTreeNode>;
-export declare function findNodeDependencies(root: PackageTreeNode, node?: PackageTreeNode): Record<string, string | PackageTreeActual | undefined>;
+export interface NodeDependency {
+    version: string;
+    node?: PackageTreeNode;
+}
+export declare function findNodeDependencies(node: PackageTreeNode): Record<string, NodeDependency>;

package/utilities/package-tree.js

@@ -14,19 +14,25 @@ function readPackageTree(path) {
     });
 }
 exports.readPackageTree = readPackageTree;
-function findNodeDependencies(root, node = root) {
-    const actual = node.isLink ? node.target : node;
+function findNodeDependencies(node) {
     const rawDeps = {
-        ...actual.package.dependencies,
-        ...actual.package.devDependencies,
-        ...actual.package.peerDependencies,
+        ...node.package.dependencies,
+        ...node.package.devDependencies,
+        ...node.package.peerDependencies,
+        ...node.package.optionalDependencies,
     };
     return Object.entries(rawDeps).reduce((deps, [name, version]) => {
-        const depNode = root.children.find(child => {
-            return child.name === name && !child.isLink && child.parent === node;
-        });
-        deps[name] = depNode || version;
+        let dependencyNode;
+        let parent = node;
+        while (!dependencyNode && parent) {
+            dependencyNode = parent.children.find(child => child.name === name);
+            parent = parent.parent;
+        }
+        deps[name] = {
+            node: dependencyNode,
+            version,
+        };
         return deps;
-    }, {});
+    }, Object.create(null));
 }
 exports.findNodeDependencies = findNodeDependencies;