@aws/nx-plugin 0.17.0 → 0.18.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/generators.json +30 -9
- package/package.json +1 -1
- package/src/cloudscape-website/app/__snapshots__/generator.spec.ts.snap +2 -0
- package/src/cloudscape-website/app/files/common/constructs/src/core/static-website.ts.template +1 -0
- package/src/cloudscape-website/app/generator.d.ts +2 -0
- package/src/cloudscape-website/app/generator.js +19 -10
- package/src/cloudscape-website/app/generator.js.map +1 -1
- package/src/cloudscape-website/cognito-auth/__snapshots__/generator.spec.ts.snap +2 -0
- package/src/cloudscape-website/cognito-auth/generator.d.ts +2 -0
- package/src/cloudscape-website/cognito-auth/generator.js +10 -4
- package/src/cloudscape-website/cognito-auth/generator.js.map +1 -1
- package/src/cloudscape-website/runtime-config/__snapshots__/generator.spec.ts.snap +2 -1
- package/src/cloudscape-website/runtime-config/generator.d.ts +2 -0
- package/src/cloudscape-website/runtime-config/generator.js +5 -0
- package/src/cloudscape-website/runtime-config/generator.js.map +1 -1
- package/src/infra/app/__snapshots__/generator.spec.ts.snap +15 -20
- package/src/infra/app/files/app/src/main.ts.template +2 -3
- package/src/infra/app/generator.d.ts +2 -0
- package/src/infra/app/generator.js +12 -5
- package/src/infra/app/generator.js.map +1 -1
- package/src/license/generator.d.ts +2 -0
- package/src/license/generator.js +5 -0
- package/src/license/generator.js.map +1 -1
- package/src/license/sync/generator.d.ts +1 -1
- package/src/license/sync/generator.js +3 -1
- package/src/license/sync/generator.js.map +1 -1
- package/src/py/fast-api/generator.d.ts +2 -0
- package/src/py/fast-api/generator.js +12 -7
- package/src/py/fast-api/generator.js.map +1 -1
- package/src/py/fast-api/react/generator.d.ts +2 -0
- package/src/py/fast-api/react/generator.js +8 -4
- package/src/py/fast-api/react/generator.js.map +1 -1
- package/src/py/lambda-function/__snapshots__/generator.spec.ts.snap +66 -0
- package/src/py/lambda-function/files/common/constructs/src/app/lambda-functions/__constructFunctionKebabCase__.ts.template +24 -0
- package/src/py/lambda-function/files/handler/__lambdaFunctionSnakeCase__.py.template +34 -0
- package/src/py/lambda-function/files/tests/test___lambdaFunctionSnakeCase__.py.template +2 -0
- package/src/py/lambda-function/generator.d.ts +27 -0
- package/src/py/lambda-function/generator.js +143 -0
- package/src/py/lambda-function/generator.js.map +1 -0
- package/src/py/lambda-function/schema.d.ts +53 -0
- package/src/py/lambda-function/schema.json +83 -0
- package/src/py/project/generator.d.ts +2 -0
- package/src/py/project/generator.js +8 -3
- package/src/py/project/generator.js.map +1 -1
- package/src/trpc/backend/generator.d.ts +2 -0
- package/src/trpc/backend/generator.js +12 -6
- package/src/trpc/backend/generator.js.map +1 -1
- package/src/trpc/react/generator.d.ts +2 -0
- package/src/trpc/react/generator.js +5 -0
- package/src/trpc/react/generator.js.map +1 -1
- package/src/ts/lib/generator.d.ts +2 -0
- package/src/ts/lib/generator.js +6 -2
- package/src/ts/lib/generator.js.map +1 -1
- package/src/utils/__snapshots__/shared-constructs.spec.ts.snap +90 -0
- package/src/utils/files/common/constructs/src/core/app.ts.template +24 -0
- package/src/utils/files/common/constructs/src/core/index.ts.template +1 -0
- package/src/utils/http-api.js +5 -5
- package/src/utils/http-api.js.map +1 -1
- package/src/utils/metrics.d.ts +13 -0
- package/src/utils/metrics.js +49 -0
- package/src/utils/metrics.js.map +1 -0
- package/src/utils/names.d.ts +1 -0
- package/src/utils/names.js +4 -1
- package/src/utils/names.js.map +1 -1
- package/src/utils/nx.d.ts +8 -6
- package/src/utils/nx.js +27 -8
- package/src/utils/nx.js.map +1 -1
- package/src/utils/object.d.ts +9 -0
- package/src/utils/object.js +15 -0
- package/src/utils/object.js.map +1 -0
- package/src/utils/shared-constructs-constants.d.ts +9 -0
- package/src/utils/shared-constructs-constants.js +13 -0
- package/src/utils/shared-constructs-constants.js.map +1 -0
- package/src/utils/shared-constructs.d.ts +0 -5
- package/src/utils/shared-constructs.js +19 -24
- package/src/utils/shared-constructs.js.map +1 -1
package/generators.json
CHANGED
|
@@ -6,83 +6,104 @@
|
|
|
6
6
|
"ts#project": {
|
|
7
7
|
"factory": "./src/ts/lib/generator",
|
|
8
8
|
"schema": "./src/ts/lib/schema.json",
|
|
9
|
-
"description": "Generates a TypeScript project"
|
|
9
|
+
"description": "Generates a TypeScript project",
|
|
10
|
+
"metric": "g1"
|
|
10
11
|
},
|
|
11
12
|
"py#project": {
|
|
12
13
|
"factory": "./src/py/project/generator",
|
|
13
14
|
"schema": "./src/py/project/schema.json",
|
|
14
|
-
"description": "Generates a Python project"
|
|
15
|
+
"description": "Generates a Python project",
|
|
16
|
+
"metric": "g2"
|
|
15
17
|
},
|
|
16
18
|
"py#fast-api": {
|
|
17
19
|
"factory": "./src/py/fast-api/generator",
|
|
18
20
|
"schema": "./src/py/fast-api/schema.json",
|
|
19
|
-
"description": "Generates a FastAPI Python project"
|
|
21
|
+
"description": "Generates a FastAPI Python project",
|
|
22
|
+
"metric": "g3"
|
|
20
23
|
},
|
|
21
24
|
"py#fast-api#react-connection": {
|
|
22
25
|
"factory": "./src/py/fast-api/react/generator",
|
|
23
26
|
"schema": "./src/py/fast-api/react/schema.json",
|
|
24
27
|
"description": "Integrates a FastAPI with a React website",
|
|
28
|
+
"metric": "g4",
|
|
25
29
|
"hidden": true
|
|
26
30
|
},
|
|
27
31
|
"ts#cloudscape-website": {
|
|
28
32
|
"factory": "./src/cloudscape-website/app/generator",
|
|
29
33
|
"schema": "./src/cloudscape-website/app/schema.json",
|
|
30
|
-
"description": "Generates a React static website based on Cloudscape"
|
|
34
|
+
"description": "Generates a React static website based on Cloudscape",
|
|
35
|
+
"metric": "g5"
|
|
31
36
|
},
|
|
32
37
|
"ts#cloudscape-website#auth": {
|
|
33
38
|
"factory": "./src/cloudscape-website/cognito-auth/generator",
|
|
34
39
|
"schema": "./src/cloudscape-website/cognito-auth/schema.json",
|
|
35
|
-
"description": "Adds auth to an existing cloudscape website"
|
|
40
|
+
"description": "Adds auth to an existing cloudscape website",
|
|
41
|
+
"metric": "g6"
|
|
36
42
|
},
|
|
37
43
|
"ts#cloudscape-website#runtime-config": {
|
|
38
44
|
"factory": "./src/cloudscape-website/runtime-config/generator",
|
|
39
45
|
"schema": "./src/cloudscape-website/runtime-config/schema.json",
|
|
40
46
|
"description": "Adds runtime config to an existing cloudscape website",
|
|
47
|
+
"metric": "g7",
|
|
41
48
|
"hidden": true
|
|
42
49
|
},
|
|
43
50
|
"ts#infra": {
|
|
44
51
|
"factory": "./src/infra/app/generator",
|
|
45
52
|
"schema": "./src/infra/app/schema.json",
|
|
46
|
-
"description": "Generates a cdk application"
|
|
53
|
+
"description": "Generates a cdk application",
|
|
54
|
+
"metric": "g8"
|
|
47
55
|
},
|
|
48
56
|
"ts#trpc-api": {
|
|
49
57
|
"factory": "./src/trpc/backend/generator",
|
|
50
58
|
"schema": "./src/trpc/backend/schema.json",
|
|
51
|
-
"description": "creates a trpc backend"
|
|
59
|
+
"description": "creates a trpc backend",
|
|
60
|
+
"metric": "g9"
|
|
52
61
|
},
|
|
53
62
|
"ts#trpc-api#react-connection": {
|
|
54
63
|
"factory": "./src/trpc/react/generator",
|
|
55
64
|
"schema": "./src/trpc/react/schema.json",
|
|
56
65
|
"description": "provides React integration to a React website",
|
|
66
|
+
"metric": "g10",
|
|
57
67
|
"hidden": true
|
|
58
68
|
},
|
|
59
69
|
"api-connection": {
|
|
60
70
|
"factory": "./src/api-connection/generator",
|
|
61
71
|
"schema": "./src/api-connection/schema.json",
|
|
62
|
-
"description": "Integrates a source project with a target API project"
|
|
72
|
+
"description": "Integrates a source project with a target API project",
|
|
73
|
+
"metric": "g11"
|
|
63
74
|
},
|
|
64
75
|
"open-api#ts-client": {
|
|
65
76
|
"factory": "./src/open-api/ts-client/generator",
|
|
66
77
|
"schema": "./src/open-api/ts-client/schema.json",
|
|
67
78
|
"description": "Generate a typescript client from an OpenAPI specification",
|
|
79
|
+
"metric": "g12",
|
|
68
80
|
"hidden": true
|
|
69
81
|
},
|
|
70
82
|
"open-api#ts-hooks": {
|
|
71
83
|
"factory": "./src/open-api/ts-hooks/generator",
|
|
72
84
|
"schema": "./src/open-api/ts-hooks/schema.json",
|
|
73
85
|
"description": "Generate typescript hooks from an OpenAPI specification",
|
|
86
|
+
"metric": "g13",
|
|
74
87
|
"hidden": true
|
|
75
88
|
},
|
|
76
89
|
"license": {
|
|
77
90
|
"factory": "./src/license/generator",
|
|
78
91
|
"schema": "./src/license/schema.json",
|
|
79
|
-
"description": "Add LICENSE files and configure source code licence headers"
|
|
92
|
+
"description": "Add LICENSE files and configure source code licence headers",
|
|
93
|
+
"metric": "g14"
|
|
80
94
|
},
|
|
81
95
|
"license#sync": {
|
|
82
96
|
"factory": "./src/license/sync/generator",
|
|
83
97
|
"schema": "./src/license/sync/schema.json",
|
|
84
98
|
"description": "Sync generator for writing licence headers and subproject LICENSE files",
|
|
99
|
+
"metric": "g15",
|
|
85
100
|
"hidden": true
|
|
101
|
+
},
|
|
102
|
+
"py#lambda-function": {
|
|
103
|
+
"factory": "./src/py/lambda-function/generator",
|
|
104
|
+
"schema": "./src/py/lambda-function/schema.json",
|
|
105
|
+
"description": "Adds a lambda function to a python project",
|
|
106
|
+
"metric": "g16"
|
|
86
107
|
}
|
|
87
108
|
}
|
|
88
109
|
}
|
package/package.json
CHANGED
|
@@ -289,6 +289,7 @@ exports[`cloudscape-website generator > should generate shared constructs > comm
|
|
|
289
289
|
|
|
290
290
|
exports[`cloudscape-website generator > should generate shared constructs > common/constructs-core-index.ts 1`] = `
|
|
291
291
|
"export * from './static-website.js';
|
|
292
|
+
export * from './app.js';
|
|
292
293
|
export * from './runtime-config.js';
|
|
293
294
|
"
|
|
294
295
|
`;
|
|
@@ -423,6 +424,7 @@ export class StaticWebsite extends Construct {
|
|
|
423
424
|
destinationBucket: this.websiteBucket,
|
|
424
425
|
// Files in the distribution's edge caches will be invalidated after files are uploaded to the destination bucket.
|
|
425
426
|
distribution: this.cloudFrontDistribution,
|
|
427
|
+
memoryLimit: 1024,
|
|
426
428
|
});
|
|
427
429
|
new CfnOutput(this, 'DistributionDomainName', {
|
|
428
430
|
value: this.cloudFrontDistribution.domainName,
|
package/src/cloudscape-website/app/files/common/constructs/src/core/static-website.ts.template
CHANGED
|
@@ -127,6 +127,7 @@ export class StaticWebsite extends Construct {
|
|
|
127
127
|
destinationBucket: this.websiteBucket,
|
|
128
128
|
// Files in the distribution's edge caches will be invalidated after files are uploaded to the destination bucket.
|
|
129
129
|
distribution: this.cloudFrontDistribution,
|
|
130
|
+
memoryLimit: 1024,
|
|
130
131
|
});
|
|
131
132
|
new CfnOutput(this, 'DistributionDomainName', {
|
|
132
133
|
value: this.cloudFrontDistribution.domainName,
|
|
@@ -4,5 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { Tree } from '@nx/devkit';
|
|
6
6
|
import { AppGeneratorSchema } from './schema';
|
|
7
|
+
import { NxGeneratorInfo } from '../../utils/nx';
|
|
8
|
+
export declare const CLOUDSCAPE_WEBSITE_APP_GENERATOR_INFO: NxGeneratorInfo;
|
|
7
9
|
export declare function appGenerator(tree: Tree, schema: AppGeneratorSchema): Promise<() => void>;
|
|
8
10
|
export default appGenerator;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CLOUDSCAPE_WEBSITE_APP_GENERATOR_INFO = void 0;
|
|
3
4
|
exports.appGenerator = appGenerator;
|
|
4
5
|
const tslib_1 = require("tslib");
|
|
5
6
|
/**
|
|
@@ -10,6 +11,7 @@ const devkit_1 = require("@nx/devkit");
|
|
|
10
11
|
const typescript_1 = require("typescript");
|
|
11
12
|
const react_1 = require("@nx/react");
|
|
12
13
|
const shared_constructs_1 = require("../../utils/shared-constructs");
|
|
14
|
+
const shared_constructs_constants_1 = require("../../utils/shared-constructs-constants");
|
|
13
15
|
const npm_scope_1 = require("../../utils/npm-scope");
|
|
14
16
|
const ts_project_utils_1 = require("../../ts/lib/ts-project-utils");
|
|
15
17
|
const versions_1 = require("../../utils/versions");
|
|
@@ -18,7 +20,11 @@ const names_1 = require("../../utils/names");
|
|
|
18
20
|
const ast_1 = require("../../utils/ast");
|
|
19
21
|
const format_1 = require("../../utils/format");
|
|
20
22
|
const path_1 = require("path");
|
|
23
|
+
const lodash_kebabcase_1 = tslib_1.__importDefault(require("lodash.kebabcase"));
|
|
24
|
+
const object_1 = require("../../utils/object");
|
|
21
25
|
const nx_1 = require("../../utils/nx");
|
|
26
|
+
const metrics_1 = require("../../utils/metrics");
|
|
27
|
+
exports.CLOUDSCAPE_WEBSITE_APP_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
22
28
|
function appGenerator(tree, schema) {
|
|
23
29
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
24
30
|
var _a, _b;
|
|
@@ -40,7 +46,7 @@ function appGenerator(tree, schema) {
|
|
|
40
46
|
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`,
|
|
41
47
|
},
|
|
42
48
|
options: {
|
|
43
|
-
command: `curl https://\`aws cloudformation describe-stacks --query "Stacks[?StackName=='infra-sandbox'][].Outputs[?contains(OutputKey, 'DistributionDomainName')].OutputValue" --output text\`/runtime-config.json > './${websiteContentPath}/public/runtime-config.json'`,
|
|
49
|
+
command: `curl https://\`aws cloudformation describe-stacks --query "Stacks[?StackName=='${(0, lodash_kebabcase_1.default)(npmScopePrefix)}-infra-sandbox'][].Outputs[?contains(OutputKey, 'DistributionDomainName')].OutputValue" --output text\`/runtime-config.json > './${websiteContentPath}/public/runtime-config.json'`,
|
|
44
50
|
},
|
|
45
51
|
};
|
|
46
52
|
const buildTarget = targets['build'];
|
|
@@ -65,33 +71,33 @@ function appGenerator(tree, schema) {
|
|
|
65
71
|
outputPath: (0, devkit_1.joinPathFragments)('dist', websiteContentPath),
|
|
66
72
|
},
|
|
67
73
|
};
|
|
68
|
-
projectConfiguration.targets = (0,
|
|
74
|
+
projectConfiguration.targets = (0, object_1.sortObjectKeys)(targets);
|
|
69
75
|
(0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfiguration);
|
|
70
76
|
(0, ts_project_utils_1.configureTsProject)(tree, {
|
|
71
77
|
dir: websiteContentPath,
|
|
72
78
|
fullyQualifiedName,
|
|
73
79
|
});
|
|
74
80
|
yield (0, shared_constructs_1.sharedConstructsGenerator)(tree);
|
|
75
|
-
if (!tree.exists((0, devkit_1.joinPathFragments)(
|
|
81
|
+
if (!tree.exists((0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'app', 'static-websites', `${websiteNameKebabCase}.ts`))) {
|
|
76
82
|
const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
|
|
77
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files',
|
|
83
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'app'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'app'), Object.assign(Object.assign({}, schema), { npmScopePrefix, scopeAlias: (0, npm_scope_1.toScopeAlias)(npmScopePrefix), websiteContentPath: (0, devkit_1.joinPathFragments)('dist', websiteContentPath), websiteNameKebabCase,
|
|
78
84
|
websiteNameClassName }), {
|
|
79
85
|
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
80
86
|
});
|
|
81
|
-
const shouldGenerateCoreStaticWebsiteConstruct = !tree.exists((0, devkit_1.joinPathFragments)(
|
|
87
|
+
const shouldGenerateCoreStaticWebsiteConstruct = !tree.exists((0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'core', 'static-website.ts'));
|
|
82
88
|
if (shouldGenerateCoreStaticWebsiteConstruct) {
|
|
83
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files',
|
|
89
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'core'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'core'), Object.assign(Object.assign({}, schema), { npmScopePrefix, scopeAlias: (0, npm_scope_1.toScopeAlias)(npmScopePrefix), websiteContentPath: (0, devkit_1.joinPathFragments)('dist', websiteContentPath), websiteNameKebabCase,
|
|
84
90
|
websiteNameClassName }), {
|
|
85
91
|
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
86
92
|
});
|
|
87
93
|
}
|
|
88
|
-
(0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(
|
|
89
|
-
(0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(
|
|
94
|
+
(0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'app', 'index.ts'), './static-websites/index.js');
|
|
95
|
+
(0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'app', 'static-websites', 'index.ts'), `./${websiteNameKebabCase}.js`);
|
|
90
96
|
if (shouldGenerateCoreStaticWebsiteConstruct) {
|
|
91
|
-
(0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(
|
|
97
|
+
(0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'core', 'index.ts'), './static-website.js');
|
|
92
98
|
}
|
|
93
99
|
}
|
|
94
|
-
(0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(
|
|
100
|
+
(0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'project.json'), (config) => {
|
|
95
101
|
var _a;
|
|
96
102
|
if (!config.targets) {
|
|
97
103
|
config.targets = {};
|
|
@@ -175,6 +181,9 @@ function appGenerator(tree, schema) {
|
|
|
175
181
|
'@cloudscape-design/global-styles',
|
|
176
182
|
'@tanstack/react-router',
|
|
177
183
|
]), (0, versions_1.withVersions)(['@tanstack/router-plugin', 'vite-tsconfig-paths']));
|
|
184
|
+
yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
|
|
185
|
+
exports.CLOUDSCAPE_WEBSITE_APP_GENERATOR_INFO,
|
|
186
|
+
]);
|
|
178
187
|
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
179
188
|
return () => {
|
|
180
189
|
if (!schema.skipInstall) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/app/generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/app/generator.ts"],"names":[],"mappings":";;;AAoDA,oCA4YC;;AAhcD;;;GAGG;AACH,uCAaoB;AACpB,2CAKoB;AAEpB,qCAAiD;AACjD,qEAA0E;AAC1E,yFAGiD;AACjD,qDAAwE;AACxE,oEAAmE;AACnE,mDAAoD;AACpD,6CAA0D;AAC1D,6CAA6D;AAC7D,yCAKyB;AACzB,+CAA0D;AAC1D,+BAAgC;AAChC,gFAAyC;AACzC,+CAAoD;AACpD,uCAAmE;AACnE,iDAAsE;AAEzD,QAAA,qCAAqC,GAChD,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAE/B,SAAsB,YAAY,CAAC,IAAU,EAAE,MAA0B;;;QACvE,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,oBAAoB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,oBAAoB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,kBAAkB,GAAG,GAAG,cAAc,GAAG,oBAAoB,EAAE,CAAC;QACtE,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,MAAA,MAAM,CAAC,SAAS,mCAAI,GAAG,EACvB,oBAAoB,CACrB,CAAC;QACF,mDAAmD;QACnD,MAAM,aAAa,GAAG,MAAM,CAAC;QAC7B,MAAM,IAAA,4BAAoB,EAAC,IAAI,kCAC1B,MAAM,KACT,IAAI,EAAE,kBAAkB,EACxB,SAAS,EAAE,kBAAkB,EAC7B,OAAO,EAAE,KAAK,EACd,aAAa,EACb,MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,QAAQ,EACxB,cAAc,EAAE,IAAI,EACpB,KAAK,EAAE,KAAK,IACZ,CAAC;QAEH,0CAA0C;QAC1C,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC,CAAC;QAE1D,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EACnD,IAAI,EACJ,kBAAkB,CACnB,CAAC;QACF,MAAM,OAAO,GAAG,oBAAoB,CAAC,OAAO,CAAC;QAC7C,OAAO,CAAC,qBAAqB,CAAC,GAAG;YAC/B,QAAQ,EAAE,iBAAiB;YAC3B,QAAQ,EAAE;gBACR,WAAW,EAAE,qOAAqO,kBAAkB,sBAAsB;aAC3R;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,kFAAkF,IAAA,0BAAS,EAAC,cAAc,CAAC,oIAAoI,kBAAkB,8BAA8B;aACzS;SACF,CAAC;QACF,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QACrC,OAAO,CAAC,SAAS,CAAC,GAAG;YACnB,QAAQ,EAAE,iBAAiB;YAC3B,OAAO,EAAE,CAAC,wCAAwC,CAAC;YACnD,OAAO,EAAE;gBACP,OAAO,EAAE,+BAA+B;gBACxC,GAAG,EAAE,eAAe;aACrB;SACF,CAAC;QACF,OAAO,CAAC,QAAQ,CAAC,mCACZ,WAAW,KACd,OAAO,kCACF,WAAW,CAAC,OAAO,KACtB,UAAU,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,kBAAkB,EAAE,QAAQ,CAAC,MAEtE,CAAC;QACF,OAAO,CAAC,OAAO,CAAC,GAAG;YACjB,SAAS,EAAE;gBACT,MAAM;gBACN,SAAS;gBACT,QAAQ;gBACR,MAAM;gBACN,GAAG,CAAC,MAAA,WAAW,CAAC,SAAS,mCAAI,EAAE,CAAC;aACjC;YACD,OAAO,EAAE;gBACP,UAAU,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,kBAAkB,CAAC;aAC1D;SACF,CAAC;QACF,oBAAoB,CAAC,OAAO,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,CAAC;QAEvD,IAAA,mCAA0B,EAAC,IAAI,EAAE,kBAAkB,EAAE,oBAAoB,CAAC,CAAC;QAE3E,IAAA,qCAAkB,EAAC,IAAI,EAAE;YACvB,GAAG,EAAE,kBAAkB;YACvB,kBAAkB;SACnB,CAAC,CAAC;QACH,MAAM,IAAA,6CAAyB,EAAC,IAAI,CAAC,CAAC;QACtC,IACE,CAAC,IAAI,CAAC,MAAM,CACV,IAAA,0BAAiB,EACf,0CAAY,EACZ,mDAAqB,EACrB,KAAK,EACL,KAAK,EACL,iBAAiB,EACjB,GAAG,oBAAoB,KAAK,CAC7B,CACF,EACD,CAAC;YACD,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;YAC/C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,SAAS,EACT,OAAO,EACP,mDAAqB,EACrB,KAAK,EACL,KAAK,CACN,EACD,IAAA,0BAAiB,EAAC,0CAAY,EAAE,mDAAqB,EAAE,KAAK,EAAE,KAAK,CAAC,kCAE/D,MAAM,KACT,cAAc,EACd,UAAU,EAAE,IAAA,wBAAY,EAAC,cAAc,CAAC,EACxC,kBAAkB,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,kBAAkB,CAAC,EACjE,oBAAoB;gBACpB,oBAAoB,KAEtB;gBACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;aAClD,CACF,CAAC;YACF,MAAM,wCAAwC,GAAG,CAAC,IAAI,CAAC,MAAM,CAC3D,IAAA,0BAAiB,EACf,0CAAY,EACZ,mDAAqB,EACrB,KAAK,EACL,MAAM,EACN,mBAAmB,CACpB,CACF,CAAC;YACF,IAAI,wCAAwC,EAAE,CAAC;gBAC7C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,SAAS,EACT,OAAO,EACP,mDAAqB,EACrB,KAAK,EACL,MAAM,CACP,EACD,IAAA,0BAAiB,EAAC,0CAAY,EAAE,mDAAqB,EAAE,KAAK,EAAE,MAAM,CAAC,kCAEhE,MAAM,KACT,cAAc,EACd,UAAU,EAAE,IAAA,wBAAY,EAAC,cAAc,CAAC,EACxC,kBAAkB,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,kBAAkB,CAAC,EACjE,oBAAoB;oBACpB,oBAAoB,KAEtB;oBACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;iBAClD,CACF,CAAC;YACJ,CAAC;YACD,IAAA,mBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,0CAAY,EACZ,mDAAqB,EACrB,KAAK,EACL,KAAK,EACL,UAAU,CACX,EACD,4BAA4B,CAC7B,CAAC;YACF,IAAA,mBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,0CAAY,EACZ,mDAAqB,EACrB,KAAK,EACL,KAAK,EACL,iBAAiB,EACjB,UAAU,CACX,EACD,KAAK,oBAAoB,KAAK,CAC/B,CAAC;YACF,IAAI,wCAAwC,EAAE,CAAC;gBAC7C,IAAA,mBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,0CAAY,EACZ,mDAAqB,EACrB,KAAK,EACL,MAAM,EACN,UAAU,CACX,EACD,qBAAqB,CACtB,CAAC;YACJ,CAAC;QACH,CAAC;QACD,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,0CAAY,EAAE,mDAAqB,EAAE,cAAc,CAAC,EACtE,CAAC,MAA4B,EAAE,EAAE;;YAC/B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;YACtB,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBAC1B,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC;YAC5B,CAAC;YACD,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG;gBAC/B,GAAG,CAAC,MAAA,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,mCAAI,EAAE,CAAC;gBACzC,GAAG,kBAAkB,QAAQ;aAC9B,CAAC;YACF,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QACF,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QACzE,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;QAC1D,IAAA,sBAAa,EACX,IAAI,EAAE,0BAA0B;QAChC,IAAA,0BAAiB,EAAC,SAAS,EAAE,aAAa,CAAC,EAAE,6BAA6B;QAC1E,WAAW,kCAEN,MAAM,KACT,kBAAkB,EAClB,SAAS,EAAE,IAAA,iCAAwB,GAAE,CAAC,IAAI,KACzC,sDAAsD;QACzD;YACE,iBAAiB,EAAE,0BAAiB,CAAC,SAAS;SAC/C,CACF,CAAC;QACF,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;YAC7B,MAAM,qBAAqB,GAAG,GAAG,kBAAkB,MAAM,CAAC;YAC1D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC,IAAI,CAAC;YAC3E,IAAA,sBAAa,EACX,IAAI,EAAE,0BAA0B;YAChC,IAAA,0BAAiB,EAAC,SAAS,EAAE,eAAe,aAAa,EAAE,CAAC,EAAE,6BAA6B;YAC3F,OAAO,kCACF,MAAM,GAAK,IAAA,cAAK,EAAC,kBAAkB,CAAC,GACzC;gBACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;aAClD,CACF,CAAC;YACF,IAAA,qCAAkB,EAAC,IAAI,EAAE;gBACvB,kBAAkB,EAAE,qBAAqB;gBACzC,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;QACL,CAAC;QACD,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAExE,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;YAChC,IAAA,2BAAqB,EACnB,IAAI,EACJ,cAAc,EACd,CAAC,oBAAoB,CAAC,EACtB,8BAA8B,CAC/B,CAAC;YAEF,IAAA,qBAAe,EACb,IAAI,EACJ,cAAc,EACd,eAAe,EACf,qBAAqB,CACtB,CAAC;YAEF,IAAA,qBAAe,EACb,IAAI,EACJ,cAAc,EACd,yBAAyB,EACzB,CAAC,IAA6B,EAAE,EAAE;gBAChC,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACrD,IAAI,IAAA,iCAAoB,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,OAAO,EAAE,CAAC;wBAClE,MAAM,WAAW,GAAG,IAAI,CAAC,WAAsC,CAAC;wBAChE,OAAO,oBAAO,CAAC,wBAAwB,CACrC,OAAO,EACP,oBAAO,CAAC,6BAA6B,CACnC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;4BACvC,IACE,IAAA,iCAAoB,EAAC,SAAS,CAAC;gCAC/B,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,QAAQ,EACrC,CAAC;gCACD,OAAO,oBAAO,CAAC,wBAAwB,CACrC,QAAQ,EACR,oBAAO,CAAC,mBAAmB,CACzB,IAAA,0BAAiB,EACf,IAAA,6BAAqB,EAAC,IAAI,EAAE,kBAAkB,CAAC,EAC/C,MAAM,EACN,kBAAkB,CACnB,CACF,CACF,CAAC;4BACJ,CAAC;4BACD,OAAO,SAAS,CAAC;wBACnB,CAAC,CAAC,EACF,IAAI,CACL,CACF,CAAC;oBACJ,CAAC;yBAAM,IACL,IAAA,iCAAoB,EAAC,IAAI,CAAC;wBAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,SAAS,EACjC,CAAC;wBACD,MAAM,aAAa,GAAG,IAAI,CAAC,WAAqC,CAAC;wBACjE,OAAO,oBAAO,CAAC,wBAAwB,CACrC,SAAS,EACT,oBAAO,CAAC,4BAA4B,CAClC;4BACE,GAAG,aAAa,CAAC,QAAQ;4BACzB,oBAAO,CAAC,oBAAoB,CAC1B,oBAAO,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,EAC9C,SAAS,EACT,EAAE,CACH;4BACD,oBAAO,CAAC,oBAAoB,CAC1B,oBAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,EACzC,SAAS,EACT,EAAE,CACH;yBACF,EACD,IAAI,CACL,CACF,CAAC;oBACJ,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC,CAAC;gBACH,OAAO,oBAAO,CAAC,6BAA6B,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;YACxE,CAAC,CACF,CAAC;YAEF,IAAA,qBAAe,EACb,IAAI,EACJ,cAAc,EACd,yBAAyB,EACzB,CAAC,IAA6B,EAAE,EAAE;gBAChC,OAAO,oBAAO,CAAC,6BAA6B,CAC1C;oBACE,oBAAO,CAAC,wBAAwB,CAC9B,QAAQ,EACR,oBAAO,CAAC,6BAA6B,CACnC;wBACE,oBAAO,CAAC,wBAAwB,CAC9B,QAAQ,EACR,oBAAO,CAAC,6BAA6B,EAAE,CACxC;qBACF,EACD,IAAI,CACL,CACF;oBACD,GAAG,IAAI,CAAC,UAAU;iBACnB,EACD,IAAI,CACL,CAAC;YACJ,CAAC,CACF,CAAC;QACJ,CAAC;QAED,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,kBAAkB,EAAE,eAAe,CAAC,EACtD,CAAC,QAAQ,EAAE,EAAE,CAAC,iCACT,QAAQ,KACX,eAAe,kCACV,QAAQ,CAAC,eAAe,KAC3B,gBAAgB,EAAE,SAAS,EAC3B,MAAM,EAAE,UAAU,OAEpB,CACH,CAAC;QACF,MAAM,wBAAwB,GAAG,IAAA,eAAQ,EACvC,IAAA,0BAAiB,EAAC,IAAI,CAAC,IAAI,EAAE,kBAAkB,CAAC,EAChD,IAAI,CAAC,IAAI,CACV,CAAC;QACF,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAC/B,wBAAwB,EACxB,MAAM,EACN,kBAAkB,EAClB,KAAK,CACN,CAAC;QACF,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,kBAAkB,EAAE,mBAAmB,CAAC,EAC1D,CAAC,QAAQ,EAAE,EAAE,CAAC,iCACT,QAAQ,KACX,eAAe,kCACV,QAAQ,CAAC,eAAe,KAC3B,MAAM,EAAE,OAAO,EACf,eAAe,EAAE,IAAA,0BAAiB,EAAC,OAAO,EAAE,0BAA0B,CAAC,EACvE,GAAG,EAAE,CAAC,KAAK,CAAC,OAEd,CACH,CAAC;QACF,IAAA,qCAA4B,EAC1B,IAAI,EACJ,IAAA,uBAAY,EAAC;YACX,+BAA+B;YAC/B,qCAAqC;YACrC,kCAAkC;YAClC,wBAAwB;SACzB,CAAC,EACF,IAAA,uBAAY,EAAC,CAAC,yBAAyB,EAAE,qBAAqB,CAAC,CAAC,CACjE,CAAC;QAEF,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE;YAC1C,6CAAqC;SACtC,CAAC,CAAC;QAEH,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;QACjC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;gBACxB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;CAAA;AACD,kBAAe,YAAY,CAAC"}
|
|
@@ -67,6 +67,7 @@ export default CognitoAuth;
|
|
|
67
67
|
|
|
68
68
|
exports[`cognito-auth generator > should generate files > identity-index 1`] = `
|
|
69
69
|
"export * from './user-identity.js';
|
|
70
|
+
export * from './app.js';
|
|
70
71
|
export * from './runtime-config.js';
|
|
71
72
|
"
|
|
72
73
|
`;
|
|
@@ -445,6 +446,7 @@ export function App() {
|
|
|
445
446
|
|
|
446
447
|
exports[`cognito-auth generator > should update shared constructs index.ts > common/constructs-index 1`] = `
|
|
447
448
|
"export * from './user-identity.js';
|
|
449
|
+
export * from './app.js';
|
|
448
450
|
export * from './runtime-config.js';
|
|
449
451
|
"
|
|
450
452
|
`;
|
|
@@ -4,5 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { Tree } from '@nx/devkit';
|
|
6
6
|
import { CognitoAuthGeneratorSchema as CognitoAuthGeneratorSchema } from './schema';
|
|
7
|
+
import { NxGeneratorInfo } from '../../utils/nx';
|
|
8
|
+
export declare const COGNITO_AUTH_GENERATOR_INFO: NxGeneratorInfo;
|
|
7
9
|
export declare function cognitoAuthGenerator(tree: Tree, options: CognitoAuthGeneratorSchema): Promise<() => void>;
|
|
8
10
|
export default cognitoAuthGenerator;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.COGNITO_AUTH_GENERATOR_INFO = void 0;
|
|
3
4
|
exports.cognitoAuthGenerator = cognitoAuthGenerator;
|
|
4
5
|
const tslib_1 = require("tslib");
|
|
5
6
|
/**
|
|
@@ -8,11 +9,15 @@ const tslib_1 = require("tslib");
|
|
|
8
9
|
*/
|
|
9
10
|
const devkit_1 = require("@nx/devkit");
|
|
10
11
|
const shared_constructs_1 = require("../../utils/shared-constructs");
|
|
12
|
+
const shared_constructs_constants_1 = require("../../utils/shared-constructs-constants");
|
|
11
13
|
const generator_1 = require("../runtime-config/generator");
|
|
12
14
|
const typescript_1 = require("typescript");
|
|
13
15
|
const versions_1 = require("../../utils/versions");
|
|
14
16
|
const ast_1 = require("../../utils/ast");
|
|
15
17
|
const format_1 = require("../../utils/format");
|
|
18
|
+
const nx_1 = require("../../utils/nx");
|
|
19
|
+
const metrics_1 = require("../../utils/metrics");
|
|
20
|
+
exports.COGNITO_AUTH_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
16
21
|
function cognitoAuthGenerator(tree, options) {
|
|
17
22
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
18
23
|
const srcRoot = (0, devkit_1.readProjectConfiguration)(tree, options.project).sourceRoot;
|
|
@@ -24,7 +29,7 @@ function cognitoAuthGenerator(tree, options) {
|
|
|
24
29
|
});
|
|
25
30
|
yield (0, shared_constructs_1.sharedConstructsGenerator)(tree);
|
|
26
31
|
// Add ICognitoProps interface and update IRuntimeConfig
|
|
27
|
-
const runtimeConfigPath = (0, devkit_1.joinPathFragments)(
|
|
32
|
+
const runtimeConfigPath = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.TYPE_DEFINITIONS_DIR, 'src', 'runtime-config.ts');
|
|
28
33
|
// Check if ICognitoProps interface exists
|
|
29
34
|
const existingCognitoProps = (0, ast_1.query)(tree, runtimeConfigPath, 'InterfaceDeclaration[name.text="ICognitoProps"]');
|
|
30
35
|
// Check if cognitoProps property exists in IRuntimeConfig
|
|
@@ -48,12 +53,12 @@ function cognitoAuthGenerator(tree, options) {
|
|
|
48
53
|
]);
|
|
49
54
|
});
|
|
50
55
|
}
|
|
51
|
-
const identityPath = (0, devkit_1.joinPathFragments)(
|
|
56
|
+
const identityPath = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'core', 'user-identity.ts');
|
|
52
57
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'app'), srcRoot, options, {
|
|
53
58
|
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
54
59
|
});
|
|
55
60
|
if (!tree.exists(identityPath)) {
|
|
56
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files',
|
|
61
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR), {
|
|
57
62
|
allowSignup: options.allowSignup,
|
|
58
63
|
cognitoDomain: options.cognitoDomain,
|
|
59
64
|
}, {
|
|
@@ -64,7 +69,7 @@ function cognitoAuthGenerator(tree, options) {
|
|
|
64
69
|
'react-oidc-context',
|
|
65
70
|
'@aws-cdk/aws-cognito-identitypool-alpha',
|
|
66
71
|
]), {});
|
|
67
|
-
(0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(
|
|
72
|
+
(0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'core', 'index.ts'), './user-identity.js');
|
|
68
73
|
}
|
|
69
74
|
const mainTsxPath = (0, devkit_1.joinPathFragments)(srcRoot, 'main.tsx');
|
|
70
75
|
(0, ast_1.addSingleImport)(tree, mainTsxPath, 'CognitoAuth', './components/CognitoAuth');
|
|
@@ -142,6 +147,7 @@ function cognitoAuthGenerator(tree, options) {
|
|
|
142
147
|
console.info(`Skipping update to ${appLayoutTsxPath} as it does not exist.`);
|
|
143
148
|
}
|
|
144
149
|
// End update App Layout
|
|
150
|
+
yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.COGNITO_AUTH_GENERATOR_INFO]);
|
|
145
151
|
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
146
152
|
return () => {
|
|
147
153
|
(0, devkit_1.installPackagesTask)(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/cognito-auth/generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/cognito-auth/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,7 +59,8 @@ export default RuntimeConfigProvider;
|
|
|
59
59
|
`;
|
|
60
60
|
|
|
61
61
|
exports[`runtime-config generator > should generate shared constructs > common/constructs-index.ts 1`] = `
|
|
62
|
-
"export * from './
|
|
62
|
+
"export * from './app.js';
|
|
63
|
+
export * from './runtime-config.js';
|
|
63
64
|
"
|
|
64
65
|
`;
|
|
65
66
|
|
|
@@ -4,5 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { Tree } from '@nx/devkit';
|
|
6
6
|
import { RuntimeConfigGeneratorSchema } from './schema';
|
|
7
|
+
import { NxGeneratorInfo } from '../../utils/nx';
|
|
8
|
+
export declare const RUNTIME_CONFIG_GENERATOR_INFO: NxGeneratorInfo;
|
|
7
9
|
export declare function runtimeConfigGenerator(tree: Tree, options: RuntimeConfigGeneratorSchema): Promise<void>;
|
|
8
10
|
export default runtimeConfigGenerator;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RUNTIME_CONFIG_GENERATOR_INFO = void 0;
|
|
3
4
|
exports.runtimeConfigGenerator = runtimeConfigGenerator;
|
|
4
5
|
const tslib_1 = require("tslib");
|
|
5
6
|
/**
|
|
@@ -12,6 +13,9 @@ const shared_constructs_1 = require("../../utils/shared-constructs");
|
|
|
12
13
|
const npm_scope_1 = require("../../utils/npm-scope");
|
|
13
14
|
const format_1 = require("../../utils/format");
|
|
14
15
|
const ast_1 = require("../../utils/ast");
|
|
16
|
+
const nx_1 = require("../../utils/nx");
|
|
17
|
+
const metrics_1 = require("../../utils/metrics");
|
|
18
|
+
exports.RUNTIME_CONFIG_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
15
19
|
function runtimeConfigGenerator(tree, options) {
|
|
16
20
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
21
|
const srcRoot = (0, devkit_1.readProjectConfiguration)(tree, options.project).sourceRoot;
|
|
@@ -45,6 +49,7 @@ function runtimeConfigGenerator(tree, options) {
|
|
|
45
49
|
if (!locatedTargetNode) {
|
|
46
50
|
throw new Error('Could not locate the RouterProvider element in main.tsx');
|
|
47
51
|
}
|
|
52
|
+
yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.RUNTIME_CONFIG_GENERATOR_INFO]);
|
|
48
53
|
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
49
54
|
});
|
|
50
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/runtime-config/generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/runtime-config/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -254,16 +254,15 @@ exports[`infra generator > should generate consistent file content across runs >
|
|
|
254
254
|
}
|
|
255
255
|
}
|
|
256
256
|
",
|
|
257
|
-
"src/main.ts": "import {
|
|
258
|
-
import {
|
|
259
|
-
import { CfnGuardValidator, RuleSet } from ':proj/common-constructs';
|
|
257
|
+
"src/main.ts": "import { ApplicationStack } from './stacks/application-stack.js';
|
|
258
|
+
import { App, CfnGuardValidator, RuleSet } from ':proj/common-constructs';
|
|
260
259
|
|
|
261
260
|
const app = new App({
|
|
262
261
|
policyValidationBeta1: [new CfnGuardValidator(RuleSet.AWS_PROTOTYPING)],
|
|
263
262
|
});
|
|
264
263
|
|
|
265
264
|
// Use this to deploy your own sandbox environment (assumes your CLI credentials)
|
|
266
|
-
new ApplicationStack(app, '
|
|
265
|
+
new ApplicationStack(app, 'proj-infra-sandbox', {
|
|
267
266
|
env: {
|
|
268
267
|
account: process.env.CDK_DEFAULT_ACCOUNT,
|
|
269
268
|
region: process.env.CDK_DEFAULT_REGION,
|
|
@@ -373,16 +372,15 @@ exports[`infra generator > should generate files with correct content > cdk-json
|
|
|
373
372
|
`;
|
|
374
373
|
|
|
375
374
|
exports[`infra generator > should generate files with correct content > main-ts 1`] = `
|
|
376
|
-
"import {
|
|
377
|
-
import {
|
|
378
|
-
import { CfnGuardValidator, RuleSet } from ':proj/common-constructs';
|
|
375
|
+
"import { ApplicationStack } from './stacks/application-stack.js';
|
|
376
|
+
import { App, CfnGuardValidator, RuleSet } from ':proj/common-constructs';
|
|
379
377
|
|
|
380
378
|
const app = new App({
|
|
381
379
|
policyValidationBeta1: [new CfnGuardValidator(RuleSet.AWS_PROTOTYPING)],
|
|
382
380
|
});
|
|
383
381
|
|
|
384
382
|
// Use this to deploy your own sandbox environment (assumes your CLI credentials)
|
|
385
|
-
new ApplicationStack(app, '
|
|
383
|
+
new ApplicationStack(app, 'proj-infra-sandbox', {
|
|
386
384
|
env: {
|
|
387
385
|
account: process.env.CDK_DEFAULT_ACCOUNT,
|
|
388
386
|
region: process.env.CDK_DEFAULT_REGION,
|
|
@@ -517,16 +515,15 @@ exports[`infra generator > should generate files with correct content > project-
|
|
|
517
515
|
}
|
|
518
516
|
}
|
|
519
517
|
",
|
|
520
|
-
"src/main.ts": "import {
|
|
521
|
-
import {
|
|
522
|
-
import { CfnGuardValidator, RuleSet } from ':proj/common-constructs';
|
|
518
|
+
"src/main.ts": "import { ApplicationStack } from './stacks/application-stack.js';
|
|
519
|
+
import { App, CfnGuardValidator, RuleSet } from ':proj/common-constructs';
|
|
523
520
|
|
|
524
521
|
const app = new App({
|
|
525
522
|
policyValidationBeta1: [new CfnGuardValidator(RuleSet.AWS_PROTOTYPING)],
|
|
526
523
|
});
|
|
527
524
|
|
|
528
525
|
// Use this to deploy your own sandbox environment (assumes your CLI credentials)
|
|
529
|
-
new ApplicationStack(app, '
|
|
526
|
+
new ApplicationStack(app, 'proj-infra-sandbox', {
|
|
530
527
|
env: {
|
|
531
528
|
account: process.env.CDK_DEFAULT_ACCOUNT,
|
|
532
529
|
region: process.env.CDK_DEFAULT_REGION,
|
|
@@ -626,16 +623,15 @@ exports[`infra generator > should generate valid CDK application code > cdk-json
|
|
|
626
623
|
`;
|
|
627
624
|
|
|
628
625
|
exports[`infra generator > should generate valid CDK application code > main-ts-content 1`] = `
|
|
629
|
-
"import {
|
|
630
|
-
import {
|
|
631
|
-
import { CfnGuardValidator, RuleSet } from ':proj/common-constructs';
|
|
626
|
+
"import { ApplicationStack } from './stacks/application-stack.js';
|
|
627
|
+
import { App, CfnGuardValidator, RuleSet } from ':proj/common-constructs';
|
|
632
628
|
|
|
633
629
|
const app = new App({
|
|
634
630
|
policyValidationBeta1: [new CfnGuardValidator(RuleSet.AWS_PROTOTYPING)],
|
|
635
631
|
});
|
|
636
632
|
|
|
637
633
|
// Use this to deploy your own sandbox environment (assumes your CLI credentials)
|
|
638
|
-
new ApplicationStack(app, '
|
|
634
|
+
new ApplicationStack(app, 'proj-infra-sandbox', {
|
|
639
635
|
env: {
|
|
640
636
|
account: process.env.CDK_DEFAULT_ACCOUNT,
|
|
641
637
|
region: process.env.CDK_DEFAULT_REGION,
|
|
@@ -731,16 +727,15 @@ exports[`infra generator > should handle custom project names correctly > custom
|
|
|
731
727
|
}
|
|
732
728
|
}
|
|
733
729
|
",
|
|
734
|
-
"src/main.ts": "import {
|
|
735
|
-
import {
|
|
736
|
-
import { CfnGuardValidator, RuleSet } from ':proj/common-constructs';
|
|
730
|
+
"src/main.ts": "import { ApplicationStack } from './stacks/application-stack.js';
|
|
731
|
+
import { App, CfnGuardValidator, RuleSet } from ':proj/common-constructs';
|
|
737
732
|
|
|
738
733
|
const app = new App({
|
|
739
734
|
policyValidationBeta1: [new CfnGuardValidator(RuleSet.AWS_PROTOTYPING)],
|
|
740
735
|
});
|
|
741
736
|
|
|
742
737
|
// Use this to deploy your own sandbox environment (assumes your CLI credentials)
|
|
743
|
-
new ApplicationStack(app, '
|
|
738
|
+
new ApplicationStack(app, 'proj-infra-sandbox', {
|
|
744
739
|
env: {
|
|
745
740
|
account: process.env.CDK_DEFAULT_ACCOUNT,
|
|
746
741
|
region: process.env.CDK_DEFAULT_REGION,
|
|
@@ -1,13 +1,12 @@
|
|
|
1
|
-
import { App } from 'aws-cdk-lib';
|
|
2
1
|
import { ApplicationStack } from './stacks/application-stack.js';
|
|
3
|
-
import { CfnGuardValidator, RuleSet } from '<%= scopeAlias %>common-constructs';
|
|
2
|
+
import { App, CfnGuardValidator, RuleSet } from '<%= scopeAlias %>common-constructs';
|
|
4
3
|
|
|
5
4
|
const app = new App({
|
|
6
5
|
policyValidationBeta1: [new CfnGuardValidator(RuleSet.<%= ruleSet %>)]
|
|
7
6
|
});
|
|
8
7
|
|
|
9
8
|
// Use this to deploy your own sandbox environment (assumes your CLI credentials)
|
|
10
|
-
new ApplicationStack(app, '<%=
|
|
9
|
+
new ApplicationStack(app, '<%= namespace %>-infra-sandbox', {
|
|
11
10
|
env: {
|
|
12
11
|
account: process.env.CDK_DEFAULT_ACCOUNT,
|
|
13
12
|
region: process.env.CDK_DEFAULT_REGION,
|
|
@@ -4,5 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { Tree, GeneratorCallback } from '@nx/devkit';
|
|
6
6
|
import { InfraGeneratorSchema } from './schema';
|
|
7
|
+
import { NxGeneratorInfo } from '../../utils/nx';
|
|
8
|
+
export declare const INFRA_APP_GENERATOR_INFO: NxGeneratorInfo;
|
|
7
9
|
export declare function infraGenerator(tree: Tree, schema: InfraGeneratorSchema): Promise<GeneratorCallback>;
|
|
8
10
|
export default infraGenerator;
|