@angular/cli 14.0.0-next.6 → 14.0.0-next.7

package/src/utilities/package-metadata.d.ts

@@ -6,24 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { logging } from '@angular-devkit/core';
-import { JsonSchemaForNpmPackageJsonFiles } from './package-json';
-export interface NpmRepositoryPackageJson {
-    name: string;
-    requestedName: string;
-    description: string;
-    'dist-tags': {
-        [name: string]: string;
-    };
-    versions: {
-        [version: string]: JsonSchemaForNpmPackageJsonFiles;
-    };
-    time: {
-        modified: string;
-        created: string;
-        [version: string]: string;
-    };
+import type { Manifest, Packument } from 'pacote';
+export interface PackageMetadata extends Packument, NgPackageManifestProperties {
+    tags: Record<string, PackageManifest>;
+    versions: Record<string, PackageManifest>;
 }
-export declare type NgAddSaveDepedency = 'dependencies' | 'devDependencies' | boolean;
+export interface NpmRepositoryPackageJson extends PackageMetadata {
+    requestedName?: string;
+}
+export declare type NgAddSaveDependency = 'dependencies' | 'devDependencies' | boolean;
 export interface PackageIdentifier {
     type: 'git' | 'tag' | 'version' | 'range' | 'file' | 'directory' | 'remote';
     name: string;
@@ -33,31 +24,18 @@ export interface PackageIdentifier {
     fetchSpec: string;
     rawSpec: string;
 }
-export interface PackageManifest {
-    name: string;
-    version: string;
-    license?: string;
-    private?: boolean;
-    deprecated?: boolean;
-    dependencies: Record<string, string>;
-    devDependencies: Record<string, string>;
-    peerDependencies: Record<string, string>;
-    optionalDependencies: Record<string, string>;
+export interface NgPackageManifestProperties {
     'ng-add'?: {
-        save?: NgAddSaveDepedency;
+        save?: NgAddSaveDependency;
     };
     'ng-update'?: {
-        migrations: string;
-        packageGroup: Record<string, string>;
+        migrations?: string;
+        packageGroup?: string[] | Record<string, string>;
+        packageGroupName?: string;
+        requirements?: string[] | Record<string, string>;
     };
 }
-export interface PackageMetadata {
-    name: string;
-    tags: {
-        [tag: string]: PackageManifest | undefined;
-    };
-    versions: Record<string, PackageManifest>;
-    'dist-tags'?: unknown;
+export interface PackageManifest extends Manifest, NgPackageManifestProperties {
 }
 export declare function fetchPackageMetadata(name: string, logger: logging.LoggerApi, options?: {
     registry?: string;

package/src/utilities/package-metadata.js

@@ -35,10 +35,9 @@ const lockfile = __importStar(require("@yarnpkg/lockfile"));
 const fs_1 = require("fs");
 const ini = __importStar(require("ini"));
 const os_1 = require("os");
-const pacote = __importStar(require("pacote"));
 const path = __importStar(require("path"));
-const npmPackageJsonCache = new Map();
 let npmrc;
+const npmPackageJsonCache = new Map();
 function ensureNpmrc(logger, usingYarn, verbose) {
     if (!npmrc) {
         try {
@@ -170,16 +169,6 @@ function normalizeOptions(rawOptions, location = process.cwd(), existingNormaliz
     }
     return options;
 }
-function normalizeManifest(rawManifest) {
-    // TODO: Fully normalize and sanitize
-    return {
-        dependencies: {},
-        devDependencies: {},
-        peerDependencies: {},
-        optionalDependencies: {},
-        ...rawManifest,
-    };
-}
 async function fetchPackageMetadata(name, logger, options) {
     const { usingYarn, verbose, registry } = {
         registry: undefined,
@@ -188,25 +177,18 @@ async function fetchPackageMetadata(name, logger, options) {
         ...options,
     };
     ensureNpmrc(logger, usingYarn, verbose);
-    const response = await pacote.packument(name, {
+    const { packument } = await Promise.resolve().then(() => __importStar(require('pacote')));
+    const response = await packument(name, {
         fullMetadata: true,
         ...npmrc,
         ...(registry ? { registry } : {}),
     });
     // Normalize the response
     const metadata = {
-        name: response.name,
+        ...response,
         tags: {},
-        versions: {},
     };
-    if (response.versions) {
-        for (const [version, manifest] of Object.entries(response.versions)) {
-            metadata.versions[version] = normalizeManifest(manifest);
-        }
-    }
     if (response['dist-tags']) {
-        // Store this for use with other npm utility packages
-        metadata['dist-tags'] = response['dist-tags'];
         for (const [tag, version] of Object.entries(response['dist-tags'])) {
             const manifest = metadata.versions[version];
             if (manifest) {
@@ -223,22 +205,24 @@ exports.fetchPackageMetadata = fetchPackageMetadata;
 async function fetchPackageManifest(name, logger, options = {}) {
     const { usingYarn = false, verbose = false, registry } = options;
     ensureNpmrc(logger, usingYarn, verbose);
-    const response = await pacote.manifest(name, {
+    const { manifest } = await Promise.resolve().then(() => __importStar(require('pacote')));
+    const response = await manifest(name, {
         fullMetadata: true,
         ...npmrc,
         ...(registry ? { registry } : {}),
     });
-    return normalizeManifest(response);
+    return response;
 }
 exports.fetchPackageManifest = fetchPackageManifest;
-function getNpmPackageJson(packageName, logger, options = {}) {
+async function getNpmPackageJson(packageName, logger, options = {}) {
     const cachedResponse = npmPackageJsonCache.get(packageName);
     if (cachedResponse) {
         return cachedResponse;
     }
     const { usingYarn = false, verbose = false, registry } = options;
     ensureNpmrc(logger, usingYarn, verbose);
-    const resultPromise = pacote.packument(packageName, {
+    const { packument } = await Promise.resolve().then(() => __importStar(require('pacote')));
+    const resultPromise = packument(packageName, {
         fullMetadata: true,
         ...npmrc,
         ...(registry ? { registry } : {}),

package/src/utilities/package-tree.d.ts

@@ -5,7 +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
  */
-import { NgAddSaveDepedency } from './package-metadata';
+import { NgAddSaveDependency } from './package-metadata';
 interface PackageJson {
     name: string;
     version: string;
@@ -17,7 +17,7 @@ interface PackageJson {
         migrations?: string;
     };
     'ng-add'?: {
-        save?: NgAddSaveDepedency;
+        save?: NgAddSaveDependency;
     };
 }
 export interface PackageTreeNode {

package/src/utilities/prompt.js

@@ -31,7 +31,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.askConfirmation = void 0;
-const inquirer = __importStar(require("inquirer"));
 const tty_1 = require("./tty");
 async function askConfirmation(message, defaultResponse, noTTYResponse) {
     if (!(0, tty_1.isTTY)()) {
@@ -44,7 +43,8 @@ async function askConfirmation(message, defaultResponse, noTTYResponse) {
         message,
         default: defaultResponse,
     };
-    const answers = await inquirer.prompt([question]);
+    const { prompt } = await Promise.resolve().then(() => __importStar(require('inquirer')));
+    const answers = await prompt([question]);
     return answers['confirmation'];
 }
 exports.askConfirmation = askConfirmation;

package/bin/postinstall/analytics-prompt.js

@@ -1,27 +0,0 @@
-/**
- * @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
- */
-
-'use strict';
-// This file is ES5 because it needs to be executed as is.
-
-if ('NG_CLI_ANALYTICS' in process.env) {
-  return;
-}
-
-try {
-  var analytics = require('../../src/analytics/analytics');
-
-  analytics
-    .getAnalytics('global')
-    .then((hasGlobalConfig) => {
-      if (!hasGlobalConfig) {
-        return analytics.promptAnalytics(true /** global */);
-      }
-    })
-    .catch(() => {});
-} catch (_) {}

package/bin/postinstall/script.js

@@ -1,16 +0,0 @@
-#!/usr/bin/env node
-/**
- * @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
- */
-
-'use strict';
-
-// These should not fail but if they do they should not block installation of the package
-try {
-  // eslint-disable-next-line import/no-unassigned-import
-  require('./analytics-prompt');
-} catch (_) {}

package/src/analytics/analytics-environment-options.js

@@ -1,20 +0,0 @@
-"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.analyticsShareDisabled = exports.analyticsDisabled = void 0;
-function isDisabled(variable) {
-    return variable === '0' || variable.toLowerCase() === 'false';
-}
-function isPresent(variable) {
-    return typeof variable === 'string' && variable !== '';
-}
-const analyticsVariable = process.env['NG_CLI_ANALYTICS'];
-exports.analyticsDisabled = isPresent(analyticsVariable) && isDisabled(analyticsVariable);
-const analyticsShareVariable = process.env['NG_CLI_ANALYTICS_SHARE'];
-exports.analyticsShareDisabled = isPresent(analyticsShareVariable) && isDisabled(analyticsShareVariable);

package/src/utilities/install-package.d.ts

@@ -1,16 +0,0 @@
-/**
- * @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';
-import { NgAddSaveDepedency } from './package-metadata';
-export declare function installAllPackages(packageManager?: PackageManager, extraArgs?: string[], cwd?: string): Promise<1 | 0>;
-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;
-    tempNodeModules: string;
-}>;
-export declare function runTempPackageBin(packageName: string, packageManager?: PackageManager, args?: string[]): Promise<number>;

package/src/utilities/install-package.js

@@ -1,193 +0,0 @@
-"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.runTempPackageBin = exports.installTempPackage = exports.installPackage = exports.installAllPackages = void 0;
-const child_process_1 = require("child_process");
-const fs_1 = require("fs");
-const os_1 = require("os");
-const path_1 = require("path");
-const workspace_schema_1 = require("../../lib/config/workspace-schema");
-const spinner_1 = require("./spinner");
-async function installAllPackages(packageManager = workspace_schema_1.PackageManager.Npm, extraArgs = [], cwd = process.cwd()) {
-    const packageManagerArgs = getPackageManagerArguments(packageManager);
-    const installArgs = [];
-    if (packageManagerArgs.installAll) {
-        installArgs.push(packageManagerArgs.installAll);
-    }
-    installArgs.push(packageManagerArgs.silent);
-    const spinner = new spinner_1.Spinner();
-    spinner.start('Installing packages...');
-    const bufferedOutput = [];
-    return new Promise((resolve, reject) => {
-        var _a, _b;
-        const childProcess = (0, child_process_1.spawn)(packageManager, [...installArgs, ...extraArgs], {
-            stdio: 'pipe',
-            shell: true,
-            cwd,
-        }).on('close', (code) => {
-            if (code === 0) {
-                spinner.succeed('Packages 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 }));
-    });
-}
-exports.installAllPackages = installAllPackages;
-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,
-    ];
-    const spinner = new spinner_1.Spinner();
-    spinner.start('Installing package...');
-    if (save === 'devDependencies') {
-        installArgs.push(packageManagerArgs.saveDev);
-    }
-    const bufferedOutput = [];
-    return new Promise((resolve, reject) => {
-        var _a, _b;
-        const childProcess = (0, 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 }));
-    });
-}
-exports.installPackage = installPackage;
-async function installTempPackage(packageName, packageManager = workspace_schema_1.PackageManager.Npm, extraArgs) {
-    const tempPath = (0, fs_1.mkdtempSync)((0, path_1.join)((0, fs_1.realpathSync)((0, os_1.tmpdir)()), 'angular-cli-packages-'));
-    // clean up temp directory on process exit
-    process.on('exit', () => {
-        try {
-            (0, fs_1.rmdirSync)(tempPath, { recursive: true, maxRetries: 3 });
-        }
-        catch { }
-    });
-    // NPM will warn when a `package.json` is not found in the install directory
-    // Example:
-    // npm WARN enoent ENOENT: no such file or directory, open '/tmp/.ng-temp-packages-84Qi7y/package.json'
-    // npm WARN .ng-temp-packages-84Qi7y No description
-    // npm WARN .ng-temp-packages-84Qi7y No repository field.
-    // npm WARN .ng-temp-packages-84Qi7y No license field.
-    // While we can use `npm init -y` we will end up needing to update the 'package.json' anyways
-    // because of missing fields.
-    (0, fs_1.writeFileSync)((0, path_1.join)(tempPath, 'package.json'), JSON.stringify({
-        name: 'temp-cli-install',
-        description: 'temp-cli-install',
-        repository: 'temp-cli-install',
-        license: 'MIT',
-    }));
-    // setup prefix/global modules path
-    const packageManagerArgs = getPackageManagerArguments(packageManager);
-    const tempNodeModules = (0, path_1.join)(tempPath, 'node_modules');
-    // Yarn will not append 'node_modules' to the path
-    const prefixPath = packageManager === workspace_schema_1.PackageManager.Yarn ? tempNodeModules : tempPath;
-    const installArgs = [
-        ...(extraArgs || []),
-        `${packageManagerArgs.prefix}="${prefixPath}"`,
-        packageManagerArgs.noLockfile,
-    ];
-    return {
-        status: await installPackage(packageName, packageManager, true, installArgs, tempPath),
-        tempNodeModules,
-    };
-}
-exports.installTempPackage = installTempPackage;
-async function runTempPackageBin(packageName, packageManager = workspace_schema_1.PackageManager.Npm, args = []) {
-    const { status: code, tempNodeModules } = 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 = (0, path_1.join)(tempNodeModules, packageNameNoVersion);
-    const packageJsonPath = (0, path_1.join)(pkgLocation, 'package.json');
-    // Get a binary location for this package
-    let binPath;
-    if ((0, fs_1.existsSync)(packageJsonPath)) {
-        const content = (0, fs_1.readFileSync)(packageJsonPath, 'utf-8');
-        if (content) {
-            const { bin = {} } = JSON.parse(content);
-            const binKeys = Object.keys(bin);
-            if (binKeys.length) {
-                binPath = (0, path_1.resolve)(pkgLocation, bin[binKeys[0]]);
-            }
-        }
-    }
-    if (!binPath) {
-        throw new Error(`Cannot locate bin for temporary package: ${packageNameNoVersion}.`);
-    }
-    const { status, error } = (0, child_process_1.spawnSync)(process.execPath, [binPath, ...args], {
-        stdio: 'inherit',
-        env: {
-            ...process.env,
-            NG_DISABLE_VERSION_CHECK: 'true',
-            NG_CLI_ANALYTICS: 'false',
-        },
-    });
-    if (status === null && error) {
-        throw error;
-    }
-    return status || 0;
-}
-exports.runTempPackageBin = runTempPackageBin;
-function getPackageManagerArguments(packageManager) {
-    switch (packageManager) {
-        case workspace_schema_1.PackageManager.Yarn:
-            return {
-                silent: '--silent',
-                saveDev: '--dev',
-                install: 'add',
-                prefix: '--modules-folder',
-                noLockfile: '--no-lockfile',
-            };
-        case workspace_schema_1.PackageManager.Pnpm:
-            return {
-                silent: '--silent',
-                saveDev: '--save-dev',
-                install: 'add',
-                installAll: 'install',
-                prefix: '--prefix',
-                noLockfile: '--no-lockfile',
-            };
-        default:
-            return {
-                silent: '--quiet',
-                saveDev: '--save-dev',
-                install: 'install',
-                installAll: 'install',
-                prefix: '--prefix',
-                noLockfile: '--no-package-lock',
-            };
-    }
-}