@angular/cli 15.2.0 → 16.0.0-next.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cli/index.js +5 -5
- package/lib/config/schema.json +2 -23
- package/lib/config/workspace-schema.d.ts +0 -10
- package/lib/config/workspace-schema.js +1 -2
- package/lib/init.js +7 -7
- package/package.json +15 -15
- package/src/analytics/analytics-collector.js +6 -8
- package/src/analytics/analytics.js +5 -8
- package/src/command-builder/architect-base-command-module.js +6 -7
- package/src/command-builder/architect-command-module.js +4 -5
- package/src/command-builder/command-module.js +2 -2
- package/src/command-builder/command-runner.js +3 -4
- package/src/command-builder/schematics-command-module.d.ts +0 -1
- package/src/command-builder/schematics-command-module.js +8 -24
- package/src/command-builder/utilities/json-help.js +8 -9
- package/src/command-builder/utilities/json-schema.js +2 -2
- package/src/command-builder/utilities/schematic-engine-host.js +4 -5
- package/src/commands/add/cli.js +9 -11
- package/src/commands/cache/info/cli.js +2 -2
- package/src/commands/cache/utilities.js +4 -5
- package/src/commands/config/cli.js +4 -5
- package/src/commands/doc/cli.js +2 -2
- package/src/commands/generate/cli.js +2 -2
- package/src/commands/new/cli.js +2 -3
- package/src/commands/run/cli.js +2 -3
- package/src/commands/update/cli.js +18 -22
- package/src/commands/update/schematic/index.js +11 -14
- package/src/commands/version/cli.js +9 -10
- package/src/utilities/completion.js +6 -9
- package/src/utilities/config.js +15 -29
- package/src/utilities/package-manager.js +9 -11
- package/src/utilities/package-metadata.js +6 -8
- package/src/utilities/package-tree.js +3 -3
- package/src/utilities/project.js +3 -4
- package/src/utilities/prompt.js +2 -2
- package/src/utilities/version.js +1 -1
package/src/commands/new/cli.js
CHANGED
|
@@ -39,9 +39,8 @@ class NewCommandModule extends schematics_command_module_1.SchematicsCommandModu
|
|
|
39
39
|
return this.addSchemaOptionsToCommand(localYargs, options);
|
|
40
40
|
}
|
|
41
41
|
async run(options) {
|
|
42
|
-
var _a;
|
|
43
42
|
// Register the version of the CLI in the registry.
|
|
44
|
-
const collectionName =
|
|
43
|
+
const collectionName = options.collection ?? (await this.getCollectionFromConfig());
|
|
45
44
|
const { dryRun, force, interactive, defaults, collection, ...schematicOptions } = options;
|
|
46
45
|
const workflow = await this.getOrCreateWorkflowForExecution(collectionName, {
|
|
47
46
|
dryRun,
|
|
@@ -82,4 +81,4 @@ class NewCommandModule extends schematics_command_module_1.SchematicsCommandModu
|
|
|
82
81
|
}
|
|
83
82
|
}
|
|
84
83
|
exports.NewCommandModule = NewCommandModule;
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/cli/src/commands/new/cli.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { join } from 'node:path';\nimport { Argv } from 'yargs';\nimport {\n  CommandModuleImplementation,\n  CommandScope,\n  Options,\n  OtherOptions,\n} from '../../command-builder/command-module';\nimport {\n  DEFAULT_SCHEMATICS_COLLECTION,\n  SchematicsCommandArgs,\n  SchematicsCommandModule,\n} from '../../command-builder/schematics-command-module';\nimport { VERSION } from '../../utilities/version';\n\ninterface NewCommandArgs extends SchematicsCommandArgs {\n  collection?: string;\n}\n\nexport class NewCommandModule\n  extends SchematicsCommandModule\n  implements CommandModuleImplementation<NewCommandArgs>\n{\n  private readonly schematicName = 'ng-new';\n  override scope = CommandScope.Out;\n  protected override allowPrivateSchematics = true;\n\n  command = 'new [name]';\n  aliases = 'n';\n  describe = 'Creates a new Angular workspace.';\n  longDescriptionPath = join(__dirname, 'long-description.md');\n\n  override async builder(argv: Argv): Promise<Argv<NewCommandArgs>> {\n    const localYargs = (await super.builder(argv)).option('collection', {\n      alias: 'c',\n      describe: 'A collection of schematics to use in generating the initial application.',\n      type: 'string',\n    });\n\n    const {\n      options: { collection: collectionNameFromArgs },\n    } = this.context.args;\n\n    const collectionName =\n      typeof collectionNameFromArgs === 'string'\n        ? collectionNameFromArgs\n        : await this.getCollectionFromConfig();\n\n    const workflow = await this.getOrCreateWorkflowForBuilder(collectionName);\n    const collection = workflow.engine.createCollection(collectionName);\n    const options = await this.getSchematicOptions(collection, this.schematicName, workflow);\n\n    return this.addSchemaOptionsToCommand(localYargs, options);\n  }\n\n  async run(options: Options<NewCommandArgs> & OtherOptions): Promise<number | void> {\n    // Register the version of the CLI in the registry.\n    const collectionName = options.collection ?? (await this.getCollectionFromConfig());\n    const { dryRun, force, interactive, defaults, collection, ...schematicOptions } = options;\n    const workflow = await this.getOrCreateWorkflowForExecution(collectionName, {\n      dryRun,\n      force,\n      interactive,\n      defaults,\n    });\n    workflow.registry.addSmartDefaultProvider('ng-cli-version', () => VERSION.full);\n\n    // Compatibility check for NPM 7\n    if (\n      collectionName === '@schematics/angular' &&\n      !schematicOptions.skipInstall &&\n      (schematicOptions.packageManager === undefined || schematicOptions.packageManager === 'npm')\n    ) {\n      this.context.packageManager.ensureCompatibility();\n    }\n\n    return this.runSchematic({\n      collectionName,\n      schematicName: this.schematicName,\n      schematicOptions,\n      executionOptions: {\n        dryRun,\n        force,\n        interactive,\n        defaults,\n      },\n    });\n  }\n\n  /** Find a collection from config that has an `ng-new` schematic. */\n  private async getCollectionFromConfig(): Promise<string> {\n    for (const collectionName of await this.getSchematicCollections()) {\n      const workflow = this.getOrCreateWorkflowForBuilder(collectionName);\n      const collection = workflow.engine.createCollection(collectionName);\n      const schematicsInCollection = collection.description.schematics;\n\n      if (Object.keys(schematicsInCollection).includes(this.schematicName)) {\n        return collectionName;\n      }\n    }\n\n    return DEFAULT_SCHEMATICS_COLLECTION;\n  }\n}\n"]}
|
package/src/commands/run/cli.js
CHANGED
|
@@ -57,8 +57,7 @@ class RunCommandModule extends architect_base_command_module_1.ArchitectBaseComm
|
|
|
57
57
|
return this.runSingleTarget(target, extraOptions);
|
|
58
58
|
}
|
|
59
59
|
makeTargetSpecifier(options) {
|
|
60
|
-
|
|
61
|
-
const architectTarget = (_a = options === null || options === void 0 ? void 0 : options.target) !== null && _a !== void 0 ? _a : this.context.args.positional[1];
|
|
60
|
+
const architectTarget = options?.target ?? this.context.args.positional[1];
|
|
62
61
|
if (!architectTarget) {
|
|
63
62
|
return undefined;
|
|
64
63
|
}
|
|
@@ -91,4 +90,4 @@ class RunCommandModule extends architect_base_command_module_1.ArchitectBaseComm
|
|
|
91
90
|
}
|
|
92
91
|
}
|
|
93
92
|
exports.RunCommandModule = RunCommandModule;
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/cli/src/commands/run/cli.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { Target } from '@angular-devkit/architect';\nimport { join } from 'path';\nimport { Argv } from 'yargs';\nimport { ArchitectBaseCommandModule } from '../../command-builder/architect-base-command-module';\nimport {\n  CommandModuleError,\n  CommandModuleImplementation,\n  CommandScope,\n  Options,\n  OtherOptions,\n} from '../../command-builder/command-module';\n\nexport interface RunCommandArgs {\n  target: string;\n}\n\nexport class RunCommandModule\n  extends ArchitectBaseCommandModule<RunCommandArgs>\n  implements CommandModuleImplementation<RunCommandArgs>\n{\n  override scope = CommandScope.In;\n\n  command = 'run <target>';\n  describe =\n    'Runs an Architect target with an optional custom builder configuration defined in your project.';\n  longDescriptionPath = join(__dirname, 'long-description.md');\n\n  async builder(argv: Argv): Promise<Argv<RunCommandArgs>> {\n    const { jsonHelp, getYargsCompletions, help } = this.context.args.options;\n\n    const localYargs: Argv<RunCommandArgs> = argv\n      .positional('target', {\n        describe:\n          'The Architect target to run provided in the the following format `project:target[:configuration]`.',\n        type: 'string',\n        demandOption: true,\n        // Show only in when using --help and auto completion because otherwise comma seperated configuration values will be invalid.\n        // Also, hide choices from JSON help so that we don't display them in AIO.\n        choices: (getYargsCompletions || help) && !jsonHelp ? this.getTargetChoices() : undefined,\n      })\n      .middleware((args) => {\n        // TODO: remove in version 15.\n        const { configuration, target } = args;\n        if (typeof configuration === 'string' && target) {\n          const targetWithConfig = target.split(':', 2);\n          targetWithConfig.push(configuration);\n\n          throw new CommandModuleError(\n            'Unknown argument: configuration.\\n' +\n              `Provide the configuration as part of the target 'ng run ${targetWithConfig.join(\n                ':',\n              )}'.`,\n          );\n        }\n      }, true)\n      .strict();\n\n    const target = this.makeTargetSpecifier();\n    if (!target) {\n      return localYargs;\n    }\n\n    const schemaOptions = await this.getArchitectTargetOptions(target);\n\n    return this.addSchemaOptionsToCommand(localYargs, schemaOptions);\n  }\n\n  async run(options: Options<RunCommandArgs> & OtherOptions): Promise<number> {\n    const target = this.makeTargetSpecifier(options);\n    const { target: _target, ...extraOptions } = options;\n\n    if (!target) {\n      throw new CommandModuleError('Cannot determine project or target.');\n    }\n\n    return this.runSingleTarget(target, extraOptions);\n  }\n\n  protected makeTargetSpecifier(options?: Options<RunCommandArgs>): Target | undefined {\n    const architectTarget = options?.target ?? this.context.args.positional[1];\n    if (!architectTarget) {\n      return undefined;\n    }\n\n    const [project = '', target = '', configuration] = architectTarget.split(':');\n\n    return {\n      project,\n      target,\n      configuration,\n    };\n  }\n\n  /** @returns a sorted list of target specifiers to be used for auto completion. */\n  private getTargetChoices(): string[] | undefined {\n    if (!this.context.workspace) {\n      return;\n    }\n\n    const targets = [];\n    for (const [projectName, project] of this.context.workspace.projects) {\n      for (const [targetName, target] of project.targets) {\n        const currentTarget = `${projectName}:${targetName}`;\n        targets.push(currentTarget);\n\n        if (!target.configurations) {\n          continue;\n        }\n\n        for (const configName of Object.keys(target.configurations)) {\n          targets.push(`${currentTarget}:${configName}`);\n        }\n      }\n    }\n\n    return targets.sort();\n  }\n}\n"]}
|