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

package/src/commands/update/schematic/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -31,7 +35,7 @@ const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const npa = __importStar(require("npm-package-arg"));
 const semver = __importStar(require("semver"));
-const package_metadata_1 = require("../../../../utilities/package-metadata");
+const package_metadata_1 = require("../../../utilities/package-metadata");
 // Angular guarantees that a major is compatible with its following major (so packages that depend
 // on Angular 5 are also compatible with Angular 6). This is, in code, represented by verifying
 // that all other packages that have a peer dependency of `"@angular/core": "^5.0.0"` actually
@@ -282,6 +286,7 @@ function _getUpdateMetadata(packageJson, logger) {
         }
         else if (typeof packageGroup == 'object' &&
             packageGroup &&
+            !Array.isArray(packageGroup) &&
             Object.values(packageGroup).every((x) => typeof x == 'string')) {
             result.packageGroup = packageGroup;
         }
@@ -358,23 +363,26 @@ function _usageMessage(options, infoMap, logger) {
     })
         .filter(({ info, version, target }) => (target === null || target === void 0 ? void 0 : target['ng-update']) && semver.compare(info.installed.version, version) < 0)
         .map(({ name, info, version, tag, target }) => {
-        var _a;
+        var _a, _b, _c;
         // Look for packageGroup.
-        const packageGroup = target['ng-update']['packageGroup'];
+        const packageGroup = (_a = target['ng-update']) === null || _a === void 0 ? void 0 : _a['packageGroup'];
         if (packageGroup) {
-            const packageGroupName = target['ng-update']['packageGroupName'] || packageGroup[0];
+            const packageGroupNames = Array.isArray(packageGroup)
+                ? packageGroup
+                : Object.keys(packageGroup);
+            const packageGroupName = ((_b = target['ng-update']) === null || _b === void 0 ? void 0 : _b['packageGroupName']) || packageGroupNames[0];
             if (packageGroupName) {
                 if (packageGroups.has(name)) {
                     return null;
                 }
-                packageGroup.forEach((x) => packageGroups.set(x, packageGroupName));
+                packageGroupNames.forEach((x) => packageGroups.set(x, packageGroupName));
                 packageGroups.set(packageGroupName, packageGroupName);
                 name = packageGroupName;
             }
         }
         let command = `ng update ${name}`;
         if (!tag) {
-            command += `@${((_a = semver.parse(version)) === null || _a === void 0 ? void 0 : _a.major) || version}`;
+            command += `@${((_c = semver.parse(version)) === null || _c === void 0 ? void 0 : _c.major) || version}`;
         }
         else if (tag == 'next') {
             command += ' --next';
@@ -504,29 +512,34 @@ function _addPackageGroup(tree, packages, allDependencies, npmPackageJson, logge
     if (!ngUpdateMetadata) {
         return;
     }
-    let packageGroup = ngUpdateMetadata['packageGroup'];
+    const packageGroup = ngUpdateMetadata['packageGroup'];
     if (!packageGroup) {
         return;
     }
+    let packageGroupNormalized = {};
     if (Array.isArray(packageGroup) && !packageGroup.some((x) => typeof x != 'string')) {
-        packageGroup = packageGroup.reduce((acc, curr) => {
+        packageGroupNormalized = packageGroup.reduce((acc, curr) => {
             acc[curr] = maybePackage;
             return acc;
         }, {});
     }
-    // Only need to check if it's an object because we set it right the time before.
-    if (typeof packageGroup != 'object' ||
-        packageGroup === null ||
-        Object.values(packageGroup).some((v) => typeof v != 'string')) {
-        logger.warn(`packageGroup metadata of package ${npmPackageJson.name} is malformed.`);
+    else if (typeof packageGroup == 'object' &&
+        packageGroup &&
+        !Array.isArray(packageGroup) &&
+        Object.values(packageGroup).every((x) => typeof x == 'string')) {
+        packageGroupNormalized = packageGroup;
+    }
+    else {
+        logger.warn(`packageGroup metadata of package ${npmPackageJson.name} is malformed. Ignoring.`);
         return;
     }
-    Object.keys(packageGroup)
-        .filter((name) => !packages.has(name)) // Don't override names from the command line.
-        .filter((name) => allDependencies.has(name)) // Remove packages that aren't installed.
-        .forEach((name) => {
-        packages.set(name, packageGroup[name]);
-    });
+    for (const [name, value] of Object.entries(packageGroupNormalized)) {
+        // Don't override names from the command line.
+        // Remove packages that aren't installed.
+        if (!packages.has(name) && allDependencies.has(name)) {
+            packages.set(name, value);
+        }
+    }
 }
 /**
  * Add peer dependencies of packages on the command line to the list of packages to update.

package/src/commands/version/cli.d.ts

@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 { Argv } from 'yargs';
+import { CommandModule, CommandModuleImplementation } from '../../command-builder/command-module';
+export declare class VersionCommandModule extends CommandModule implements CommandModuleImplementation {
+    command: string;
+    aliases: string[];
+    describe: string;
+    longDescriptionPath?: string | undefined;
+    builder(localYargs: Argv): Argv;
+    run(): Promise<void>;
+    private getVersion;
+}

package/{commands/version-impl.js → src/commands/version/cli.js}

@@ -10,59 +10,63 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VersionCommand = void 0;
-const child_process_1 = require("child_process");
+exports.VersionCommandModule = void 0;
 const module_1 = __importDefault(require("module"));
-const command_1 = require("../models/command");
-const color_1 = require("../utilities/color");
-const package_manager_1 = require("../utilities/package-manager");
+const path_1 = require("path");
+const command_module_1 = require("../../command-builder/command-module");
+const color_1 = require("../../utilities/color");
 /**
  * Major versions of Node.js that are officially supported by Angular.
  */
-const SUPPORTED_NODE_MAJORS = [12, 14, 16];
-class VersionCommand extends command_1.Command {
+const SUPPORTED_NODE_MAJORS = [14, 16];
+const PACKAGE_PATTERNS = [
+    /^@angular\/.*/,
+    /^@angular-devkit\/.*/,
+    /^@bazel\/.*/,
+    /^@ngtools\/.*/,
+    /^@nguniversal\/.*/,
+    /^@schematics\/.*/,
+    /^rxjs$/,
+    /^typescript$/,
+    /^ng-packagr$/,
+    /^webpack$/,
+];
+class VersionCommandModule extends command_module_1.CommandModule {
     constructor() {
         super(...arguments);
-        this.localRequire = module_1.default.createRequire(__filename);
-        // Trailing slash is used to allow the path to be treated as a directory
-        this.workspaceRequire = module_1.default.createRequire(this.context.root + '/');
+        this.command = 'version';
+        this.aliases = ['v'];
+        this.describe = 'Outputs Angular CLI version.';
+    }
+    builder(localYargs) {
+        return localYargs;
     }
     async run() {
-        const cliPackage = this.localRequire('../package.json');
+        var _a;
+        const { packageManager, logger, root } = this.context;
+        const localRequire = module_1.default.createRequire((0, path_1.resolve)(__filename, '../../../'));
+        // Trailing slash is used to allow the path to be treated as a directory
+        const workspaceRequire = module_1.default.createRequire(root + '/');
+        const cliPackage = localRequire('./package.json');
         let workspacePackage;
         try {
-            workspacePackage = this.workspaceRequire('./package.json');
+            workspacePackage = workspaceRequire('./package.json');
         }
         catch { }
         const [nodeMajor] = process.versions.node.split('.').map((part) => Number(part));
         const unsupportedNodeVersion = !SUPPORTED_NODE_MAJORS.includes(nodeMajor);
-        const patterns = [
-            /^@angular\/.*/,
-            /^@angular-devkit\/.*/,
-            /^@bazel\/.*/,
-            /^@ngtools\/.*/,
-            /^@nguniversal\/.*/,
-            /^@schematics\/.*/,
-            /^rxjs$/,
-            /^typescript$/,
-            /^ng-packagr$/,
-            /^webpack$/,
-        ];
-        const packageNames = [
-            ...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) || {}),
-        ];
-        const versions = packageNames
-            .filter((x) => patterns.some((p) => p.test(x)))
-            .reduce((acc, name) => {
-            if (name in acc) {
-                return acc;
+        const packageNames = new Set(Object.keys({
+            ...cliPackage.dependencies,
+            ...cliPackage.devDependencies,
+            ...workspacePackage === null || workspacePackage === void 0 ? void 0 : workspacePackage.dependencies,
+            ...workspacePackage === null || workspacePackage === void 0 ? void 0 : workspacePackage.devDependencies,
+        }));
+        const versions = {};
+        for (const name of packageNames) {
+            if (PACKAGE_PATTERNS.some((p) => p.test(name))) {
+                versions[name] = this.getVersion(name, workspaceRequire, localRequire);
             }
-            acc[name] = this.getVersion(name);
-            return acc;
-        }, {});
+        }
         const ngCliVersion = cliPackage.version;
         let angularCoreVersion = '';
         const angularSameAsCore = [];
@@ -70,11 +74,10 @@ class VersionCommand extends command_1.Command {
             // Filter all angular versions that are the same as core.
             angularCoreVersion = versions['@angular/core'];
             if (angularCoreVersion) {
-                for (const angularPackage of Object.keys(versions)) {
-                    if (versions[angularPackage] == angularCoreVersion &&
-                        angularPackage.startsWith('@angular/')) {
-                        angularSameAsCore.push(angularPackage.replace(/^@angular\//, ''));
-                        delete versions[angularPackage];
+                for (const [name, version] of Object.entries(versions)) {
+                    if (version === angularCoreVersion && name.startsWith('@angular/')) {
+                        angularSameAsCore.push(name.replace(/^@angular\//, ''));
+                        delete versions[name];
                     }
                 }
                 // Make sure we list them in alphabetical order.
@@ -93,11 +96,11 @@ class VersionCommand extends command_1.Command {
             .split('\n')
             .map((x) => color_1.colors.red(x))
             .join('\n');
-        this.logger.info(asciiArt);
-        this.logger.info(`
+        logger.info(asciiArt);
+        logger.info(`
       Angular CLI: ${ngCliVersion}
       Node: ${process.versions.node}${unsupportedNodeVersion ? ' (Unsupported)' : ''}
-      Package Manager: ${await this.getPackageManager()}
+      Package Manager: ${packageManager.name} ${(_a = packageManager.version) !== null && _a !== void 0 ? _a : '<error>'} 
       OS: ${process.platform} ${process.arch}
 
       Angular: ${angularCoreVersion}
@@ -126,54 +129,33 @@ class VersionCommand extends command_1.Command {
             .join('\n')}
     `.replace(/^ {6}/gm, ''));
         if (unsupportedNodeVersion) {
-            this.logger.warn(`Warning: The current version of Node (${process.versions.node}) is not supported by Angular.`);
+            logger.warn(`Warning: The current version of Node (${process.versions.node}) is not supported by Angular.`);
         }
     }
-    getVersion(moduleName) {
+    getVersion(moduleName, workspaceRequire, localRequire) {
         let packageInfo;
         let cliOnly = false;
         // Try to find the package in the workspace
         try {
-            packageInfo = this.workspaceRequire(`${moduleName}/package.json`);
+            packageInfo = workspaceRequire(`${moduleName}/package.json`);
         }
         catch { }
         // If not found, try to find within the CLI
         if (!packageInfo) {
             try {
-                packageInfo = this.localRequire(`${moduleName}/package.json`);
+                packageInfo = localRequire(`${moduleName}/package.json`);
                 cliOnly = true;
             }
             catch { }
         }
-        let version;
         // If found, attempt to get the version
         if (packageInfo) {
             try {
-                version = packageInfo.version + (cliOnly ? ' (cli-only)' : '');
+                return packageInfo.version + (cliOnly ? ' (cli-only)' : '');
             }
             catch { }
         }
-        return version || '<error>';
-    }
-    async getPackageManager() {
-        try {
-            const manager = await (0, package_manager_1.getPackageManager)(this.context.root);
-            const version = (0, child_process_1.execSync)(`${manager} --version`, {
-                encoding: 'utf8',
-                stdio: ['ignore', 'pipe', 'ignore'],
-                env: {
-                    ...process.env,
-                    //  NPM updater notifier will prevents the child process from closing until it timeout after 3 minutes.
-                    NO_UPDATE_NOTIFIER: '1',
-                    NPM_CONFIG_UPDATE_NOTIFIER: 'false',
-                },
-            }).trim();
-            return `${manager} ${version}`;
-        }
-        catch {
-            return '<error>';
-        }
+        return '<error>';
     }
 }
-exports.VersionCommand = VersionCommand;
-VersionCommand.aliases = ['v'];
+exports.VersionCommandModule = VersionCommandModule;

package/src/typings-bazel.d.ts

@@ -0,0 +1,14 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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
+ */
+
+/* eslint-disable import/no-extraneous-dependencies */
+// Workaround for https://github.com/bazelbuild/rules_nodejs/issues/1033
+// Alternative approach instead of https://github.com/angular/angular/pull/33226
+declare module '@yarnpkg/lockfile' {
+  export * from '@types/yarnpkg__lockfile';
+}

package/src/typings.d.ts

@@ -5,20 +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
  */
-declare module '@yarnpkg/lockfile' {
-    function parse(data: string): Record<string, any>;
-}
-declare module 'ini' {
-    function parse(data: string): Record<string, any>;
-}
 declare module 'npm-pick-manifest' {
-    function pickManifest(metadata: import('../utilities/package-metadata').PackageMetadata, selector: string): import('../utilities/package-metadata').PackageManifest;
+    function pickManifest(metadata: import('./utilities/package-metadata').PackageMetadata, selector: string): import('./utilities/package-metadata').PackageManifest;
     export = pickManifest;
 }
-declare module 'pacote' {
-    function manifest(specifier: string, options: Record<string, unknown>): Promise<{
-        name: string;
-        version: string;
-    }>;
-    function packument(specifier: string, options: Record<string, unknown>): Promise<import('../utilities/package-metadata').NpmRepositoryPackageJson>;
-}

package/{utilities → src/utilities}/color.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/{utilities → src/utilities}/config.d.ts

@@ -6,25 +6,26 @@
  * 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 {
-    private workspace;
+    private readonly workspace;
     readonly filePath: string;
     readonly basePath: string;
     constructor(workspace: workspaces.WorkspaceDefinition, filePath: string);
     get extensions(): Record<string, json.JsonValue | undefined>;
     get projects(): workspaces.ProjectDefinitionCollection;
-    getCli(): Record<string, any>;
-    getProjectCli(projectName: string): Record<string, any>;
+    getCli(): Record<string, any> | undefined;
+    getProjectCli(projectName: string): Record<string, any> | undefined;
+    save(): Promise<void>;
     static load(workspaceFilePath: string): Promise<AngularWorkspace>;
 }
-export declare function getWorkspace(level?: 'local' | 'global'): Promise<AngularWorkspace | null>;
+export declare function getWorkspace(level?: 'local' | 'global'): Promise<AngularWorkspace | undefined>;
 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 → src/utilities}/config.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -26,7 +30,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"));
@@ -38,15 +42,16 @@ function isJsonObject(value) {
 }
 function createWorkspaceHost() {
     return {
-        async readFile(path) {
-            return (0, fs_1.readFileSync)(path, 'utf-8');
+        readFile(path) {
+            return fs_1.promises.readFile(path, 'utf-8');
         },
         async writeFile(path, data) {
-            (0, fs_1.writeFileSync)(path, data);
+            await fs_1.promises.writeFile(path, data);
         },
         async isDirectory(path) {
             try {
-                return (0, fs_1.statSync)(path).isDirectory();
+                const stats = await fs_1.promises.stat(path);
+                return stats.isDirectory();
             }
             catch {
                 return false;
@@ -54,7 +59,8 @@ function createWorkspaceHost() {
         },
         async isFile(path) {
             try {
-                return (0, fs_1.statSync)(path).isFile();
+                const stats = await fs_1.promises.stat(path);
+                return stats.isFile();
             }
             catch {
                 return false;
@@ -62,10 +68,7 @@ function createWorkspaceHost() {
         },
     };
 }
-function getSchemaLocation() {
-    return path.join(__dirname, '../lib/config/schema.json');
-}
-exports.workspaceSchemaPath = getSchemaLocation();
+exports.workspaceSchemaPath = path.join(__dirname, '../../lib/config/schema.json');
 const configNames = ['angular.json', '.angular.json'];
 const globalFileName = '.angular-config.json';
 function xdgConfigHome(home, configFile) {
@@ -131,20 +134,17 @@ class AngularWorkspace {
     // Temporary helper functions to support refactoring
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     getCli() {
-        return this.workspace.extensions['cli'] || {};
+        return this.workspace.extensions['cli'];
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     getProjectCli(projectName) {
         const project = this.workspace.projects.get(projectName);
-        return (project === null || project === void 0 ? void 0 : project.extensions['cli']) || {};
+        return project === null || project === void 0 ? void 0 : project.extensions['cli'];
+    }
+    save() {
+        return core_1.workspaces.writeWorkspace(this.workspace, createWorkspaceHost(), this.filePath);
     }
     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);
     }
@@ -152,14 +152,16 @@ class AngularWorkspace {
 exports.AngularWorkspace = AngularWorkspace;
 const cachedWorkspaces = new Map();
 async function getWorkspace(level = 'local') {
-    const cached = cachedWorkspaces.get(level);
-    if (cached !== undefined) {
-        return cached;
+    if (cachedWorkspaces.has(level)) {
+        return cachedWorkspaces.get(level);
     }
-    const configPath = level === 'local' ? projectFilePath() : globalFilePath();
+    let configPath = level === 'local' ? projectFilePath() : globalFilePath();
     if (!configPath) {
-        cachedWorkspaces.set(level, null);
-        return null;
+        if (level === 'local') {
+            cachedWorkspaces.set(level, undefined);
+            return undefined;
+        }
+        configPath = createGlobalSettings();
     }
     try {
         const workspace = await AngularWorkspace.load(configPath);
@@ -196,7 +198,7 @@ function getWorkspaceRaw(level = 'local') {
 }
 exports.getWorkspaceRaw = getWorkspaceRaw;
 async function validateWorkspace(data) {
-    const schema = (0, json_file_1.readAndParseJson)(path.join(__dirname, '../lib/config/schema.json'));
+    const schema = (0, json_file_1.readAndParseJson)(exports.workspaceSchemaPath);
     const { formats } = await Promise.resolve().then(() => __importStar(require('@angular-devkit/schematics')));
     const registry = new core_1.json.schema.CoreSchemaRegistry(formats.standardFormats);
     const validator = await registry.compile(schema).toPromise();
@@ -242,6 +244,7 @@ function findProjectByPath(workspace, location) {
     }
     return projects[0][1];
 }
+let defaultProjectDeprecationWarningShown = false;
 function getProjectByCwd(workspace) {
     if (workspace.projects.size === 1) {
         // If there is only one project, return that one.
@@ -254,6 +257,11 @@ function getProjectByCwd(workspace) {
     const defaultProject = workspace.extensions['defaultProject'];
     if (defaultProject && typeof defaultProject === 'string') {
         // If there is a default project name, return it.
+        if (!defaultProjectDeprecationWarningShown) {
+            console.warn(`DEPRECATED: The 'defaultProject' workspace option has been deprecated. ` +
+                `The project to use will be determined from the current working directory.`);
+            defaultProjectDeprecationWarningShown = true;
+        }
         return defaultProject;
     }
     return null;
@@ -268,86 +276,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 = {};