@angular/cli 10.1.0-rc.0 → 10.1.3

package/commands/version-impl.js

@@ -9,22 +9,18 @@ exports.VersionCommand = void 0;
  * found in the LICENSE file at https://angular.io/license
  */
 const core_1 = require("@angular-devkit/core");
-const child_process = require("child_process");
 const fs = require("fs");
 const path = require("path");
 const command_1 = require("../models/command");
 const color_1 = require("../utilities/color");
-const find_up_1 = require("../utilities/find-up");
 class VersionCommand extends command_1.Command {
     async run() {
-        const pkg = require(path.resolve(__dirname, '..', 'package.json'));
-        let projPkg;
+        const cliPackage = require('../package.json');
+        let workspacePackage;
         try {
-            projPkg = require(path.resolve(this.workspace.root, 'package.json'));
-        }
-        catch (_a) {
-            projPkg = undefined;
+            workspacePackage = require(path.resolve(this.workspace.root, 'package.json'));
         }
+        catch (_a) { }
         const patterns = [
             /^@angular\/.*/,
             /^@angular-devkit\/.*/,
@@ -37,54 +33,25 @@ class VersionCommand extends command_1.Command {
             /^ng-packagr$/,
             /^webpack$/,
         ];
-        const maybeNodeModules = find_up_1.findUp('node_modules', __dirname);
-        const packageRoot = projPkg
-            ? path.resolve(this.workspace.root, 'node_modules')
-            : maybeNodeModules;
         const packageNames = [
-            ...Object.keys((pkg && pkg['dependencies']) || {}),
-            ...Object.keys((pkg && pkg['devDependencies']) || {}),
-            ...Object.keys((projPkg && projPkg['dependencies']) || {}),
-            ...Object.keys((projPkg && projPkg['devDependencies']) || {}),
+            ...Object.keys(cliPackage.dependencies || {}),
+            ...Object.keys(cliPackage.devDependencies || {}),
+            ...Object.keys((workspacePackage === null || workspacePackage === void 0 ? void 0 : workspacePackage.dependencies) || {}),
+            ...Object.keys((workspacePackage === null || workspacePackage === void 0 ? void 0 : workspacePackage.devDependencies) || {}),
         ];
-        if (packageRoot != null) {
-            // Add all node_modules and node_modules/@*/*
-            const nodePackageNames = fs.readdirSync(packageRoot).reduce((acc, name) => {
-                if (name.startsWith('@')) {
-                    return acc.concat(fs.readdirSync(path.resolve(packageRoot, name)).map(subName => name + '/' + subName));
-                }
-                else {
-                    return acc.concat(name);
-                }
-            }, []);
-            packageNames.push(...nodePackageNames);
-        }
         const versions = packageNames
             .filter(x => patterns.some(p => p.test(x)))
             .reduce((acc, name) => {
             if (name in acc) {
                 return acc;
             }
-            acc[name] = this.getVersion(name, packageRoot, maybeNodeModules);
+            acc[name] = this.getVersion(name);
             return acc;
         }, {});
-        let ngCliVersion = pkg.version;
-        if (!__dirname.match(/node_modules/)) {
-            let gitBranch = '??';
-            try {
-                const gitRefName = child_process.execSync('git rev-parse --abbrev-ref HEAD', {
-                    cwd: __dirname,
-                    encoding: 'utf8',
-                    stdio: 'pipe',
-                });
-                gitBranch = gitRefName.replace('\n', '');
-            }
-            catch (_b) { }
-            ngCliVersion = `local (v${pkg.version}, branch: ${gitBranch})`;
-        }
+        const ngCliVersion = cliPackage.version;
         let angularCoreVersion = '';
         const angularSameAsCore = [];
-        if (projPkg) {
+        if (workspacePackage) {
             // Filter all angular versions that are the same as core.
             angularCoreVersion = versions['@angular/core'];
             if (angularCoreVersion) {
@@ -134,7 +101,7 @@ class VersionCommand extends command_1.Command {
             return acc;
         }, [])
             .join('\n... ')}
-      Ivy Workspace: ${projPkg ? this.getIvyWorkspace() : ''}
+      Ivy Workspace: ${workspacePackage ? this.getIvyWorkspace() : ''}
 
       Package${namePad.slice(7)}Version
       -------${namePad.replace(/ /g, '-')}------------------
@@ -144,22 +111,31 @@ class VersionCommand extends command_1.Command {
             .join('\n')}
     `.replace(/^ {6}/gm, ''));
     }
-    getVersion(moduleName, projectNodeModules, cliNodeModules) {
+    getVersion(moduleName) {
+        let packagePath;
+        let cliOnly = false;
+        // Try to find the package in the workspace
         try {
-            if (projectNodeModules) {
-                const modulePkg = require(path.resolve(projectNodeModules, moduleName, 'package.json'));
-                return modulePkg.version;
-            }
+            packagePath = require.resolve(`${moduleName}/package.json`, { paths: [this.workspace.root] });
         }
         catch (_a) { }
-        try {
-            if (cliNodeModules) {
-                const modulePkg = require(path.resolve(cliNodeModules, moduleName, 'package.json'));
-                return modulePkg.version + ' (cli-only)';
+        // If not found, try to find within the CLI
+        if (!packagePath) {
+            try {
+                packagePath = require.resolve(`${moduleName}/package.json`);
+                cliOnly = true;
+            }
+            catch (_b) { }
+        }
+        let version;
+        // If found, attempt to get the version
+        if (packagePath) {
+            try {
+                version = require(packagePath).version + (cliOnly ? ' (cli-only)' : '');
             }
+            catch (_c) { }
         }
-        catch (_b) { }
-        return '<error>';
+        return version || '<error>';
     }
     getIvyWorkspace() {
         try {

package/lib/config/schema.json

@@ -27,7 +27,7 @@
     "projects": {
       "type": "object",
       "patternProperties": {
-        "^(?:@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$": {
+        "^(?:@[a-zA-Z0-9_-]+\/)?[a-zA-Z0-9_-]+$": {
           "$ref": "#/definitions/project"
         }
       },
@@ -725,7 +725,7 @@
               ]
             },
             "fileReplacements": {
-              "description": "Replace files with other files in the build.",
+              "description": "Replace compilation source files with other compilation source files in the build.",
               "type": "array",
               "items": {
                 "$ref": "#/definitions/targetOptions/definitions/browser/definitions/fileReplacement"
@@ -1202,7 +1202,7 @@
             },
             "allowedHosts": {
               "type": "array",
-              "description": "Whitelist of hosts that are allowed to access the dev server.",
+              "description": "List of hosts that are allowed to access the dev server.",
               "default": [],
               "items": {
                 "type": "string"
@@ -1511,7 +1511,7 @@
               "default": []
             },
             "fileReplacements": {
-              "description": "Replace files with other files in the build.",
+              "description": "Replace compilation source files with other compilation source files in the build.",
               "type": "array",
               "items": {
                 "oneOf": [
@@ -1752,7 +1752,7 @@
               ]
             },
             "fileReplacements": {
-              "description": "Replace files with other files in the build.",
+              "description": "Replace compilation source files with other compilation source files in the build.",
               "type": "array",
               "items": {
                 "$ref": "#/definitions/targetOptions/definitions/server/definitions/fileReplacement"

package/models/schematic-command.js

@@ -164,7 +164,10 @@ class SchematicCommand extends command_1.Command {
             registry: new core_1.schema.CoreSchemaRegistry(schematics_1.formats.standardFormats),
             resolvePaths: !!this.workspace.configFile
                 // Workspace
-                ? [process.cwd(), this.workspace.root, __dirname]
+                ? this.collectionName === this.defaultCollectionName
+                    // Favor __dirname for @schematics/angular to use the build-in version
+                    ? [__dirname, process.cwd(), this.workspace.root]
+                    : [process.cwd(), this.workspace.root, __dirname]
                 // Global
                 : [__dirname, process.cwd()],
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "10.1.0-rc.0",
+  "version": "10.1.3",
   "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.1001.0-rc.0",
-    "@angular-devkit/core": "10.1.0-rc.0",
-    "@angular-devkit/schematics": "10.1.0-rc.0",
-    "@schematics/angular": "10.1.0-rc.0",
-    "@schematics/update": "0.1001.0-rc.0",
+    "@angular-devkit/architect": "0.1001.3",
+    "@angular-devkit/core": "10.1.3",
+    "@angular-devkit/schematics": "10.1.3",
+    "@schematics/angular": "10.1.3",
+    "@schematics/update": "0.1001.3",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.1.1",
@@ -52,12 +52,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "10.1.0-rc.0",
-      "@angular-devkit/build-angular": "0.1001.0-rc.0",
-      "@angular-devkit/build-ng-packagr": "0.1001.0-rc.0",
-      "@angular-devkit/build-webpack": "0.1001.0-rc.0",
-      "@angular-devkit/core": "10.1.0-rc.0",
-      "@angular-devkit/schematics": "10.1.0-rc.0"
+      "@angular/cli": "10.1.3",
+      "@angular-devkit/build-angular": "0.1001.3",
+      "@angular-devkit/build-ng-packagr": "0.1001.3",
+      "@angular-devkit/build-webpack": "0.1001.3",
+      "@angular-devkit/core": "10.1.3",
+      "@angular-devkit/schematics": "10.1.3"
     }
   },
   "engines": {