@aws/nx-plugin 1.0.0-rc.1 → 1.0.0-rc.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.
- package/generators.json +10 -5
- package/package.json +1 -1
- package/src/py/api/schema.d.ts +1 -1
- package/src/py/api/schema.json +2 -2
- package/src/py/fast-api/generator.js +48 -36
- package/src/py/fast-api/generator.js.map +1 -1
- package/src/py/fast-api/schema.d.ts +1 -1
- package/src/py/fast-api/schema.json +2 -2
- package/src/py/lambda-function/generator.js +19 -16
- package/src/py/lambda-function/generator.js.map +1 -1
- package/src/py/lambda-function/schema.d.ts +3 -0
- package/src/py/lambda-function/schema.json +8 -0
- package/src/smithy/ts/api/generator.js +71 -54
- package/src/smithy/ts/api/generator.js.map +1 -1
- package/src/smithy/ts/api/schema.d.ts +1 -1
- package/src/smithy/ts/api/schema.json +1 -1
- package/src/trpc/backend/generator.js +56 -38
- package/src/trpc/backend/generator.js.map +1 -1
- package/src/trpc/backend/schema.d.ts +1 -1
- package/src/trpc/backend/schema.json +2 -2
- package/src/ts/api/generator.js +3 -1
- package/src/ts/api/generator.js.map +1 -1
- package/src/ts/api/schema.d.ts +1 -1
- package/src/ts/api/schema.json +1 -1
- package/src/ts/lambda-function/generator.js +26 -21
- package/src/ts/lambda-function/generator.js.map +1 -1
- package/src/ts/lambda-function/schema.d.ts +3 -0
- package/src/ts/lambda-function/schema.json +8 -0
- package/src/ts/rdb/generator.js +73 -55
- package/src/ts/rdb/generator.js.map +1 -1
- package/src/ts/rdb/schema.d.ts +1 -1
- package/src/ts/rdb/schema.json +1 -1
- package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap +4 -2
- package/src/ts/react-website/app/generator.js +81 -75
- package/src/ts/react-website/app/generator.js.map +1 -1
- package/src/ts/react-website/app/schema.d.ts +3 -0
- package/src/ts/website/app/schema.d.ts +2 -0
- package/src/ts/website/app/schema.json +8 -0
|
@@ -41,26 +41,30 @@ async function tsReactWebsiteGenerator(tree, schema) {
|
|
|
41
41
|
const fullyQualifiedName = `${npmScopePrefix}${websiteNameKebabCase}`;
|
|
42
42
|
// NB: interactive nx generator cli can pass empty string
|
|
43
43
|
const websiteContentPath = (0, devkit_1.joinPathFragments)(schema.directory || '.', schema.subDirectory || websiteNameKebabCase);
|
|
44
|
+
const projectAlreadyExists = tree.exists((0, devkit_1.joinPathFragments)(websiteContentPath, 'project.json'));
|
|
44
45
|
// TODO: consider exposing and supporting e2e tests
|
|
45
46
|
const e2eTestRunner = 'none';
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
47
|
+
if (!projectAlreadyExists) {
|
|
48
|
+
await (0, react_1.applicationGenerator)(tree, {
|
|
49
|
+
...schema,
|
|
50
|
+
name: fullyQualifiedName,
|
|
51
|
+
directory: websiteContentPath,
|
|
52
|
+
routing: false,
|
|
53
|
+
e2eTestRunner,
|
|
54
|
+
linter: 'eslint',
|
|
55
|
+
bundler: 'vite',
|
|
56
|
+
unitTestRunner: 'vitest',
|
|
57
|
+
useProjectJson: true,
|
|
58
|
+
style: 'css',
|
|
59
|
+
});
|
|
60
|
+
// Replace with simpler sample source code
|
|
61
|
+
tree.delete((0, devkit_1.joinPathFragments)(websiteContentPath, 'src'));
|
|
62
|
+
}
|
|
60
63
|
const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
|
|
61
64
|
const targets = projectConfiguration.targets;
|
|
62
|
-
|
|
63
|
-
|
|
65
|
+
const infra = schema.infra ?? 'cloudfront-s3';
|
|
66
|
+
// Configure load:runtime-config target based on IaC provider (only when infra is not none)
|
|
67
|
+
const iac = infra !== 'none' ? await (0, iac_1.resolveIac)(tree, schema.iac) : undefined;
|
|
64
68
|
if (iac === 'cdk') {
|
|
65
69
|
targets['load:runtime-config'] = {
|
|
66
70
|
executor: 'nx:run-commands',
|
|
@@ -88,60 +92,60 @@ async function tsReactWebsiteGenerator(tree, schema) {
|
|
|
88
92
|
},
|
|
89
93
|
};
|
|
90
94
|
}
|
|
91
|
-
|
|
92
|
-
|
|
95
|
+
if (!projectAlreadyExists) {
|
|
96
|
+
const buildTarget = targets['build'];
|
|
97
|
+
targets['compile'] = {
|
|
98
|
+
dependsOn: ['bundle'],
|
|
99
|
+
executor: 'nx:run-commands',
|
|
100
|
+
outputs: ['{workspaceRoot}/dist/{projectRoot}/tsc'],
|
|
101
|
+
options: {
|
|
102
|
+
command: 'tsc --build tsconfig.app.json',
|
|
103
|
+
cwd: '{projectRoot}',
|
|
104
|
+
},
|
|
105
|
+
};
|
|
106
|
+
targets['bundle'] = {
|
|
107
|
+
...buildTarget,
|
|
108
|
+
options: {
|
|
109
|
+
...buildTarget.options,
|
|
110
|
+
outputPath: 'dist/{projectRoot}/bundle',
|
|
111
|
+
},
|
|
112
|
+
};
|
|
113
|
+
targets['build'] = {
|
|
114
|
+
dependsOn: [
|
|
115
|
+
'lint',
|
|
116
|
+
'compile',
|
|
117
|
+
'bundle',
|
|
118
|
+
'test',
|
|
119
|
+
...(buildTarget.dependsOn ?? []),
|
|
120
|
+
],
|
|
121
|
+
options: {
|
|
122
|
+
outputPath: 'dist/{projectRoot}/bundle',
|
|
123
|
+
},
|
|
124
|
+
};
|
|
125
|
+
targets['test'] = {
|
|
126
|
+
...targets['test'],
|
|
127
|
+
options: {
|
|
128
|
+
...(targets['test']?.options ?? {}),
|
|
129
|
+
reportsDirectory: '{workspaceRoot}/coverage/{projectRoot}',
|
|
130
|
+
},
|
|
131
|
+
};
|
|
132
|
+
// Add a serve-local target for running the website and its dependencies locally
|
|
133
|
+
targets['serve-local'] = {
|
|
134
|
+
executor: '@nx/vite:dev-server',
|
|
135
|
+
options: {
|
|
136
|
+
buildTarget: `${fullyQualifiedName}:build:development`,
|
|
137
|
+
hmr: true,
|
|
138
|
+
mode: 'serve-local',
|
|
139
|
+
},
|
|
140
|
+
continuous: true,
|
|
141
|
+
};
|
|
93
142
|
}
|
|
94
|
-
const buildTarget = targets['build'];
|
|
95
|
-
targets['compile'] = {
|
|
96
|
-
dependsOn: ['bundle'],
|
|
97
|
-
executor: 'nx:run-commands',
|
|
98
|
-
outputs: ['{workspaceRoot}/dist/{projectRoot}/tsc'],
|
|
99
|
-
options: {
|
|
100
|
-
command: 'tsc --build tsconfig.app.json',
|
|
101
|
-
cwd: '{projectRoot}',
|
|
102
|
-
},
|
|
103
|
-
};
|
|
104
|
-
targets['bundle'] = {
|
|
105
|
-
...buildTarget,
|
|
106
|
-
options: {
|
|
107
|
-
...buildTarget.options,
|
|
108
|
-
outputPath: 'dist/{projectRoot}/bundle',
|
|
109
|
-
},
|
|
110
|
-
};
|
|
111
|
-
targets['build'] = {
|
|
112
|
-
dependsOn: [
|
|
113
|
-
'lint',
|
|
114
|
-
'compile',
|
|
115
|
-
'bundle',
|
|
116
|
-
'test',
|
|
117
|
-
...(buildTarget.dependsOn ?? []),
|
|
118
|
-
],
|
|
119
|
-
options: {
|
|
120
|
-
outputPath: 'dist/{projectRoot}/bundle',
|
|
121
|
-
},
|
|
122
|
-
};
|
|
123
|
-
targets['test'] = {
|
|
124
|
-
...targets['test'],
|
|
125
|
-
options: {
|
|
126
|
-
...(targets['test']?.options ?? {}),
|
|
127
|
-
reportsDirectory: '{workspaceRoot}/coverage/{projectRoot}',
|
|
128
|
-
},
|
|
129
|
-
};
|
|
130
|
-
// Add a serve-local target for running the website and its dependencies locally
|
|
131
|
-
targets['serve-local'] = {
|
|
132
|
-
executor: '@nx/vite:dev-server',
|
|
133
|
-
options: {
|
|
134
|
-
buildTarget: `${fullyQualifiedName}:build:development`,
|
|
135
|
-
hmr: true,
|
|
136
|
-
mode: 'serve-local',
|
|
137
|
-
},
|
|
138
|
-
continuous: true,
|
|
139
|
-
};
|
|
140
143
|
projectConfiguration.targets = (0, object_1.sortObjectKeys)(targets);
|
|
141
144
|
(0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfiguration);
|
|
142
145
|
(0, nx_1.addGeneratorMetadata)(tree, projectConfiguration.name, exports.REACT_WEBSITE_APP_GENERATOR_INFO, {
|
|
143
146
|
ux,
|
|
144
147
|
framework: 'react',
|
|
148
|
+
infra,
|
|
145
149
|
});
|
|
146
150
|
await (0, ts_project_utils_1.configureTsProject)(tree, {
|
|
147
151
|
dir: websiteContentPath,
|
|
@@ -150,17 +154,19 @@ async function tsReactWebsiteGenerator(tree, schema) {
|
|
|
150
154
|
if (ux === 'shadcn') {
|
|
151
155
|
await (0, shared_shadcn_1.sharedShadcnGenerator)(tree);
|
|
152
156
|
}
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
157
|
+
if (iac) {
|
|
158
|
+
await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
|
|
159
|
+
iac,
|
|
160
|
+
});
|
|
161
|
+
await (0, website_constructs_1.addWebsiteInfra)(tree, {
|
|
162
|
+
iac,
|
|
163
|
+
websiteProjectName: fullyQualifiedName,
|
|
164
|
+
scopeAlias,
|
|
165
|
+
websiteContentPath: (0, devkit_1.joinPathFragments)('dist', websiteContentPath),
|
|
166
|
+
websiteNameKebabCase,
|
|
167
|
+
websiteNameClassName,
|
|
168
|
+
});
|
|
169
|
+
}
|
|
164
170
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
|
|
165
171
|
const libraryRoot = projectConfig.root;
|
|
166
172
|
const sharedShadcnStylesImport = (0, path_1.relative)((0, devkit_1.joinPathFragments)(libraryRoot, 'src'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_SHADCN_DIR, 'src', 'styles', 'globals.css'))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/app/generator.ts"],"names":[],"mappings":";;;AAyDA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/app/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,8 @@
|
|
|
5
5
|
import { IacOption } from '../../../utils/iac';
|
|
6
6
|
import { UxOption } from './generator';
|
|
7
7
|
|
|
8
|
+
export type WebsiteInfraOption = 'cloudfront-s3' | 'none';
|
|
9
|
+
|
|
8
10
|
export interface TsReactWebsiteGeneratorSchema {
|
|
9
11
|
name: string;
|
|
10
12
|
directory?: string;
|
|
@@ -13,5 +15,6 @@ export interface TsReactWebsiteGeneratorSchema {
|
|
|
13
15
|
tanstackRouter?: boolean;
|
|
14
16
|
tailwind?: boolean;
|
|
15
17
|
ux?: UxOption;
|
|
18
|
+
infra?: WebsiteInfraOption;
|
|
16
19
|
iac: IacOption;
|
|
17
20
|
}
|
|
@@ -6,6 +6,7 @@ import { IacOption } from '../../../utils/iac';
|
|
|
6
6
|
import { UxOption } from '../../react-website/app/generator';
|
|
7
7
|
|
|
8
8
|
export type WebsiteFramework = 'react';
|
|
9
|
+
export type WebsiteInfraOption = 'cloudfront-s3' | 'none';
|
|
9
10
|
|
|
10
11
|
export interface TsWebsiteGeneratorSchema {
|
|
11
12
|
name: string;
|
|
@@ -16,5 +17,6 @@ export interface TsWebsiteGeneratorSchema {
|
|
|
16
17
|
tanstackRouter?: boolean;
|
|
17
18
|
tailwind?: boolean;
|
|
18
19
|
ux?: UxOption;
|
|
20
|
+
infra?: WebsiteInfraOption;
|
|
19
21
|
iac: IacOption;
|
|
20
22
|
}
|
|
@@ -83,6 +83,14 @@
|
|
|
83
83
|
"x-priority": "important",
|
|
84
84
|
"x-prompt": "Would you like to enable Tanstack Router for type-safe routing?"
|
|
85
85
|
},
|
|
86
|
+
"infra": {
|
|
87
|
+
"type": "string",
|
|
88
|
+
"description": "The type of infrastructure to deploy your website with.",
|
|
89
|
+
"enum": ["cloudfront-s3", "none"],
|
|
90
|
+
"default": "cloudfront-s3",
|
|
91
|
+
"x-priority": "important",
|
|
92
|
+
"x-prompt": "What infrastructure would you like to deploy your website with?"
|
|
93
|
+
},
|
|
86
94
|
"iac": {
|
|
87
95
|
"type": "string",
|
|
88
96
|
"description": "The preferred IaC provider. By default this is inherited from your initial selection.",
|