@angular/cli 14.0.0-next.0 → 14.0.0-next.3

package/commands/config-impl.js

@@ -8,7 +8,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigCommand = void 0;
-const core_1 = require("@angular-devkit/core");
 const uuid_1 = require("uuid");
 const command_1 = require("../models/command");
 const interface_1 = require("../models/interface");
@@ -88,18 +87,7 @@ class ConfigCommand extends command_1.Command {
         if (!options.global) {
             await this.validateScope(interface_1.CommandScope.InProject);
         }
-        let [config] = (0, config_1.getWorkspaceRaw)(level);
-        if (options.global && !config) {
-            try {
-                if ((0, config_1.migrateLegacyGlobalConfig)()) {
-                    config = (0, config_1.getWorkspaceRaw)(level)[0];
-                    this.logger.info(core_1.tags.oneLine `
-            We found a global configuration that was used in Angular CLI 1.
-            It has been automatically migrated.`);
-                }
-            }
-            catch { }
-        }
+        const [config] = (0, config_1.getWorkspaceRaw)(level);
         if (options.value == undefined) {
             if (!config) {
                 this.logger.error('No config found.');

package/commands/extract-i18n-impl.js

@@ -15,17 +15,6 @@ class ExtractI18nCommand extends architect_command_1.ArchitectCommand {
         this.target = 'extract-i18n';
     }
     async run(options) {
-        const version = process.version.substr(1).split('.');
-        if (Number(version[0]) === 12 && Number(version[1]) === 0) {
-            this.logger.error('Due to a defect in Node.js 12.0, the command is not supported on this Node.js version. ' +
-                'Please upgrade to Node.js 12.1 or later.');
-            return 1;
-        }
-        const commandName = process.argv[2];
-        if (['xi18n', 'i18n-extract'].includes(commandName)) {
-            this.logger.warn(`Warning: "ng ${commandName}" has been deprecated and will be removed in a future major version. ` +
-                'Please use "ng extract-i18n" instead.');
-        }
         return this.runArchitectTarget(options);
     }
 }

package/commands/extract-i18n.json

@@ -3,8 +3,6 @@
   "$id": "ng-cli://commands/extract-i18n.json",
   "description": "Extracts i18n messages from source code.",
   "$longDescription": "",
-
-  "$aliases": ["i18n-extract", "xi18n"],
   "$scope": "in",
   "$type": "architect",
   "$impl": "./extract-i18n-impl#ExtractI18nCommand",

package/models/architect-command.js

@@ -218,19 +218,7 @@ class ArchitectCommand extends command_1.Command {
             return;
         }
         const packageManager = await (0, package_manager_1.getPackageManager)(basePath);
-        let installSuggestion = 'Try installing with ';
-        switch (packageManager) {
-            case 'npm':
-                installSuggestion += `'npm install'`;
-                break;
-            case 'yarn':
-                installSuggestion += `'yarn'`;
-                break;
-            default:
-                installSuggestion += `the project's package manager`;
-                break;
-        }
-        this.logger.warn(`Node packages may not be installed. ${installSuggestion}.`);
+        this.logger.warn(`Node packages may not be installed. Try installing with '${packageManager} install'.`);
     }
     async run(options) {
         return await this.runArchitectTarget(options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.0.0-next.0",
+  "version": "14.0.0-next.3",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,21 +28,21 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1400.0-next.0",
-    "@angular-devkit/core": "14.0.0-next.0",
-    "@angular-devkit/schematics": "14.0.0-next.0",
-    "@schematics/angular": "14.0.0-next.0",
+    "@angular-devkit/architect": "0.1400.0-next.3",
+    "@angular-devkit/core": "14.0.0-next.3",
+    "@angular-devkit/schematics": "14.0.0-next.3",
+    "@schematics/angular": "14.0.0-next.3",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.3",
     "ini": "2.0.0",
     "inquirer": "8.2.0",
     "jsonc-parser": "3.0.0",
-    "npm-package-arg": "8.1.5",
-    "npm-pick-manifest": "6.1.1",
+    "npm-package-arg": "9.0.0",
+    "npm-pick-manifest": "7.0.0",
     "open": "8.4.0",
     "ora": "5.4.1",
-    "pacote": "12.0.3",
+    "pacote": "13.0.2",
     "resolve": "1.22.0",
     "semver": "7.3.5",
     "symbol-observable": "4.0.0",
@@ -51,12 +51,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "14.0.0-next.0",
-      "@angular-devkit/architect": "0.1400.0-next.0",
-      "@angular-devkit/build-angular": "14.0.0-next.0",
-      "@angular-devkit/build-webpack": "0.1400.0-next.0",
-      "@angular-devkit/core": "14.0.0-next.0",
-      "@angular-devkit/schematics": "14.0.0-next.0"
+      "@angular/cli": "14.0.0-next.3",
+      "@angular-devkit/architect": "0.1400.0-next.3",
+      "@angular-devkit/build-angular": "14.0.0-next.3",
+      "@angular-devkit/build-webpack": "0.1400.0-next.3",
+      "@angular-devkit/core": "14.0.0-next.3",
+      "@angular-devkit/schematics": "14.0.0-next.3"
     }
   },
   "engines": {

package/utilities/config.d.ts

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { json, workspaces } from '@angular-devkit/core';
+import { PackageManager } from '../lib/config/workspace-schema';
 import { JSONFile } from './json-file';
 export declare const workspaceSchemaPath: string;
 export declare class AngularWorkspace {
@@ -24,7 +25,6 @@ export declare function createGlobalSettings(): string;
 export declare function getWorkspaceRaw(level?: 'local' | 'global'): [JSONFile | null, string | null];
 export declare function validateWorkspace(data: json.JsonObject): Promise<void>;
 export declare function getProjectByCwd(workspace: AngularWorkspace): string | null;
-export declare function getConfiguredPackageManager(): Promise<string | null>;
-export declare function migrateLegacyGlobalConfig(): boolean;
+export declare function getConfiguredPackageManager(): Promise<PackageManager | null>;
 export declare function getSchematicDefaults(collection: string, schematic: string, project?: string | null): Promise<{}>;
 export declare function isWarningEnabled(warning: string): Promise<boolean>;

package/utilities/config.js

@@ -26,7 +26,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWarningEnabled = exports.getSchematicDefaults = exports.migrateLegacyGlobalConfig = exports.getConfiguredPackageManager = exports.getProjectByCwd = exports.validateWorkspace = exports.getWorkspaceRaw = exports.createGlobalSettings = exports.getWorkspace = exports.AngularWorkspace = exports.workspaceSchemaPath = void 0;
+exports.isWarningEnabled = exports.getSchematicDefaults = exports.getConfiguredPackageManager = exports.getProjectByCwd = exports.validateWorkspace = exports.getWorkspaceRaw = exports.createGlobalSettings = exports.getWorkspace = exports.AngularWorkspace = exports.workspaceSchemaPath = void 0;
 const core_1 = require("@angular-devkit/core");
 const fs_1 = require("fs");
 const os = __importStar(require("os"));
@@ -139,12 +139,6 @@ class AngularWorkspace {
         return (project === null || project === void 0 ? void 0 : project.extensions['cli']) || {};
     }
     static async load(workspaceFilePath) {
-        const oldConfigFileNames = ['.angular-cli.json', 'angular-cli.json'];
-        if (oldConfigFileNames.includes(path.basename(workspaceFilePath))) {
-            // 1.x file format
-            // Create an empty workspace to allow update to be used
-            return new AngularWorkspace({ extensions: {}, projects: new core_1.workspaces.ProjectDefinitionCollection() }, workspaceFilePath);
-        }
         const result = await core_1.workspaces.readWorkspace(workspaceFilePath, createWorkspaceHost(), core_1.workspaces.WorkspaceFormat.JSON);
         return new AngularWorkspace(result.workspace, workspaceFilePath);
     }
@@ -268,86 +262,24 @@ async function getConfiguredPackageManager() {
                 return value;
             }
         }
+        return null;
     };
-    let result;
+    let result = null;
     const workspace = await getWorkspace('local');
     if (workspace) {
         const project = getProjectByCwd(workspace);
         if (project) {
             result = getPackageManager((_a = workspace.projects.get(project)) === null || _a === void 0 ? void 0 : _a.extensions['cli']);
         }
-        result = result !== null && result !== void 0 ? result : getPackageManager(workspace.extensions['cli']);
+        result !== null && result !== void 0 ? result : (result = getPackageManager(workspace.extensions['cli']));
     }
-    if (result === undefined) {
+    if (!result) {
         const globalOptions = await getWorkspace('global');
         result = getPackageManager(globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.extensions['cli']);
-        if (!workspace && !globalOptions) {
-            // Only check legacy if updated workspace is not found
-            result = getLegacyPackageManager();
-        }
     }
-    // Default to null
-    return result !== null && result !== void 0 ? result : null;
+    return result;
 }
 exports.getConfiguredPackageManager = getConfiguredPackageManager;
-function migrateLegacyGlobalConfig() {
-    const homeDir = os.homedir();
-    if (homeDir) {
-        const legacyGlobalConfigPath = path.join(homeDir, '.angular-cli.json');
-        if ((0, fs_1.existsSync)(legacyGlobalConfigPath)) {
-            const legacy = (0, json_file_1.readAndParseJson)(legacyGlobalConfigPath);
-            if (!isJsonObject(legacy)) {
-                return false;
-            }
-            const cli = {};
-            if (legacy.packageManager &&
-                typeof legacy.packageManager == 'string' &&
-                legacy.packageManager !== 'default') {
-                cli['packageManager'] = legacy.packageManager;
-            }
-            if (isJsonObject(legacy.defaults) &&
-                isJsonObject(legacy.defaults.schematics) &&
-                typeof legacy.defaults.schematics.collection == 'string') {
-                cli['defaultCollection'] = legacy.defaults.schematics.collection;
-            }
-            if (isJsonObject(legacy.warnings)) {
-                const warnings = {};
-                if (typeof legacy.warnings.versionMismatch == 'boolean') {
-                    warnings['versionMismatch'] = legacy.warnings.versionMismatch;
-                }
-                if (Object.getOwnPropertyNames(warnings).length > 0) {
-                    cli['warnings'] = warnings;
-                }
-            }
-            if (Object.getOwnPropertyNames(cli).length > 0) {
-                const globalPath = path.join(homeDir, globalFileName);
-                (0, fs_1.writeFileSync)(globalPath, JSON.stringify({ version: 1, cli }, null, 2));
-                return true;
-            }
-        }
-    }
-    return false;
-}
-exports.migrateLegacyGlobalConfig = migrateLegacyGlobalConfig;
-// Fallback, check for packageManager in config file in v1.* global config.
-function getLegacyPackageManager() {
-    const homeDir = os.homedir();
-    if (homeDir) {
-        const legacyGlobalConfigPath = path.join(homeDir, '.angular-cli.json');
-        if ((0, fs_1.existsSync)(legacyGlobalConfigPath)) {
-            const legacy = (0, json_file_1.readAndParseJson)(legacyGlobalConfigPath);
-            if (!isJsonObject(legacy)) {
-                return null;
-            }
-            if (legacy.packageManager &&
-                typeof legacy.packageManager === 'string' &&
-                legacy.packageManager !== 'default') {
-                return legacy.packageManager;
-            }
-        }
-    }
-    return null;
-}
 async function getSchematicDefaults(collection, schematic, project) {
     var _a;
     const result = {};

package/utilities/package-manager.d.ts

@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { PackageManager } from '../lib/config/workspace-schema';
-export declare function supportsYarn(): boolean;
-export declare function supportsNpm(): boolean;
 export declare function getPackageManager(root: string): Promise<PackageManager>;
 /**
  * Checks if the npm version is a supported 7.x version.  If not, display a warning.

package/utilities/package-manager.js

@@ -7,54 +7,77 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureCompatibleNpm = exports.getPackageManager = exports.supportsNpm = exports.supportsYarn = void 0;
+exports.ensureCompatibleNpm = exports.getPackageManager = void 0;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const semver_1 = require("semver");
+const util_1 = require("util");
 const workspace_schema_1 = require("../lib/config/workspace-schema");
 const config_1 = require("./config");
-function supports(name) {
+const exec = (0, util_1.promisify)(child_process_1.exec);
+async function supports(name) {
     try {
-        (0, child_process_1.execSync)(`${name} --version`, { stdio: 'ignore' });
+        await exec(`${name} --version`);
         return true;
     }
     catch {
         return false;
     }
 }
-function supportsYarn() {
-    return supports('yarn');
-}
-exports.supportsYarn = supportsYarn;
-function supportsNpm() {
-    return supports('npm');
+async function hasLockfile(root, packageManager) {
+    try {
+        let lockfileName;
+        switch (packageManager) {
+            case workspace_schema_1.PackageManager.Yarn:
+                lockfileName = 'yarn.lock';
+                break;
+            case workspace_schema_1.PackageManager.Pnpm:
+                lockfileName = 'pnpm-lock.yaml';
+                break;
+            case workspace_schema_1.PackageManager.Npm:
+            default:
+                lockfileName = 'package-lock.json';
+                break;
+        }
+        await fs_1.promises.access((0, path_1.join)(root, lockfileName), fs_1.constants.F_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
 }
-exports.supportsNpm = supportsNpm;
 async function getPackageManager(root) {
-    let packageManager = (await (0, config_1.getConfiguredPackageManager)());
+    const packageManager = await (0, config_1.getConfiguredPackageManager)();
     if (packageManager) {
         return packageManager;
     }
-    const hasYarn = supportsYarn();
-    const hasYarnLock = (0, fs_1.existsSync)((0, path_1.join)(root, 'yarn.lock'));
-    const hasNpm = supportsNpm();
-    const hasNpmLock = (0, fs_1.existsSync)((0, path_1.join)(root, 'package-lock.json'));
+    const [hasYarnLock, hasNpmLock, hasPnpmLock] = await Promise.all([
+        hasLockfile(root, workspace_schema_1.PackageManager.Yarn),
+        hasLockfile(root, workspace_schema_1.PackageManager.Npm),
+        hasLockfile(root, workspace_schema_1.PackageManager.Pnpm),
+    ]);
+    const hasYarn = await supports(workspace_schema_1.PackageManager.Yarn);
     if (hasYarn && hasYarnLock && !hasNpmLock) {
-        packageManager = workspace_schema_1.PackageManager.Yarn;
+        return workspace_schema_1.PackageManager.Yarn;
+    }
+    const hasPnpm = await supports(workspace_schema_1.PackageManager.Pnpm);
+    if (hasPnpm && hasPnpmLock && !hasNpmLock) {
+        return workspace_schema_1.PackageManager.Pnpm;
     }
-    else if (hasNpm && hasNpmLock && !hasYarnLock) {
-        packageManager = workspace_schema_1.PackageManager.Npm;
+    const hasNpm = await supports(workspace_schema_1.PackageManager.Npm);
+    if (hasNpm && hasNpmLock && !hasYarnLock && !hasPnpmLock) {
+        return workspace_schema_1.PackageManager.Npm;
     }
-    else if (hasYarn && !hasNpm) {
-        packageManager = workspace_schema_1.PackageManager.Yarn;
+    if (hasYarn && !hasNpm && !hasPnpm) {
+        return workspace_schema_1.PackageManager.Yarn;
     }
-    else if (hasNpm && !hasYarn) {
-        packageManager = workspace_schema_1.PackageManager.Npm;
+    if (hasPnpm && !hasYarn && !hasNpm) {
+        return workspace_schema_1.PackageManager.Pnpm;
     }
     // TODO: This should eventually inform the user of ambiguous package manager usage.
     //       Potentially with a prompt to choose and optionally set as the default.
-    return packageManager || workspace_schema_1.PackageManager.Npm;
+    return workspace_schema_1.PackageManager.Npm;
 }
 exports.getPackageManager = getPackageManager;
 /**

package/utilities/project.js

@@ -33,12 +33,7 @@ const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const find_up_1 = require("./find-up");
 function findWorkspaceFile(currentDirectory = process.cwd()) {
-    const possibleConfigFiles = [
-        'angular.json',
-        '.angular.json',
-        'angular-cli.json',
-        '.angular-cli.json',
-    ];
+    const possibleConfigFiles = ['angular.json', '.angular.json'];
     const configFilePath = (0, find_up_1.findUp)(possibleConfigFiles, currentDirectory);
     if (configFilePath === null) {
         return null;