@aws/nx-plugin 0.43.0 → 0.45.0

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

@@ -41,6 +41,7 @@ export default defineConfig(() => ({
     },
   },
   test: {
+    name: '@proj/test-app',
     watch: false,
     globals: true,
     environment: 'jsdom',
@@ -95,6 +96,7 @@ export default defineConfig(() => ({
     },
   },
   test: {
+    name: '@proj/test-app',
     watch: false,
     globals: true,
     environment: 'jsdom',
@@ -157,7 +159,7 @@ export default [
         'error',
         {
           enforceBuildableLibDependency: true,
-          allow: ['^.*/eslint(\\\\.base)?\\\\.config\\\\.[cm]?js$'],
+          allow: ['^.*/eslint(\\\\.base)?\\\\.config\\\\.[cm]?[jt]s$'],
           depConstraints: [
             {
               sourceTag: '*',
@@ -307,12 +309,12 @@ exports[`react-website generator > Tanstack router integration > should generate
   },
   "devDependencies": {
     "@eslint/js": "^9.8.0",
-    "@nx/eslint": "21.0.3",
-    "@nx/eslint-plugin": "21.0.3",
-    "@nx/js": "21.0.3",
-    "@nx/react": "21.0.3",
-    "@nx/vite": "21.0.3",
-    "@nx/web": "21.0.3",
+    "@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",
     "@swc-node/register": "~1.9.1",
     "@swc/cli": "~0.6.0",
     "@swc/core": "~1.5.7",
@@ -337,8 +339,8 @@ exports[`react-website generator > Tanstack router integration > should generate
     "jsdom": "~22.1.0",
     "jsonc-eslint-parser": "^2.4.0",
     "prettier": "^3.5.3",
-    "typescript": "~5.7.2",
-    "typescript-eslint": "^8.19.0",
+    "typescript": "~5.8.2",
+    "typescript-eslint": "^8.29.0",
     "vite": "^6.0.0",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.0.0"
@@ -396,7 +398,7 @@ export default [
         'warn',
         {
           ignoredFiles: [
-            '{projectRoot}/eslint.config.{js,cjs,mjs}',
+            '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}',
             '{projectRoot}/vite.config.{js,ts,mjs,mts}',
           ],
         },
@@ -462,6 +464,7 @@ import { StaticWebsite } from '../../core/index.js';
 export class TestApp extends StaticWebsite {
   constructor(scope: Construct, id: string) {
     super(scope, id, {
+      websiteName: 'TestApp',
       websiteFilePath: url.fileURLToPath(
         new URL('../../../../../../dist/test-app/bundle', import.meta.url),
       ),
@@ -508,25 +511,24 @@ export * from './runtime-config.js';
 `;
 
 exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/constructs/src/core/runtime-config.ts 1`] = `
-"import type { IRuntimeConfig } from ':proj/common-types';
-import { Stack } from 'aws-cdk-lib';
+"import { Stack, Stage } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 
 const RuntimeConfigKey = '__RuntimeConfig__';
 
 export class RuntimeConfig extends Construct {
-  private readonly _runtimeConfig: Partial<IRuntimeConfig> = {};
+  private readonly _runtimeConfig: any = {};
 
   static ensure(scope: Construct): RuntimeConfig {
-    const stack = Stack.of(scope);
+    const parent = Stage.of(scope) ?? Stack.of(scope);
     return (
-      RuntimeConfig.of(scope) ?? new RuntimeConfig(stack, RuntimeConfigKey)
+      RuntimeConfig.of(scope) ?? new RuntimeConfig(parent, RuntimeConfigKey)
     );
   }
 
   static of(scope: Construct): RuntimeConfig | undefined {
-    const stack = Stack.of(scope);
-    return stack.node.tryFindChild(RuntimeConfigKey) as
+    const parent = Stage.of(scope) ?? Stack.of(scope);
+    return parent.node.tryFindChild(RuntimeConfigKey) as
       | RuntimeConfig
       | undefined;
   }
@@ -535,7 +537,7 @@ export class RuntimeConfig extends Construct {
     super(scope, id);
   }
 
-  get config(): Partial<IRuntimeConfig> {
+  get config(): any {
     return this._runtimeConfig;
   }
 }
@@ -561,6 +563,7 @@ import { CfnWebACL } from 'aws-cdk-lib/aws-wafv2';
 const DEFAULT_RUNTIME_CONFIG_FILENAME = 'runtime-config.json';
 
 export interface StaticWebsiteProps {
+  readonly websiteName: string;
   readonly websiteFilePath: string;
 }
 
@@ -580,7 +583,7 @@ export class StaticWebsite extends Construct {
   constructor(
     scope: Construct,
     id: string,
-    { websiteFilePath }: StaticWebsiteProps,
+    { websiteFilePath, websiteName }: StaticWebsiteProps,
   ) {
     super(scope, id);
     this.node.setContext(
@@ -677,7 +680,7 @@ export class StaticWebsite extends Construct {
     new CfnOutput(this, 'DistributionDomainName', {
       value: this.cloudFrontDistribution.domainName,
     });
-    new CfnOutput(this, 'WebsiteBucketName', {
+    new CfnOutput(this, \`\${websiteName}WebsiteBucketName\`, {
       value: this.websiteBucket.bucketName,
     });
   }
@@ -835,229 +838,7 @@ export default defineConfig(() => ({
   //  plugins: [ nxViteTsPaths() ],
   // },
   test: {
-    watch: false,
-    globals: true,
-    environment: 'jsdom',
-    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
-      provider: 'v8' as const,
-    },
-    passWithNoTests: true,
-  },
-}));
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/types/README.md 1`] = `
-"# @proj/common-types
-
-This library was generated with [@aws/nx-plugin](https://github.com/awslabs/nx-plugin-for-aws/).
-
-## Building
-
-Run \`npx nx build @proj/common-types [--skip-nx-cache]\` to build the application.
-
-## Running unit tests
-
-Run \`npx nx test @proj/common-types\` to execute the unit tests via Vitest.
-
-### Updating snapshots
-
-To update snapshots, run the following command:
-
-\`npx nx test @proj/common-types --configuration=update-snapshot\`
-
-## Run lint
-
-Run \`npx nx lint @proj/common-types\`
-
-### Fixable issues
-
-You can also automatiaclly fix some lint errors by running the following command:
-
-\`npx nx lint @proj/common-types --configuration=fix\`
-
-## Useful links
-
-- [common-types reference docs](TODO)
-- [Learn more about NX](https://nx.dev/getting-started/intro)
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/types/eslint.config.mjs 1`] = `
-"import baseConfig from '../../../eslint.config.mjs';
-
-export default [
-  ...baseConfig,
-  {
-    files: ['**/*.json'],
-    rules: {
-      '@nx/dependency-checks': [
-        'warn',
-        {
-          ignoredFiles: [
-            '{projectRoot}/eslint.config.{js,cjs,mjs}',
-            '{projectRoot}/vite.config.{js,ts,mjs,mts}',
-          ],
-        },
-      ],
-    },
-    languageOptions: {
-      parser: await import('jsonc-eslint-parser'),
-    },
-  },
-];
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/types/project.json 1`] = `
-"{
-  "name": "@proj/common-types",
-  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "packages/common/types/src",
-  "projectType": "library",
-  "tags": [],
-  "targets": {
-    "build": {
-      "dependsOn": ["lint", "compile", "test"]
-    },
-    "compile": {
-      "executor": "nx:run-commands",
-      "outputs": ["{workspaceRoot}/dist/packages/common/types/tsc"],
-      "options": {
-        "command": "tsc --build tsconfig.lib.json",
-        "cwd": "{projectRoot}"
-      }
-    },
-    "test": {
-      "executor": "@nx/vite:test",
-      "outputs": ["{options.reportsDirectory}"],
-      "options": {
-        "reportsDirectory": "../../../coverage/packages/common/types"
-      }
-    }
-  },
-  "metadata": {
-    "generator": "ts#project"
-  }
-}
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/types/src/index.ts 1`] = `
-"export * from './runtime-config.js';
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/types/src/runtime-config.ts 1`] = `
-"// eslint-disable-next-line @typescript-eslint/no-empty-object-type, @typescript-eslint/no-empty-interface
-export interface IRuntimeConfig {}
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/types/tsconfig.json 1`] = `
-"{
-  "extends": "../../../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ],
-  "compilerOptions": {}
-}
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/types/tsconfig.lib.json 1`] = `
-"{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": ".",
-    "outDir": "../../../dist/packages/common/types/tsc",
-    "tsBuildInfoFile": "../../../dist/packages/common/types/tsc/tsconfig.lib.tsbuildinfo",
-    "emitDeclarationOnly": false,
-    "module": "nodenext",
-    "moduleResolution": "nodenext",
-    "types": ["node"]
-  },
-  "include": ["src/**/*.ts"],
-  "references": [],
-  "exclude": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx"
-  ]
-}
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/types/tsconfig.spec.json 1`] = `
-"{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
-    "types": [
-      "vitest/globals",
-      "vitest/importMeta",
-      "vite/client",
-      "node",
-      "vitest"
-    ],
-    "module": "nodenext",
-    "moduleResolution": "nodenext"
-  },
-  "include": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx",
-    "src/**/*.d.ts"
-  ],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
-}
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/types/vite.config.ts 1`] = `
-"import { defineConfig } from 'vite';
-
-export default defineConfig(() => ({
-  root: __dirname,
-  cacheDir: '../../../node_modules/.vite/packages/common/types',
-  plugins: [],
-  // Uncomment this if you are using workers.
-  // worker: {
-  //  plugins: [ nxViteTsPaths() ],
-  // },
-  test: {
+    name: '@proj/common-constructs',
     watch: false,
     globals: true,
     environment: 'jsdom',
@@ -1078,7 +859,6 @@ exports[`react-website generator > Tanstack router integration > should generate
   - 'packages/*'
   - 'test-app'
   - 'packages/common/*'
-  - 'packages/common/constructs'
 "
 `;
 
@@ -1216,7 +996,7 @@ exports[`react-website generator > Tanstack router integration > should generate
         "description": "Load runtime config from your deployed stack for dev purposes. You must set your AWS CLI credentials whilst calling 'pnpm exec nx run @proj/test-app:load:runtime-config'"
       },
       "options": {
-        "command": "aws s3 cp s3://\`aws cloudformation describe-stacks --query \\"Stacks[?StackName=='proj-infra-sandbox'][].Outputs[?contains(OutputKey, 'WebsiteBucketName')].OutputValue\\" --output text\`/runtime-config.json './test-app/public/runtime-config.json'"
+        "command": "aws s3 cp s3://\`aws cloudformation describe-stacks --query \\"Stacks[?starts_with(StackName, 'proj-')][].Outputs[] | [?contains(OutputKey, 'TestAppWebsiteBucketName')].OutputValue\\" --output text\`/runtime-config.json './test-app/public/runtime-config.json'"
       }
     },
     "preview": {
@@ -1588,6 +1368,7 @@ export default defineConfig(() => ({
     },
   },
   test: {
+    name: '@proj/test-app',
     watch: false,
     globals: true,
     environment: 'jsdom',
@@ -1607,7 +1388,6 @@ exports[`react-website generator > Tanstack router integration > should generate
 "{
   "compilerOptions": {
     "paths": {
-      ":proj/common-types": ["packages/common/types/src/index.ts"],
       ":proj/test-app": ["test-app/src/index.ts"],
       ":proj/common-constructs": ["packages/common/constructs/src/index.ts"]
     },
@@ -1624,9 +1404,6 @@ exports[`react-website generator > Tanstack router integration > should generate
     {
       "path": "./test-app"
     },
-    {
-      "path": "./packages/common/types"
-    },
     {
       "path": "./packages/common/constructs"
     }
@@ -1679,7 +1456,7 @@ export default [
         'error',
         {
           enforceBuildableLibDependency: true,
-          allow: ['^.*/eslint(\\\\.base)?\\\\.config\\\\.[cm]?js$'],
+          allow: ['^.*/eslint(\\\\.base)?\\\\.config\\\\.[cm]?[jt]s$'],
           depConstraints: [
             {
               sourceTag: '*',
@@ -1830,12 +1607,12 @@ exports[`react-website generator > Tanstack router integration > should generate
   },
   "devDependencies": {
     "@eslint/js": "^9.8.0",
-    "@nx/eslint": "21.0.3",
-    "@nx/eslint-plugin": "21.0.3",
-    "@nx/js": "21.0.3",
-    "@nx/react": "21.0.3",
-    "@nx/vite": "21.0.3",
-    "@nx/web": "21.0.3",
+    "@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",
     "@swc-node/register": "~1.9.1",
     "@swc/cli": "~0.6.0",
     "@swc/core": "~1.5.7",
@@ -1864,8 +1641,8 @@ exports[`react-website generator > Tanstack router integration > should generate
     "jsdom": "~22.1.0",
     "jsonc-eslint-parser": "^2.4.0",
     "prettier": "^3.5.3",
-    "typescript": "~5.7.2",
-    "typescript-eslint": "^8.19.0",
+    "typescript": "~5.8.2",
+    "typescript-eslint": "^8.29.0",
     "vite": "^6.0.0",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.0.0"
@@ -1923,7 +1700,7 @@ export default [
         'warn',
         {
           ignoredFiles: [
-            '{projectRoot}/eslint.config.{js,cjs,mjs}',
+            '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}',
             '{projectRoot}/vite.config.{js,ts,mjs,mts}',
           ],
         },
@@ -1989,6 +1766,7 @@ import { StaticWebsite } from '../../core/index.js';
 export class TestApp extends StaticWebsite {
   constructor(scope: Construct, id: string) {
     super(scope, id, {
+      websiteName: 'TestApp',
       websiteFilePath: url.fileURLToPath(
         new URL('../../../../../../dist/test-app/bundle', import.meta.url),
       ),
@@ -2035,25 +1813,24 @@ export * from './runtime-config.js';
 `;
 
 exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/constructs/src/core/runtime-config.ts 1`] = `
-"import type { IRuntimeConfig } from ':proj/common-types';
-import { Stack } from 'aws-cdk-lib';
+"import { Stack, Stage } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 
 const RuntimeConfigKey = '__RuntimeConfig__';
 
 export class RuntimeConfig extends Construct {
-  private readonly _runtimeConfig: Partial<IRuntimeConfig> = {};
+  private readonly _runtimeConfig: any = {};
 
   static ensure(scope: Construct): RuntimeConfig {
-    const stack = Stack.of(scope);
+    const parent = Stage.of(scope) ?? Stack.of(scope);
     return (
-      RuntimeConfig.of(scope) ?? new RuntimeConfig(stack, RuntimeConfigKey)
+      RuntimeConfig.of(scope) ?? new RuntimeConfig(parent, RuntimeConfigKey)
     );
   }
 
   static of(scope: Construct): RuntimeConfig | undefined {
-    const stack = Stack.of(scope);
-    return stack.node.tryFindChild(RuntimeConfigKey) as
+    const parent = Stage.of(scope) ?? Stack.of(scope);
+    return parent.node.tryFindChild(RuntimeConfigKey) as
       | RuntimeConfig
       | undefined;
   }
@@ -2062,7 +1839,7 @@ export class RuntimeConfig extends Construct {
     super(scope, id);
   }
 
-  get config(): Partial<IRuntimeConfig> {
+  get config(): any {
     return this._runtimeConfig;
   }
 }
@@ -2088,6 +1865,7 @@ import { CfnWebACL } from 'aws-cdk-lib/aws-wafv2';
 const DEFAULT_RUNTIME_CONFIG_FILENAME = 'runtime-config.json';
 
 export interface StaticWebsiteProps {
+  readonly websiteName: string;
   readonly websiteFilePath: string;
 }
 
@@ -2107,7 +1885,7 @@ export class StaticWebsite extends Construct {
   constructor(
     scope: Construct,
     id: string,
-    { websiteFilePath }: StaticWebsiteProps,
+    { websiteFilePath, websiteName }: StaticWebsiteProps,
   ) {
     super(scope, id);
     this.node.setContext(
@@ -2204,7 +1982,7 @@ export class StaticWebsite extends Construct {
     new CfnOutput(this, 'DistributionDomainName', {
       value: this.cloudFrontDistribution.domainName,
     });
-    new CfnOutput(this, 'WebsiteBucketName', {
+    new CfnOutput(this, \`\${websiteName}WebsiteBucketName\`, {
       value: this.websiteBucket.bucketName,
     });
   }
@@ -2362,229 +2140,7 @@ export default defineConfig(() => ({
   //  plugins: [ nxViteTsPaths() ],
   // },
   test: {
-    watch: false,
-    globals: true,
-    environment: 'jsdom',
-    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
-      provider: 'v8' as const,
-    },
-    passWithNoTests: true,
-  },
-}));
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/types/README.md 1`] = `
-"# @proj/common-types
-
-This library was generated with [@aws/nx-plugin](https://github.com/awslabs/nx-plugin-for-aws/).
-
-## Building
-
-Run \`npx nx build @proj/common-types [--skip-nx-cache]\` to build the application.
-
-## Running unit tests
-
-Run \`npx nx test @proj/common-types\` to execute the unit tests via Vitest.
-
-### Updating snapshots
-
-To update snapshots, run the following command:
-
-\`npx nx test @proj/common-types --configuration=update-snapshot\`
-
-## Run lint
-
-Run \`npx nx lint @proj/common-types\`
-
-### Fixable issues
-
-You can also automatiaclly fix some lint errors by running the following command:
-
-\`npx nx lint @proj/common-types --configuration=fix\`
-
-## Useful links
-
-- [common-types reference docs](TODO)
-- [Learn more about NX](https://nx.dev/getting-started/intro)
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/types/eslint.config.mjs 1`] = `
-"import baseConfig from '../../../eslint.config.mjs';
-
-export default [
-  ...baseConfig,
-  {
-    files: ['**/*.json'],
-    rules: {
-      '@nx/dependency-checks': [
-        'warn',
-        {
-          ignoredFiles: [
-            '{projectRoot}/eslint.config.{js,cjs,mjs}',
-            '{projectRoot}/vite.config.{js,ts,mjs,mts}',
-          ],
-        },
-      ],
-    },
-    languageOptions: {
-      parser: await import('jsonc-eslint-parser'),
-    },
-  },
-];
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/types/project.json 1`] = `
-"{
-  "name": "@proj/common-types",
-  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "packages/common/types/src",
-  "projectType": "library",
-  "tags": [],
-  "targets": {
-    "build": {
-      "dependsOn": ["lint", "compile", "test"]
-    },
-    "compile": {
-      "executor": "nx:run-commands",
-      "outputs": ["{workspaceRoot}/dist/packages/common/types/tsc"],
-      "options": {
-        "command": "tsc --build tsconfig.lib.json",
-        "cwd": "{projectRoot}"
-      }
-    },
-    "test": {
-      "executor": "@nx/vite:test",
-      "outputs": ["{options.reportsDirectory}"],
-      "options": {
-        "reportsDirectory": "../../../coverage/packages/common/types"
-      }
-    }
-  },
-  "metadata": {
-    "generator": "ts#project"
-  }
-}
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/types/src/index.ts 1`] = `
-"export * from './runtime-config.js';
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/types/src/runtime-config.ts 1`] = `
-"// eslint-disable-next-line @typescript-eslint/no-empty-object-type, @typescript-eslint/no-empty-interface
-export interface IRuntimeConfig {}
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/types/tsconfig.json 1`] = `
-"{
-  "extends": "../../../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ],
-  "compilerOptions": {}
-}
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/types/tsconfig.lib.json 1`] = `
-"{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": ".",
-    "outDir": "../../../dist/packages/common/types/tsc",
-    "tsBuildInfoFile": "../../../dist/packages/common/types/tsc/tsconfig.lib.tsbuildinfo",
-    "emitDeclarationOnly": false,
-    "module": "nodenext",
-    "moduleResolution": "nodenext",
-    "types": ["node"]
-  },
-  "include": ["src/**/*.ts"],
-  "references": [],
-  "exclude": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx"
-  ]
-}
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/types/tsconfig.spec.json 1`] = `
-"{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
-    "types": [
-      "vitest/globals",
-      "vitest/importMeta",
-      "vite/client",
-      "node",
-      "vitest"
-    ],
-    "module": "nodenext",
-    "moduleResolution": "nodenext"
-  },
-  "include": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx",
-    "src/**/*.d.ts"
-  ],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
-}
-"
-`;
-
-exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/types/vite.config.ts 1`] = `
-"import { defineConfig } from 'vite';
-
-export default defineConfig(() => ({
-  root: __dirname,
-  cacheDir: '../../../node_modules/.vite/packages/common/types',
-  plugins: [],
-  // Uncomment this if you are using workers.
-  // worker: {
-  //  plugins: [ nxViteTsPaths() ],
-  // },
-  test: {
+    name: '@proj/common-constructs',
     watch: false,
     globals: true,
     environment: 'jsdom',
@@ -2605,7 +2161,6 @@ exports[`react-website generator > Tanstack router integration > should generate
   - 'packages/*'
   - 'test-app'
   - 'packages/common/*'
-  - 'packages/common/constructs'
 "
 `;
 
@@ -2743,7 +2298,7 @@ exports[`react-website generator > Tanstack router integration > should generate
         "description": "Load runtime config from your deployed stack for dev purposes. You must set your AWS CLI credentials whilst calling 'pnpm exec nx run @proj/test-app:load:runtime-config'"
       },
       "options": {
-        "command": "aws s3 cp s3://\`aws cloudformation describe-stacks --query \\"Stacks[?StackName=='proj-infra-sandbox'][].Outputs[?contains(OutputKey, 'WebsiteBucketName')].OutputValue\\" --output text\`/runtime-config.json './test-app/public/runtime-config.json'"
+        "command": "aws s3 cp s3://\`aws cloudformation describe-stacks --query \\"Stacks[?starts_with(StackName, 'proj-')][].Outputs[] | [?contains(OutputKey, 'TestAppWebsiteBucketName')].OutputValue\\" --output text\`/runtime-config.json './test-app/public/runtime-config.json'"
       }
     },
     "preview": {
@@ -3354,6 +2909,7 @@ export default defineConfig(() => ({
     },
   },
   test: {
+    name: '@proj/test-app',
     watch: false,
     globals: true,
     environment: 'jsdom',
@@ -3373,7 +2929,6 @@ exports[`react-website generator > Tanstack router integration > should generate
 "{
   "compilerOptions": {
     "paths": {
-      ":proj/common-types": ["packages/common/types/src/index.ts"],
       ":proj/test-app": ["test-app/src/index.ts"],
       ":proj/common-constructs": ["packages/common/constructs/src/index.ts"]
     },
@@ -3390,9 +2945,6 @@ exports[`react-website generator > Tanstack router integration > should generate
     {
       "path": "./test-app"
     },
-    {
-      "path": "./packages/common/types"
-    },
     {
       "path": "./packages/common/constructs"
     }
@@ -3470,6 +3022,7 @@ export default defineConfig(() => ({
     },
   },
   test: {
+    name: '@proj/test-app',
     watch: false,
     globals: true,
     environment: 'jsdom',
@@ -3739,6 +3292,7 @@ import { CfnWebACL } from 'aws-cdk-lib/aws-wafv2';
 const DEFAULT_RUNTIME_CONFIG_FILENAME = 'runtime-config.json';
 
 export interface StaticWebsiteProps {
+  readonly websiteName: string;
   readonly websiteFilePath: string;
 }
 
@@ -3758,7 +3312,7 @@ export class StaticWebsite extends Construct {
   constructor(
     scope: Construct,
     id: string,
-    { websiteFilePath }: StaticWebsiteProps,
+    { websiteFilePath, websiteName }: StaticWebsiteProps,
   ) {
     super(scope, id);
     this.node.setContext(
@@ -3855,7 +3409,7 @@ export class StaticWebsite extends Construct {
     new CfnOutput(this, 'DistributionDomainName', {
       value: this.cloudFrontDistribution.domainName,
     });
-    new CfnOutput(this, 'WebsiteBucketName', {
+    new CfnOutput(this, \`\${websiteName}WebsiteBucketName\`, {
       value: this.websiteBucket.bucketName,
     });
   }
@@ -3914,6 +3468,7 @@ import { StaticWebsite } from '../../core/index.js';
 export class TestApp extends StaticWebsite {
   constructor(scope: Construct, id: string) {
     super(scope, id, {
+      websiteName: 'TestApp',
       websiteFilePath: url.fileURLToPath(
         new URL('../../../../../../dist/test-app/bundle', import.meta.url),
       ),