aws-cdk 2.1100.0 → 2.1100.1

package/lib/index.js

@@ -3500,7 +3500,7 @@ var require_semver2 = __commonJS({
 // ../@aws-cdk/cloud-assembly-schema/cli-version.json
 var require_cli_version = __commonJS({
   "../@aws-cdk/cloud-assembly-schema/cli-version.json"(exports2, module2) {
-    module2.exports = { version: "2.1100.0" };
+    module2.exports = { version: "2.1100.1" };
   }
 });
 
@@ -139214,7 +139214,8 @@ var init_early_validation = __esm({
           }
           return `The template cannot be deployed because of early validation errors, but retrieving more details about those
 errors failed (${error5}). Make sure you have permissions to call the DescribeEvents API, or re-bootstrap
-your environment with the latest version of the CLI (need at least version 30, current version ${currentVersion ?? "unknown"}).`;
+your environment by running 'cdk bootstrap' to update the Bootstrap CDK Toolkit stack.
+Bootstrap toolkit stack version 30 or later is needed; current version: ${currentVersion ?? "unknown"}.`;
         }
         let message2 = `ChangeSet '${changeSetName}' on stack '${stackName}' failed early validation`;
         if (operationEvents.length > 0) {
@@ -276799,7 +276800,7 @@ var init_session = __esm({
           identifiers: {
             installationId: await getOrCreateInstallationId(this.ioHost.asIoHelper()),
             sessionId: (0, import_crypto7.randomUUID)(),
-            telemetryVersion: "1.0",
+            telemetryVersion: "2.0",
             cdkCliVersion: versionNumber2(),
             cdkLibraryVersion: await getLibraryVersion(this.ioHost.asIoHelper())
           },
@@ -277171,6 +277172,13 @@ var init_cli_io_host = __esm({
         return _CliIoHost._instance;
       }
       async startTelemetry(args, context, proxyAgent) {
+        const config = require_cli_type_registry();
+        const validCommands = Object.keys(config.commands);
+        const cmd = args._[0];
+        if (!validCommands.includes(cmd)) {
+          await this.asIoHelper().defaults.trace(`Session instantiated with an invalid command (${cmd}). Not starting telemetry.`);
+          return;
+        }
         let sinks = [];
         const telemetryFilePath = args["telemetry-file"];
         if (telemetryFilePath) {
@@ -279868,7 +279876,7 @@ async function invokeBuiltinHooks(ioHelper, target, context) {
       break;
     case "javascript":
     case "typescript":
-      await context.substitutePlaceholdersIn("package.json");
+      await context.substitutePlaceholdersIn("package.json", "README.md");
   }
 }
 async function dotnetAddProject(ioHelper, targetDirectory, context, ext4 = "csproj") {
@@ -279926,6 +279934,23 @@ var init_language = __esm({
   }
 });
 
+// lib/commands/init/package-manager.ts
+var JS_PACKAGE_MANAGERS, getPmCmdPrefix;
+var init_package_manager = __esm({
+  "lib/commands/init/package-manager.ts"() {
+    "use strict";
+    JS_PACKAGE_MANAGERS = [
+      { name: "npm", commandPrefix: "npm run" },
+      { name: "yarn", commandPrefix: "yarn" },
+      { name: "pnpm", commandPrefix: "pnpm" },
+      { name: "bun", commandPrefix: "bun run" }
+    ];
+    getPmCmdPrefix = /* @__PURE__ */ __name((packageManager) => {
+      return JS_PACKAGE_MANAGERS.find((pm) => pm.name === packageManager).commandPrefix;
+    }, "getPmCmdPrefix");
+  }
+});
+
 // ../../node_modules/camelcase/index.js
 var require_camelcase = __commonJS({
   "../../node_modules/camelcase/index.js"(exports2, module2) {
@@ -280213,7 +280238,7 @@ function pythonExecutable() {
   }
   return python;
 }
-function expandPlaceholders(template, language, project) {
+function expandPlaceholders(template, language, project, packageManager) {
   const cdkVersion = project.versions["aws-cdk-lib"];
   const cdkCliVersion = project.versions["aws-cdk"];
   let constructsVersion = project.versions.constructs;
@@ -280233,7 +280258,7 @@ function expandPlaceholders(template, language, project) {
   ).replace(
     /%PascalStackProps%/,
     project.stackName ? camelCase(project.stackName, { pascalCase: true }) + "StackProps" : "StackProps"
-  ).replace(/%name\.camelCased%/g, camelCase(project.name)).replace(/%name\.PascalCased%/g, camelCase(project.name, { pascalCase: true })).replace(/%cdk-version%/g, cdkVersion).replace(/%cdk-cli-version%/g, cdkCliVersion).replace(/%constructs-version%/g, constructsVersion).replace(/%cdk-home%/g, cdkHomeDir()).replace(/%name\.PythonModule%/g, project.name.replace(/-/g, "_")).replace(/%python-executable%/g, pythonExecutable()).replace(/%name\.StackName%/g, project.name.replace(/[^A-Za-z0-9-]/g, "-"));
+  ).replace(/%name\.camelCased%/g, camelCase(project.name)).replace(/%name\.PascalCased%/g, camelCase(project.name, { pascalCase: true })).replace(/%cdk-version%/g, cdkVersion).replace(/%cdk-cli-version%/g, cdkCliVersion).replace(/%constructs-version%/g, constructsVersion).replace(/%cdk-home%/g, cdkHomeDir()).replace(/%name\.PythonModule%/g, project.name.replace(/-/g, "_")).replace(/%python-executable%/g, pythonExecutable()).replace(/%name\.StackName%/g, project.name.replace(/[^A-Za-z0-9-]/g, "-")).replace(/%pm-cmd%/g, getPmCmdPrefix(packageManager ?? "npm"));
 }
 async function availableInitTemplates() {
   try {
@@ -280267,7 +280292,7 @@ async function printAvailableTemplates(ioHelper, language) {
 async function initializeProject(ioHelper, template, language, canUseNetwork, generateOnly, workDir, stackName, migrate, cdkVersion, packageManager) {
   await assertIsEmptyDirectory(workDir);
   await ioHelper.defaults.info(`Applying project template ${chalk26.green(template.name)} for ${chalk26.blue(language)}`);
-  await template.install(ioHelper, language, workDir, stackName, cdkVersion);
+  await template.install(ioHelper, language, workDir, stackName, cdkVersion, packageManager);
   if (migrate) {
     await template.addMigrateContext(workDir);
   }
@@ -280504,6 +280529,7 @@ var init_init = __esm({
     init_version();
     init_util7();
     init_language();
+    init_package_manager();
     camelCase = require_camelcase();
     decamelize = require_decamelize();
     SUPPORTED_LANGUAGE_NAMES = SUPPORTED_LANGUAGES.map((l4) => l4.name);
@@ -280580,7 +280606,7 @@ var init_init = __esm({
        * @param libVersion - the version of the CDK library to use
        * @default undefined
        */
-      async install(ioHelper, language, targetDirectory, stackName, libVersion) {
+      async install(ioHelper, language, targetDirectory, stackName, libVersion, packageManager) {
         if (this.languages.indexOf(language) === -1) {
           await ioHelper.defaults.error(
             `The ${chalk26.blue(language)} language is not supported for ${chalk26.green(this.name)} (it supports: ${this.languages.map((l4) => chalk26.blue(l4)).join(", ")})`
@@ -280602,7 +280628,7 @@ var init_init = __esm({
         if (this.templateType === "custom" /* CUSTOM */) {
           await this.installFilesWithoutProcessing(sourceDirectory, targetDirectory);
         } else {
-          await this.installFiles(sourceDirectory, targetDirectory, language, projectInfo);
+          await this.installFiles(sourceDirectory, targetDirectory, language, projectInfo, packageManager);
           await this.applyFutureFlags(targetDirectory);
           await invokeBuiltinHooks(
             ioHelper,
@@ -280612,25 +280638,25 @@ var init_init = __esm({
                 const fileProcessingPromises = fileNames.map(async (fileName) => {
                   const fullPath = path34.join(targetDirectory, fileName);
                   const template = await fs36.readFile(fullPath, { encoding: "utf-8" });
-                  await fs36.writeFile(fullPath, expandPlaceholders(template, language, projectInfo));
+                  await fs36.writeFile(fullPath, expandPlaceholders(template, language, projectInfo, packageManager));
                 });
                 await Promise.all(fileProcessingPromises);
               }, "substitutePlaceholdersIn"),
-              placeholder: /* @__PURE__ */ __name((ph) => expandPlaceholders(`%${ph}%`, language, projectInfo), "placeholder")
+              placeholder: /* @__PURE__ */ __name((ph) => expandPlaceholders(`%${ph}%`, language, projectInfo, packageManager), "placeholder")
             }
           );
         }
       }
-      async installFiles(sourceDirectory, targetDirectory, language, project) {
+      async installFiles(sourceDirectory, targetDirectory, language, project, packageManager) {
         for (const file of await fs36.readdir(sourceDirectory)) {
           const fromFile = path34.join(sourceDirectory, file);
-          const toFile = path34.join(targetDirectory, expandPlaceholders(file, language, project));
+          const toFile = path34.join(targetDirectory, expandPlaceholders(file, language, project, packageManager));
           if ((await fs36.stat(fromFile)).isDirectory()) {
             await fs36.mkdir(toFile);
-            await this.installFiles(fromFile, toFile, language, project);
+            await this.installFiles(fromFile, toFile, language, project, packageManager);
             continue;
           } else if (file.match(/^.*\.template\.[^.]+$/)) {
-            await this.installProcessed(fromFile, toFile.replace(/\.template(\.[^.]+)$/, "$1"), language, project);
+            await this.installProcessed(fromFile, toFile.replace(/\.template(\.[^.]+)$/, "$1"), language, project, packageManager);
             continue;
           } else if (file.match(/^.*\.hook\.(d.)?[^.]+$/)) {
             continue;
@@ -280639,9 +280665,9 @@ var init_init = __esm({
           }
         }
       }
-      async installProcessed(templatePath, toFile, language, project) {
+      async installProcessed(templatePath, toFile, language, project, packageManager) {
         const template = await fs36.readFile(templatePath, { encoding: "utf-8" });
-        await fs36.writeFile(toFile, expandPlaceholders(template, language, project));
+        await fs36.writeFile(toFile, expandPlaceholders(template, language, project, packageManager));
       }
       /**
        * Copy template files without processing placeholders (for custom templates)

package/lib/init-templates/app/javascript/README.md

@@ -6,7 +6,7 @@ The `cdk.json` file tells the CDK Toolkit how to execute your app. The build ste
 
 ## Useful commands
 
-* `npm run test`         perform the jest unit tests
+* `%pm-cmd% test`         perform the jest unit tests
 * `npx cdk deploy`       deploy this stack to your default AWS account/region
 * `npx cdk diff`         compare deployed stack with current state
 * `npx cdk synth`        emits the synthesized CloudFormation template

package/lib/init-templates/app/typescript/README.md

@@ -6,9 +6,9 @@ The `cdk.json` file tells the CDK Toolkit how to execute your app.
 
 ## Useful commands
 
-* `npm run build`   compile typescript to js
-* `npm run watch`   watch for changes and compile
-* `npm run test`    perform the jest unit tests
+* `%pm-cmd% build`   compile typescript to js
+* `%pm-cmd% watch`   watch for changes and compile
+* `%pm-cmd% test`    perform the jest unit tests
 * `npx cdk deploy`  deploy this stack to your default AWS account/region
 * `npx cdk diff`    compare deployed stack with current state
 * `npx cdk synth`   emits the synthesized CloudFormation template

package/lib/init-templates/lib/typescript/README.template.md

@@ -7,6 +7,6 @@ The construct defines an interface (`%name.PascalCased%Props`) to configure the
 
 ## Useful commands
 
-* `npm run build`   compile typescript to js
-* `npm run watch`   watch for changes and compile
-* `npm run test`    perform the jest unit tests
+* `%pm-cmd% build`   compile typescript to js
+* `%pm-cmd% watch`   watch for changes and compile
+* `%pm-cmd% test`    perform the jest unit tests

package/lib/init-templates/sample-app/javascript/README.template.md

@@ -7,7 +7,7 @@ The `cdk.json` file tells the CDK Toolkit how to execute your app. The build ste
 
 ## Useful commands
 
-* `npm run test`         perform the jest unit tests
+* `%pm-cmd% test`         perform the jest unit tests
 * `cdk deploy`           deploy this stack to your default AWS account/region
 * `cdk diff`             compare deployed stack with current state
 * `cdk synth`            emits the synthesized CloudFormation template

package/lib/init-templates/sample-app/typescript/README.template.md

@@ -7,9 +7,9 @@ The `cdk.json` file tells the CDK Toolkit how to execute your app.
 
 ## Useful commands
 
-* `npm run build`   compile typescript to js
-* `npm run watch`   watch for changes and compile
-* `npm run test`    perform the jest unit tests
+* `%pm-cmd% build`   compile typescript to js
+* `%pm-cmd% watch`   watch for changes and compile
+* `%pm-cmd% test`    perform the jest unit tests
 * `cdk deploy`      deploy this stack to your default AWS account/region
 * `cdk diff`        compare deployed stack with current state
 * `cdk synth`       emits the synthesized CloudFormation template

package/package.json

@@ -78,10 +78,10 @@
     "typescript": "5.9",
     "xml-js": "^1.6.11",
     "@aws-cdk/cdk-assets-lib": "^1.1.0",
-    "@aws-cdk/cloud-assembly-schema": ">=49.1.0",
+    "@aws-cdk/cloud-assembly-schema": ">=49.2.0",
     "@aws-cdk/cloudformation-diff": "2.185.0",
     "@aws-cdk/cx-api": "^2.232.1",
-    "@aws-cdk/toolkit-lib": "^1.12.1",
+    "@aws-cdk/toolkit-lib": "^1.12.2",
     "@aws-sdk/client-appsync": "^3",
     "@aws-sdk/client-cloudcontrol": "^3",
     "@aws-sdk/client-cloudformation": "^3",
@@ -144,7 +144,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.1100.0",
+  "version": "2.1100.1",
   "types": "lib/index.d.ts",
   "exports": {
     "./package.json": "./package.json",