@aws/nx-plugin 1.0.0-rc.4 → 1.0.0-rc.41

package/src/infra/app/__snapshots__/generator.spec.ts.snap

@@ -2,71 +2,49 @@
 
 exports[`infra generator > should add required dependencies to package.json > dependencies 1`] = `
 {
-  "aws-cdk": "2.1125.0",
-  "aws-cdk-lib": "2.257.0",
+  "aws-cdk": "2.1130.0",
+  "aws-cdk-lib": "2.261.0",
   "constructs": "10.6.0",
-  "esbuild": "0.28.0",
+  "esbuild": "0.28.1",
   "source-map-support": "0.5.21",
 }
 `;
 
 exports[`infra generator > should add required dependencies to package.json > dev-dependencies 1`] = `
 {
-  "@eslint/js": "^9.8.0",
-  "@nx/eslint": "22.7.5",
-  "@nx/eslint-plugin": "22.7.5",
-  "@nx/js": "22.7.5",
-  "@nx/vitest": "22.7.5",
-  "@swc-node/register": "~1.11.1",
-  "@swc/core": "~1.15.5",
+  "@nx/js": "23.1.0",
+  "@nx/vitest": "23.1.0",
   "@swc/helpers": "~0.5.18",
-  "@types/node": "25.9.1",
-  "@vitest/coverage-v8": "4.1.7",
-  "eslint": "^9.8.0",
-  "eslint-config-prettier": "^10.0.0",
-  "eslint-plugin-prettier": "5.5.6",
+  "@types/node": "26.1.1",
+  "@vitest/coverage-v8": "4.1.10",
   "jsdom": "^27.1.0",
-  "jsonc-eslint-parser": "3.1.0",
-  "prettier": "3.8.3",
-  "tsx": "4.22.4",
-  "typescript": "~5.9.2",
-  "typescript-eslint": "^8.40.0",
-  "vite": "8.0.14",
-  "vitest": "4.1.7",
+  "tsx": "4.23.0",
+  "typescript": "~6.0.3",
+  "vite": "8.1.4",
+  "vitest": "4.1.10",
 }
 `;
 
 exports[`infra generator > should add required dependencies to package.json > package-json 1`] = `
 {
   "dependencies": {
-    "aws-cdk": "2.1125.0",
-    "aws-cdk-lib": "2.257.0",
+    "aws-cdk": "2.1130.0",
+    "aws-cdk-lib": "2.261.0",
     "constructs": "10.6.0",
-    "esbuild": "0.28.0",
+    "esbuild": "0.28.1",
     "source-map-support": "0.5.21",
   },
   "devDependencies": {
-    "@eslint/js": "^9.8.0",
-    "@nx/eslint": "22.7.5",
-    "@nx/eslint-plugin": "22.7.5",
-    "@nx/js": "22.7.5",
-    "@nx/vitest": "22.7.5",
-    "@swc-node/register": "~1.11.1",
-    "@swc/core": "~1.15.5",
+    "@nx/js": "23.1.0",
+    "@nx/vitest": "23.1.0",
     "@swc/helpers": "~0.5.18",
-    "@types/node": "25.9.1",
-    "@vitest/coverage-v8": "4.1.7",
-    "eslint": "^9.8.0",
-    "eslint-config-prettier": "^10.0.0",
-    "eslint-plugin-prettier": "5.5.6",
+    "@types/node": "26.1.1",
+    "@vitest/coverage-v8": "4.1.10",
     "jsdom": "^27.1.0",
-    "jsonc-eslint-parser": "3.1.0",
-    "prettier": "3.8.3",
-    "tsx": "4.22.4",
-    "typescript": "~5.9.2",
-    "typescript-eslint": "^8.40.0",
-    "vite": "8.0.14",
-    "vitest": "4.1.7",
+    "tsx": "4.23.0",
+    "typescript": "~6.0.3",
+    "vite": "8.1.4",
+    "vitest": "4.1.10",
   },
   "name": "@proj/source",
   "type": "module",
@@ -84,7 +62,7 @@ exports[`infra generator > should configure Checkov target correctly > checkov-t
     "{workspaceRoot}/dist/{projectRoot}/cdk.out",
   ],
   "options": {
-    "command": "uvx --from checkov==3.2.532 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+    "command": "uvx --from checkov==3.3.8 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
   },
   "outputs": [
     "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -177,7 +155,7 @@ exports[`infra generator > should configure project.json with correct targets >
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
       "options": {
-        "command": "uvx --from checkov==3.2.532 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+        "command": "uvx --from checkov==3.3.8 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
       },
       "outputs": [
         "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -229,20 +207,44 @@ exports[`infra generator > should configure project.json with correct targets >
         "cwd": "{projectRoot}",
       },
     },
+    "format": {
+      "cache": true,
+      "configurations": {
+        "fix": {
+          "command": "biome format --write {projectRoot}",
+        },
+        "skip-lint": {
+          "command": "node -e """,
+        },
+      },
+      "executor": "nx:run-commands",
+      "inputs": [
+        "biome",
+      ],
+      "options": {
+        "command": "biome format {projectRoot}",
+      },
+    },
     "lint": {
       "cache": true,
       "configurations": {
         "fix": {
-          "fix": true,
+          "command": "biome check --write {projectRoot}",
         },
         "skip-lint": {
-          "force": true,
+          "command": "node -e """,
         },
       },
-      "executor": "@nx/eslint:lint",
+      "dependsOn": [
+        "format",
+      ],
+      "executor": "nx:run-commands",
       "inputs": [
-        "eslint",
+        "biome",
       ],
+      "options": {
+        "command": "biome lint {projectRoot}",
+      },
     },
     "synth": {
       "cache": true,
@@ -262,15 +264,6 @@ exports[`infra generator > should configure project.json with correct targets >
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
     },
-    "test": {
-      "executor": "@nx/vitest:test",
-      "options": {
-        "reportsDirectory": "{workspaceRoot}/coverage/{projectRoot}",
-      },
-      "outputs": [
-        "{options.reportsDirectory}",
-      ],
-    },
   },
 }
 `;
@@ -739,7 +732,7 @@ exports[`infra generator > should handle custom project names correctly > custom
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
       "options": {
-        "command": "uvx --from checkov==3.2.532 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+        "command": "uvx --from checkov==3.3.8 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
       },
       "outputs": [
         "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -791,20 +784,44 @@ exports[`infra generator > should handle custom project names correctly > custom
         "cwd": "{projectRoot}",
       },
     },
+    "format": {
+      "cache": true,
+      "configurations": {
+        "fix": {
+          "command": "biome format --write {projectRoot}",
+        },
+        "skip-lint": {
+          "command": "node -e """,
+        },
+      },
+      "executor": "nx:run-commands",
+      "inputs": [
+        "biome",
+      ],
+      "options": {
+        "command": "biome format {projectRoot}",
+      },
+    },
     "lint": {
       "cache": true,
       "configurations": {
         "fix": {
-          "fix": true,
+          "command": "biome check --write {projectRoot}",
         },
         "skip-lint": {
-          "force": true,
+          "command": "node -e """,
         },
       },
-      "executor": "@nx/eslint:lint",
+      "dependsOn": [
+        "format",
+      ],
+      "executor": "nx:run-commands",
       "inputs": [
-        "eslint",
+        "biome",
       ],
+      "options": {
+        "command": "biome lint {projectRoot}",
+      },
     },
     "synth": {
       "cache": true,
@@ -824,15 +841,6 @@ exports[`infra generator > should handle custom project names correctly > custom
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
     },
-    "test": {
-      "executor": "@nx/vitest:test",
-      "options": {
-        "reportsDirectory": "{workspaceRoot}/coverage/{projectRoot}",
-      },
-      "outputs": [
-        "{options.reportsDirectory}",
-      ],
-    },
   },
 }
 `;
@@ -993,30 +1001,34 @@ export type StagesConfig = {
 "
 `;
 
-exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/index.ts 1`] = `
+exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/index.ts 1`] = `
 "// Scripts (infra-deploy, infra-destroy) are the public interface of this package.
 "
 `;
 
-exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra-deploy.ts 1`] = `
+exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/infra-deploy.ts 1`] = `
 "import { run } from './stage-credentials/run.js';
 run('deploy');
 "
 `;
 
-exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra-destroy.ts 1`] = `
+exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/infra-destroy.ts 1`] = `
 "import { run } from './stage-credentials/run.js';
 run('destroy');
 "
 `;
 
-exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/stage-credentials/cdk-command.ts 1`] = `
+exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/stage-credentials/cdk-command.ts 1`] = `
 "/**
  * Builds the CDK command as an array of arguments for spawnSync.
  *
  * Defaults to --require-approval=never (standard for local dev deploys).
  * If the user explicitly passes --require-approval with any value, we
  * respect their choice and don't add the default.
+ *
+ * Pass --express to opt into CloudFormation express mode for faster
+ * iteration; it is not enabled by default so deploys wait for full
+ * resource stabilization.
  */
 export function buildCdkCommand(
   action: string,
@@ -1025,14 +1037,13 @@ export function buildCdkCommand(
   const hasRequireApproval = remainingArgs.some(
     (a) => a === '--require-approval' || a.startsWith('--require-approval='),
   );
-  return hasRequireApproval
-    ? ['cdk', action, ...remainingArgs]
-    : ['cdk', action, '--require-approval=never', ...remainingArgs];
+  const defaults = hasRequireApproval ? [] : ['--require-approval=never'];
+  return ['cdk', action, ...defaults, ...remainingArgs];
 }
 "
 `;
 
-exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/stage-credentials/credentials.ts 1`] = `
+exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/stage-credentials/credentials.ts 1`] = `
 "import type { StageCredentials, StagesConfig } from ':proj/common-infra-config';
 
 /**
@@ -1081,8 +1092,9 @@ export async function buildChildEnv(
       let STSClient: typeof import('@aws-sdk/client-sts').STSClient;
       let AssumeRoleCommand: typeof import('@aws-sdk/client-sts').AssumeRoleCommand;
       try {
-        ({ STSClient, AssumeRoleCommand } =
-          await import('@aws-sdk/client-sts'));
+        ({ STSClient, AssumeRoleCommand } = await import(
+          '@aws-sdk/client-sts'
+        ));
       } catch {
         console.error(
           '[infra-deploy] Error: @aws-sdk/client-sts is required for assumeRole credentials but is not installed.',
@@ -1133,7 +1145,7 @@ export function describeCredentials(creds: StageCredentials): string {
 "
 `;
 
-exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/stage-credentials/run.ts 1`] = `
+exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/stage-credentials/run.ts 1`] = `
 "import { spawnSync } from 'child_process';
 import stagesConfig from ':proj/common-infra-config';
 import { parseStageName } from './stage-parser.js';
@@ -1189,7 +1201,7 @@ export async function run(action: 'deploy' | 'destroy'): Promise<void> {
 "
 `;
 
-exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/stage-credentials/stage-parser.ts 1`] = `
+exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/stage-credentials/stage-parser.ts 1`] = `
 "/**
  * Extracts the CDK stage name from the first positional argument.
  *

package/src/infra/app/files/app/src/main.ts.template

@@ -1,4 +1,4 @@
-import { ApplicationStage } from './stages/application-stage.js';
+import { ApplicationStage } from './stages/application-stage<% if (esm) { %>.js<% } %>';
 import { App } from '<%= scopeAlias %>common-constructs';
 <% if (stageConfig) { %>import { resolveStage } from '<%= scopeAlias %>common-infra-config';
 <% } %>

package/src/infra/app/files/app/src/stages/application-stage.ts.template

@@ -1,6 +1,6 @@
 import { Stage, StageProps } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
-import { ApplicationStack } from '../stacks/application-stack.js';
+import { ApplicationStack } from '../stacks/application-stack<% if (esm) { %>.js<% } %>';
 
 /**
  * Defines a collection of CDK Stacks which make up your application

package/src/infra/app/generator.d.ts

@@ -2,9 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree, GeneratorCallback } from '@nx/devkit';
-import { TsInfraGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../utils/nx';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../utils/nx';
+import type { TsInfraGeneratorSchema } from './schema';
 export declare const INFRA_APP_GENERATOR_INFO: NxGeneratorInfo;
 export declare function tsInfraGenerator(tree: Tree, schema: TsInfraGeneratorSchema): Promise<GeneratorCallback>;
 export default tsInfraGenerator;