@aws/nx-plugin 0.88.0 → 0.88.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/package.json +1 -1
- package/src/ts/nx-generator/generator.js +2 -11
- package/src/ts/nx-generator/generator.js.map +1 -1
- package/src/ts/react-website/cognito-auth/__snapshots__/generator.spec.ts.snap +1 -5
- package/src/ts/react-website/runtime-config/generator.js +8 -6
- package/src/ts/react-website/runtime-config/generator.js.map +1 -1
package/package.json
CHANGED
|
@@ -11,7 +11,6 @@ const names_1 = require("../../utils/names");
|
|
|
11
11
|
const lodash_camelcase_1 = tslib_1.__importDefault(require("lodash.camelcase"));
|
|
12
12
|
const paths_1 = require("../../utils/paths");
|
|
13
13
|
const ast_1 = require("../../utils/ast");
|
|
14
|
-
const typescript_1 = require("typescript");
|
|
15
14
|
const nx_1 = require("../../utils/nx");
|
|
16
15
|
const metrics_1 = require("../../utils/metrics");
|
|
17
16
|
const format_1 = require("../../utils/format");
|
|
@@ -58,16 +57,8 @@ const tsNxGeneratorGenerator = (tree, options) => tslib_1.__awaiter(void 0, void
|
|
|
58
57
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'nx-plugin-for-aws', 'generator'), generatorDir, Object.assign({}, enhancedOptions));
|
|
59
58
|
// Generate guide page in docs
|
|
60
59
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'nx-plugin-for-aws', 'docs'), (0, devkit_1.joinPathFragments)('docs', 'src', 'content', 'docs', 'en', 'guides'), Object.assign({}, enhancedOptions));
|
|
61
|
-
// Update the docs config to add the page entry
|
|
62
|
-
(0, ast_1.
|
|
63
|
-
return typescript_1.factory.createArrayLiteralExpression([
|
|
64
|
-
...node.elements,
|
|
65
|
-
typescript_1.factory.createObjectLiteralExpression([
|
|
66
|
-
typescript_1.factory.createPropertyAssignment('label', typescript_1.factory.createStringLiteral(name, true)),
|
|
67
|
-
typescript_1.factory.createPropertyAssignment('link', typescript_1.factory.createStringLiteral(`/guides/${enhancedOptions.nameKebabCase}`, true)),
|
|
68
|
-
]),
|
|
69
|
-
]);
|
|
70
|
-
});
|
|
60
|
+
// Update the docs config to add the page entry to the Generator guides sidebar section
|
|
61
|
+
yield (0, ast_1.applyGritQLTransform)(tree, (0, devkit_1.joinPathFragments)('docs', 'astro.config.mjs'), `\`items: [$items]\` where { $items <: within \`sidebar: [$_]\`, $items <: contains \`'ts#project'\`, $items += \`, { label: '${name}', link: '/guides/${enhancedOptions.nameKebabCase}' }\` }`);
|
|
71
62
|
}
|
|
72
63
|
else {
|
|
73
64
|
// Local generator in a project other than nx-plugin-for-aws
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/nx-generator/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAQoB;AAEpB,6CAAqE;AACrE,gFAAyC;AACzC,6CAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/nx-generator/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -273,8 +273,6 @@ exports[`cognito-auth generator > should not be able to run the generator multip
|
|
|
273
273
|
|
|
274
274
|
exports[`cognito-auth generator > should update main.tsx when RuntimeConfigProvider exists > main-tsx-with-runtime-config 1`] = `
|
|
275
275
|
"import CognitoAuth from './components/CognitoAuth';
|
|
276
|
-
import RuntimeConfigProvider from './components/RuntimeConfig';
|
|
277
|
-
|
|
278
276
|
import { RuntimeConfigProvider } from './components/RuntimeConfig';
|
|
279
277
|
import { RouterProvider, createRouter } from '@tanstack/react-router';
|
|
280
278
|
|
|
@@ -284,9 +282,7 @@ export function Main() {
|
|
|
284
282
|
return (
|
|
285
283
|
<RuntimeConfigProvider>
|
|
286
284
|
<CognitoAuth>
|
|
287
|
-
<
|
|
288
|
-
<App />
|
|
289
|
-
</RuntimeConfigProvider>
|
|
285
|
+
<App />
|
|
290
286
|
</CognitoAuth>
|
|
291
287
|
</RuntimeConfigProvider>
|
|
292
288
|
);
|
|
@@ -8,7 +8,6 @@ const tslib_1 = require("tslib");
|
|
|
8
8
|
* SPDX-License-Identifier: Apache-2.0
|
|
9
9
|
*/
|
|
10
10
|
const devkit_1 = require("@nx/devkit");
|
|
11
|
-
const typescript_1 = require("typescript");
|
|
12
11
|
const npm_scope_1 = require("../../../utils/npm-scope");
|
|
13
12
|
const format_1 = require("../../../utils/format");
|
|
14
13
|
const ast_1 = require("../../../utils/ast");
|
|
@@ -34,11 +33,14 @@ function runtimeConfigGenerator(tree, options) {
|
|
|
34
33
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'app'), srcRoot, Object.assign(Object.assign({}, options), { npmScopePrefix, scopeAlias: (0, npm_scope_1.toScopeAlias)(npmScopePrefix) }), {
|
|
35
34
|
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
36
35
|
});
|
|
37
|
-
|
|
38
|
-
(0, ast_1.
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
36
|
+
// Only add RuntimeConfigProvider wrapper and import if not already present in JSX
|
|
37
|
+
const alreadyWrapped = yield (0, ast_1.hasGritQLMatch)(tree, mainTsxPath, '`<RuntimeConfigProvider>$_</RuntimeConfigProvider>`');
|
|
38
|
+
if (!alreadyWrapped) {
|
|
39
|
+
yield (0, ast_1.addSingleImport)(tree, mainTsxPath, 'RuntimeConfigProvider', './components/RuntimeConfig');
|
|
40
|
+
const wrapped = yield (0, ast_1.applyGritQLTransform)(tree, mainTsxPath, '`<App />` => `<RuntimeConfigProvider><App /></RuntimeConfigProvider>`');
|
|
41
|
+
if (!wrapped) {
|
|
42
|
+
throw new Error('Could not locate the App element in main.tsx');
|
|
43
|
+
}
|
|
42
44
|
}
|
|
43
45
|
yield (0, website_1.addHookResultToRouterProviderContext)(tree, mainTsxPath, {
|
|
44
46
|
hook: 'useRuntimeConfig',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/runtime-config/generator.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/runtime-config/generator.ts"],"names":[],"mappings":";;;AA+BA,wDAsFC;;AArHD;;;GAGG;AACH,uCAKoB;AAEpB,wDAA2E;AAC3E,kDAA6D;AAC7D,4CAI4B;AAC5B,0CAK2B;AAC3B,oDAAyE;AACzE,gDAA6D;AAC7D,wDAAkF;AAErE,QAAA,6BAA6B,GACxC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAE/B,SAAsB,sBAAsB,CAC1C,IAAU,EACV,OAAqC;;QAErC,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;QACF,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,CAAC;QACzC,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CACb,2DAA2D,WAAW,EAAE,CACzE,CAAC;QACJ,CAAC;QAED,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,OAAO,EACP,YAAY,EACZ,eAAe,EACf,WAAW,CACZ,CAAC;QACF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;YACpE,OAAO;QACT,CAAC;QAED,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAC/C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,EAC5C,OAAO,kCAEF,OAAO,KACV,cAAc,EACd,UAAU,EAAE,IAAA,wBAAY,EAAC,cAAc,CAAC,KAE1C;YACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;SAClD,CACF,CAAC;QAEF,kFAAkF;QAClF,MAAM,cAAc,GAAG,MAAM,IAAA,oBAAc,EACzC,IAAI,EACJ,WAAW,EACX,qDAAqD,CACtD,CAAC;QACF,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAA,qBAAe,EACnB,IAAI,EACJ,WAAW,EACX,uBAAuB,EACvB,4BAA4B,CAC7B,CAAC;YAEF,MAAM,OAAO,GAAG,MAAM,IAAA,0BAAoB,EACxC,IAAI,EACJ,WAAW,EACX,uEAAuE,CACxE,CAAC;YAEF,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;QAED,MAAM,IAAA,8CAAoC,EAAC,IAAI,EAAE,WAAW,EAAE;YAC5D,IAAI,EAAE,kBAAkB;YACxB,MAAM,EAAE,0BAA0B;YAClC,WAAW,EAAE,eAAe;SAC7B,CAAC,CAAC;QAEH,IAAA,kCAA6B,EAC3B,IAAI,EACJ,OAAO,CAAC,OAAO,EACf,qCAA6B,EAC7B,IAAA,6BAAqB,EACnB,aAAa,EACb,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,EAAE,eAAe,CAAC,CAC1D,CACF,CAAC;QAEF,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE,CAAC,qCAA6B,CAAC,CAAC,CAAC;QAE7E,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;IACnC,CAAC;CAAA;AACD,kBAAe,sBAAsB,CAAC"}
|