@aws/nx-plugin 0.2.0 → 0.2.1
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 +1469 -3026
- package/generators.json +0 -6
- package/package.json +14 -14
- package/src/cloudscape-website/app/__snapshots__/generator.spec.ts.snap +15 -19
- package/src/cloudscape-website/app/files/common/constructs/src/core/static-website.ts.template +5 -0
- package/src/cloudscape-website/app/generator.js +29 -23
- package/src/cloudscape-website/app/generator.js.map +1 -1
- package/src/cloudscape-website/app/schema.d.ts +0 -1
- package/src/cloudscape-website/cognito-auth/__snapshots__/generator.spec.ts.snap +13 -11
- package/src/cloudscape-website/cognito-auth/generator.js +2 -2
- package/src/cloudscape-website/cognito-auth/generator.js.map +1 -1
- package/src/cloudscape-website/runtime-config/__snapshots__/generator.spec.ts.snap +9 -2
- package/src/cloudscape-website/runtime-config/generator.js +1 -1
- package/src/cloudscape-website/runtime-config/generator.js.map +1 -1
- package/src/infra/app/__snapshots__/generator.spec.ts.snap +78 -61
- package/src/infra/app/files/common/constructs/src/core/cfn-guard.ts.template +2 -2
- package/src/infra/app/generator.js +20 -5
- package/src/infra/app/generator.js.map +1 -1
- package/src/trpc/backend/__snapshots__/generator.spec.ts.snap +13 -10
- package/src/trpc/backend/generator.js +2 -2
- package/src/trpc/backend/generator.js.map +1 -1
- package/src/trpc/react/__snapshots__/generator.spec.ts.snap +1 -1
- package/src/trpc/react/generator.js +2 -2
- package/src/trpc/react/generator.js.map +1 -1
- package/src/ts/lib/__snapshots__/generator.spec.ts.snap +47 -93
- package/src/ts/lib/eslint.d.ts +1 -2
- package/src/ts/lib/eslint.js +24 -31
- package/src/ts/lib/eslint.js.map +1 -1
- package/src/ts/lib/generator.js +34 -2
- package/src/ts/lib/generator.js.map +1 -1
- package/src/ts/lib/schema.d.ts +0 -1
- package/src/ts/lib/schema.json +0 -6
- package/src/ts/lib/ts-project-utils.js +3 -18
- package/src/ts/lib/ts-project-utils.js.map +1 -1
- package/src/ts/lib/vitest.js +2 -4
- package/src/ts/lib/vitest.js.map +1 -1
- package/src/utils/files/common/types/src/runtime-config.ts.template +1 -0
- package/src/utils/format.d.ts +1 -1
- package/src/utils/format.js +2 -2
- package/src/utils/format.js.map +1 -1
- package/src/utils/shared-constructs.js +2 -2
- package/src/utils/shared-constructs.js.map +1 -1
- package/src/utils/test.d.ts +2 -0
- package/src/utils/test.js +19 -0
- package/src/utils/test.js.map +1 -0
- package/src/ts/cjs-to-esm/generator.d.ts +0 -12
- package/src/ts/cjs-to-esm/generator.js +0 -189
- package/src/ts/cjs-to-esm/generator.js.map +0 -1
- package/src/ts/cjs-to-esm/schema.d.ts +0 -9
- package/src/ts/cjs-to-esm/schema.json +0 -28
package/generators.json
CHANGED
|
@@ -8,12 +8,6 @@
|
|
|
8
8
|
"schema": "./src/ts/lib/schema.json",
|
|
9
9
|
"description": "Generates a TypeScript library"
|
|
10
10
|
},
|
|
11
|
-
"ts#cjs-to-esm": {
|
|
12
|
-
"factory": "./src/ts/cjs-to-esm/generator",
|
|
13
|
-
"schema": "./src/ts/cjs-to-esm/schema.json",
|
|
14
|
-
"description": "Convert CommonJS TypeScript/JavaScript files to ESM",
|
|
15
|
-
"hidden": true
|
|
16
|
-
},
|
|
17
11
|
"cloudscape-website#app": {
|
|
18
12
|
"factory": "./src/cloudscape-website/app/generator",
|
|
19
13
|
"schema": "./src/cloudscape-website/app/schema.json",
|
package/package.json
CHANGED
|
@@ -1,29 +1,29 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws/nx-plugin",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"license": "Apache-2.0",
|
|
7
7
|
"main": "./src/index.js",
|
|
8
8
|
"typings": "./src/index.d.ts",
|
|
9
|
+
"publishConfig": {
|
|
10
|
+
"access": "public"
|
|
11
|
+
},
|
|
12
|
+
"generators": "./generators.json",
|
|
13
|
+
"peerDependencies": {
|
|
14
|
+
"prettier": "^3.4.2"
|
|
15
|
+
},
|
|
9
16
|
"dependencies": {
|
|
10
|
-
"@nx/devkit": "20.
|
|
11
|
-
"@nx/eslint": "20.
|
|
12
|
-
"@nx/js": "20.
|
|
13
|
-
"@nx/react": "20.
|
|
14
|
-
"@nx/vite": "20.
|
|
17
|
+
"@nx/devkit": "^20.4.0",
|
|
18
|
+
"@nx/eslint": "^20.4.0",
|
|
19
|
+
"@nx/js": "^20.4.0",
|
|
20
|
+
"@nx/react": "^20.4.0",
|
|
21
|
+
"@nx/vite": "^20.4.0",
|
|
15
22
|
"@phenomnomnominal/tsquery": "6.1.3",
|
|
16
23
|
"lodash.kebabcase": "4.1.1",
|
|
17
|
-
"minimatch": "^10.0.1",
|
|
18
|
-
"nx": "20.3.1",
|
|
19
24
|
"typescript": "~5.5.4",
|
|
20
25
|
"vite": "^5.4.0",
|
|
21
|
-
"vitest": "^1.6.0"
|
|
22
|
-
"prettier": "^2.8.8"
|
|
26
|
+
"vitest": "^1.6.0"
|
|
23
27
|
},
|
|
24
|
-
"publishConfig": {
|
|
25
|
-
"access": "public"
|
|
26
|
-
},
|
|
27
|
-
"generators": "./generators.json",
|
|
28
28
|
"types": "./src/index.d.ts"
|
|
29
29
|
}
|
|
@@ -3,17 +3,8 @@
|
|
|
3
3
|
exports[`cloudscape-website generator > should configure TypeScript correctly > tsconfig.json 1`] = `
|
|
4
4
|
{
|
|
5
5
|
"compilerOptions": {
|
|
6
|
-
"allowJs": false,
|
|
7
|
-
"allowSyntheticDefaultImports": true,
|
|
8
|
-
"esModuleInterop": false,
|
|
9
|
-
"jsx": "react-jsx",
|
|
10
6
|
"module": "Preserve",
|
|
11
7
|
"moduleResolution": "Bundler",
|
|
12
|
-
"strict": true,
|
|
13
|
-
"types": [
|
|
14
|
-
"vite/client",
|
|
15
|
-
"vitest",
|
|
16
|
-
],
|
|
17
8
|
},
|
|
18
9
|
"extends": "../tsconfig.base.json",
|
|
19
10
|
"files": [],
|
|
@@ -96,7 +87,7 @@ const getBreadcrumbs = (
|
|
|
96
87
|
pathName: string,
|
|
97
88
|
search: string,
|
|
98
89
|
defaultBreadcrumb: string,
|
|
99
|
-
availableRoutes?: string[]
|
|
90
|
+
availableRoutes?: string[],
|
|
100
91
|
) => {
|
|
101
92
|
const segments = [
|
|
102
93
|
defaultBreadcrumb,
|
|
@@ -148,7 +139,7 @@ const App: React.FC = () => {
|
|
|
148
139
|
JSON.stringify(appLayoutProps) !== JSON.stringify(props) &&
|
|
149
140
|
setAppLayoutProps(props);
|
|
150
141
|
},
|
|
151
|
-
[appLayoutProps]
|
|
142
|
+
[appLayoutProps],
|
|
152
143
|
);
|
|
153
144
|
|
|
154
145
|
useEffect(() => {
|
|
@@ -167,7 +158,7 @@ const App: React.FC = () => {
|
|
|
167
158
|
navigate(e.detail.href);
|
|
168
159
|
}
|
|
169
160
|
},
|
|
170
|
-
[navigate, setAppLayoutPropsSafe]
|
|
161
|
+
[navigate, setAppLayoutPropsSafe],
|
|
171
162
|
);
|
|
172
163
|
|
|
173
164
|
return (
|
|
@@ -234,7 +225,7 @@ root &&
|
|
|
234
225
|
<App />
|
|
235
226
|
</BrowserRouter>
|
|
236
227
|
</I18nProvider>
|
|
237
|
-
</React.StrictMode
|
|
228
|
+
</React.StrictMode>,
|
|
238
229
|
);
|
|
239
230
|
"
|
|
240
231
|
`;
|
|
@@ -288,12 +279,12 @@ export class StaticWebsite extends Construct {
|
|
|
288
279
|
constructor(
|
|
289
280
|
scope: Construct,
|
|
290
281
|
id: string,
|
|
291
|
-
{ websiteFilePath }: StaticWebsiteProps
|
|
282
|
+
{ websiteFilePath }: StaticWebsiteProps,
|
|
292
283
|
) {
|
|
293
284
|
super(scope, id);
|
|
294
285
|
this.node.setContext(
|
|
295
286
|
'@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy',
|
|
296
|
-
true
|
|
287
|
+
true,
|
|
297
288
|
);
|
|
298
289
|
|
|
299
290
|
const websiteKey = new Key(this, 'WebsiteKey', {
|
|
@@ -360,8 +351,13 @@ export class StaticWebsite extends Construct {
|
|
|
360
351
|
responseHttpStatus: 200,
|
|
361
352
|
responsePagePath: \`/\${defaultRootObject}\`,
|
|
362
353
|
},
|
|
354
|
+
{
|
|
355
|
+
httpStatus: 403, // We need to redirect reloads from paths (e.g. /foo/bar) to index.html for single page apps
|
|
356
|
+
responseHttpStatus: 200,
|
|
357
|
+
responsePagePath: \`/\${defaultRootObject}\`,
|
|
358
|
+
},
|
|
363
359
|
],
|
|
364
|
-
}
|
|
360
|
+
},
|
|
365
361
|
);
|
|
366
362
|
// Deploy Website
|
|
367
363
|
this.bucketDeployment = new BucketDeployment(this, 'WebsiteDeployment', {
|
|
@@ -369,7 +365,7 @@ export class StaticWebsite extends Construct {
|
|
|
369
365
|
Source.asset(websiteFilePath),
|
|
370
366
|
Source.jsonData(
|
|
371
367
|
DEFAULT_RUNTIME_CONFIG_FILENAME,
|
|
372
|
-
this.resolveTokens(RuntimeConfig.ensure(this).config)
|
|
368
|
+
this.resolveTokens(RuntimeConfig.ensure(this).config),
|
|
373
369
|
),
|
|
374
370
|
],
|
|
375
371
|
destinationBucket: this.websiteBucket,
|
|
@@ -456,7 +452,7 @@ export class TestApp extends StaticWebsite {
|
|
|
456
452
|
constructor(scope: Construct, id: string) {
|
|
457
453
|
super(scope, id, {
|
|
458
454
|
websiteFilePath: url.fileURLToPath(
|
|
459
|
-
new URL('../../../../../../dist/test-app', import.meta.url)
|
|
455
|
+
new URL('../../../../../../dist/test-app', import.meta.url),
|
|
460
456
|
),
|
|
461
457
|
});
|
|
462
458
|
}
|
|
@@ -483,7 +479,7 @@ root &&
|
|
|
483
479
|
<App />
|
|
484
480
|
</BrowserRouter>
|
|
485
481
|
</I18nProvider>
|
|
486
|
-
</React.StrictMode
|
|
482
|
+
</React.StrictMode>,
|
|
487
483
|
);
|
|
488
484
|
"
|
|
489
485
|
`;
|
package/src/cloudscape-website/app/files/common/constructs/src/core/static-website.ts.template
CHANGED
|
@@ -107,6 +107,11 @@ export class StaticWebsite extends Construct {
|
|
|
107
107
|
responseHttpStatus: 200,
|
|
108
108
|
responsePagePath: `/${defaultRootObject}`,
|
|
109
109
|
},
|
|
110
|
+
{
|
|
111
|
+
httpStatus: 403, // We need to redirect reloads from paths (e.g. /foo/bar) to index.html for single page apps
|
|
112
|
+
responseHttpStatus: 200,
|
|
113
|
+
responsePagePath: `/${defaultRootObject}`,
|
|
114
|
+
},
|
|
110
115
|
],
|
|
111
116
|
}
|
|
112
117
|
);
|
|
@@ -15,9 +15,9 @@ const npm_scope_1 = require("../../utils/npm-scope");
|
|
|
15
15
|
const ts_project_utils_1 = require("../../ts/lib/ts-project-utils");
|
|
16
16
|
const versions_1 = require("../../utils/versions");
|
|
17
17
|
const paths_1 = require("../../utils/paths");
|
|
18
|
-
const format_1 = require("../../utils/format");
|
|
19
18
|
const names_1 = require("../../utils/names");
|
|
20
19
|
const ast_1 = require("../../utils/ast");
|
|
20
|
+
const format_1 = require("../../utils/format");
|
|
21
21
|
function appGenerator(tree, schema) {
|
|
22
22
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
23
23
|
var _a, _b, _c;
|
|
@@ -28,27 +28,33 @@ function appGenerator(tree, schema) {
|
|
|
28
28
|
const websiteContentPath = (0, devkit_1.joinPathFragments)((_a = schema.directory) !== null && _a !== void 0 ? _a : '.', websiteNameKebabCase);
|
|
29
29
|
// TODO: consider exposing and supporting e2e tests
|
|
30
30
|
const e2eTestRunner = 'none';
|
|
31
|
-
yield (0, react_1.applicationGenerator)(tree, Object.assign(Object.assign({}, schema), { name:
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
31
|
+
yield (0, react_1.applicationGenerator)(tree, Object.assign(Object.assign({}, schema), { name: websiteNameKebabCase, directory: websiteContentPath, routing: false, e2eTestRunner, linter: 'eslint', bundler: 'vite', unitTestRunner: 'vitest', alwaysGenerateProjectJson: true }));
|
|
32
|
+
const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
|
|
33
|
+
const targets = projectConfiguration.targets;
|
|
34
|
+
targets['load:runtime-config'] = {
|
|
35
|
+
executor: 'nx:run-commands',
|
|
36
|
+
metadata: {
|
|
37
|
+
description: `Load runtime config from your deployed stack for dev purposes. You must set the AWS_REGION and CDK_APP_DIR env variables whilst calling i.e: AWS_REGION=ap-southeast-2 CDK_APP_DIR=./dist/packages/infra/cdk.out pnpm exec nx run ${fullyQualifiedName}:load:runtime-config`,
|
|
38
|
+
},
|
|
39
|
+
options: {
|
|
40
|
+
command: `cdk-app WebsiteBucket get --key runtime-config.json './${websiteContentPath}/public/runtime-config.json'`,
|
|
41
|
+
},
|
|
42
|
+
};
|
|
43
|
+
const buildTarget = targets['build'];
|
|
44
|
+
targets['compile'] = Object.assign(Object.assign({}, buildTarget), { options: Object.assign(Object.assign({}, buildTarget.options), { outputPath: (0, devkit_1.joinPathFragments)('dist', websiteContentPath) }) });
|
|
45
|
+
targets['build'] = {
|
|
46
|
+
dependsOn: ['lint', 'compile', 'test', ...((_b = buildTarget.dependsOn) !== null && _b !== void 0 ? _b : [])],
|
|
47
|
+
options: {
|
|
48
|
+
outputPath: (0, devkit_1.joinPathFragments)('dist', websiteContentPath),
|
|
49
|
+
},
|
|
50
|
+
};
|
|
51
|
+
projectConfiguration.targets = Object.keys(targets)
|
|
52
|
+
.sort()
|
|
53
|
+
.reduce((obj, key) => {
|
|
54
|
+
obj[key] = targets[key];
|
|
55
|
+
return obj;
|
|
56
|
+
}, {});
|
|
57
|
+
(0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfiguration);
|
|
52
58
|
(0, ts_project_utils_1.configureTsProject)(tree, {
|
|
53
59
|
dir: websiteContentPath,
|
|
54
60
|
fullyQualifiedName,
|
|
@@ -153,7 +159,7 @@ function appGenerator(tree, schema) {
|
|
|
153
159
|
'@cloudscape-design/global-styles',
|
|
154
160
|
'react-router-dom',
|
|
155
161
|
]), (0, versions_1.withVersions)(['cdk-app-cli']));
|
|
156
|
-
yield (0, format_1.formatFilesInSubtree)(tree
|
|
162
|
+
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
157
163
|
return () => {
|
|
158
164
|
if (!schema.skipInstall) {
|
|
159
165
|
(0, devkit_1.installPackagesTask)(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/app/generator.ts"],"names":[],"mappings":";;AAsCA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/app/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,8 +66,9 @@ export default CognitoAuth;
|
|
|
66
66
|
`;
|
|
67
67
|
|
|
68
68
|
exports[`cognito-auth generator > should generate files > identity-index 1`] = `
|
|
69
|
-
"export * from
|
|
70
|
-
export * from './runtime-config.js';
|
|
69
|
+
"export * from './user-identity.js';
|
|
70
|
+
export * from './runtime-config.js';
|
|
71
|
+
"
|
|
71
72
|
`;
|
|
72
73
|
|
|
73
74
|
exports[`cognito-auth generator > should generate files > user-identity 1`] = `
|
|
@@ -110,12 +111,12 @@ export class UserIdentity extends Construct {
|
|
|
110
111
|
this.userPoolClient = this.createUserPoolClient(this.userPool);
|
|
111
112
|
this.identityPool = this.createIdentityPool(
|
|
112
113
|
this.userPool,
|
|
113
|
-
this.userPoolClient
|
|
114
|
+
this.userPoolClient,
|
|
114
115
|
);
|
|
115
116
|
this.createManagedLoginBranding(
|
|
116
117
|
this.userPool,
|
|
117
118
|
this.userPoolClient,
|
|
118
|
-
this.userPoolDomain
|
|
119
|
+
this.userPoolDomain,
|
|
119
120
|
);
|
|
120
121
|
|
|
121
122
|
RuntimeConfig.ensure(this).config.cognitoProps = {
|
|
@@ -183,8 +184,8 @@ export class UserIdentity extends Construct {
|
|
|
183
184
|
\`https://\${Stack.of(this).region}.console.aws.amazon.com\`,
|
|
184
185
|
].concat(
|
|
185
186
|
this.findCloudFrontDistributions().map(
|
|
186
|
-
(d) => \`https://\${d.domainName}
|
|
187
|
-
)
|
|
187
|
+
(d) => \`https://\${d.domainName}\`,
|
|
188
|
+
),
|
|
188
189
|
),
|
|
189
190
|
});
|
|
190
191
|
|
|
@@ -208,7 +209,7 @@ export class UserIdentity extends Construct {
|
|
|
208
209
|
|
|
209
210
|
private createIdentityPool = (
|
|
210
211
|
userPool: UserPool,
|
|
211
|
-
userPoolClient: UserPoolClient
|
|
212
|
+
userPoolClient: UserPoolClient,
|
|
212
213
|
) => {
|
|
213
214
|
const identityPool = new IdentityPool(this, 'IdentityPool');
|
|
214
215
|
|
|
@@ -216,7 +217,7 @@ export class UserIdentity extends Construct {
|
|
|
216
217
|
new UserPoolAuthenticationProvider({
|
|
217
218
|
userPool,
|
|
218
219
|
userPoolClient,
|
|
219
|
-
})
|
|
220
|
+
}),
|
|
220
221
|
);
|
|
221
222
|
|
|
222
223
|
return identityPool;
|
|
@@ -225,7 +226,7 @@ export class UserIdentity extends Construct {
|
|
|
225
226
|
private createManagedLoginBranding = (
|
|
226
227
|
userPool: UserPool,
|
|
227
228
|
userPoolClient: UserPoolClient,
|
|
228
|
-
userPoolDomain: CfnUserPoolDomain
|
|
229
|
+
userPoolDomain: CfnUserPoolDomain,
|
|
229
230
|
) => {
|
|
230
231
|
new CfnManagedLoginBranding(this, 'ManagedLoginBranding', {
|
|
231
232
|
userPoolId: userPool.userPoolId,
|
|
@@ -264,6 +265,7 @@ export function App() {
|
|
|
264
265
|
`;
|
|
265
266
|
|
|
266
267
|
exports[`cognito-auth generator > should update shared constructs index.ts > common/constructs-index 1`] = `
|
|
267
|
-
"export * from
|
|
268
|
-
export * from './runtime-config.js';
|
|
268
|
+
"export * from './user-identity.js';
|
|
269
|
+
export * from './runtime-config.js';
|
|
270
|
+
"
|
|
269
271
|
`;
|
|
@@ -12,8 +12,8 @@ const generator_1 = require("../runtime-config/generator");
|
|
|
12
12
|
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
13
13
|
const typescript_1 = require("typescript");
|
|
14
14
|
const versions_1 = require("../../utils/versions");
|
|
15
|
-
const format_1 = require("../../utils/format");
|
|
16
15
|
const ast_1 = require("../../utils/ast");
|
|
16
|
+
const format_1 = require("../../utils/format");
|
|
17
17
|
function cognitoAuthGenerator(tree, options) {
|
|
18
18
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
19
|
const srcRoot = (0, devkit_1.readProjectConfiguration)(tree, options.project).sourceRoot;
|
|
@@ -163,7 +163,7 @@ function cognitoAuthGenerator(tree, options) {
|
|
|
163
163
|
console.info(`Skipping update to ${appLayoutTsxPath} as it does not exist.`);
|
|
164
164
|
}
|
|
165
165
|
// End update App Layout
|
|
166
|
-
yield (0, format_1.formatFilesInSubtree)(tree
|
|
166
|
+
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
167
167
|
return () => {
|
|
168
168
|
(0, devkit_1.installPackagesTask)(tree);
|
|
169
169
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/cognito-auth/generator.ts"],"names":[],"mappings":";;AA4CA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/cognito-auth/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,13 +2,20 @@
|
|
|
2
2
|
|
|
3
3
|
exports[`runtime-config generator > should generate runtime config files > runtime-config-component.tsx 1`] = `
|
|
4
4
|
"import { Alert, Spinner } from '@cloudscape-design/components';
|
|
5
|
-
import React, {
|
|
5
|
+
import React, {
|
|
6
|
+
createContext,
|
|
7
|
+
PropsWithChildren,
|
|
8
|
+
useEffect,
|
|
9
|
+
useState,
|
|
10
|
+
} from 'react';
|
|
6
11
|
import type { IRuntimeConfig } from ':proj/common-types';
|
|
7
12
|
|
|
8
13
|
/**
|
|
9
14
|
* Context for storing the runtimeConfig.
|
|
10
15
|
*/
|
|
11
|
-
export const RuntimeConfigContext = createContext<IRuntimeConfig | undefined>(
|
|
16
|
+
export const RuntimeConfigContext = createContext<IRuntimeConfig | undefined>(
|
|
17
|
+
undefined,
|
|
18
|
+
);
|
|
12
19
|
|
|
13
20
|
/**
|
|
14
21
|
* Sets up the runtimeConfig.
|
|
@@ -56,7 +56,7 @@ function runtimeConfigGenerator(tree, options) {
|
|
|
56
56
|
if (locatedTargetNode && mainTsxContents !== mainTsxUpdatedContents) {
|
|
57
57
|
tree.write(mainTsxPath, mainTsxUpdatedContents);
|
|
58
58
|
}
|
|
59
|
-
yield (0, format_1.formatFilesInSubtree)(tree
|
|
59
|
+
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
62
|
exports.default = runtimeConfigGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/runtime-config/generator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/runtime-config/generator.ts"],"names":[],"mappings":"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"}
|