@angular/cli 12.0.0-rc.0 → 12.0.0

package/src/commands/update/schematic/npm-package-json.js

@@ -1,2 +1,9 @@
 "use strict";
+/**
+ * @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
+ */
 Object.defineProperty(exports, "__esModule", { value: true });

package/src/commands/update/schematic/npm.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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

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

@@ -1,11 +1,18 @@
 "use strict";
+/**
+ * @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
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNpmPackageJson = void 0;
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path = require("path");
-const ini = require('ini');
 const lockfile = require('@yarnpkg/lockfile');
+const ini = require('ini');
 const pacote = require('pacote');
 const npmPackageJsonCache = new Map();
 let npmrc;
@@ -27,9 +34,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/src/commands/update/schematic/package-json.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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

package/src/commands/update/schematic/package-json.js

@@ -1,15 +1,9 @@
 "use strict";
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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
  */
-/**
- * This file was automatically generated by json-schema-to-typescript.
- * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
- * and run json-schema-to-typescript to regenerate this file.
- */
-// tslint:disable
 Object.defineProperty(exports, "__esModule", { value: true });

package/src/commands/update/schematic/schema.json

@@ -57,14 +57,8 @@
       "description": "The preferred package manager configuration files to use for registry settings.",
       "type": "string",
       "default": "npm",
-      "enum": [
-        "npm",
-        "yarn",
-        "cnpm",
-        "pnpm"
-      ]
+      "enum": ["npm", "yarn", "cnpm", "pnpm"]
     }
   },
-  "required": [
-  ]
+  "required": []
 }

package/utilities/color.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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

package/utilities/color.js

@@ -1,13 +1,13 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.colors = exports.removeColor = void 0;
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.colors = exports.removeColor = void 0;
 const ansiColors = require("ansi-colors");
 const tty_1 = require("tty");
 const supportsColor = process.stdout instanceof tty_1.WriteStream && process.stdout.getColorDepth() > 1;

package/utilities/config.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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

package/utilities/config.js

@@ -1,13 +1,13 @@
 "use strict";
-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;
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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
  */
+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;
 const core_1 = require("@angular-devkit/core");
 const fs_1 = require("fs");
 const os = require("os");
@@ -51,8 +51,16 @@ const configNames = ['angular.json', '.angular.json'];
 const globalFileName = '.angular-config.json';
 function xdgConfigHome(home, configFile) {
     // https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+    const xdgConfigHome = process.env['XDG_CONFIG_HOME'] || path.join(home, '.config');
+    const xdgAngularHome = path.join(xdgConfigHome, 'angular');
+    return configFile ? path.join(xdgAngularHome, configFile) : xdgAngularHome;
+}
+function xdgConfigHomeOld(home) {
+    // Check the configuration files in the old location that should be:
+    // - $XDG_CONFIG_HOME/.angular-config.json (if XDG_CONFIG_HOME is set)
+    // - $HOME/.config/angular/.angular-config.json (otherwise)
     const p = process.env['XDG_CONFIG_HOME'] || path.join(home, '.config', 'angular');
-    return configFile ? path.join(p, configFile) : p;
+    return path.join(p, '.angular-config.json');
 }
 function projectFilePath(projectPath) {
     // Find the configuration, either where specified, in the Angular CLI project
@@ -70,10 +78,19 @@ function globalFilePath() {
     // note that createGlobalSettings() will continue creating
     // global file in home directory, with this user will have
     // choice to move change its location to meet XDG convention
-    const xdgConfig = xdgConfigHome(home, globalFileName);
+    const xdgConfig = xdgConfigHome(home, 'config.json');
     if (fs_1.existsSync(xdgConfig)) {
         return xdgConfig;
     }
+    // NOTE: This check is for the old configuration location, for more
+    // information see https://github.com/angular/angular-cli/pull/20556
+    const xdgConfigOld = xdgConfigHomeOld(home);
+    if (fs_1.existsSync(xdgConfigOld)) {
+        /* eslint-disable no-console */
+        console.warn(`Old configuration location detected: ${xdgConfigOld}\n` +
+            `Please move the file to the new location ~/.config/angular/config.json`);
+        return xdgConfigOld;
+    }
     const p = path.join(home, globalFileName);
     if (fs_1.existsSync(p)) {
         return p;
@@ -93,11 +110,11 @@ class AngularWorkspace {
         return this.workspace.projects;
     }
     // Temporary helper functions to support refactoring
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     getCli() {
         return this.workspace.extensions['cli'] || {};
     }
-    // tslint:disable-next-line: no-any
+    // 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']) || {};

package/utilities/find-up.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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

package/utilities/find-up.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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

package/utilities/install-package.d.ts

@@ -1,13 +1,15 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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 { logging } from '@angular-devkit/core';
 import { PackageManager } from '../lib/config/workspace-schema';
 import { NgAddSaveDepedency } from '../utilities/package-metadata';
-export declare function installPackage(packageName: string, logger: logging.Logger | undefined, packageManager?: PackageManager, save?: Exclude<NgAddSaveDepedency, false>, extraArgs?: string[], cwd?: string): void;
-export declare function installTempPackage(packageName: string, logger: logging.Logger | undefined, packageManager?: PackageManager, extraArgs?: string[]): string;
-export declare function runTempPackageBin(packageName: string, logger: logging.Logger, packageManager?: PackageManager, args?: string[]): number;
+export declare function installPackage(packageName: string, packageManager?: PackageManager, save?: Exclude<NgAddSaveDepedency, false>, extraArgs?: string[], cwd?: string): Promise<1 | 0>;
+export declare function installTempPackage(packageName: string, packageManager?: PackageManager, extraArgs?: string[]): Promise<{
+    status: 1 | 0;
+    tempPath: string;
+}>;
+export declare function runTempPackageBin(packageName: string, packageManager?: PackageManager, args?: string[]): Promise<number>;

package/utilities/install-package.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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
@@ -14,35 +14,44 @@ const os_1 = require("os");
 const path_1 = require("path");
 const rimraf = require("rimraf");
 const workspace_schema_1 = require("../lib/config/workspace-schema");
-const color_1 = require("../utilities/color");
-function installPackage(packageName, logger, packageManager = workspace_schema_1.PackageManager.Npm, save = true, extraArgs = [], cwd = process.cwd()) {
+const spinner_1 = require("./spinner");
+async function installPackage(packageName, packageManager = workspace_schema_1.PackageManager.Npm, save = true, extraArgs = [], cwd = process.cwd()) {
     const packageManagerArgs = getPackageManagerArguments(packageManager);
     const installArgs = [
         packageManagerArgs.install,
         packageName,
         packageManagerArgs.silent,
     ];
-    logger === null || logger === void 0 ? void 0 : logger.info(color_1.colors.green(`Installing packages for tooling via ${packageManager}.`));
+    const spinner = new spinner_1.Spinner();
+    spinner.start('Installing package...');
     if (save === 'devDependencies') {
         installArgs.push(packageManagerArgs.saveDev);
     }
-    const { status, stderr, stdout, error } = child_process_1.spawnSync(packageManager, [...installArgs, ...extraArgs], {
-        stdio: 'pipe',
-        shell: true,
-        encoding: 'utf8',
-        cwd,
+    const bufferedOutput = [];
+    return new Promise((resolve, reject) => {
+        var _a, _b;
+        const childProcess = child_process_1.spawn(packageManager, [...installArgs, ...extraArgs], {
+            stdio: 'pipe',
+            shell: true,
+            cwd,
+        }).on('close', (code) => {
+            if (code === 0) {
+                spinner.succeed('Package successfully installed.');
+                resolve(0);
+            }
+            else {
+                spinner.stop();
+                bufferedOutput.forEach(({ stream, data }) => stream.write(data));
+                spinner.fail('Package install failed, see above.');
+                reject(1);
+            }
+        });
+        (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => bufferedOutput.push({ stream: process.stdout, data: data }));
+        (_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => bufferedOutput.push({ stream: process.stderr, data: data }));
     });
-    if (status !== 0) {
-        let errorMessage = ((error && error.message) || stderr || stdout || '').trim();
-        if (errorMessage) {
-            errorMessage += '\n';
-        }
-        throw new Error(errorMessage + `Package install failed${errorMessage ? ', see above' : ''}.`);
-    }
-    logger === null || logger === void 0 ? void 0 : logger.info(color_1.colors.green(`Installed packages for tooling via ${packageManager}.`));
 }
 exports.installPackage = installPackage;
-function installTempPackage(packageName, logger, packageManager = workspace_schema_1.PackageManager.Npm, extraArgs) {
+async function installTempPackage(packageName, packageManager = workspace_schema_1.PackageManager.Npm, extraArgs) {
     const tempPath = fs_1.mkdtempSync(path_1.join(fs_1.realpathSync(os_1.tmpdir()), 'angular-cli-packages-'));
     // clean up temp directory on process exit
     process.on('exit', () => {
@@ -75,16 +84,21 @@ function installTempPackage(packageName, logger, packageManager = workspace_sche
         `${packageManagerArgs.prefix}="${prefixPath}"`,
         packageManagerArgs.noLockfile,
     ];
-    installPackage(packageName, logger, packageManager, true, installArgs, tempPath);
-    return tempNodeModules;
+    return {
+        status: await installPackage(packageName, packageManager, true, installArgs, tempPath),
+        tempPath,
+    };
 }
 exports.installTempPackage = installTempPackage;
-function runTempPackageBin(packageName, logger, packageManager = workspace_schema_1.PackageManager.Npm, args = []) {
-    const tempNodeModulesPath = installTempPackage(packageName, logger, packageManager);
+async function runTempPackageBin(packageName, packageManager = workspace_schema_1.PackageManager.Npm, args = []) {
+    const { status: code, tempPath } = await installTempPackage(packageName, packageManager);
+    if (code !== 0) {
+        return code;
+    }
     // Remove version/tag etc... from package name
     // Ex: @angular/cli@latest -> @angular/cli
     const packageNameNoVersion = packageName.substring(0, packageName.lastIndexOf('@'));
-    const pkgLocation = path_1.join(tempNodeModulesPath, packageNameNoVersion);
+    const pkgLocation = path_1.join(tempPath, packageNameNoVersion);
     const packageJsonPath = path_1.join(pkgLocation, 'package.json');
     // Get a binary location for this package
     let binPath;

package/utilities/json-file.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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

package/utilities/json-file.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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
@@ -52,7 +52,7 @@ class JSONFile {
         let getInsertionIndex;
         if (insertInOrder === undefined) {
             const property = jsonPath.slice(-1)[0];
-            getInsertionIndex = properties => [...properties, property].sort().findIndex(p => p === property);
+            getInsertionIndex = (properties) => [...properties, property].sort().findIndex((p) => p === property);
         }
         else if (insertInOrder !== false) {
             getInsertionIndex = insertInOrder;
@@ -76,7 +76,7 @@ class JSONFile {
     }
 }
 exports.JSONFile = JSONFile;
-// tslint:disable-next-line: no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function readAndParseJson(path) {
     const errors = [];
     const content = jsonc_parser_1.parse(fs_1.readFileSync(path, 'utf-8'), errors, { allowTrailingComma: true });
@@ -90,7 +90,7 @@ function formatError(path, errors) {
     const { error, offset } = errors[0];
     throw new Error(`Failed to parse "${path}" as JSON AST Object. ${jsonc_parser_1.printParseErrorCode(error)} at location: ${offset}.`);
 }
-// tslint:disable-next-line: no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function parseJson(content) {
     return jsonc_parser_1.parse(content, undefined, { allowTrailingComma: true });
 }

package/utilities/json-schema.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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

package/utilities/json-schema.js

@@ -1,13 +1,13 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseJsonSchemaToOptions = exports.parseJsonSchemaToCommandDescription = exports.parseJsonSchemaToSubCommandDescription = exports.CommandJsonPathException = void 0;
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseJsonSchemaToOptions = exports.parseJsonSchemaToCommandDescription = exports.parseJsonSchemaToSubCommandDescription = exports.CommandJsonPathException = void 0;
 const core_1 = require("@angular-devkit/core");
 const tools_1 = require("@angular-devkit/schematics/tools");
 const fs_1 = require("fs");
@@ -34,14 +34,14 @@ async function parseJsonSchemaToSubCommandDescription(name, jsonPath, registry,
     const options = await parseJsonSchemaToOptions(registry, schema);
     const aliases = [];
     if (core_1.json.isJsonArray(schema.$aliases)) {
-        schema.$aliases.forEach(value => {
+        schema.$aliases.forEach((value) => {
             if (typeof value == 'string') {
                 aliases.push(value);
             }
         });
     }
     if (core_1.json.isJsonArray(schema.aliases)) {
-        schema.aliases.forEach(value => {
+        schema.aliases.forEach((value) => {
             if (typeof value == 'string') {
                 aliases.push(value);
             }
@@ -131,7 +131,8 @@ async function parseJsonSchemaToOptions(registry, schema) {
             throw new Error('Cannot find type of schema.');
         }
         // We only support number, string or boolean (or array of those), so remove everything else.
-        const types = [...typeSet].filter(x => {
+        const types = [...typeSet]
+            .filter((x) => {
             switch (x) {
                 case 'boolean':
                 case 'number':
@@ -139,22 +140,23 @@ async function parseJsonSchemaToOptions(registry, schema) {
                     return true;
                 case 'array':
                     // Only include arrays if they're boolean, string or number.
-                    if (core_1.json.isJsonObject(current.items)
-                        && typeof current.items.type == 'string'
-                        && ['boolean', 'number', 'string'].includes(current.items.type)) {
+                    if (core_1.json.isJsonObject(current.items) &&
+                        typeof current.items.type == 'string' &&
+                        ['boolean', 'number', 'string'].includes(current.items.type)) {
                         return true;
                     }
                     return false;
                 default:
                     return false;
             }
-        }).map(x => _getEnumFromValue(x, interface_1.OptionType, interface_1.OptionType.String));
+        })
+            .map((x) => _getEnumFromValue(x, interface_1.OptionType, interface_1.OptionType.String));
         if (types.length == 0) {
             // This means it's not usable on the command line. e.g. an Object.
             return;
         }
         // Only keep enum values we support (booleans, numbers and strings).
-        const enumValues = (core_1.json.isJsonArray(current.enum) && current.enum || []).filter(x => {
+        const enumValues = ((core_1.json.isJsonArray(current.enum) && current.enum) || []).filter((x) => {
             switch (typeof x) {
                 case 'boolean':
                 case 'number':
@@ -186,14 +188,16 @@ async function parseJsonSchemaToOptions(registry, schema) {
         }
         const type = types[0];
         const $default = current.$default;
-        const $defaultIndex = (core_1.json.isJsonObject($default) && $default['$source'] == 'argv')
-            ? $default['index'] : undefined;
-        const positional = typeof $defaultIndex == 'number'
-            ? $defaultIndex : undefined;
+        const $defaultIndex = core_1.json.isJsonObject($default) && $default['$source'] == 'argv' ? $default['index'] : undefined;
+        const positional = typeof $defaultIndex == 'number' ? $defaultIndex : undefined;
         const required = core_1.json.isJsonArray(current.required)
-            ? current.required.indexOf(name) != -1 : false;
-        const aliases = core_1.json.isJsonArray(current.aliases) ? [...current.aliases].map(x => '' + x)
-            : current.alias ? ['' + current.alias] : [];
+            ? current.required.indexOf(name) != -1
+            : false;
+        const aliases = core_1.json.isJsonArray(current.aliases)
+            ? [...current.aliases].map((x) => '' + x)
+            : current.alias
+                ? ['' + current.alias]
+                : [];
         const format = typeof current.format == 'string' ? current.format : undefined;
         const visible = current.visible === undefined || current.visible === true;
         const hidden = !!current.hidden || !visible;
@@ -201,21 +205,20 @@ async function parseJsonSchemaToOptions(registry, schema) {
         const userAnalytics = typeof xUserAnalytics == 'number' ? xUserAnalytics : undefined;
         // Deprecated is set only if it's true or a string.
         const xDeprecated = current['x-deprecated'];
-        const deprecated = (xDeprecated === true || typeof xDeprecated === 'string')
-            ? xDeprecated : undefined;
+        const deprecated = xDeprecated === true || typeof xDeprecated === 'string' ? xDeprecated : undefined;
         const option = {
             name,
             description: '' + (current.description === undefined ? '' : current.description),
-            ...types.length == 1 ? { type } : { type, types },
-            ...defaultValue !== undefined ? { default: defaultValue } : {},
-            ...enumValues && enumValues.length > 0 ? { enum: enumValues } : {},
+            ...(types.length == 1 ? { type } : { type, types }),
+            ...(defaultValue !== undefined ? { default: defaultValue } : {}),
+            ...(enumValues && enumValues.length > 0 ? { enum: enumValues } : {}),
             required,
             aliases,
-            ...format !== undefined ? { format } : {},
+            ...(format !== undefined ? { format } : {}),
             hidden,
-            ...userAnalytics ? { userAnalytics } : {},
-            ...deprecated !== undefined ? { deprecated } : {},
-            ...positional !== undefined ? { positional } : {},
+            ...(userAnalytics ? { userAnalytics } : {}),
+            ...(deprecated !== undefined ? { deprecated } : {}),
+            ...(positional !== undefined ? { positional } : {}),
         };
         options.push(option);
     }

package/utilities/log-file.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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

package/utilities/log-file.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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

package/utilities/package-manager.d.ts

@@ -1,3 +1,10 @@
+/**
+ * @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 { PackageManager } from '../lib/config/workspace-schema';
 export declare function supportsYarn(): boolean;
 export declare function supportsNpm(): boolean;

package/utilities/package-manager.js

@@ -1,13 +1,13 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureCompatibleNpm = exports.getPackageManager = exports.supportsNpm = exports.supportsYarn = void 0;
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureCompatibleNpm = exports.getPackageManager = exports.supportsNpm = exports.supportsYarn = void 0;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -32,7 +32,7 @@ function supportsNpm() {
 }
 exports.supportsNpm = supportsNpm;
 async function getPackageManager(root) {
-    let packageManager = await config_1.getConfiguredPackageManager();
+    let packageManager = (await config_1.getConfiguredPackageManager());
     if (packageManager) {
         return packageManager;
     }
@@ -71,7 +71,7 @@ async function ensureCompatibleNpm(root) {
             return;
         }
         if (semver_1.satisfies(version, '>=7 <7.5.6')) {
-            // tslint:disable-next-line: no-console
+            // eslint-disable-next-line no-console
             console.warn(`npm version ${version} detected.` +
                 ' When using npm 7 with the Angular CLI, npm version 7.5.6 or higher is recommended.');
         }

package/utilities/package-metadata.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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

package/utilities/package-metadata.js

@@ -1,11 +1,18 @@
 "use strict";
+/**
+ * @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
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchPackageManifest = exports.fetchPackageMetadata = void 0;
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path = require("path");
-const ini = require('ini');
 const lockfile = require('@yarnpkg/lockfile');
+const ini = require('ini');
 const pacote = require('pacote');
 let npmrc;
 function ensureNpmrc(logger, usingYarn, verbose) {

package/utilities/package-tree.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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

package/utilities/package-tree.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * 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

package/utilities/project.d.ts

@@ -1 +1,8 @@
+/**
+ * @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
+ */
 export declare function findWorkspaceFile(currentDirectory?: string): string | null;