feat: update

Author: ren-yamanashi

packages/aws-cdk/lib/cli/cli-config.ts

@@ -5,6 +5,7 @@ import * as cdk_from_cfn from 'cdk-from-cfn';
 import { StackActivityProgress } from '../commands/deploy';
 import { availableInitLanguages } from '../commands/init';
 import { getLanguageAlias } from '../commands/language';
+import { JS_PACKAGE_MANAGERS } from '../commands/init/package-manager';
 
 export const YARGS_HELPERS = new CliHelpers('./util/yargs-helpers');
 
@@ -407,7 +408,7 @@ export async function makeConfig(): Promise<CliConfig> {
           'lib-version': { type: 'string', alias: 'V', default: undefined, desc: 'The version of the CDK library (aws-cdk-lib) to initialize built-in templates with. Defaults to the version that was current when this CLI was built.' },
           'from-path': { type: 'string', desc: 'Path to a local custom template directory or multi-template repository', requiresArg: true, conflicts: ['lib-version'] },
           'template-path': { type: 'string', desc: 'Path to a specific template within a multi-template repository', requiresArg: true },
-          'package-manager': { type: 'string', desc: 'The package manager to use to install dependencies. Only applicable for TypeScript and JavaScript projects.', choices: ['npm', 'yarn', 'pnpm'] },
+          'package-manager': { type: 'string', desc: 'The package manager to use to install dependencies. Only applicable for TypeScript and JavaScript projects.', choices: JS_PACKAGE_MANAGERS },
         },
         implies: { 'template-path': 'from-path' },
       },

packages/aws-cdk/lib/cli/cli-type-registry.json

@@ -903,6 +903,15 @@
           "type": "string",
           "desc": "Path to a specific template within a multi-template repository",
           "requiresArg": true
+        },
+        "package-manager": {
+          "type": "string",
+          "desc": "The package manager to use to install dependencies. Only applicable for TypeScript and JavaScript projects.",
+          "choices": [
+            "npm",
+            "yarn",
+            "pnpm"
+          ]
         }
       },
       "implies": {

packages/aws-cdk/lib/cli/cli.ts

@@ -565,6 +565,7 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise<n
             libVersion: args.libVersion,
             fromPath: args['from-path'],
             templatePath: args['template-path'],
+            packageManager: args['package-manager'],
           });
         }
       case 'migrate':

packages/aws-cdk/lib/cli/convert-to-user-input.ts

@@ -250,6 +250,7 @@ export function convertYargsToUserInput(args: any): UserInput {
         libVersion: args.libVersion,
         fromPath: args.fromPath,
         templatePath: args.templatePath,
+        packageManager: args.packageManager,
         TEMPLATE: args.TEMPLATE,
       };
       break;
@@ -493,6 +494,7 @@ export function convertConfigToUserInput(config: any): UserInput {
     libVersion: config.init?.libVersion,
     fromPath: config.init?.fromPath,
     templatePath: config.init?.templatePath,
+    packageManager: config.init?.packageManager,
   };
   const migrateOptions = {
     stackName: config.migrate?.stackName,

packages/aws-cdk/lib/cli/parse-command-line-arguments.ts

@@ -894,6 +894,12 @@ export function parseCommandLineArguments(args: Array<string>): any {
           type: 'string',
           desc: 'Path to a specific template within a multi-template repository',
           requiresArg: true,
+        })
+        .option('package-manager', {
+          default: undefined,
+          type: 'string',
+          desc: 'The package manager to use to install dependencies. Only applicable for TypeScript and JavaScript projects.',
+          choices: ['npm', 'yarn', 'pnpm'],
         }),
     )
     .command('migrate', 'Migrate existing AWS resources into a CDK app', (yargs: Argv) =>

packages/aws-cdk/lib/cli/user-input.ts

@@ -1408,6 +1408,13 @@ export interface InitOptions {
    */
   readonly templatePath?: string;
 
+  /**
+   * The package manager to use to install dependencies. Only applicable for TypeScript and JavaScript projects.
+   *
+   * @default - undefined
+   */
+  readonly packageManager?: string;
+
   /**
    * Positional argument for init
    */

packages/aws-cdk/lib/commands/init/init.ts

@@ -10,6 +10,7 @@ import { versionNumber } from '../../cli/version';
 import { cdkHomeDir, formatErrorMessage, rangeFromSemver } from '../../util';
 import type { LanguageInfo } from '../language';
 import { getLanguageAlias, getLanguageExtensions, SUPPORTED_LANGUAGES } from '../language';
+import { JsPackageManager } from './package-manager';
 
 /* eslint-disable @typescript-eslint/no-var-requires */ // Packages don't have @types module
 // eslint-disable-next-line @typescript-eslint/no-require-imports
@@ -76,6 +77,13 @@ export interface CliInitOptions {
    */
   readonly templatePath?: string;
 
+  /**
+   * The package manager to use for installing dependencies.
+   * Only applicable for TypeScript and JavaScript projects.
+   * @default undefined
+   */
+  readonly packageManager?: JsPackageManager;
+
   readonly ioHelper: IoHelper;
 }
 
@@ -653,6 +661,7 @@ async function initializeProject(
   stackName?: string,
   migrate?: boolean,
   cdkVersion?: string,
+  packageManager?: JsPackageManager,
 ) {
   // Step 1: Ensure target directory is empty
   await assertIsEmptyDirectory(workDir);
@@ -675,7 +684,7 @@ async function initializeProject(
     await initializeGitRepository(ioHelper, workDir);
 
     // Step 4: Post-install steps
-    await postInstall(ioHelper, language, canUseNetwork, workDir);
+    await postInstall(ioHelper, language, canUseNetwork, workDir, packageManager);
   }
 
   await ioHelper.defaults.info('✅ All done!');
@@ -728,12 +737,12 @@ async function initializeGitRepository(ioHelper: IoHelper, workDir: string) {
   }
 }
 
-async function postInstall(ioHelper: IoHelper, language: string, canUseNetwork: boolean, workDir: string) {
+async function postInstall(ioHelper: IoHelper, language: string, canUseNetwork: boolean, workDir: string, packageManager?: JsPackageManager) {
   switch (language) {
     case 'javascript':
-      return postInstallJavascript(ioHelper, canUseNetwork, workDir);
+      return postInstallJavascript(ioHelper, canUseNetwork, workDir, packageManager);
     case 'typescript':
-      return postInstallTypescript(ioHelper, canUseNetwork, workDir);
+      return postInstallTypescript(ioHelper, canUseNetwork, workDir, packageManager);
     case 'java':
       return postInstallJava(ioHelper, canUseNetwork, workDir);
     case 'python':
@@ -747,12 +756,12 @@ async function postInstall(ioHelper: IoHelper, language: string, canUseNetwork:
   }
 }
 
-async function postInstallJavascript(ioHelper: IoHelper, canUseNetwork: boolean, cwd: string) {
-  return postInstallTypescript(ioHelper, canUseNetwork, cwd);
+async function postInstallJavascript(ioHelper: IoHelper, canUseNetwork: boolean, cwd: string, packageManager?: JsPackageManager) {
+  return postInstallTypescript(ioHelper, canUseNetwork, cwd, packageManager);
 }
 
-async function postInstallTypescript(ioHelper: IoHelper, canUseNetwork: boolean, cwd: string) {
-  const command = 'npm';
+async function postInstallTypescript(ioHelper: IoHelper, canUseNetwork: boolean, cwd: string, packageManager?: JsPackageManager) {
+  const command = packageManager ?? 'npm';
 
   if (!canUseNetwork) {
     await ioHelper.defaults.warn(`Please run '${command} install'!`);

packages/aws-cdk/lib/commands/init/package-manager.ts

@@ -0,0 +1,3 @@
+export const JS_PACKAGE_MANAGERS = ['npm', 'yarn', 'pnpm'] as const;
+
+export type JsPackageManager = typeof JS_PACKAGE_MANAGERS[number];