@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
|
@@ -14,11 +14,11 @@ exports[`infra generator > should add required dependencies to package.json > de
|
|
|
14
14
|
exports[`infra generator > should add required dependencies to package.json > dev-dependencies 1`] = `
|
|
15
15
|
{
|
|
16
16
|
"@eslint/js": "^9.8.0",
|
|
17
|
-
"@nx/eslint": "20.
|
|
18
|
-
"@nx/eslint-plugin": "20.
|
|
19
|
-
"@nx/js": "20.
|
|
20
|
-
"@nx/vite": "20.
|
|
21
|
-
"@nx/web": "20.
|
|
17
|
+
"@nx/eslint": "20.4.0",
|
|
18
|
+
"@nx/eslint-plugin": "20.4.0",
|
|
19
|
+
"@nx/js": "20.4.0",
|
|
20
|
+
"@nx/vite": "20.4.0",
|
|
21
|
+
"@nx/web": "20.4.0",
|
|
22
22
|
"@swc-node/register": "~1.9.1",
|
|
23
23
|
"@swc/core": "~1.5.7",
|
|
24
24
|
"@swc/helpers": "~0.5.11",
|
|
@@ -30,8 +30,8 @@ exports[`infra generator > should add required dependencies to package.json > de
|
|
|
30
30
|
"jsdom": "~22.1.0",
|
|
31
31
|
"prettier": "^3.4.2",
|
|
32
32
|
"tsx": "^4.19.2",
|
|
33
|
-
"typescript": "~5.
|
|
34
|
-
"typescript-eslint": "^8.
|
|
33
|
+
"typescript": "~5.7.2",
|
|
34
|
+
"typescript-eslint": "^8.19.0",
|
|
35
35
|
"vite": "^5.0.0",
|
|
36
36
|
"vitest": "^1.3.1",
|
|
37
37
|
}
|
|
@@ -49,11 +49,11 @@ exports[`infra generator > should add required dependencies to package.json > pa
|
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@eslint/js": "^9.8.0",
|
|
52
|
-
"@nx/eslint": "20.
|
|
53
|
-
"@nx/eslint-plugin": "20.
|
|
54
|
-
"@nx/js": "20.
|
|
55
|
-
"@nx/vite": "20.
|
|
56
|
-
"@nx/web": "20.
|
|
52
|
+
"@nx/eslint": "20.4.0",
|
|
53
|
+
"@nx/eslint-plugin": "20.4.0",
|
|
54
|
+
"@nx/js": "20.4.0",
|
|
55
|
+
"@nx/vite": "20.4.0",
|
|
56
|
+
"@nx/web": "20.4.0",
|
|
57
57
|
"@swc-node/register": "~1.9.1",
|
|
58
58
|
"@swc/core": "~1.5.7",
|
|
59
59
|
"@swc/helpers": "~0.5.11",
|
|
@@ -65,29 +65,27 @@ exports[`infra generator > should add required dependencies to package.json > pa
|
|
|
65
65
|
"jsdom": "~22.1.0",
|
|
66
66
|
"prettier": "^3.4.2",
|
|
67
67
|
"tsx": "^4.19.2",
|
|
68
|
-
"typescript": "~5.
|
|
69
|
-
"typescript-eslint": "^8.
|
|
68
|
+
"typescript": "~5.7.2",
|
|
69
|
+
"typescript-eslint": "^8.19.0",
|
|
70
70
|
"vite": "^5.0.0",
|
|
71
71
|
"vitest": "^1.3.1",
|
|
72
72
|
},
|
|
73
73
|
"name": "@proj/source",
|
|
74
74
|
"type": "module",
|
|
75
|
+
"workspaces": [
|
|
76
|
+
"packages/*",
|
|
77
|
+
"packages/common/*",
|
|
78
|
+
],
|
|
75
79
|
}
|
|
76
80
|
`;
|
|
77
81
|
|
|
78
82
|
exports[`infra generator > should configure project.json with correct targets > build-target 1`] = `
|
|
79
83
|
{
|
|
80
|
-
"cache": true,
|
|
81
84
|
"dependsOn": [
|
|
82
|
-
"
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
"command": "cdk synth",
|
|
87
|
-
"cwd": "packages/test",
|
|
88
|
-
},
|
|
89
|
-
"outputs": [
|
|
90
|
-
"{workspaceRoot}/dist/packages/test/cdk.out",
|
|
85
|
+
"lint",
|
|
86
|
+
"compile",
|
|
87
|
+
"test",
|
|
88
|
+
"synth",
|
|
91
89
|
],
|
|
92
90
|
}
|
|
93
91
|
`;
|
|
@@ -112,17 +110,11 @@ exports[`infra generator > should configure project.json with correct targets >
|
|
|
112
110
|
"tags": [],
|
|
113
111
|
"targets": {
|
|
114
112
|
"build": {
|
|
115
|
-
"cache": true,
|
|
116
113
|
"dependsOn": [
|
|
117
|
-
"
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
"command": "cdk synth",
|
|
122
|
-
"cwd": "packages/test",
|
|
123
|
-
},
|
|
124
|
-
"outputs": [
|
|
125
|
-
"{workspaceRoot}/dist/packages/test/cdk.out",
|
|
114
|
+
"lint",
|
|
115
|
+
"compile",
|
|
116
|
+
"test",
|
|
117
|
+
"synth",
|
|
126
118
|
],
|
|
127
119
|
},
|
|
128
120
|
"compile": {
|
|
@@ -131,9 +123,9 @@ exports[`infra generator > should configure project.json with correct targets >
|
|
|
131
123
|
"assets": [
|
|
132
124
|
"packages/test/*.md",
|
|
133
125
|
],
|
|
134
|
-
"main": "packages/test/src/
|
|
126
|
+
"main": "packages/test/src/main.ts",
|
|
135
127
|
"outputPath": "dist/packages/test",
|
|
136
|
-
"tsConfig": "packages/test/tsconfig.
|
|
128
|
+
"tsConfig": "packages/test/tsconfig.json",
|
|
137
129
|
},
|
|
138
130
|
"outputs": [
|
|
139
131
|
"{options.outputPath}",
|
|
@@ -149,6 +141,20 @@ exports[`infra generator > should configure project.json with correct targets >
|
|
|
149
141
|
"lint": {
|
|
150
142
|
"executor": "@nx/eslint:lint",
|
|
151
143
|
},
|
|
144
|
+
"synth": {
|
|
145
|
+
"cache": true,
|
|
146
|
+
"dependsOn": [
|
|
147
|
+
"^build",
|
|
148
|
+
],
|
|
149
|
+
"executor": "nx:run-commands",
|
|
150
|
+
"options": {
|
|
151
|
+
"command": "cdk synth",
|
|
152
|
+
"cwd": "packages/test",
|
|
153
|
+
},
|
|
154
|
+
"outputs": [
|
|
155
|
+
"{workspaceRoot}/dist/packages/test/cdk.out",
|
|
156
|
+
],
|
|
157
|
+
},
|
|
152
158
|
"test": {
|
|
153
159
|
"executor": "@nx/vite:test",
|
|
154
160
|
"options": {
|
|
@@ -450,13 +456,16 @@ exports[`infra generator > should generate files with correct content > project-
|
|
|
450
456
|
"tags": [],
|
|
451
457
|
"targets": {
|
|
452
458
|
"build": {
|
|
453
|
-
"
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
"
|
|
459
|
+
"dependsOn": ["lint", "compile", "test", "synth"]
|
|
460
|
+
},
|
|
461
|
+
"compile": {
|
|
462
|
+
"executor": "@nx/js:tsc",
|
|
463
|
+
"outputs": ["{options.outputPath}"],
|
|
457
464
|
"options": {
|
|
458
|
-
"
|
|
459
|
-
"
|
|
465
|
+
"outputPath": "dist/packages/test",
|
|
466
|
+
"main": "packages/test/src/main.ts",
|
|
467
|
+
"tsConfig": "packages/test/tsconfig.json",
|
|
468
|
+
"assets": ["packages/test/*.md"]
|
|
460
469
|
}
|
|
461
470
|
},
|
|
462
471
|
"lint": {
|
|
@@ -469,14 +478,14 @@ exports[`infra generator > should generate files with correct content > project-
|
|
|
469
478
|
"reportsDirectory": "../../coverage/packages/test"
|
|
470
479
|
}
|
|
471
480
|
},
|
|
472
|
-
"
|
|
473
|
-
"
|
|
474
|
-
"
|
|
481
|
+
"synth": {
|
|
482
|
+
"cache": true,
|
|
483
|
+
"executor": "nx:run-commands",
|
|
484
|
+
"outputs": ["{workspaceRoot}/dist/packages/test/cdk.out"],
|
|
485
|
+
"dependsOn": ["^build"],
|
|
475
486
|
"options": {
|
|
476
|
-
"
|
|
477
|
-
"
|
|
478
|
-
"tsConfig": "packages/test/tsconfig.lib.json",
|
|
479
|
-
"assets": ["packages/test/*.md"]
|
|
487
|
+
"cwd": "packages/test",
|
|
488
|
+
"command": "cdk synth"
|
|
480
489
|
}
|
|
481
490
|
},
|
|
482
491
|
"deploy": {
|
|
@@ -746,17 +755,11 @@ exports[`infra generator > should handle custom project names correctly > custom
|
|
|
746
755
|
"tags": [],
|
|
747
756
|
"targets": {
|
|
748
757
|
"build": {
|
|
749
|
-
"cache": true,
|
|
750
758
|
"dependsOn": [
|
|
751
|
-
"
|
|
752
|
-
|
|
753
|
-
|
|
754
|
-
|
|
755
|
-
"command": "cdk synth",
|
|
756
|
-
"cwd": "packages/custom-infra",
|
|
757
|
-
},
|
|
758
|
-
"outputs": [
|
|
759
|
-
"{workspaceRoot}/dist/packages/custom-infra/cdk.out",
|
|
759
|
+
"lint",
|
|
760
|
+
"compile",
|
|
761
|
+
"test",
|
|
762
|
+
"synth",
|
|
760
763
|
],
|
|
761
764
|
},
|
|
762
765
|
"compile": {
|
|
@@ -765,9 +768,9 @@ exports[`infra generator > should handle custom project names correctly > custom
|
|
|
765
768
|
"assets": [
|
|
766
769
|
"packages/custom-infra/*.md",
|
|
767
770
|
],
|
|
768
|
-
"main": "packages/custom-infra/src/
|
|
771
|
+
"main": "packages/custom-infra/src/main.ts",
|
|
769
772
|
"outputPath": "dist/packages/custom-infra",
|
|
770
|
-
"tsConfig": "packages/custom-infra/tsconfig.
|
|
773
|
+
"tsConfig": "packages/custom-infra/tsconfig.json",
|
|
771
774
|
},
|
|
772
775
|
"outputs": [
|
|
773
776
|
"{options.outputPath}",
|
|
@@ -783,6 +786,20 @@ exports[`infra generator > should handle custom project names correctly > custom
|
|
|
783
786
|
"lint": {
|
|
784
787
|
"executor": "@nx/eslint:lint",
|
|
785
788
|
},
|
|
789
|
+
"synth": {
|
|
790
|
+
"cache": true,
|
|
791
|
+
"dependsOn": [
|
|
792
|
+
"^build",
|
|
793
|
+
],
|
|
794
|
+
"executor": "nx:run-commands",
|
|
795
|
+
"options": {
|
|
796
|
+
"command": "cdk synth",
|
|
797
|
+
"cwd": "packages/custom-infra",
|
|
798
|
+
},
|
|
799
|
+
"outputs": [
|
|
800
|
+
"{workspaceRoot}/dist/packages/custom-infra/cdk.out",
|
|
801
|
+
],
|
|
802
|
+
},
|
|
786
803
|
"test": {
|
|
787
804
|
"executor": "@nx/vite:test",
|
|
788
805
|
"options": {
|
|
@@ -30,7 +30,7 @@ export const suppressRule = (
|
|
|
30
30
|
.filter((resource) => CfnResource.isCfnResource(resource));
|
|
31
31
|
|
|
32
32
|
resources.forEach((resource) => {
|
|
33
|
-
|
|
33
|
+
const metadata = resource.getMetadata('guard') || {};
|
|
34
34
|
metadata['SuppressedRules'] = [
|
|
35
35
|
...(metadata['SuppressedRules'] ?? []),
|
|
36
36
|
ruleName,
|
|
@@ -46,7 +46,7 @@ export enum RuleSet {
|
|
|
46
46
|
NIST_CSF = 'nist-csf.guard',
|
|
47
47
|
PCI_DSS_3_2_1 = 'pci-dss-3-2-1.guard',
|
|
48
48
|
WELL_ARCHITECTED_RELIABILITY = 'wa-reliability-pillar.guard',
|
|
49
|
-
WELL_ARCHITECTED_SECURITY = 'wa-security-pillar.guard'
|
|
49
|
+
WELL_ARCHITECTED_SECURITY = 'wa-security-pillar.guard',
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
export class CfnGuardValidator extends _CfnGuardValidator {
|
|
@@ -9,14 +9,15 @@ const tslib_1 = require("tslib");
|
|
|
9
9
|
const devkit_1 = require("@nx/devkit");
|
|
10
10
|
const generator_1 = tslib_1.__importStar(require("../../ts/lib/generator"));
|
|
11
11
|
const versions_1 = require("../../utils/versions");
|
|
12
|
-
const format_1 = require("../../utils/format");
|
|
13
12
|
const npm_scope_1 = require("../../utils/npm-scope");
|
|
14
13
|
const shared_constructs_1 = require("../../utils/shared-constructs");
|
|
15
14
|
const ast_1 = require("../../utils/ast");
|
|
15
|
+
const path_1 = tslib_1.__importDefault(require("path"));
|
|
16
|
+
const format_1 = require("../../utils/format");
|
|
16
17
|
function infraGenerator(tree, schema) {
|
|
17
18
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
18
19
|
const lib = (0, generator_1.getTsLibDetails)(tree, schema);
|
|
19
|
-
|
|
20
|
+
yield (0, generator_1.default)(tree, schema);
|
|
20
21
|
yield (0, shared_constructs_1.sharedConstructsGenerator)(tree);
|
|
21
22
|
const synthDirFromRoot = `/dist/${lib.dir}/cdk.out`;
|
|
22
23
|
const synthDirFromProject = lib.dir
|
|
@@ -39,8 +40,14 @@ function infraGenerator(tree, schema) {
|
|
|
39
40
|
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
40
41
|
});
|
|
41
42
|
(0, devkit_1.updateJson)(tree, `${libraryRoot}/project.json`, (config) => {
|
|
43
|
+
var _a;
|
|
42
44
|
config.projectType = 'application';
|
|
43
|
-
config.targets.build =
|
|
45
|
+
config.targets.build.dependsOn = [
|
|
46
|
+
...((_a = config.targets.build.dependsOn) !== null && _a !== void 0 ? _a : []),
|
|
47
|
+
'synth',
|
|
48
|
+
];
|
|
49
|
+
config.targets.compile.options.main = (0, devkit_1.joinPathFragments)(libraryRoot, 'src', 'main.ts');
|
|
50
|
+
config.targets.synth = {
|
|
44
51
|
cache: true,
|
|
45
52
|
executor: 'nx:run-commands',
|
|
46
53
|
outputs: [`{workspaceRoot}${synthDirFromRoot}`],
|
|
@@ -68,8 +75,16 @@ function infraGenerator(tree, schema) {
|
|
|
68
75
|
'constructs',
|
|
69
76
|
'source-map-support',
|
|
70
77
|
]), (0, versions_1.withVersions)(['tsx']));
|
|
71
|
-
|
|
72
|
-
|
|
78
|
+
(0, devkit_1.updateJson)(tree, `${libraryRoot}/tsconfig.json`, (tsConfig) => (Object.assign(Object.assign({}, tsConfig), { references: [
|
|
79
|
+
...(tsConfig.references || []),
|
|
80
|
+
{
|
|
81
|
+
path: `${path_1.default.relative(libraryRoot, `${tree.root}/${shared_constructs_1.PACKAGES_DIR}`)}/${shared_constructs_1.SHARED_CONSTRUCTS_DIR}/tsconfig.json`,
|
|
82
|
+
},
|
|
83
|
+
] })));
|
|
84
|
+
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
85
|
+
return () => {
|
|
86
|
+
(0, devkit_1.installPackagesTask)(tree);
|
|
87
|
+
};
|
|
73
88
|
});
|
|
74
89
|
}
|
|
75
90
|
exports.default = infraGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/infra/app/generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/infra/app/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,10 @@ export type IEcho = z.TypeOf<typeof EchoSchema>;
|
|
|
16
16
|
"
|
|
17
17
|
`;
|
|
18
18
|
|
|
19
|
-
exports[`trpc backend generator > should set up shared constructs > index.ts 1`] = `
|
|
19
|
+
exports[`trpc backend generator > should set up shared constructs > index.ts 1`] = `
|
|
20
|
+
"export * from './test-api.js';
|
|
21
|
+
"
|
|
22
|
+
`;
|
|
20
23
|
|
|
21
24
|
exports[`trpc backend generator > should set up shared constructs > test-api.ts 1`] = `
|
|
22
25
|
"import { Construct } from 'constructs';
|
|
@@ -27,13 +30,13 @@ import { HttpIamAuthorizer } from 'aws-cdk-lib/aws-apigatewayv2-authorizers';
|
|
|
27
30
|
export class TestApi extends TrpcApi {
|
|
28
31
|
constructor(scope: Construct, id: string) {
|
|
29
32
|
super(scope, id, {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
33
|
+
defaultAuthorizer: new HttpIamAuthorizer(),
|
|
34
|
+
handlerFilePath: url.fileURLToPath(
|
|
35
|
+
new URL(
|
|
36
|
+
'../../../../../../apps/test-api/backend/src/lambdas/router.ts',
|
|
37
|
+
import.meta.url,
|
|
38
|
+
),
|
|
39
|
+
),
|
|
37
40
|
});
|
|
38
41
|
}
|
|
39
42
|
}
|
|
@@ -104,7 +107,7 @@ export class TrpcApi extends Construct {
|
|
|
104
107
|
],
|
|
105
108
|
integration: new HttpLambdaIntegration(
|
|
106
109
|
'RouterIntegration',
|
|
107
|
-
routerFunction
|
|
110
|
+
routerFunction,
|
|
108
111
|
),
|
|
109
112
|
});
|
|
110
113
|
|
|
@@ -122,7 +125,7 @@ export class TrpcApi extends Construct {
|
|
|
122
125
|
effect: Effect.ALLOW,
|
|
123
126
|
actions: ['execute-api:Invoke'],
|
|
124
127
|
resources: [this.api.arnForExecuteApi('*', '/*', '*')],
|
|
125
|
-
})
|
|
128
|
+
}),
|
|
126
129
|
);
|
|
127
130
|
}
|
|
128
131
|
}
|
|
@@ -13,9 +13,9 @@ const generator_1 = tslib_1.__importDefault(require("../../ts/lib/generator"));
|
|
|
13
13
|
const npm_scope_1 = require("../../utils/npm-scope");
|
|
14
14
|
const versions_1 = require("../../utils/versions");
|
|
15
15
|
const paths_1 = require("../../utils/paths");
|
|
16
|
-
const format_1 = require("../../utils/format");
|
|
17
16
|
const names_1 = require("../../utils/names");
|
|
18
17
|
const ast_1 = require("../../utils/ast");
|
|
18
|
+
const format_1 = require("../../utils/format");
|
|
19
19
|
function trpcBackendGenerator(tree, options) {
|
|
20
20
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
21
21
|
var _a;
|
|
@@ -84,7 +84,7 @@ function trpcBackendGenerator(tree, options) {
|
|
|
84
84
|
]), (0, versions_1.withVersions)(['@types/aws-lambda']));
|
|
85
85
|
tree.delete((0, devkit_1.joinPathFragments)(backendRoot, 'package.json'));
|
|
86
86
|
tree.delete((0, devkit_1.joinPathFragments)(schemaRoot, 'package.json'));
|
|
87
|
-
yield (0, format_1.formatFilesInSubtree)(tree
|
|
87
|
+
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
88
88
|
return () => {
|
|
89
89
|
(0, devkit_1.installPackagesTask)(tree);
|
|
90
90
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"names":[],"mappings":";;AA6BA,oDAqLC;;AAlND;;;GAGG;AACH,uCAUoB;AAEpB,gFAAyC;AACzC,qEAIuC;AACvC,+EAAoD;AACpD,qDAAwE;AACxE,mDAAoD;AACpD,6CAA0D;AAC1D
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ export interface IsolatedTrpcClientProviderProps extends PropsWithChildren {
|
|
|
20
20
|
|
|
21
21
|
export const createIsolatedTrpcClientProvider = <
|
|
22
22
|
TAppRouter extends AnyTRPCRouter,
|
|
23
|
-
TContext
|
|
23
|
+
TContext,
|
|
24
24
|
>() => {
|
|
25
25
|
const isolatedTrpcContext = createContext(null as any);
|
|
26
26
|
const trpc = createTRPCReact<TAppRouter, TContext>({
|
|
@@ -13,9 +13,9 @@ const generator_1 = require("../../cloudscape-website/runtime-config/generator")
|
|
|
13
13
|
const shared_constructs_1 = require("../../utils/shared-constructs");
|
|
14
14
|
const npm_scope_1 = require("../../utils/npm-scope");
|
|
15
15
|
const versions_1 = require("../../utils/versions");
|
|
16
|
-
const format_1 = require("../../utils/format");
|
|
17
16
|
const ast_1 = require("../../utils/ast");
|
|
18
17
|
const names_1 = require("../../utils/names");
|
|
18
|
+
const format_1 = require("../../utils/format");
|
|
19
19
|
function reactGenerator(tree, options) {
|
|
20
20
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
21
21
|
var _a;
|
|
@@ -157,7 +157,7 @@ function reactGenerator(tree, options) {
|
|
|
157
157
|
? ['oidc-client-ts', 'react-oidc-context']
|
|
158
158
|
: []),
|
|
159
159
|
]), {});
|
|
160
|
-
yield (0, format_1.formatFilesInSubtree)(tree
|
|
160
|
+
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
161
161
|
return () => {
|
|
162
162
|
(0, devkit_1.installPackagesTask)(tree);
|
|
163
163
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/react/generator.ts"],"names":[],"mappings":";;AAiDA,wCA2VC;;AA5YD;;;GAGG;AACH,uCAQoB;AAEpB,2CAkBoB;AACpB,uDAAyD;AACzD,iFAA2F;AAC3F,qEAGuC;AACvC,qDAAqD;AACrD,mDAAoD;AACpD
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/react/generator.ts"],"names":[],"mappings":"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"}
|