@aws/nx-plugin 0.60.2 → 0.62.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE-THIRD-PARTY +678 -2016
- package/package.json +11 -11
- package/src/infra/app/__snapshots__/generator.spec.ts.snap +27 -33
- package/src/preset/__snapshots__/generator.spec.ts.snap +2 -2
- package/src/py/fast-api/__snapshots__/generator.spec.ts.snap +13 -11
- package/src/py/mcp-server/__snapshots__/generator.spec.ts.snap +88 -418
- package/src/py/strands-agent/__snapshots__/generator.spec.ts.snap +88 -414
- package/src/smithy/ts/api/__snapshots__/generator.spec.ts.snap +14 -12
- package/src/trpc/backend/__snapshots__/generator.spec.ts.snap +13 -11
- package/src/ts/lib/__snapshots__/generator.spec.ts.snap +4 -4
- package/src/ts/lib/eslint.js +1 -1
- package/src/ts/lib/eslint.js.map +1 -1
- package/src/ts/lib/generator.js +13 -1
- package/src/ts/lib/generator.js.map +1 -1
- package/src/ts/lib/vitest.js +3 -3
- package/src/ts/lib/vitest.js.map +1 -1
- package/src/ts/mcp-server/__snapshots__/generator.spec.ts.snap +86 -416
- package/src/ts/nx-plugin/__snapshots__/generator.spec.ts.snap +1 -1
- package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap +112 -94
- package/src/ts/react-website/app/files/app/src/components/AppLayout/index.tsx.template +5 -2
- package/src/ts/react-website/app/generator.js +1 -1
- package/src/ts/react-website/app/generator.js.map +1 -1
- package/src/utils/agent-core-constructs/agent-core-constructs.js +3 -4
- package/src/utils/agent-core-constructs/agent-core-constructs.js.map +1 -1
- package/src/utils/agent-core-constructs/files/cdk/app/agent-core/__nameKebabCase__/__nameKebabCase__.ts.template +23 -19
- package/src/utils/agent-core-constructs/files/terraform/app/agent-core/__nameKebabCase__/__nameKebabCase__.tf.template +5 -3
- package/src/utils/agent-core-constructs/files/terraform/core/agent-core/runtime.tf.template +53 -222
- package/src/utils/api-constructs/files/cdk/app/apis/rest/__apiNameKebabCase__.ts.template +13 -16
- package/src/utils/versions.d.ts +52 -51
- package/src/utils/versions.js +51 -50
- package/src/utils/versions.js.map +1 -1
- package/src/utils/agent-core-constructs/files/cdk/core/agent-core/runtime.ts.template +0 -159
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
|
|
2
2
|
|
|
3
|
-
exports[`react-website generator > TailwindCSS integration > should configure vite with TailwindCSS plugin by default > vite.config.
|
|
3
|
+
exports[`react-website generator > TailwindCSS integration > should configure vite with TailwindCSS plugin by default > vite.config.mts-with-tailwind 1`] = `
|
|
4
4
|
"import tailwindcss from '@tailwindcss/vite';
|
|
5
5
|
import tsconfigPaths from 'vite-tsconfig-paths';
|
|
6
6
|
import { resolve } from 'path';
|
|
@@ -13,7 +13,7 @@ export default defineConfig(() => ({
|
|
|
13
13
|
define: {
|
|
14
14
|
global: {},
|
|
15
15
|
},
|
|
16
|
-
root:
|
|
16
|
+
root: import.meta.dirname,
|
|
17
17
|
cacheDir: '../node_modules/.vite/test-app',
|
|
18
18
|
server: {
|
|
19
19
|
port: 4200,
|
|
@@ -57,7 +57,7 @@ export default defineConfig(() => ({
|
|
|
57
57
|
"
|
|
58
58
|
`;
|
|
59
59
|
|
|
60
|
-
exports[`react-website generator > TailwindCSS integration > should configure vite without TailwindCSS plugin when disabled > vite.config.
|
|
60
|
+
exports[`react-website generator > TailwindCSS integration > should configure vite without TailwindCSS plugin when disabled > vite.config.mts-without-tailwind 1`] = `
|
|
61
61
|
"import tsconfigPaths from 'vite-tsconfig-paths';
|
|
62
62
|
import { resolve } from 'path';
|
|
63
63
|
import { tanstackRouter } from '@tanstack/router-plugin/vite';
|
|
@@ -69,7 +69,7 @@ export default defineConfig(() => ({
|
|
|
69
69
|
define: {
|
|
70
70
|
global: {},
|
|
71
71
|
},
|
|
72
|
-
root:
|
|
72
|
+
root: import.meta.dirname,
|
|
73
73
|
cacheDir: '../node_modules/.vite/test-app',
|
|
74
74
|
server: {
|
|
75
75
|
port: 4200,
|
|
@@ -903,9 +903,9 @@ export default [
|
|
|
903
903
|
{
|
|
904
904
|
ignores: [
|
|
905
905
|
'**/dist',
|
|
906
|
-
'**/
|
|
906
|
+
'**/out-tsc',
|
|
907
907
|
'**/vitest.config.*.timestamp*',
|
|
908
|
-
'**/vite.config
|
|
908
|
+
'**/vite.config.*.timestamp*',
|
|
909
909
|
],
|
|
910
910
|
},
|
|
911
911
|
{
|
|
@@ -976,7 +976,12 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
976
976
|
"{workspaceRoot}/eslint.config.mjs"
|
|
977
977
|
]
|
|
978
978
|
},
|
|
979
|
-
"@nx/vite:
|
|
979
|
+
"@nx/vite:build": {
|
|
980
|
+
"cache": true,
|
|
981
|
+
"dependsOn": ["^build"],
|
|
982
|
+
"inputs": ["default", "^default"]
|
|
983
|
+
},
|
|
984
|
+
"@nx/vitest:test": {
|
|
980
985
|
"cache": true,
|
|
981
986
|
"inputs": ["default", "^default"],
|
|
982
987
|
"configurations": {
|
|
@@ -985,11 +990,6 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
985
990
|
}
|
|
986
991
|
}
|
|
987
992
|
},
|
|
988
|
-
"@nx/vite:build": {
|
|
989
|
-
"cache": true,
|
|
990
|
-
"dependsOn": ["^build"],
|
|
991
|
-
"inputs": ["default", "^default"]
|
|
992
|
-
},
|
|
993
993
|
"test": {
|
|
994
994
|
"dependsOn": ["^build"],
|
|
995
995
|
"inputs": ["default"]
|
|
@@ -1054,36 +1054,37 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
1054
1054
|
"{
|
|
1055
1055
|
"name": "@proj/source",
|
|
1056
1056
|
"dependencies": {
|
|
1057
|
-
"@cloudscape-design/board-components": "3.0.
|
|
1058
|
-
"@cloudscape-design/components": "3.0.
|
|
1059
|
-
"@cloudscape-design/global-styles": "1.0.
|
|
1060
|
-
"aws-cdk-lib": "2.
|
|
1061
|
-
"constructs": "10.4.
|
|
1062
|
-
"react": "19.
|
|
1063
|
-
"react-dom": "19.
|
|
1064
|
-
"tailwindcss": "4.1.
|
|
1057
|
+
"@cloudscape-design/board-components": "3.0.130",
|
|
1058
|
+
"@cloudscape-design/components": "3.0.1143",
|
|
1059
|
+
"@cloudscape-design/global-styles": "1.0.49",
|
|
1060
|
+
"aws-cdk-lib": "2.229.1",
|
|
1061
|
+
"constructs": "10.4.3",
|
|
1062
|
+
"react": "19.2.0",
|
|
1063
|
+
"react-dom": "19.2.0",
|
|
1064
|
+
"tailwindcss": "4.1.17"
|
|
1065
1065
|
},
|
|
1066
1066
|
"devDependencies": {
|
|
1067
1067
|
"@eslint/js": "^9.8.0",
|
|
1068
|
-
"@nx/eslint": "22.
|
|
1069
|
-
"@nx/eslint-plugin": "22.
|
|
1070
|
-
"@nx/js": "22.
|
|
1071
|
-
"@nx/react": "22.
|
|
1072
|
-
"@nx/vite": "22.
|
|
1073
|
-
"@nx/
|
|
1068
|
+
"@nx/eslint": "22.1.3",
|
|
1069
|
+
"@nx/eslint-plugin": "22.1.3",
|
|
1070
|
+
"@nx/js": "22.1.3",
|
|
1071
|
+
"@nx/react": "22.1.3",
|
|
1072
|
+
"@nx/vite": "22.1.3",
|
|
1073
|
+
"@nx/vitest": "22.1.3",
|
|
1074
|
+
"@nx/web": "22.1.3",
|
|
1074
1075
|
"@swc-node/register": "~1.9.1",
|
|
1075
1076
|
"@swc/cli": "~0.6.0",
|
|
1076
1077
|
"@swc/core": "~1.5.7",
|
|
1077
1078
|
"@swc/helpers": "~0.5.11",
|
|
1078
|
-
"@tailwindcss/vite": "4.1.
|
|
1079
|
+
"@tailwindcss/vite": "4.1.17",
|
|
1079
1080
|
"@testing-library/dom": "10.4.0",
|
|
1080
1081
|
"@testing-library/react": "16.3.0",
|
|
1081
|
-
"@types/node": "22.19.
|
|
1082
|
+
"@types/node": "22.19.1",
|
|
1082
1083
|
"@types/react": "^19.0.0",
|
|
1083
1084
|
"@types/react-dom": "^19.0.0",
|
|
1084
1085
|
"@vitejs/plugin-react": "^4.2.0",
|
|
1085
|
-
"@vitest/coverage-v8": "^
|
|
1086
|
-
"@vitest/ui": "^
|
|
1086
|
+
"@vitest/coverage-v8": "^4.0.0",
|
|
1087
|
+
"@vitest/ui": "^4.0.0",
|
|
1087
1088
|
"eslint": "^9.8.0",
|
|
1088
1089
|
"eslint-config-prettier": "^10.0.0",
|
|
1089
1090
|
"eslint-plugin-import": "2.31.0",
|
|
@@ -1099,7 +1100,7 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
1099
1100
|
"typescript-eslint": "^8.40.0",
|
|
1100
1101
|
"vite": "^7.0.0",
|
|
1101
1102
|
"vite-tsconfig-paths": "5.1.4",
|
|
1102
|
-
"vitest": "^
|
|
1103
|
+
"vitest": "^4.0.0"
|
|
1103
1104
|
},
|
|
1104
1105
|
"type": "module"
|
|
1105
1106
|
}
|
|
@@ -1191,7 +1192,7 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
1191
1192
|
}
|
|
1192
1193
|
},
|
|
1193
1194
|
"test": {
|
|
1194
|
-
"executor": "@nx/
|
|
1195
|
+
"executor": "@nx/vitest:test",
|
|
1195
1196
|
"outputs": ["{options.reportsDirectory}"],
|
|
1196
1197
|
"options": {
|
|
1197
1198
|
"reportsDirectory": "../../../coverage/packages/common/constructs"
|
|
@@ -1688,11 +1689,12 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
1688
1689
|
"
|
|
1689
1690
|
`;
|
|
1690
1691
|
|
|
1691
|
-
exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/constructs/vite.config.
|
|
1692
|
-
"
|
|
1692
|
+
exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/constructs/vite.config.mts 1`] = `
|
|
1693
|
+
"/// <reference types='vitest' />
|
|
1694
|
+
import { defineConfig } from 'vite';
|
|
1693
1695
|
|
|
1694
1696
|
export default defineConfig(() => ({
|
|
1695
|
-
root:
|
|
1697
|
+
root: import.meta.dirname,
|
|
1696
1698
|
cacheDir: '../../../node_modules/.vite/packages/common/constructs',
|
|
1697
1699
|
plugins: [],
|
|
1698
1700
|
// Uncomment this if you are using workers.
|
|
@@ -1704,7 +1706,7 @@ export default defineConfig(() => ({
|
|
|
1704
1706
|
watch: false,
|
|
1705
1707
|
globals: true,
|
|
1706
1708
|
environment: 'jsdom',
|
|
1707
|
-
include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
|
|
1709
|
+
include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
|
|
1708
1710
|
reporters: ['default'],
|
|
1709
1711
|
coverage: {
|
|
1710
1712
|
reportsDirectory: './test-output/vitest/coverage',
|
|
@@ -1912,7 +1914,7 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
1912
1914
|
}
|
|
1913
1915
|
},
|
|
1914
1916
|
"test": {
|
|
1915
|
-
"executor": "@nx/
|
|
1917
|
+
"executor": "@nx/vitest:test",
|
|
1916
1918
|
"outputs": ["{options.reportsDirectory}"],
|
|
1917
1919
|
"options": {
|
|
1918
1920
|
"reportsDirectory": "../coverage/test-app"
|
|
@@ -2199,7 +2201,7 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
2199
2201
|
"
|
|
2200
2202
|
`;
|
|
2201
2203
|
|
|
2202
|
-
exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > test-app/vite.config.
|
|
2204
|
+
exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > test-app/vite.config.mts 1`] = `
|
|
2203
2205
|
"import tailwindcss from '@tailwindcss/vite';
|
|
2204
2206
|
import tsconfigPaths from 'vite-tsconfig-paths';
|
|
2205
2207
|
/// <reference types='vitest' />
|
|
@@ -2210,7 +2212,7 @@ export default defineConfig(() => ({
|
|
|
2210
2212
|
define: {
|
|
2211
2213
|
global: {},
|
|
2212
2214
|
},
|
|
2213
|
-
root:
|
|
2215
|
+
root: import.meta.dirname,
|
|
2214
2216
|
cacheDir: '../node_modules/.vite/test-app',
|
|
2215
2217
|
server: {
|
|
2216
2218
|
port: 4200,
|
|
@@ -2306,9 +2308,9 @@ export default [
|
|
|
2306
2308
|
{
|
|
2307
2309
|
ignores: [
|
|
2308
2310
|
'**/dist',
|
|
2309
|
-
'**/
|
|
2311
|
+
'**/out-tsc',
|
|
2310
2312
|
'**/vitest.config.*.timestamp*',
|
|
2311
|
-
'**/vite.config
|
|
2313
|
+
'**/vite.config.*.timestamp*',
|
|
2312
2314
|
],
|
|
2313
2315
|
},
|
|
2314
2316
|
{
|
|
@@ -2379,7 +2381,12 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
2379
2381
|
"{workspaceRoot}/eslint.config.mjs"
|
|
2380
2382
|
]
|
|
2381
2383
|
},
|
|
2382
|
-
"@nx/vite:
|
|
2384
|
+
"@nx/vite:build": {
|
|
2385
|
+
"cache": true,
|
|
2386
|
+
"dependsOn": ["^build"],
|
|
2387
|
+
"inputs": ["default", "^default"]
|
|
2388
|
+
},
|
|
2389
|
+
"@nx/vitest:test": {
|
|
2383
2390
|
"cache": true,
|
|
2384
2391
|
"inputs": ["default", "^default"],
|
|
2385
2392
|
"configurations": {
|
|
@@ -2388,11 +2395,6 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
2388
2395
|
}
|
|
2389
2396
|
}
|
|
2390
2397
|
},
|
|
2391
|
-
"@nx/vite:build": {
|
|
2392
|
-
"cache": true,
|
|
2393
|
-
"dependsOn": ["^build"],
|
|
2394
|
-
"inputs": ["default", "^default"]
|
|
2395
|
-
},
|
|
2396
2398
|
"test": {
|
|
2397
2399
|
"dependsOn": ["^build"],
|
|
2398
2400
|
"inputs": ["default"]
|
|
@@ -2457,41 +2459,42 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
2457
2459
|
"{
|
|
2458
2460
|
"name": "@proj/source",
|
|
2459
2461
|
"dependencies": {
|
|
2460
|
-
"@cloudscape-design/board-components": "3.0.
|
|
2461
|
-
"@cloudscape-design/components": "3.0.
|
|
2462
|
-
"@cloudscape-design/global-styles": "1.0.
|
|
2463
|
-
"@tanstack/react-router": "1.
|
|
2464
|
-
"aws-cdk-lib": "2.
|
|
2465
|
-
"constructs": "10.4.
|
|
2466
|
-
"react": "19.
|
|
2467
|
-
"react-dom": "19.
|
|
2468
|
-
"tailwindcss": "4.1.
|
|
2462
|
+
"@cloudscape-design/board-components": "3.0.130",
|
|
2463
|
+
"@cloudscape-design/components": "3.0.1143",
|
|
2464
|
+
"@cloudscape-design/global-styles": "1.0.49",
|
|
2465
|
+
"@tanstack/react-router": "1.139.6",
|
|
2466
|
+
"aws-cdk-lib": "2.229.1",
|
|
2467
|
+
"constructs": "10.4.3",
|
|
2468
|
+
"react": "19.2.0",
|
|
2469
|
+
"react-dom": "19.2.0",
|
|
2470
|
+
"tailwindcss": "4.1.17"
|
|
2469
2471
|
},
|
|
2470
2472
|
"devDependencies": {
|
|
2471
2473
|
"@eslint/js": "^9.8.0",
|
|
2472
|
-
"@nx/eslint": "22.
|
|
2473
|
-
"@nx/eslint-plugin": "22.
|
|
2474
|
-
"@nx/js": "22.
|
|
2475
|
-
"@nx/react": "22.
|
|
2476
|
-
"@nx/vite": "22.
|
|
2477
|
-
"@nx/
|
|
2474
|
+
"@nx/eslint": "22.1.3",
|
|
2475
|
+
"@nx/eslint-plugin": "22.1.3",
|
|
2476
|
+
"@nx/js": "22.1.3",
|
|
2477
|
+
"@nx/react": "22.1.3",
|
|
2478
|
+
"@nx/vite": "22.1.3",
|
|
2479
|
+
"@nx/vitest": "22.1.3",
|
|
2480
|
+
"@nx/web": "22.1.3",
|
|
2478
2481
|
"@swc-node/register": "~1.9.1",
|
|
2479
2482
|
"@swc/cli": "~0.6.0",
|
|
2480
2483
|
"@swc/core": "~1.5.7",
|
|
2481
2484
|
"@swc/helpers": "~0.5.11",
|
|
2482
|
-
"@tailwindcss/vite": "4.1.
|
|
2483
|
-
"@tanstack/router-generator": "1.
|
|
2484
|
-
"@tanstack/router-plugin": "1.
|
|
2485
|
-
"@tanstack/router-utils": "1.
|
|
2486
|
-
"@tanstack/virtual-file-routes": "1.
|
|
2485
|
+
"@tailwindcss/vite": "4.1.17",
|
|
2486
|
+
"@tanstack/router-generator": "1.139.6",
|
|
2487
|
+
"@tanstack/router-plugin": "1.139.6",
|
|
2488
|
+
"@tanstack/router-utils": "1.139.0",
|
|
2489
|
+
"@tanstack/virtual-file-routes": "1.139.0",
|
|
2487
2490
|
"@testing-library/dom": "10.4.0",
|
|
2488
2491
|
"@testing-library/react": "16.3.0",
|
|
2489
|
-
"@types/node": "22.19.
|
|
2492
|
+
"@types/node": "22.19.1",
|
|
2490
2493
|
"@types/react": "^19.0.0",
|
|
2491
2494
|
"@types/react-dom": "^19.0.0",
|
|
2492
2495
|
"@vitejs/plugin-react": "^4.2.0",
|
|
2493
|
-
"@vitest/coverage-v8": "^
|
|
2494
|
-
"@vitest/ui": "^
|
|
2496
|
+
"@vitest/coverage-v8": "^4.0.0",
|
|
2497
|
+
"@vitest/ui": "^4.0.0",
|
|
2495
2498
|
"eslint": "^9.8.0",
|
|
2496
2499
|
"eslint-config-prettier": "^10.0.0",
|
|
2497
2500
|
"eslint-plugin-import": "2.31.0",
|
|
@@ -2507,7 +2510,7 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
2507
2510
|
"typescript-eslint": "^8.40.0",
|
|
2508
2511
|
"vite": "^7.0.0",
|
|
2509
2512
|
"vite-tsconfig-paths": "5.1.4",
|
|
2510
|
-
"vitest": "^
|
|
2513
|
+
"vitest": "^4.0.0"
|
|
2511
2514
|
},
|
|
2512
2515
|
"type": "module"
|
|
2513
2516
|
}
|
|
@@ -2599,7 +2602,7 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
2599
2602
|
}
|
|
2600
2603
|
},
|
|
2601
2604
|
"test": {
|
|
2602
|
-
"executor": "@nx/
|
|
2605
|
+
"executor": "@nx/vitest:test",
|
|
2603
2606
|
"outputs": ["{options.reportsDirectory}"],
|
|
2604
2607
|
"options": {
|
|
2605
2608
|
"reportsDirectory": "../../../coverage/packages/common/constructs"
|
|
@@ -3096,11 +3099,12 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
3096
3099
|
"
|
|
3097
3100
|
`;
|
|
3098
3101
|
|
|
3099
|
-
exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/constructs/vite.config.
|
|
3100
|
-
"
|
|
3102
|
+
exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/constructs/vite.config.mts 1`] = `
|
|
3103
|
+
"/// <reference types='vitest' />
|
|
3104
|
+
import { defineConfig } from 'vite';
|
|
3101
3105
|
|
|
3102
3106
|
export default defineConfig(() => ({
|
|
3103
|
-
root:
|
|
3107
|
+
root: import.meta.dirname,
|
|
3104
3108
|
cacheDir: '../../../node_modules/.vite/packages/common/constructs',
|
|
3105
3109
|
plugins: [],
|
|
3106
3110
|
// Uncomment this if you are using workers.
|
|
@@ -3112,7 +3116,7 @@ export default defineConfig(() => ({
|
|
|
3112
3116
|
watch: false,
|
|
3113
3117
|
globals: true,
|
|
3114
3118
|
environment: 'jsdom',
|
|
3115
|
-
include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
|
|
3119
|
+
include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
|
|
3116
3120
|
reporters: ['default'],
|
|
3117
3121
|
coverage: {
|
|
3118
3122
|
reportsDirectory: './test-output/vitest/coverage',
|
|
@@ -3320,7 +3324,7 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
3320
3324
|
}
|
|
3321
3325
|
},
|
|
3322
3326
|
"test": {
|
|
3323
|
-
"executor": "@nx/
|
|
3327
|
+
"executor": "@nx/vitest:test",
|
|
3324
3328
|
"outputs": ["{options.reportsDirectory}"],
|
|
3325
3329
|
"options": {
|
|
3326
3330
|
"reportsDirectory": "../coverage/test-app"
|
|
@@ -3387,9 +3391,14 @@ import {
|
|
|
3387
3391
|
import CloudscapeAppLayout, {
|
|
3388
3392
|
AppLayoutProps,
|
|
3389
3393
|
} from '@cloudscape-design/components/app-layout';
|
|
3390
|
-
import {
|
|
3394
|
+
import {
|
|
3395
|
+
useMatchRoute,
|
|
3396
|
+
useLocation,
|
|
3397
|
+
useNavigate,
|
|
3398
|
+
} from '@tanstack/react-router';
|
|
3391
3399
|
|
|
3392
3400
|
const getBreadcrumbs = (
|
|
3401
|
+
matchRoute: ReturnType<typeof useMatchRoute>,
|
|
3393
3402
|
pathName: string,
|
|
3394
3403
|
search: string,
|
|
3395
3404
|
defaultBreadcrumb: string,
|
|
@@ -3410,7 +3419,7 @@ const getBreadcrumbs = (
|
|
|
3410
3419
|
.replace('//', '/')}\`;
|
|
3411
3420
|
|
|
3412
3421
|
const matched =
|
|
3413
|
-
!availableRoutes || availableRoutes.find((r) =>
|
|
3422
|
+
!availableRoutes || availableRoutes.find((r) => matchRoute({ to: href }));
|
|
3414
3423
|
|
|
3415
3424
|
return {
|
|
3416
3425
|
href: matched ? \`\${href}\${search}\` : '#',
|
|
@@ -3454,10 +3463,12 @@ const AppLayout: React.FC<React.PropsWithChildren> = ({ children }) => {
|
|
|
3454
3463
|
const [activeBreadcrumbs, setActiveBreadcrumbs] = useState<
|
|
3455
3464
|
BreadcrumbGroupProps.Item[]
|
|
3456
3465
|
>([{ text: '/', href: '/' }]);
|
|
3466
|
+
const matchRoute = useMatchRoute();
|
|
3457
3467
|
const { pathname, search } = useLocation();
|
|
3458
3468
|
|
|
3459
3469
|
useEffect(() => {
|
|
3460
3470
|
const breadcrumbs = getBreadcrumbs(
|
|
3471
|
+
matchRoute,
|
|
3461
3472
|
pathname,
|
|
3462
3473
|
Object.entries(search).reduce((p, [k, v]) => p + \`\${k}=\${v}\`, ''),
|
|
3463
3474
|
'/',
|
|
@@ -3836,7 +3847,7 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
3836
3847
|
"
|
|
3837
3848
|
`;
|
|
3838
3849
|
|
|
3839
|
-
exports[`react-website generator > Tanstack router integration > should generate website with router correctly > test-app/vite.config.
|
|
3850
|
+
exports[`react-website generator > Tanstack router integration > should generate website with router correctly > test-app/vite.config.mts 1`] = `
|
|
3840
3851
|
"import tailwindcss from '@tailwindcss/vite';
|
|
3841
3852
|
import tsconfigPaths from 'vite-tsconfig-paths';
|
|
3842
3853
|
import { resolve } from 'path';
|
|
@@ -3849,7 +3860,7 @@ export default defineConfig(() => ({
|
|
|
3849
3860
|
define: {
|
|
3850
3861
|
global: {},
|
|
3851
3862
|
},
|
|
3852
|
-
root:
|
|
3863
|
+
root: import.meta.dirname,
|
|
3853
3864
|
cacheDir: '../node_modules/.vite/test-app',
|
|
3854
3865
|
server: {
|
|
3855
3866
|
port: 4200,
|
|
@@ -3949,7 +3960,7 @@ exports[`react-website generator > should configure TypeScript correctly > tscon
|
|
|
3949
3960
|
}
|
|
3950
3961
|
`;
|
|
3951
3962
|
|
|
3952
|
-
exports[`react-website generator > should configure vite correctly > vite.config.
|
|
3963
|
+
exports[`react-website generator > should configure vite correctly > vite.config.mts 1`] = `
|
|
3953
3964
|
"import tailwindcss from '@tailwindcss/vite';
|
|
3954
3965
|
import tsconfigPaths from 'vite-tsconfig-paths';
|
|
3955
3966
|
import { resolve } from 'path';
|
|
@@ -3962,7 +3973,7 @@ export default defineConfig(() => ({
|
|
|
3962
3973
|
define: {
|
|
3963
3974
|
global: {},
|
|
3964
3975
|
},
|
|
3965
|
-
root:
|
|
3976
|
+
root: import.meta.dirname,
|
|
3966
3977
|
cacheDir: '../node_modules/.vite/test-app',
|
|
3967
3978
|
server: {
|
|
3968
3979
|
port: 4200,
|
|
@@ -4020,9 +4031,14 @@ import {
|
|
|
4020
4031
|
import CloudscapeAppLayout, {
|
|
4021
4032
|
AppLayoutProps,
|
|
4022
4033
|
} from '@cloudscape-design/components/app-layout';
|
|
4023
|
-
import {
|
|
4034
|
+
import {
|
|
4035
|
+
useMatchRoute,
|
|
4036
|
+
useLocation,
|
|
4037
|
+
useNavigate,
|
|
4038
|
+
} from '@tanstack/react-router';
|
|
4024
4039
|
|
|
4025
4040
|
const getBreadcrumbs = (
|
|
4041
|
+
matchRoute: ReturnType<typeof useMatchRoute>,
|
|
4026
4042
|
pathName: string,
|
|
4027
4043
|
search: string,
|
|
4028
4044
|
defaultBreadcrumb: string,
|
|
@@ -4043,7 +4059,7 @@ const getBreadcrumbs = (
|
|
|
4043
4059
|
.replace('//', '/')}\`;
|
|
4044
4060
|
|
|
4045
4061
|
const matched =
|
|
4046
|
-
!availableRoutes || availableRoutes.find((r) =>
|
|
4062
|
+
!availableRoutes || availableRoutes.find((r) => matchRoute({ to: href }));
|
|
4047
4063
|
|
|
4048
4064
|
return {
|
|
4049
4065
|
href: matched ? \`\${href}\${search}\` : '#',
|
|
@@ -4087,10 +4103,12 @@ const AppLayout: React.FC<React.PropsWithChildren> = ({ children }) => {
|
|
|
4087
4103
|
const [activeBreadcrumbs, setActiveBreadcrumbs] = useState<
|
|
4088
4104
|
BreadcrumbGroupProps.Item[]
|
|
4089
4105
|
>([{ text: '/', href: '/' }]);
|
|
4106
|
+
const matchRoute = useMatchRoute();
|
|
4090
4107
|
const { pathname, search } = useLocation();
|
|
4091
4108
|
|
|
4092
4109
|
useEffect(() => {
|
|
4093
4110
|
const breadcrumbs = getBreadcrumbs(
|
|
4111
|
+
matchRoute,
|
|
4094
4112
|
pathname,
|
|
4095
4113
|
Object.entries(search).reduce((p, [k, v]) => p + \`\${k}=\${v}\`, ''),
|
|
4096
4114
|
'/',
|
|
@@ -4543,14 +4561,14 @@ root &&
|
|
|
4543
4561
|
|
|
4544
4562
|
exports[`react-website generator > should handle npm scope prefix correctly > scoped-dependencies 1`] = `
|
|
4545
4563
|
{
|
|
4546
|
-
"@cloudscape-design/board-components": "3.0.
|
|
4547
|
-
"@cloudscape-design/components": "3.0.
|
|
4548
|
-
"@cloudscape-design/global-styles": "1.0.
|
|
4549
|
-
"@tanstack/react-router": "1.
|
|
4550
|
-
"aws-cdk-lib": "2.
|
|
4551
|
-
"constructs": "10.4.
|
|
4552
|
-
"react": "19.
|
|
4553
|
-
"react-dom": "19.
|
|
4554
|
-
"tailwindcss": "4.1.
|
|
4564
|
+
"@cloudscape-design/board-components": "3.0.130",
|
|
4565
|
+
"@cloudscape-design/components": "3.0.1143",
|
|
4566
|
+
"@cloudscape-design/global-styles": "1.0.49",
|
|
4567
|
+
"@tanstack/react-router": "1.139.6",
|
|
4568
|
+
"aws-cdk-lib": "2.229.1",
|
|
4569
|
+
"constructs": "10.4.3",
|
|
4570
|
+
"react": "19.2.0",
|
|
4571
|
+
"react-dom": "19.2.0",
|
|
4572
|
+
"tailwindcss": "4.1.17",
|
|
4555
4573
|
}
|
|
4556
4574
|
`;
|
|
@@ -11,9 +11,10 @@ import {
|
|
|
11
11
|
import CloudscapeAppLayout, {
|
|
12
12
|
AppLayoutProps,
|
|
13
13
|
} from '@cloudscape-design/components/app-layout';
|
|
14
|
-
<% if (enableTanstackRouter) { %>import {
|
|
14
|
+
<% if (enableTanstackRouter) { %>import { useMatchRoute, useLocation, useNavigate } from '@tanstack/react-router';
|
|
15
15
|
|
|
16
16
|
const getBreadcrumbs = (
|
|
17
|
+
matchRoute: ReturnType<typeof useMatchRoute>,
|
|
17
18
|
pathName: string,
|
|
18
19
|
search: string,
|
|
19
20
|
defaultBreadcrumb: string,
|
|
@@ -34,7 +35,7 @@ const getBreadcrumbs = (
|
|
|
34
35
|
.replace('//', '/')}`;
|
|
35
36
|
|
|
36
37
|
const matched =
|
|
37
|
-
!availableRoutes || availableRoutes.find((r) =>
|
|
38
|
+
!availableRoutes || availableRoutes.find((r) => matchRoute({ to: href }));
|
|
38
39
|
|
|
39
40
|
return {
|
|
40
41
|
href: matched ? `${href}${search}` : '#',
|
|
@@ -78,10 +79,12 @@ const AppLayout: React.FC<React.PropsWithChildren> = ({ children }) => {
|
|
|
78
79
|
const [activeBreadcrumbs, setActiveBreadcrumbs] = useState<
|
|
79
80
|
BreadcrumbGroupProps.Item[]
|
|
80
81
|
>([{ text: '/', href: '/' }]);
|
|
82
|
+
const matchRoute = useMatchRoute();
|
|
81
83
|
const { pathname, search } = useLocation();
|
|
82
84
|
|
|
83
85
|
useEffect(() => {
|
|
84
86
|
const breadcrumbs = getBreadcrumbs(
|
|
87
|
+
matchRoute,
|
|
85
88
|
pathname,
|
|
86
89
|
Object.entries(search).reduce((p, [k, v]) => p + `${k}=${v}`, ''),
|
|
87
90
|
'/',
|
|
@@ -157,7 +157,7 @@ function tsReactWebsiteGenerator(tree, schema) {
|
|
|
157
157
|
dir: e2eRoot,
|
|
158
158
|
});
|
|
159
159
|
}
|
|
160
|
-
const viteConfigPath = (0, devkit_1.joinPathFragments)(libraryRoot, 'vite.config.
|
|
160
|
+
const viteConfigPath = (0, devkit_1.joinPathFragments)(libraryRoot, 'vite.config.mts');
|
|
161
161
|
if (tree.exists(viteConfigPath)) {
|
|
162
162
|
// Add Tanstack Router import if enabled
|
|
163
163
|
if (enableTanstackRouter) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/app/generator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/app/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ exports.addAgentInfra = exports.addMcpServerInfra = void 0;
|
|
|
8
8
|
const devkit_1 = require("@nx/devkit");
|
|
9
9
|
const shared_constructs_constants_1 = require("../shared-constructs-constants");
|
|
10
10
|
const ast_1 = require("../ast");
|
|
11
|
+
const versions_1 = require("../versions");
|
|
11
12
|
const addAgentCoreInfra = (tree, options) => {
|
|
12
13
|
switch (options.iacProvider) {
|
|
13
14
|
case 'CDK':
|
|
@@ -36,10 +37,8 @@ const addAgentCoreInfra = (tree, options) => {
|
|
|
36
37
|
});
|
|
37
38
|
};
|
|
38
39
|
const addAgentCoreCDKInfra = (tree, options) => {
|
|
39
|
-
// Add
|
|
40
|
-
(0, devkit_1.
|
|
41
|
-
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
42
|
-
});
|
|
40
|
+
// Add dependency on bedrock agentcore alpha package
|
|
41
|
+
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, (0, versions_1.withVersions)(['@aws-cdk/aws-bedrock-agentcore-alpha']));
|
|
43
42
|
// Generate app specific CDK construct
|
|
44
43
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'cdk', 'app', 'agent-core'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'app', options.appDirectory), options, {
|
|
45
44
|
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-core-constructs.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/agent-core-constructs/agent-core-constructs.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,
|
|
1
|
+
{"version":3,"file":"agent-core-constructs.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/agent-core-constructs/agent-core-constructs.ts"],"names":[],"mappings":"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"}
|