@aws/nx-plugin 0.51.0 → 0.52.0

package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap

@@ -8,6 +8,8 @@ import { tanstackRouter } from '@tanstack/router-plugin/vite';
 /// <reference types='vitest' />
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
   define: {
@@ -29,6 +31,8 @@ export default defineConfig(() => ({
       generatedRouteTree: resolve(__dirname, 'src/routeTree.gen.ts'),
     }),
     react(),
+    nxViteTsPaths(),
+    nxCopyAssetsPlugin(['*.md']),
     tailwindcss(),
     tsconfigPaths(),
   ],
@@ -48,7 +52,7 @@ export default defineConfig(() => ({
     include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
     coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
+      reportsDirectory: '../coverage/test-app',
       provider: 'v8' as const,
     },
     passWithNoTests: true,
@@ -64,6 +68,8 @@ import { tanstackRouter } from '@tanstack/router-plugin/vite';
 /// <reference types='vitest' />
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
   define: {
@@ -85,6 +91,8 @@ export default defineConfig(() => ({
       generatedRouteTree: resolve(__dirname, 'src/routeTree.gen.ts'),
     }),
     react(),
+    nxViteTsPaths(),
+    nxCopyAssetsPlugin(['*.md']),
     tsconfigPaths(),
   ],
   build: {
@@ -103,7 +111,7 @@ export default defineConfig(() => ({
     include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
     coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
+      reportsDirectory: '../coverage/test-app',
       provider: 'v8' as const,
     },
     passWithNoTests: true,
@@ -886,6 +894,14 @@ vitest.config.*.timestamp*
 runtime-config.json"
 `;
 
+exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > .prettierignore 1`] = `
+"# Add files here to ignore them from prettier formatting
+/dist
+/coverage
+/.nx/cache
+/.nx/workspace-data"
+`;
+
 exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > .prettierrc 1`] = `
 "{ "singleQuote": true }
 "
@@ -990,13 +1006,12 @@ exports[`react-website generator > Tanstack router integration > should generate
       "dependsOn": ["^build"],
       "inputs": ["default", "^default"]
     },
-    "test": {
-      "dependsOn": ["^build"],
-      "inputs": ["default"]
-    },
     "compile": {
       "cache": true,
       "inputs": ["default"]
+    },
+    "test": {
+      "inputs": ["default"]
     }
   },
   "generators": {
@@ -1054,31 +1069,31 @@ exports[`react-website generator > Tanstack router integration > should generate
 "{
   "name": "@proj/source",
   "dependencies": {
-    "@cloudscape-design/board-components": "3.0.117",
-    "@cloudscape-design/components": "3.0.1075",
+    "@cloudscape-design/board-components": "3.0.119",
+    "@cloudscape-design/components": "3.0.1097",
     "@cloudscape-design/global-styles": "1.0.45",
     "aws-cdk-lib": "2.217.0",
     "constructs": "10.4.2",
     "react": "19.0.0",
     "react-dom": "19.0.0",
-    "tailwindcss": "4.1.12"
+    "tailwindcss": "4.1.13"
   },
   "devDependencies": {
     "@eslint/js": "^9.8.0",
-    "@nx/eslint": "21.4.1",
-    "@nx/eslint-plugin": "21.4.1",
-    "@nx/js": "21.4.1",
-    "@nx/react": "21.4.1",
-    "@nx/vite": "21.4.1",
-    "@nx/web": "21.4.1",
+    "@nx/eslint": "21.5.3",
+    "@nx/eslint-plugin": "21.5.3",
+    "@nx/js": "21.5.3",
+    "@nx/react": "21.5.3",
+    "@nx/vite": "21.5.3",
+    "@nx/web": "21.5.3",
     "@swc-node/register": "~1.9.1",
     "@swc/cli": "~0.6.0",
     "@swc/core": "~1.5.7",
     "@swc/helpers": "~0.5.11",
-    "@tailwindcss/vite": "4.1.12",
+    "@tailwindcss/vite": "4.1.13",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.1.0",
-    "@types/node": "22.18.0",
+    "@types/node": "22.18.6",
     "@types/react": "19.0.0",
     "@types/react-dom": "19.0.0",
     "@vitejs/plugin-react": "^4.2.0",
@@ -1093,11 +1108,11 @@ exports[`react-website generator > Tanstack router integration > should generate
     "eslint-plugin-react-hooks": "5.0.0",
     "jiti": "2.4.2",
     "jsdom": "~22.1.0",
-    "jsonc-eslint-parser": "2.4.0",
+    "jsonc-eslint-parser": "2.4.1",
     "prettier": "3.6.2",
-    "typescript": "~5.8.2",
-    "typescript-eslint": "^8.29.0",
-    "vite": "^6.0.0",
+    "typescript": "~5.9.2",
+    "typescript-eslint": "^8.40.0",
+    "vite": "^7.0.0",
     "vite-tsconfig-paths": "5.1.4",
     "vitest": "^3.0.0"
   },
@@ -1164,6 +1179,9 @@ export default [
       parser: await import('jsonc-eslint-parser'),
     },
   },
+  {
+    ignores: ['**/out-tsc'],
+  },
 ];
 "
 `;
@@ -1648,9 +1666,9 @@ exports[`react-website generator > Tanstack router integration > should generate
 
 exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/constructs/tsconfig.spec.json 1`] = `
 "{
-  "extends": "../../../tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
+    "outDir": "../../../dist/out-tsc",
     "types": [
       "vitest/globals",
       "vitest/importMeta",
@@ -1687,11 +1705,13 @@ exports[`react-website generator > Tanstack router integration > should generate
 
 exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/constructs/vite.config.ts 1`] = `
 "import { defineConfig } from 'vite';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
   root: __dirname,
   cacheDir: '../../../node_modules/.vite/packages/common/constructs',
-  plugins: [],
+  plugins: [nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
   // Uncomment this if you are using workers.
   // worker: {
   //  plugins: [ nxViteTsPaths() ],
@@ -1704,7 +1724,7 @@ export default defineConfig(() => ({
     include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
     coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
+      reportsDirectory: '../../../coverage/packages/common/constructs',
       provider: 'v8' as const,
     },
     passWithNoTests: true,
@@ -2159,9 +2179,9 @@ exports[`react-website generator > Tanstack router integration > should generate
 
 exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > test-app/tsconfig.spec.json 1`] = `
 "{
-  "extends": "../tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
+    "outDir": "../dist/out-tsc",
     "types": [
       "vitest/globals",
       "vitest/importMeta",
@@ -2202,6 +2222,8 @@ import tsconfigPaths from 'vite-tsconfig-paths';
 /// <reference types='vitest' />
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
   define: {
@@ -2217,7 +2239,13 @@ export default defineConfig(() => ({
     port: 4300,
     host: 'localhost',
   },
-  plugins: [react(), tailwindcss(), tsconfigPaths()],
+  plugins: [
+    react(),
+    nxViteTsPaths(),
+    nxCopyAssetsPlugin(['*.md']),
+    tailwindcss(),
+    tsconfigPaths(),
+  ],
   build: {
     outDir: '../dist/test-app',
     emptyOutDir: true,
@@ -2234,7 +2262,7 @@ export default defineConfig(() => ({
     include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
     coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
+      reportsDirectory: '../coverage/test-app',
       provider: 'v8' as const,
     },
     passWithNoTests: true,
@@ -2286,6 +2314,14 @@ vitest.config.*.timestamp*
 runtime-config.json"
 `;
 
+exports[`react-website generator > Tanstack router integration > should generate website with router correctly > .prettierignore 1`] = `
+"# Add files here to ignore them from prettier formatting
+/dist
+/coverage
+/.nx/cache
+/.nx/workspace-data"
+`;
+
 exports[`react-website generator > Tanstack router integration > should generate website with router correctly > .prettierrc 1`] = `
 "{ "singleQuote": true }
 "
@@ -2390,13 +2426,12 @@ exports[`react-website generator > Tanstack router integration > should generate
       "dependsOn": ["^build"],
       "inputs": ["default", "^default"]
     },
-    "test": {
-      "dependsOn": ["^build"],
-      "inputs": ["default"]
-    },
     "compile": {
       "cache": true,
       "inputs": ["default"]
+    },
+    "test": {
+      "inputs": ["default"]
     }
   },
   "generators": {
@@ -2454,36 +2489,36 @@ exports[`react-website generator > Tanstack router integration > should generate
 "{
   "name": "@proj/source",
   "dependencies": {
-    "@cloudscape-design/board-components": "3.0.117",
-    "@cloudscape-design/components": "3.0.1075",
+    "@cloudscape-design/board-components": "3.0.119",
+    "@cloudscape-design/components": "3.0.1097",
     "@cloudscape-design/global-styles": "1.0.45",
-    "@tanstack/react-router": "1.131.28",
+    "@tanstack/react-router": "1.132.7",
     "aws-cdk-lib": "2.217.0",
     "constructs": "10.4.2",
     "react": "19.0.0",
     "react-dom": "19.0.0",
-    "tailwindcss": "4.1.12"
+    "tailwindcss": "4.1.13"
   },
   "devDependencies": {
     "@eslint/js": "^9.8.0",
-    "@nx/eslint": "21.4.1",
-    "@nx/eslint-plugin": "21.4.1",
-    "@nx/js": "21.4.1",
-    "@nx/react": "21.4.1",
-    "@nx/vite": "21.4.1",
-    "@nx/web": "21.4.1",
+    "@nx/eslint": "21.5.3",
+    "@nx/eslint-plugin": "21.5.3",
+    "@nx/js": "21.5.3",
+    "@nx/react": "21.5.3",
+    "@nx/vite": "21.5.3",
+    "@nx/web": "21.5.3",
     "@swc-node/register": "~1.9.1",
     "@swc/cli": "~0.6.0",
     "@swc/core": "~1.5.7",
     "@swc/helpers": "~0.5.11",
-    "@tailwindcss/vite": "4.1.12",
-    "@tanstack/router-generator": "1.131.28",
-    "@tanstack/router-plugin": "1.131.28",
-    "@tanstack/router-utils": "1.131.2",
-    "@tanstack/virtual-file-routes": "1.131.2",
+    "@tailwindcss/vite": "4.1.13",
+    "@tanstack/router-generator": "1.132.7",
+    "@tanstack/router-plugin": "1.132.7",
+    "@tanstack/router-utils": "1.132.0",
+    "@tanstack/virtual-file-routes": "1.132.0",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.1.0",
-    "@types/node": "22.18.0",
+    "@types/node": "22.18.6",
     "@types/react": "19.0.0",
     "@types/react-dom": "19.0.0",
     "@vitejs/plugin-react": "^4.2.0",
@@ -2498,11 +2533,11 @@ exports[`react-website generator > Tanstack router integration > should generate
     "eslint-plugin-react-hooks": "5.0.0",
     "jiti": "2.4.2",
     "jsdom": "~22.1.0",
-    "jsonc-eslint-parser": "2.4.0",
+    "jsonc-eslint-parser": "2.4.1",
     "prettier": "3.6.2",
-    "typescript": "~5.8.2",
-    "typescript-eslint": "^8.29.0",
-    "vite": "^6.0.0",
+    "typescript": "~5.9.2",
+    "typescript-eslint": "^8.40.0",
+    "vite": "^7.0.0",
     "vite-tsconfig-paths": "5.1.4",
     "vitest": "^3.0.0"
   },
@@ -2569,6 +2604,9 @@ export default [
       parser: await import('jsonc-eslint-parser'),
     },
   },
+  {
+    ignores: ['**/out-tsc'],
+  },
 ];
 "
 `;
@@ -3053,9 +3091,9 @@ exports[`react-website generator > Tanstack router integration > should generate
 
 exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/constructs/tsconfig.spec.json 1`] = `
 "{
-  "extends": "../../../tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
+    "outDir": "../../../dist/out-tsc",
     "types": [
       "vitest/globals",
       "vitest/importMeta",
@@ -3092,11 +3130,13 @@ exports[`react-website generator > Tanstack router integration > should generate
 
 exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/constructs/vite.config.ts 1`] = `
 "import { defineConfig } from 'vite';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
   root: __dirname,
   cacheDir: '../../../node_modules/.vite/packages/common/constructs',
-  plugins: [],
+  plugins: [nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
   // Uncomment this if you are using workers.
   // worker: {
   //  plugins: [ nxViteTsPaths() ],
@@ -3109,7 +3149,7 @@ export default defineConfig(() => ({
     include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
     coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
+      reportsDirectory: '../../../coverage/packages/common/constructs',
       provider: 'v8' as const,
     },
     passWithNoTests: true,
@@ -3404,7 +3444,7 @@ const getBreadcrumbs = (
             .replace('//', '/')}\`;
 
     const matched =
-      !availableRoutes || availableRoutes.find((r) => matchByPath(r, href, {}));
+      !availableRoutes || availableRoutes.find((r) => matchByPath(href, {}));
 
     return {
       href: matched ? \`\${href}\${search}\` : '#',
@@ -3793,9 +3833,9 @@ exports[`react-website generator > Tanstack router integration > should generate
 
 exports[`react-website generator > Tanstack router integration > should generate website with router correctly > test-app/tsconfig.spec.json 1`] = `
 "{
-  "extends": "../tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
+    "outDir": "../dist/out-tsc",
     "types": [
       "vitest/globals",
       "vitest/importMeta",
@@ -3838,6 +3878,8 @@ import { tanstackRouter } from '@tanstack/router-plugin/vite';
 /// <reference types='vitest' />
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
   define: {
@@ -3859,6 +3901,8 @@ export default defineConfig(() => ({
       generatedRouteTree: resolve(__dirname, 'src/routeTree.gen.ts'),
     }),
     react(),
+    nxViteTsPaths(),
+    nxCopyAssetsPlugin(['*.md']),
     tailwindcss(),
     tsconfigPaths(),
   ],
@@ -3878,7 +3922,7 @@ export default defineConfig(() => ({
     include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
     coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
+      reportsDirectory: '../coverage/test-app',
       provider: 'v8' as const,
     },
     passWithNoTests: true,
@@ -3951,6 +3995,8 @@ import { tanstackRouter } from '@tanstack/router-plugin/vite';
 /// <reference types='vitest' />
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
   define: {
@@ -3972,6 +4018,8 @@ export default defineConfig(() => ({
       generatedRouteTree: resolve(__dirname, 'src/routeTree.gen.ts'),
     }),
     react(),
+    nxViteTsPaths(),
+    nxCopyAssetsPlugin(['*.md']),
     tailwindcss(),
     tsconfigPaths(),
   ],
@@ -3991,7 +4039,7 @@ export default defineConfig(() => ({
     include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
     coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
+      reportsDirectory: '../coverage/test-app',
       provider: 'v8' as const,
     },
     passWithNoTests: true,
@@ -4037,7 +4085,7 @@ const getBreadcrumbs = (
             .replace('//', '/')}\`;
 
     const matched =
-      !availableRoutes || availableRoutes.find((r) => matchByPath(r, href, {}));
+      !availableRoutes || availableRoutes.find((r) => matchByPath(href, {}));
 
     return {
       href: matched ? \`\${href}\${search}\` : '#',
@@ -4537,14 +4585,14 @@ root &&
 
 exports[`react-website generator > should handle npm scope prefix correctly > scoped-dependencies 1`] = `
 {
-  "@cloudscape-design/board-components": "3.0.117",
-  "@cloudscape-design/components": "3.0.1075",
+  "@cloudscape-design/board-components": "3.0.119",
+  "@cloudscape-design/components": "3.0.1097",
   "@cloudscape-design/global-styles": "1.0.45",
-  "@tanstack/react-router": "1.131.28",
+  "@tanstack/react-router": "1.132.7",
   "aws-cdk-lib": "2.217.0",
   "constructs": "10.4.2",
   "react": "19.0.0",
   "react-dom": "19.0.0",
-  "tailwindcss": "4.1.12",
+  "tailwindcss": "4.1.13",
 }
 `;

package/src/ts/react-website/app/files/app/src/components/AppLayout/index.tsx.template

@@ -34,7 +34,7 @@ const getBreadcrumbs = (
             .replace('//', '/')}`;
 
     const matched =
-      !availableRoutes || availableRoutes.find((r) => matchByPath(r, href, {}));
+      !availableRoutes || availableRoutes.find((r) => matchByPath(href, {}));
 
     return {
       href: matched ? `${href}${search}` : '#',

package/src/utils/agent-core-constructs/files/cdk/app/agent-core/__nameKebabCase__/__nameKebabCase__.ts.template

@@ -1,3 +1,4 @@
+import { Lazy, Names } from 'aws-cdk-lib';
 import { DockerImageAsset, Platform } from 'aws-cdk-lib/aws-ecr-assets';
 import { Construct } from 'constructs';
 import { execSync } from 'child_process';
@@ -29,8 +30,11 @@ export class <%- nameClassName %> extends Construct {
       ).trim(),
     });
 
-    this.agentCoreRuntime = new AgentCoreRuntime(this, 'AgentCore', {
-      runtimeName: '<%- nameClassName %>',
+    this.agentCoreRuntime = new AgentCoreRuntime(this, '<%- nameClassName %>', {
+      runtimeName: Lazy.string({
+        produce: () =>
+          Names.uniqueResourceName(this.agentCoreRuntime, { maxLength: 40 }),
+      }),
       serverProtocol: '<%- serverProtocol %>',
       containerUri: this.dockerImage.imageUri,
       ...props,

package/src/utils/api-constructs/api-constructs.d.ts

@@ -10,16 +10,16 @@ interface BackendOptions {
 export interface TrpcBackendOptions extends BackendOptions {
     type: 'trpc';
     projectAlias: string;
-    dir: string;
+    bundleOutputDir: string;
 }
 export interface FastApiBackendOptions extends BackendOptions {
     type: 'fastapi';
     moduleName: string;
-    dir: string;
+    bundleOutputDir: string;
 }
 export interface SmithyBackendOptions extends BackendOptions {
     type: 'smithy';
-    dir: string;
+    bundleOutputDir: string;
 }
 export interface AddApiGatewayConstructOptions {
     apiProjectName: string;

package/src/utils/api-constructs/files/cdk/app/apis/http/__apiNameKebabCase__.ts.template

@@ -100,7 +100,7 @@ export class <%= apiNameClassName %><
         code: Code.fromAsset(
           url.fileURLToPath(
             new URL(
-              '../../../../../../dist/<%- backend.dir %>/bundle',
+              '../../../../../../<%- backend.bundleOutputDir %>',
               import.meta.url,
             ),
           ),
@@ -111,7 +111,7 @@ export class <%= apiNameClassName %><
         code: Code.fromAsset(
           url.fileURLToPath(
             new URL(
-              '../../../../../../dist/<%- backend.dir %>/bundle',
+              '../../../../../../<%- backend.bundleOutputDir %>',
               import.meta.url,
             ),
           ),

package/src/utils/api-constructs/files/cdk/app/apis/rest/__apiNameKebabCase__.ts.template

@@ -104,7 +104,7 @@ export class <%= apiNameClassName %><
         code: Code.fromAsset(
           url.fileURLToPath(
             new URL(
-              '../../../../../../dist/<%- backend.dir %>/bundle',
+              '../../../../../../<%- backend.bundleOutputDir %>',
               import.meta.url,
             ),
           ),
@@ -115,7 +115,7 @@ export class <%= apiNameClassName %><
         code: Code.fromAsset(
           url.fileURLToPath(
             new URL(
-              '../../../../../../dist/<%- backend.dir %>/bundle',
+              '../../../../../../<%- backend.bundleOutputDir %>',
               import.meta.url,
             ),
           ),

package/src/utils/api-constructs/files/terraform/app/apis/http/__apiNameKebabCase__/__apiNameKebabCase__.tf.template

@@ -91,7 +91,7 @@ data "aws_caller_identity" "current" {}
 # Create Lambda ZIP file from the bundle directory
 data "archive_file" "lambda_zip" {
   type        = "zip"
-  source_dir  = "${path.module}/../../../../../../../dist/<%- backend.dir %>/bundle"
+  source_dir  = "${path.module}/../../../../../../../<%- backend.bundleOutputDir %>"
   output_path = "${path.module}/../../../../../../../dist/packages/common/terraform/apis/<%- apiNameKebabCase %>/lambda.zip"
 }
 

package/src/utils/api-constructs/files/terraform/app/apis/rest/__apiNameKebabCase__/__apiNameKebabCase__.tf.template

@@ -74,7 +74,7 @@ data "aws_caller_identity" "current" {}
 # Create Lambda ZIP file from the FastAPI bundle directory
 data "archive_file" "lambda_zip" {
   type        = "zip"
-  source_dir  = "${path.module}/../../../../../../../dist/<%- backend.dir %>/bundle"
+  source_dir  = "${path.module}/../../../../../../../<%- backend.bundleOutputDir %>"
   output_path = "${path.module}/../../../../../../../dist/packages/common/terraform/apis/<%- apiNameKebabCase %>/lambda.zip"
 }
 

package/src/utils/bundle/bundle.d.ts

@@ -13,7 +13,10 @@ export interface AddPythonBundleTargetOptions {
 /**
  * Adds a bundle target to the given project if it does not exist, and updates the build target to depend on it
  */
-export declare const addPythonBundleTarget: (project: ProjectConfiguration, opts?: AddPythonBundleTargetOptions) => void;
+export declare const addPythonBundleTarget: (project: ProjectConfiguration, opts?: AddPythonBundleTargetOptions) => {
+    bundleTargetName: string;
+    bundleOutputDir: string;
+};
 export interface AddTypeScriptBundleTargetOptions {
     /**
      * Path to the target file relative to the project dir

package/src/utils/bundle/bundle.js

@@ -14,15 +14,15 @@ const nx_1 = require("../nx");
 /**
  * Create a target for bundling a python project
  */
-const createPythonBundleTarget = ({ projectDir, packageName, pythonPlatform, }) => {
+const createPythonBundleTarget = ({ projectDir, packageName, pythonPlatform, bundleTargetName, }) => {
     return {
         cache: true,
         executor: 'nx:run-commands',
-        outputs: [`{workspaceRoot}/dist/${projectDir}/bundle`],
+        outputs: [`{workspaceRoot}/dist/${projectDir}/${bundleTargetName}`],
         options: {
             commands: [
-                `uv export --frozen --no-dev --no-editable --project ${projectDir} --package ${packageName} -o dist/${projectDir}/bundle/requirements.txt`,
-                `uv pip install -n --no-deps --no-installer-metadata --no-compile-bytecode --python-platform ${pythonPlatform} --target dist/${projectDir}/bundle -r dist/${projectDir}/bundle/requirements.txt`,
+                `uv export --frozen --no-dev --no-editable --project ${projectDir} --package ${packageName} -o dist/${projectDir}/${bundleTargetName}/requirements.txt`,
+                `uv pip install -n --no-deps --no-installer-metadata --no-compile-bytecode --python-platform ${pythonPlatform} --target dist/${projectDir}/${bundleTargetName} -r dist/${projectDir}/${bundleTargetName}/requirements.txt`,
             ],
             parallel: false,
         },
@@ -32,23 +32,27 @@ const createPythonBundleTarget = ({ projectDir, packageName, pythonPlatform, })
  * Adds a bundle target to the given project if it does not exist, and updates the build target to depend on it
  */
 const addPythonBundleTarget = (project, opts) => {
-    var _a, _b, _c, _d;
+    var _a, _b;
     if (!project.targets) {
         project.targets = {};
     }
-    if (!((_a = project.targets) === null || _a === void 0 ? void 0 : _a.bundle)) {
-        project.targets.bundle = Object.assign(Object.assign({}, createPythonBundleTarget({
+    const pythonPlatform = (_a = opts === null || opts === void 0 ? void 0 : opts.pythonPlatform) !== null && _a !== void 0 ? _a : 'x86_64-manylinux2014';
+    const bundleTargetName = pythonPlatform === 'aarch64-manylinux2014' ? 'bundle-arm' : 'bundle-x86';
+    if (!((_b = project.targets) === null || _b === void 0 ? void 0 : _b[bundleTargetName])) {
+        project.targets[bundleTargetName] = Object.assign(Object.assign({}, createPythonBundleTarget({
             projectDir: project.root,
             packageName: project.name,
-            pythonPlatform: (_b = opts === null || opts === void 0 ? void 0 : opts.pythonPlatform) !== null && _b !== void 0 ? _b : 'x86_64-manylinux2014',
+            pythonPlatform,
+            bundleTargetName,
         })), { dependsOn: ['compile'] });
     }
-    if ((_c = project.targets) === null || _c === void 0 ? void 0 : _c.build) {
-        project.targets.build.dependsOn = [
-            ...((_d = project.targets.build.dependsOn) !== null && _d !== void 0 ? _d : []).filter((t) => t !== 'bundle'),
-            'bundle',
-        ];
-    }
+    // Add a "bundle" target which depends on either bundle-arm or bundle-x86 (or both)
+    (0, nx_1.addDependencyToTargetIfNotPresent)(project, 'bundle', bundleTargetName);
+    (0, nx_1.addDependencyToTargetIfNotPresent)(project, 'build', 'bundle');
+    return {
+        bundleTargetName,
+        bundleOutputDir: (0, devkit_1.joinPathFragments)('dist', project.root, bundleTargetName),
+    };
 };
 exports.addPythonBundleTarget = addPythonBundleTarget;
 /**