@aws/nx-plugin 0.39.0 → 0.39.2

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.
Files changed (15) hide show
  1. package/package.json +1 -1
  2. package/src/infra/app/__snapshots__/generator.spec.ts.snap +2 -2
  3. package/src/py/fast-api/react/generator.js +1 -0
  4. package/src/py/fast-api/react/generator.js.map +1 -1
  5. package/src/trpc/react/__snapshots__/generator.spec.ts.snap +20 -17
  6. package/src/trpc/react/files/src/components/__apiNameClassName__ClientProvider.tsx.template +3 -5
  7. package/src/trpc/react/files/src/hooks/use__apiNameClassName__.tsx.template +2 -2
  8. package/src/trpc/react/generator.js +1 -0
  9. package/src/trpc/react/generator.js.map +1 -1
  10. package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap +9 -69
  11. package/src/ts/react-website/app/files/common/constructs/src/core/static-website.ts.template +2 -22
  12. package/src/utils/files/website/components/tanstack-query/QueryClientProvider.tsx.template +16 -3
  13. package/src/utils/versions.d.ts +3 -2
  14. package/src/utils/versions.js +2 -1
  15. package/src/utils/versions.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws/nx-plugin",
3
- "version": "0.39.0",
3
+ "version": "0.39.2",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://github.com/awslabs/nx-plugin-for-aws.git",
package/src/infra/app/__snapshots__/generator.spec.ts.snap CHANGED
@@ -4,7 +4,7 @@ exports[`infra generator > should add required dependencies to package.json > de
4
4
  {
5
5
  "@cdklabs/cdk-validator-cfnguard": "^0.0.60",
6
6
  "aws-cdk": "^2.1006.0",
7
- "aws-cdk-lib": "^2.200.0",
7
+ "aws-cdk-lib": "^2.207.0",
8
8
  "constructs": "^10.4.2",
9
9
  "esbuild": "^0.25.1",
10
10
  "source-map-support": "^0.5.21",
@@ -45,7 +45,7 @@ exports[`infra generator > should add required dependencies to package.json > pa
45
45
  "dependencies": {
46
46
  "@cdklabs/cdk-validator-cfnguard": "^0.0.60",
47
47
  "aws-cdk": "^2.1006.0",
48
- "aws-cdk-lib": "^2.200.0",
48
+ "aws-cdk-lib": "^2.207.0",
49
49
  "constructs": "^10.4.2",
50
50
  "esbuild": "^0.25.1",
51
51
  "source-map-support": "^0.5.21",
package/src/py/fast-api/react/generator.js CHANGED
@@ -135,6 +135,7 @@ const fastApiReactGenerator = (tree, options) => tslib_1.__awaiter(void 0, void
135
135
  : []),
136
136
  ...(auth === 'Cognito' ? ['react-oidc-context'] : []),
137
137
  '@tanstack/react-query',
138
+ '@tanstack/react-query-devtools',
138
139
  ]), (0, versions_1.withVersions)(['@smithy/types']));
139
140
  yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.FAST_API_REACT_GENERATOR_INFO]);
140
141
  yield (0, format_1.formatFilesInSubtree)(tree);
package/src/py/fast-api/react/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/generator.ts"],"names":[],"mappings":"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"}
package/src/trpc/react/__snapshots__/generator.spec.ts.snap CHANGED
@@ -8,9 +8,7 @@ import { FC, PropsWithChildren, useMemo } from 'react';
8
8
  import { useRuntimeConfig } from '../hooks/useRuntimeConfig';
9
9
  import { HTTPLinkOptions, createTRPCClient, httpLink } from '@trpc/client';
10
10
 
11
- const { TRPCProvider, useTRPC } = createTRPCContext<AppRouter>();
12
-
13
- export const useTestApi = useTRPC;
11
+ export const TestApiTRPCContext = createTRPCContext<AppRouter>();
14
12
 
15
13
  export const TestApiClientProvider: FC<PropsWithChildren> = ({ children }) => {
16
14
  const queryClient = useQueryClient();
@@ -28,9 +26,12 @@ export const TestApiClientProvider: FC<PropsWithChildren> = ({ children }) => {
28
26
  }, [apiUrl]);
29
27
 
30
28
  return (
31
- <TRPCProvider trpcClient={trpcClient} queryClient={queryClient}>
29
+ <TestApiTRPCContext.TRPCProvider
30
+ trpcClient={trpcClient}
31
+ queryClient={queryClient}
32
+ >
32
33
  {children}
33
- </TRPCProvider>
34
+ </TestApiTRPCContext.TRPCProvider>
34
35
  );
35
36
  };
36
37
 
@@ -39,9 +40,9 @@ export default TestApiClientProvider;
39
40
  `;
40
41
 
41
42
  exports[`trpc react generator > should generate trpc react files > useTestApi.tsx 1`] = `
42
- "import { useTestApi as useClient } from '../components/TestApiClientProvider';
43
+ "import { TestApiTRPCContext } from '../components/TestApiClientProvider';
43
44
 
44
- export const useTestApi = useClient;
45
+ export const useTestApi = TestApiTRPCContext.useTRPC;
45
46
  "
46
47
  `;
47
48
 
@@ -54,9 +55,7 @@ import { useRuntimeConfig } from '../hooks/useRuntimeConfig';
54
55
  import { HTTPLinkOptions, createTRPCClient, httpLink } from '@trpc/client';
55
56
  import { useAuth } from 'react-oidc-context';
56
57
 
57
- const { TRPCProvider, useTRPC } = createTRPCContext<AppRouter>();
58
-
59
- export const useTestApi = useTRPC;
58
+ export const TestApiTRPCContext = createTRPCContext<AppRouter>();
60
59
 
61
60
  export const TestApiClientProvider: FC<PropsWithChildren> = ({ children }) => {
62
61
  const queryClient = useQueryClient();
@@ -79,9 +78,12 @@ export const TestApiClientProvider: FC<PropsWithChildren> = ({ children }) => {
79
78
  }, [apiUrl, user]);
80
79
 
81
80
  return (
82
- <TRPCProvider trpcClient={trpcClient} queryClient={queryClient}>
81
+ <TestApiTRPCContext.TRPCProvider
82
+ trpcClient={trpcClient}
83
+ queryClient={queryClient}
84
+ >
83
85
  {children}
84
- </TRPCProvider>
86
+ </TestApiTRPCContext.TRPCProvider>
85
87
  );
86
88
  };
87
89
 
@@ -98,9 +100,7 @@ import { useRuntimeConfig } from '../hooks/useRuntimeConfig';
98
100
  import { HTTPLinkOptions, createTRPCClient, httpLink } from '@trpc/client';
99
101
  import { useSigV4 } from '../hooks/useSigV4';
100
102
 
101
- const { TRPCProvider, useTRPC } = createTRPCContext<AppRouter>();
102
-
103
- export const useTestApi = useTRPC;
103
+ export const TestApiTRPCContext = createTRPCContext<AppRouter>();
104
104
 
105
105
  export const TestApiClientProvider: FC<PropsWithChildren> = ({ children }) => {
106
106
  const queryClient = useQueryClient();
@@ -121,9 +121,12 @@ export const TestApiClientProvider: FC<PropsWithChildren> = ({ children }) => {
121
121
  }, [apiUrl, sigv4Client]);
122
122
 
123
123
  return (
124
- <TRPCProvider trpcClient={trpcClient} queryClient={queryClient}>
124
+ <TestApiTRPCContext.TRPCProvider
125
+ trpcClient={trpcClient}
126
+ queryClient={queryClient}
127
+ >
125
128
  {children}
126
- </TRPCProvider>
129
+ </TestApiTRPCContext.TRPCProvider>
127
130
  );
128
131
  };
129
132
 
package/src/trpc/react/files/src/components/__apiNameClassName__ClientProvider.tsx.template CHANGED
@@ -10,9 +10,7 @@ import { useSigV4 } from "../hooks/useSigV4";
10
10
  import { useAuth } from "react-oidc-context";
11
11
  <%_ } _%>
12
12
 
13
- const { TRPCProvider, useTRPC } = createTRPCContext<AppRouter>();
14
-
15
- export const use<%= apiNameClassName %> = useTRPC;
13
+ export const <%= apiNameClassName %>TRPCContext = createTRPCContext<AppRouter>();
16
14
 
17
15
  export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
18
16
  children,
@@ -45,9 +43,9 @@ export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
45
43
  }, [apiUrl<% if (auth === 'IAM') { %>, sigv4Client<% } else if (auth === 'Cognito') { %>, user<% } %>]);
46
44
 
47
45
  return (
48
- <TRPCProvider trpcClient={trpcClient} queryClient={queryClient}>
46
+ <<%= apiNameClassName %>TRPCContext.TRPCProvider trpcClient={trpcClient} queryClient={queryClient}>
49
47
  {children}
50
- </TRPCProvider>
48
+ </<%= apiNameClassName %>TRPCContext.TRPCProvider>
51
49
  );
52
50
  };
53
51
 
package/src/trpc/react/files/src/hooks/use__apiNameClassName__.tsx.template CHANGED
@@ -1,3 +1,3 @@
1
- import { use<%- apiNameClassName %> as useClient } from '../components/<%- apiNameClassName %>ClientProvider';
1
+ import { <%= apiNameClassName %>TRPCContext } from '../components/<%- apiNameClassName %>ClientProvider';
2
2
 
3
- export const use<%- apiNameClassName %> = useClient;
3
+ export const use<%- apiNameClassName %> = <%= apiNameClassName %>TRPCContext.useTRPC;
package/src/trpc/react/generator.js CHANGED
@@ -67,6 +67,7 @@ function reactGenerator(tree, options) {
67
67
  '@trpc/client',
68
68
  '@trpc/tanstack-react-query',
69
69
  '@tanstack/react-query',
70
+ '@tanstack/react-query-devtools',
70
71
  ...(auth === 'IAM'
71
72
  ? [
72
73
  'oidc-client-ts',
package/src/trpc/react/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/react/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/react/generator.ts"],"names":[],"mappings":";;;AAoCA,wCAkKC;;AAtMD;;;GAGG;AACH,uCAOoB;AAGpB,+EAAyF;AACzF,qDAAqD;AACrD,mDAAoD;AACpD,yCAKyB;AACzB,6CAAgD;AAChD,+CAA0D;AAC1D,uCAIwB;AACxB,iDAAsE;AACtE,kEAAyE;AAE5D,QAAA,yBAAyB,GACpC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAE/B,SAAsB,cAAc,CAClC,IAAU,EACV,OAA6B;;;QAE7B,MAAM,qBAAqB,GAAG,IAAA,wCAAmC,EAC/D,IAAI,EACJ,OAAO,CAAC,mBAAmB,CAC5B,CAAC;QACF,MAAM,oBAAoB,GAAG,IAAA,wCAAmC,EAC9D,IAAI,EACJ,OAAO,CAAC,kBAAkB,CAC3B,CAAC;QACF,uDAAuD;QACvD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,QAAe,CAAC;QACtD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QACjC,MAAM,IAAI,GAAG,MAAA,QAAQ,CAAC,IAAI,mCAAI,KAAK,CAAC;QACpC,MAAM,IAAI,GAAG,MAAA,QAAQ,CAAC,IAAI,mCAAI,IAAI,CAAC;QACnC,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,mBAAmB,GAAG,IAAA,wBAAY,EAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAEpE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,qBAAqB,CAAC,IAAI,gCAExB,OAAO,EACP,gBAAgB,EAAE,IAAA,mBAAW,EAAC,OAAO,CAAC,IACnC,OAAO,KACV,IAAI;YACJ,mBAAmB,KAErB;YACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;SAClD,CACF,CAAC;QAEF,oEAAoE;QACpE,IACE,CAAC,IAAI,CAAC,MAAM,CACV,IAAA,0BAAiB,EACf,qBAAqB,CAAC,UAAU,EAChC,YAAY,EACZ,yBAAyB,CAC1B,CACF,EACD,CAAC;YACD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,SAAS,EACT,qDAAqD,CACtD,EACD,IAAA,0BAAiB,EAAC,qBAAqB,CAAC,UAAU,EAAE,YAAY,CAAC,EACjE,EAAE,CACH,CAAC;QACJ,CAAC;QAED,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,uCAAuC,CAAC,EACrE,IAAA,0BAAiB,EAAC,qBAAqB,CAAC,UAAU,EAAE,OAAO,CAAC,EAC5D,EAAE,CACH,CAAC;QACJ,CAAC;QAED,MAAM,IAAA,kCAAsB,EAAC,IAAI,EAAE;YACjC,OAAO,EAAE,qBAAqB,CAAC,IAAI;SACpC,CAAC,CAAC;QAEH,kBAAkB;QAClB,MAAM,WAAW,GAAG,IAAA,0BAAiB,EACnC,qBAAqB,CAAC,UAAU,EAChC,UAAU,CACX,CAAC;QACF,IAAA,qBAAe,EACb,IAAI,EACJ,WAAW,EACX,qBAAqB,EACrB,kCAAkC,CACnC,CAAC;QAEF,MAAM,kBAAkB,GAAG,GAAG,gBAAgB,gBAAgB,CAAC;QAC/D,IAAA,qBAAe,EACb,IAAI,EACJ,WAAW,EACX,kBAAkB,EAClB,gBAAgB,kBAAkB,EAAE,CACrC,CAAC;QAEF,8CAA8C;QAC9C,MAAM,sBAAsB,GAC1B,IAAA,WAAK,EACH,IAAI,EACJ,WAAW,EACX,uDAAuD,CACxD,CAAC,MAAM,GAAG,CAAC,CAAC;QAEf,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC5B,IAAA,aAAO,EACL,IAAI,EACJ,WAAW,EACX,2CAA2C,EAC3C,CAAC,IAA2B,EAAE,EAAE,CAC9B,IAAA,oCAA8B,EAAC,qBAAqB,EAAE,CAAC,IAAI,CAAC,CAAC,CAChE,CAAC;QACJ,CAAC;QAED,0CAA0C;QAC1C,MAAM,WAAW,GACf,IAAA,WAAK,EACH,IAAI,EACJ,WAAW,EACX,mCAAmC,kBAAkB,IAAI,CAC1D,CAAC,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,IAAA,aAAO,EACL,IAAI,EACJ,WAAW,EACX,2CAA2C,EAC3C,CAAC,IAA2B,EAAE,EAAE,CAC9B,IAAA,oCAA8B,EAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,CAAC,CAC7D,CAAC;QACJ,CAAC;QAED,IAAA,mCAAqB,EACnB,IAAI,EACJ,qBAAqB,CAAC,IAAI,EAC1B,oBAAoB,CAAC,IAAI,EACzB;YACE,GAAG,EAAE,oBAAoB,IAAI,GAAG;YAChC,OAAO;SACR,CACF,CAAC;QAEF,IAAA,qCAA4B,EAC1B,IAAI,EACJ,IAAA,uBAAY,EAAC;YACX,cAAc;YACd,4BAA4B;YAC5B,uBAAuB;YACvB,gCAAgC;YAChC,GAAI,CAAC,IAAI,KAAK,KAAK;gBACjB,CAAC,CAAC;oBACE,gBAAgB;oBAChB,WAAW;oBACX,kCAAkC;oBAClC,+CAA+C;oBAC/C,oBAAoB;iBACrB;gBACH,CAAC,CAAC,EAAE,CAAS;YACf,GAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAS;SAC/D,CAAC,EACF,IAAA,uBAAY,EAAC,CAAC,eAAe,CAAC,CAAC,CAChC,CAAC;QAEF,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE,CAAC,iCAAyB,CAAC,CAAC,CAAC;QAEzE,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;QACjC,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AACD,kBAAe,cAAc,CAAC"}
package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap CHANGED
@@ -299,7 +299,7 @@ exports[`react-website generator > Tanstack router integration > should generate
299
299
  "@cloudscape-design/board-components": "^3.0.94",
300
300
  "@cloudscape-design/components": "^3.0.928",
301
301
  "@cloudscape-design/global-styles": "^1.0.38",
302
- "aws-cdk-lib": "^2.200.0",
302
+ "aws-cdk-lib": "^2.207.0",
303
303
  "constructs": "^10.4.2",
304
304
  "react": "19.0.0",
305
305
  "react-dom": "19.0.0",
@@ -543,7 +543,7 @@ export class RuntimeConfig extends Construct {
543
543
  `;
544
544
 
545
545
  exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/constructs/src/core/static-website.ts 1`] = `
546
- "import { CfnJson, CfnOutput, RemovalPolicy, Stack, Token } from 'aws-cdk-lib';
546
+ "import { CfnOutput, RemovalPolicy, Stack } from 'aws-cdk-lib';
547
547
  import { Distribution, ViewerProtocolPolicy } from 'aws-cdk-lib/aws-cloudfront';
548
548
  import { S3BucketOrigin } from 'aws-cdk-lib/aws-cloudfront-origins';
549
549
  import {
@@ -666,7 +666,7 @@ export class StaticWebsite extends Construct {
666
666
  Source.asset(websiteFilePath),
667
667
  Source.jsonData(
668
668
  DEFAULT_RUNTIME_CONFIG_FILENAME,
669
- this.resolveTokens(RuntimeConfig.ensure(this).config),
669
+ RuntimeConfig.ensure(this).config,
670
670
  ),
671
671
  ],
672
672
  destinationBucket: this.websiteBucket,
@@ -681,26 +681,6 @@ export class StaticWebsite extends Construct {
681
681
  value: this.websiteBucket.bucketName,
682
682
  });
683
683
  }
684
- private resolveTokens = (payload: any) => {
685
- const _payload: Record<string, any> = {};
686
- Object.entries(payload).forEach(([key, value]) => {
687
- if (
688
- Token.isUnresolved(value) ||
689
- (typeof value === 'string' && value.endsWith('}}'))
690
- ) {
691
- _payload[key] = new CfnJson(this, \`ResolveToken-\${key}\`, {
692
- value,
693
- }).value;
694
- } else if (typeof value === 'object') {
695
- _payload[key] = this.resolveTokens(value);
696
- } else if (Array.isArray(value)) {
697
- _payload[key] = value.map((v) => this.resolveTokens(v));
698
- } else {
699
- _payload[key] = value;
700
- }
701
- });
702
- return _payload;
703
- };
704
684
  }
705
685
 
706
686
  export class CloudfrontWebAcl extends Stack {
@@ -1842,7 +1822,7 @@ exports[`react-website generator > Tanstack router integration > should generate
1842
1822
  "@cloudscape-design/components": "^3.0.928",
1843
1823
  "@cloudscape-design/global-styles": "^1.0.38",
1844
1824
  "@tanstack/react-router": "^1.121.16",
1845
- "aws-cdk-lib": "^2.200.0",
1825
+ "aws-cdk-lib": "^2.207.0",
1846
1826
  "constructs": "^10.4.2",
1847
1827
  "react": "19.0.0",
1848
1828
  "react-dom": "19.0.0",
@@ -2090,7 +2070,7 @@ export class RuntimeConfig extends Construct {
2090
2070
  `;
2091
2071
 
2092
2072
  exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/constructs/src/core/static-website.ts 1`] = `
2093
- "import { CfnJson, CfnOutput, RemovalPolicy, Stack, Token } from 'aws-cdk-lib';
2073
+ "import { CfnOutput, RemovalPolicy, Stack } from 'aws-cdk-lib';
2094
2074
  import { Distribution, ViewerProtocolPolicy } from 'aws-cdk-lib/aws-cloudfront';
2095
2075
  import { S3BucketOrigin } from 'aws-cdk-lib/aws-cloudfront-origins';
2096
2076
  import {
@@ -2213,7 +2193,7 @@ export class StaticWebsite extends Construct {
2213
2193
  Source.asset(websiteFilePath),
2214
2194
  Source.jsonData(
2215
2195
  DEFAULT_RUNTIME_CONFIG_FILENAME,
2216
- this.resolveTokens(RuntimeConfig.ensure(this).config),
2196
+ RuntimeConfig.ensure(this).config,
2217
2197
  ),
2218
2198
  ],
2219
2199
  destinationBucket: this.websiteBucket,
@@ -2228,26 +2208,6 @@ export class StaticWebsite extends Construct {
2228
2208
  value: this.websiteBucket.bucketName,
2229
2209
  });
2230
2210
  }
2231
- private resolveTokens = (payload: any) => {
2232
- const _payload: Record<string, any> = {};
2233
- Object.entries(payload).forEach(([key, value]) => {
2234
- if (
2235
- Token.isUnresolved(value) ||
2236
- (typeof value === 'string' && value.endsWith('}}'))
2237
- ) {
2238
- _payload[key] = new CfnJson(this, \`ResolveToken-\${key}\`, {
2239
- value,
2240
- }).value;
2241
- } else if (typeof value === 'object') {
2242
- _payload[key] = this.resolveTokens(value);
2243
- } else if (Array.isArray(value)) {
2244
- _payload[key] = value.map((v) => this.resolveTokens(v));
2245
- } else {
2246
- _payload[key] = value;
2247
- }
2248
- });
2249
- return _payload;
2250
- };
2251
2211
  }
2252
2212
 
2253
2213
  export class CloudfrontWebAcl extends Stack {
@@ -3761,7 +3721,7 @@ export * from './runtime-config.js';
3761
3721
  `;
3762
3722
 
3763
3723
  exports[`react-website generator > should generate shared constructs > common/constructs-core-static-website.ts 1`] = `
3764
- "import { CfnJson, CfnOutput, RemovalPolicy, Stack, Token } from 'aws-cdk-lib';
3724
+ "import { CfnOutput, RemovalPolicy, Stack } from 'aws-cdk-lib';
3765
3725
  import { Distribution, ViewerProtocolPolicy } from 'aws-cdk-lib/aws-cloudfront';
3766
3726
  import { S3BucketOrigin } from 'aws-cdk-lib/aws-cloudfront-origins';
3767
3727
  import {
@@ -3884,7 +3844,7 @@ export class StaticWebsite extends Construct {
3884
3844
  Source.asset(websiteFilePath),
3885
3845
  Source.jsonData(
3886
3846
  DEFAULT_RUNTIME_CONFIG_FILENAME,
3887
- this.resolveTokens(RuntimeConfig.ensure(this).config),
3847
+ RuntimeConfig.ensure(this).config,
3888
3848
  ),
3889
3849
  ],
3890
3850
  destinationBucket: this.websiteBucket,
@@ -3899,26 +3859,6 @@ export class StaticWebsite extends Construct {
3899
3859
  value: this.websiteBucket.bucketName,
3900
3860
  });
3901
3861
  }
3902
- private resolveTokens = (payload: any) => {
3903
- const _payload: Record<string, any> = {};
3904
- Object.entries(payload).forEach(([key, value]) => {
3905
- if (
3906
- Token.isUnresolved(value) ||
3907
- (typeof value === 'string' && value.endsWith('}}'))
3908
- ) {
3909
- _payload[key] = new CfnJson(this, \`ResolveToken-\${key}\`, {
3910
- value,
3911
- }).value;
3912
- } else if (typeof value === 'object') {
3913
- _payload[key] = this.resolveTokens(value);
3914
- } else if (Array.isArray(value)) {
3915
- _payload[key] = value.map((v) => this.resolveTokens(v));
3916
- } else {
3917
- _payload[key] = value;
3918
- }
3919
- });
3920
- return _payload;
3921
- };
3922
3862
  }
3923
3863
 
3924
3864
  export class CloudfrontWebAcl extends Stack {
@@ -4029,7 +3969,7 @@ exports[`react-website generator > should handle npm scope prefix correctly > sc
4029
3969
  "@cloudscape-design/components": "^3.0.928",
4030
3970
  "@cloudscape-design/global-styles": "^1.0.38",
4031
3971
  "@tanstack/react-router": "^1.121.16",
4032
- "aws-cdk-lib": "^2.200.0",
3972
+ "aws-cdk-lib": "^2.207.0",
4033
3973
  "constructs": "^10.4.2",
4034
3974
  "react": "19.0.0",
4035
3975
  "react-dom": "19.0.0",
package/src/ts/react-website/app/files/common/constructs/src/core/static-website.ts.template CHANGED
@@ -1,4 +1,4 @@
1
- import { CfnJson, CfnOutput, RemovalPolicy, Stack, Token } from 'aws-cdk-lib';
1
+ import { CfnOutput, RemovalPolicy, Stack } from 'aws-cdk-lib';
2
2
  import { Distribution, ViewerProtocolPolicy } from 'aws-cdk-lib/aws-cloudfront';
3
3
  import { S3BucketOrigin } from 'aws-cdk-lib/aws-cloudfront-origins';
4
4
  import {
@@ -121,7 +121,7 @@ export class StaticWebsite extends Construct {
121
121
  Source.asset(websiteFilePath),
122
122
  Source.jsonData(
123
123
  DEFAULT_RUNTIME_CONFIG_FILENAME,
124
- this.resolveTokens(RuntimeConfig.ensure(this).config)
124
+ RuntimeConfig.ensure(this).config
125
125
  ),
126
126
  ],
127
127
  destinationBucket: this.websiteBucket,
@@ -136,26 +136,6 @@ export class StaticWebsite extends Construct {
136
136
  value: this.websiteBucket.bucketName,
137
137
  });
138
138
  }
139
- private resolveTokens = (payload: any) => {
140
- const _payload: Record<string, any> = {};
141
- Object.entries(payload).forEach(([key, value]) => {
142
- if (
143
- Token.isUnresolved(value) ||
144
- (typeof value === 'string' && value.endsWith('}}'))
145
- ) {
146
- _payload[key] = new CfnJson(this, `ResolveToken-${key}`, {
147
- value,
148
- }).value;
149
- } else if (typeof value === 'object') {
150
- _payload[key] = this.resolveTokens(value);
151
- } else if (Array.isArray(value)) {
152
- _payload[key] = value.map((v) => this.resolveTokens(v));
153
- } else {
154
- _payload[key] = value;
155
- }
156
- });
157
- return _payload;
158
- };
159
139
  }
160
140
 
161
141
  export class CloudfrontWebAcl extends Stack {
package/src/utils/files/website/components/tanstack-query/QueryClientProvider.tsx.template CHANGED
@@ -1,16 +1,29 @@
1
- import { FC, PropsWithChildren, useState } from 'react';
1
+ import { ComponentProps, FC, PropsWithChildren, useState } from 'react';
2
2
  import {
3
3
  QueryClient,
4
4
  QueryClientProvider as QueryClientProviderInner,
5
5
  } from '@tanstack/react-query';
6
+ import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
6
7
 
7
- export const QueryClientProvider: FC<PropsWithChildren> = ({
8
+ type QueryClientProviderProps = PropsWithChildren & {
9
+ client?: QueryClient;
10
+ devtoolsOptions?: Omit<ComponentProps<typeof ReactQueryDevtools>, 'client'>;
11
+ disableDevtools?: boolean;
12
+ };
13
+
14
+ export const QueryClientProvider: FC<QueryClientProviderProps> = ({
8
15
  children,
16
+ client = new QueryClient(),
17
+ disableDevtools = false,
18
+ devtoolsOptions,
9
19
  }) => {
10
- const [queryClient] = useState(new QueryClient());
20
+ const [queryClient] = useState(client);
11
21
  return (
12
22
  <QueryClientProviderInner client={queryClient}>
13
23
  {children}
24
+ {!disableDevtools && (
25
+ <ReactQueryDevtools client={queryClient} {...devtoolsOptions} />
26
+ )}
14
27
  </QueryClientProviderInner>
15
28
  );
16
29
  };
package/src/utils/versions.d.ts CHANGED
@@ -24,6 +24,7 @@ export declare const VERSIONS: {
24
24
  readonly '@cloudscape-design/components': "^3.0.928";
25
25
  readonly '@cloudscape-design/global-styles': "^1.0.38";
26
26
  readonly '@tanstack/react-query': "^5.74.3";
27
+ readonly '@tanstack/react-query-devtools': "^5.84.2";
27
28
  readonly '@trpc/tanstack-react-query': "11.0.0";
28
29
  readonly '@trpc/client': "11.0.0";
29
30
  readonly '@trpc/server': "11.0.0";
@@ -33,7 +34,7 @@ export declare const VERSIONS: {
33
34
  readonly '@smithy/types': "^4.2.0";
34
35
  readonly aws4fetch: "^1.0.20";
35
36
  readonly 'aws-cdk': "^2.1006.0";
36
- readonly 'aws-cdk-lib': "^2.200.0";
37
+ readonly 'aws-cdk-lib': "^2.207.0";
37
38
  readonly 'aws-xray-sdk-core': "^3.10.3";
38
39
  readonly constructs: "^10.4.2";
39
40
  readonly cors: "^2.8.5";
@@ -56,5 +57,5 @@ export type IVersion = keyof typeof VERSIONS;
56
57
  * Add versions to the given dependencies
57
58
  */
58
59
  export declare const withVersions: (deps: (keyof typeof VERSIONS)[]) => {
59
- [k: string]: "^0.0.60" | "^3.775.0" | "^2.24.1" | "^6.0.0" | "^21.0.0" | "~21.0.3" | "^1.11.3" | "^1.121.16" | "^1.120.17" | "^1.121.0" | "^3.0.94" | "^3.0.928" | "^1.0.38" | "^5.74.3" | "11.0.0" | "^22.13.13" | "^8.10.148" | "^2.8.18" | "^4.2.0" | "^1.0.20" | "^2.1006.0" | "^2.200.0" | "^3.10.3" | "^10.4.2" | "^2.8.5" | "^0.25.1" | "^5.2.5" | "^2.4.0" | "^3.2.0" | "^3.5.3" | "^0.5.21" | "^4.1.11" | "4.20.1" | "^5.1.4" | "^4.0.14" | "npm:zod@^3";
60
+ [k: string]: "^0.0.60" | "^3.775.0" | "^2.24.1" | "^6.0.0" | "^21.0.0" | "~21.0.3" | "^1.11.3" | "^1.121.16" | "^1.120.17" | "^1.121.0" | "^3.0.94" | "^3.0.928" | "^1.0.38" | "^5.74.3" | "^5.84.2" | "11.0.0" | "^22.13.13" | "^8.10.148" | "^2.8.18" | "^4.2.0" | "^1.0.20" | "^2.1006.0" | "^2.207.0" | "^3.10.3" | "^10.4.2" | "^2.8.5" | "^0.25.1" | "^5.2.5" | "^2.4.0" | "^3.2.0" | "^3.5.3" | "^0.5.21" | "^4.1.11" | "4.20.1" | "^5.1.4" | "^4.0.14" | "npm:zod@^3";
60
61
  };
package/src/utils/versions.js CHANGED
@@ -27,6 +27,7 @@ exports.VERSIONS = {
27
27
  '@cloudscape-design/components': '^3.0.928',
28
28
  '@cloudscape-design/global-styles': '^1.0.38',
29
29
  '@tanstack/react-query': '^5.74.3',
30
+ '@tanstack/react-query-devtools': '^5.84.2',
30
31
  '@trpc/tanstack-react-query': '11.0.0',
31
32
  '@trpc/client': '11.0.0',
32
33
  '@trpc/server': '11.0.0',
@@ -36,7 +37,7 @@ exports.VERSIONS = {
36
37
  '@smithy/types': '^4.2.0',
37
38
  aws4fetch: '^1.0.20',
38
39
  'aws-cdk': '^2.1006.0',
39
- 'aws-cdk-lib': '^2.200.0',
40
+ 'aws-cdk-lib': '^2.207.0',
40
41
  'aws-xray-sdk-core': '^3.10.3',
41
42
  constructs: '^10.4.2',
42
43
  cors: '^2.8.5',
package/src/utils/versions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/versions.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACU,QAAA,QAAQ,GAAG;IACtB,iCAAiC,EAAE,SAAS;IAC5C,kCAAkC,EAAE,UAAU;IAC9C,+BAA+B,EAAE,UAAU;IAC3C,+CAA+C,EAAE,UAAU;IAC3D,+BAA+B,EAAE,SAAS;IAC1C,gCAAgC,EAAE,SAAS;IAC3C,+BAA+B,EAAE,SAAS;IAC1C,+BAA+B,EAAE,SAAS;IAC1C,aAAa,EAAE,QAAQ;IACvB,cAAc,EAAE,SAAS;IACzB,YAAY,EAAE,SAAS;IACvB,2BAA2B,EAAE,SAAS;IACtC,wBAAwB,EAAE,WAAW;IACrC,yBAAyB,EAAE,WAAW;IACtC,4BAA4B,EAAE,WAAW;IACzC,+BAA+B,EAAE,WAAW;IAC5C,wBAAwB,EAAE,UAAU;IACpC,qCAAqC,EAAE,SAAS;IAChD,+BAA+B,EAAE,UAAU;IAC3C,kCAAkC,EAAE,SAAS;IAC7C,uBAAuB,EAAE,SAAS;IAClC,4BAA4B,EAAE,QAAQ;IACtC,cAAc,EAAE,QAAQ;IACxB,cAAc,EAAE,QAAQ;IACxB,aAAa,EAAE,WAAW;IAC1B,mBAAmB,EAAE,WAAW;IAChC,aAAa,EAAE,SAAS;IACxB,eAAe,EAAE,QAAQ;IACzB,SAAS,EAAE,SAAS;IACpB,SAAS,EAAE,WAAW;IACtB,aAAa,EAAE,UAAU;IACzB,mBAAmB,EAAE,SAAS;IAC9B,UAAU,EAAE,SAAS;IACrB,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,SAAS;IAClB,wBAAwB,EAAE,QAAQ;IAClC,qBAAqB,EAAE,QAAQ;IAC/B,gBAAgB,EAAE,QAAQ;IAC1B,QAAQ,EAAE,QAAQ;IAClB,oBAAoB,EAAE,QAAQ;IAC9B,oBAAoB,EAAE,SAAS;IAC/B,WAAW,EAAE,SAAS;IACtB,mBAAmB,EAAE,SAAS;IAC9B,GAAG,EAAE,QAAQ,EAAE,kDAAkD;IACjE,qBAAqB,EAAE,QAAQ;IAC/B,GAAG,EAAE,SAAS;IACd,2FAA2F;IAC3F,oEAAoE;IACpE,QAAQ,EAAE,YAAY;CACd,CAAC;AAEX;;GAEG;AACI,MAAM,YAAY,GAAG,CAAC,IAA+B,EAAE,EAAE,CAC9D,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,gBAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AADjD,QAAA,YAAY,gBACqC"}
1
+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/versions.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACU,QAAA,QAAQ,GAAG;IACtB,iCAAiC,EAAE,SAAS;IAC5C,kCAAkC,EAAE,UAAU;IAC9C,+BAA+B,EAAE,UAAU;IAC3C,+CAA+C,EAAE,UAAU;IAC3D,+BAA+B,EAAE,SAAS;IAC1C,gCAAgC,EAAE,SAAS;IAC3C,+BAA+B,EAAE,SAAS;IAC1C,+BAA+B,EAAE,SAAS;IAC1C,aAAa,EAAE,QAAQ;IACvB,cAAc,EAAE,SAAS;IACzB,YAAY,EAAE,SAAS;IACvB,2BAA2B,EAAE,SAAS;IACtC,wBAAwB,EAAE,WAAW;IACrC,yBAAyB,EAAE,WAAW;IACtC,4BAA4B,EAAE,WAAW;IACzC,+BAA+B,EAAE,WAAW;IAC5C,wBAAwB,EAAE,UAAU;IACpC,qCAAqC,EAAE,SAAS;IAChD,+BAA+B,EAAE,UAAU;IAC3C,kCAAkC,EAAE,SAAS;IAC7C,uBAAuB,EAAE,SAAS;IAClC,gCAAgC,EAAE,SAAS;IAC3C,4BAA4B,EAAE,QAAQ;IACtC,cAAc,EAAE,QAAQ;IACxB,cAAc,EAAE,QAAQ;IACxB,aAAa,EAAE,WAAW;IAC1B,mBAAmB,EAAE,WAAW;IAChC,aAAa,EAAE,SAAS;IACxB,eAAe,EAAE,QAAQ;IACzB,SAAS,EAAE,SAAS;IACpB,SAAS,EAAE,WAAW;IACtB,aAAa,EAAE,UAAU;IACzB,mBAAmB,EAAE,SAAS;IAC9B,UAAU,EAAE,SAAS;IACrB,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,SAAS;IAClB,wBAAwB,EAAE,QAAQ;IAClC,qBAAqB,EAAE,QAAQ;IAC/B,gBAAgB,EAAE,QAAQ;IAC1B,QAAQ,EAAE,QAAQ;IAClB,oBAAoB,EAAE,QAAQ;IAC9B,oBAAoB,EAAE,SAAS;IAC/B,WAAW,EAAE,SAAS;IACtB,mBAAmB,EAAE,SAAS;IAC9B,GAAG,EAAE,QAAQ,EAAE,kDAAkD;IACjE,qBAAqB,EAAE,QAAQ;IAC/B,GAAG,EAAE,SAAS;IACd,2FAA2F;IAC3F,oEAAoE;IACpE,QAAQ,EAAE,YAAY;CACd,CAAC;AAEX;;GAEG;AACI,MAAM,YAAY,GAAG,CAAC,IAA+B,EAAE,EAAE,CAC9D,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,gBAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AADjD,QAAA,YAAY,gBACqC"}