@aws/nx-plugin 0.28.3 → 0.29.0
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/api-connection/serve-local.d.ts +15 -0
- package/src/api-connection/serve-local.js +46 -0
- package/src/api-connection/serve-local.js.map +1 -0
- package/src/cloudscape-website/app/generator.js +10 -0
- package/src/cloudscape-website/app/generator.js.map +1 -1
- package/src/cloudscape-website/cognito-auth/__snapshots__/generator.spec.ts.snap +4 -0
- package/src/cloudscape-website/cognito-auth/files/app/components/CognitoAuth/index.tsx.template +6 -0
- package/src/cloudscape-website/runtime-config/__snapshots__/generator.spec.ts.snap +22 -18
- package/src/cloudscape-website/runtime-config/files/app/components/RuntimeConfig/index.tsx.template +20 -18
- package/src/open-api/ts-client/__snapshots__/generator.arrays.spec.ts.snap +1579 -0
- package/src/open-api/ts-client/__snapshots__/generator.complex-types.spec.ts.snap +3 -15
- package/src/open-api/ts-client/__snapshots__/generator.composite-types.spec.ts.snap +5 -17
- package/src/open-api/ts-client/files/client.gen.ts.template +18 -2
- package/src/open-api/ts-hooks/files/options-proxy.gen.ts.template +1 -1
- package/src/open-api/ts-hooks/generator.spec.tsx +16 -0
- package/src/py/fast-api/generator.js +5 -1
- package/src/py/fast-api/generator.js.map +1 -1
- package/src/py/fast-api/react/generator.js +22 -1
- package/src/py/fast-api/react/generator.js.map +1 -1
- package/src/trpc/backend/files/backend/src/local-server.ts.template +1 -1
- package/src/trpc/backend/generator.js +5 -1
- package/src/trpc/backend/generator.js.map +1 -1
- package/src/trpc/react/__snapshots__/generator.spec.ts.snap +4 -0
- package/src/trpc/react/generator.js +7 -1
- package/src/trpc/react/generator.js.map +1 -1
- package/src/utils/files/website/hooks/sigv4/useSigV4.tsx.template +4 -0
- package/src/utils/port.d.ts +12 -0
- package/src/utils/port.js +23 -0
- package/src/utils/port.js.map +1 -0
package/package.json
CHANGED
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
import { Tree } from '@nx/devkit';
|
|
6
|
+
export interface ServeLocalOptions {
|
|
7
|
+
apiName: string;
|
|
8
|
+
url: string;
|
|
9
|
+
additionalDependencyTargets?: string[];
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Adds the given target project to the source project's serve-local target
|
|
13
|
+
* Updates the runtime config provider (if it exists)
|
|
14
|
+
*/
|
|
15
|
+
export declare const addTargetToServeLocal: (tree: Tree, sourceProjectName: string, targetProjectName: string, options: ServeLocalOptions) => void;
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addTargetToServeLocal = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
6
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
7
|
+
*/
|
|
8
|
+
const devkit_1 = require("@nx/devkit");
|
|
9
|
+
const ast_1 = require("../utils/ast");
|
|
10
|
+
const typescript_1 = require("typescript");
|
|
11
|
+
const nx_1 = require("../utils/nx");
|
|
12
|
+
const names_1 = require("../utils/names");
|
|
13
|
+
/**
|
|
14
|
+
* Adds the given target project to the source project's serve-local target
|
|
15
|
+
* Updates the runtime config provider (if it exists)
|
|
16
|
+
*/
|
|
17
|
+
const addTargetToServeLocal = (tree, sourceProjectName, targetProjectName, options) => {
|
|
18
|
+
var _a, _b, _c, _d, _e;
|
|
19
|
+
const sourceProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, sourceProjectName);
|
|
20
|
+
const targetProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, targetProjectName);
|
|
21
|
+
// Target project must have a serve target which is continuous
|
|
22
|
+
if (!(((_b = (_a = targetProject.targets) === null || _a === void 0 ? void 0 : _a.serve) === null || _b === void 0 ? void 0 : _b.continuous) &&
|
|
23
|
+
((_c = sourceProject.targets) === null || _c === void 0 ? void 0 : _c['serve-local']))) {
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
// Add a dependency on the serve target
|
|
27
|
+
sourceProject.targets['serve-local'].dependsOn = [
|
|
28
|
+
...((_d = sourceProject.targets['serve-local'].dependsOn) !== null && _d !== void 0 ? _d : []),
|
|
29
|
+
{
|
|
30
|
+
projects: [targetProject.name],
|
|
31
|
+
target: 'serve',
|
|
32
|
+
},
|
|
33
|
+
...((_e = options.additionalDependencyTargets) !== null && _e !== void 0 ? _e : []),
|
|
34
|
+
];
|
|
35
|
+
(0, devkit_1.updateProjectConfiguration)(tree, sourceProject.name, sourceProject);
|
|
36
|
+
// Add an override to runtime-config.json for the serve-local target to use the local url
|
|
37
|
+
const runtimeConfigProvider = (0, devkit_1.joinPathFragments)(sourceProject.root, 'src', 'components', 'RuntimeConfig', 'index.tsx');
|
|
38
|
+
if (tree.exists(runtimeConfigProvider)) {
|
|
39
|
+
(0, ast_1.replaceIfExists)(tree, runtimeConfigProvider, 'VariableDeclaration[name.name="applyOverrides"] IfStatement:has(StringLiteral[text="serve-local"]) Block', (block) => typescript_1.factory.createBlock([
|
|
40
|
+
...block.statements,
|
|
41
|
+
typescript_1.factory.createExpressionStatement(typescript_1.factory.createAssignment(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('runtimeConfig'), 'apis'), (0, names_1.toClassName)(options.apiName)), typescript_1.factory.createStringLiteral(options.url, true))),
|
|
42
|
+
]));
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
exports.addTargetToServeLocal = addTargetToServeLocal;
|
|
46
|
+
//# sourceMappingURL=serve-local.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serve-local.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/api-connection/serve-local.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAIoB;AACpB,sCAA+C;AAC/C,2CAA4C;AAC5C,oCAAkE;AAClE,0CAA6C;AAQ7C;;;GAGG;AACI,MAAM,qBAAqB,GAAG,CACnC,IAAU,EACV,iBAAyB,EACzB,iBAAyB,EACzB,OAA0B,EAC1B,EAAE;;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,iBAAiB,CAClB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,iBAAiB,CAClB,CAAC;IAEF,8DAA8D;IAC9D,IACE,CAAC,CACC,CAAA,MAAA,MAAA,aAAa,CAAC,OAAO,0CAAE,KAAK,0CAAE,UAAU;SACxC,MAAA,aAAa,CAAC,OAAO,0CAAG,aAAa,CAAC,CAAA,CACvC,EACD,CAAC;QACD,OAAO;IACT,CAAC;IAED,uCAAuC;IACvC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,SAAS,GAAG;QAC/C,GAAG,CAAC,MAAA,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,SAAS,mCAAI,EAAE,CAAC;QACzD;YACE,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;YAC9B,MAAM,EAAE,OAAO;SAChB;QACD,GAAG,CAAC,MAAA,OAAO,CAAC,2BAA2B,mCAAI,EAAE,CAAC;KAC/C,CAAC;IACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAEpE,yFAAyF;IACzF,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAC7C,aAAa,CAAC,IAAI,EAClB,KAAK,EACL,YAAY,EACZ,eAAe,EACf,WAAW,CACZ,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACvC,IAAA,qBAAe,EACb,IAAI,EACJ,qBAAqB,EACrB,0GAA0G,EAC1G,CAAC,KAAY,EAAE,EAAE,CACf,oBAAO,CAAC,WAAW,CAAC;YAClB,GAAG,KAAK,CAAC,UAAU;YACnB,oBAAO,CAAC,yBAAyB,CAC/B,oBAAO,CAAC,gBAAgB,CACtB,oBAAO,CAAC,8BAA8B,CACpC,oBAAO,CAAC,8BAA8B,CACpC,oBAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,EACzC,MAAM,CACP,EACD,IAAA,mBAAW,EAAC,OAAO,CAAC,OAAO,CAAC,CAC7B,EACD,oBAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAC/C,CACF;SACF,CAAC,CACL,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAnEW,QAAA,qBAAqB,yBAmEhC"}
|
|
@@ -71,6 +71,16 @@ function tsCloudScapeWebsiteGenerator(tree, schema) {
|
|
|
71
71
|
outputPath: (0, devkit_1.joinPathFragments)('dist', websiteContentPath, 'bundle'),
|
|
72
72
|
},
|
|
73
73
|
};
|
|
74
|
+
// Add a serve-local target for running the website and its dependencies locally
|
|
75
|
+
targets['serve-local'] = {
|
|
76
|
+
executor: '@nx/vite:dev-server',
|
|
77
|
+
options: {
|
|
78
|
+
buildTarget: `${fullyQualifiedName}:build:development`,
|
|
79
|
+
hmr: true,
|
|
80
|
+
mode: 'serve-local',
|
|
81
|
+
},
|
|
82
|
+
continuous: true,
|
|
83
|
+
};
|
|
74
84
|
projectConfiguration.targets = (0, object_1.sortObjectKeys)(targets);
|
|
75
85
|
(0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfiguration);
|
|
76
86
|
(0, nx_1.addGeneratorMetadata)(tree, projectConfiguration.name, exports.CLOUDSCAPE_WEBSITE_APP_GENERATOR_INFO);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/app/generator.ts"],"names":[],"mappings":";;;AAwDA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/app/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,10 @@ const CognitoAuth: React.FC<PropsWithChildren> = ({ children }) => {
|
|
|
16
16
|
const { cognitoProps } = useRuntimeConfig();
|
|
17
17
|
|
|
18
18
|
if (!cognitoProps) {
|
|
19
|
+
if (import.meta.env.MODE === 'serve-local') {
|
|
20
|
+
// In serve-local mode with no cognitoProps available, we skip login
|
|
21
|
+
return <AuthProvider>{children}</AuthProvider>;
|
|
22
|
+
}
|
|
19
23
|
return (
|
|
20
24
|
<Alert type="error" header="Runtime config configuration error">
|
|
21
25
|
The cognitoProps have not been configured in the runtime-config.json.
|
package/src/cloudscape-website/cognito-auth/files/app/components/CognitoAuth/index.tsx.template
CHANGED
|
@@ -13,6 +13,12 @@ const CognitoAuth: React.FC<PropsWithChildren> = ({ children }) => {
|
|
|
13
13
|
const { cognitoProps } = useRuntimeConfig();
|
|
14
14
|
|
|
15
15
|
if (!cognitoProps) {
|
|
16
|
+
if (import.meta.env.MODE === 'serve-local') {
|
|
17
|
+
// In serve-local mode with no cognitoProps available, we skip login
|
|
18
|
+
return (
|
|
19
|
+
<AuthProvider>{children}</AuthProvider>
|
|
20
|
+
);
|
|
21
|
+
}
|
|
16
22
|
return (
|
|
17
23
|
<Alert
|
|
18
24
|
type="error"
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
|
|
2
2
|
|
|
3
3
|
exports[`runtime-config generator > should generate runtime config files > runtime-config-component.tsx 1`] = `
|
|
4
|
-
"import {
|
|
4
|
+
"import { Spinner } from '@cloudscape-design/components';
|
|
5
5
|
import React, {
|
|
6
6
|
createContext,
|
|
7
7
|
PropsWithChildren,
|
|
@@ -17,6 +17,17 @@ export const RuntimeConfigContext = createContext<IRuntimeConfig | undefined>(
|
|
|
17
17
|
undefined,
|
|
18
18
|
);
|
|
19
19
|
|
|
20
|
+
/**
|
|
21
|
+
* Apply any overrides to point to local servers/resources here
|
|
22
|
+
* for the serve-local target
|
|
23
|
+
*/
|
|
24
|
+
const applyOverrides = (runtimeConfig: IRuntimeConfig) => {
|
|
25
|
+
if (import.meta.env.MODE === 'serve-local') {
|
|
26
|
+
// Add local server urls here
|
|
27
|
+
}
|
|
28
|
+
return runtimeConfig;
|
|
29
|
+
};
|
|
30
|
+
|
|
20
31
|
/**
|
|
21
32
|
* Sets up the runtimeConfig.
|
|
22
33
|
*
|
|
@@ -26,26 +37,19 @@ const RuntimeConfigProvider: React.FC<PropsWithChildren> = ({ children }) => {
|
|
|
26
37
|
const [runtimeConfig, setRuntimeConfig] = useState<
|
|
27
38
|
IRuntimeConfig | undefined
|
|
28
39
|
>();
|
|
29
|
-
const [error, setError] = useState<string | undefined>();
|
|
30
|
-
|
|
31
40
|
useEffect(() => {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
});
|
|
41
|
+
(async () => {
|
|
42
|
+
try {
|
|
43
|
+
setRuntimeConfig(
|
|
44
|
+
applyOverrides(await (await fetch('/runtime-config.json')).json()),
|
|
45
|
+
);
|
|
46
|
+
} catch {
|
|
47
|
+
setRuntimeConfig(applyOverrides({ apis: {} } as any));
|
|
48
|
+
}
|
|
49
|
+
})();
|
|
42
50
|
}, [setRuntimeConfig]);
|
|
43
51
|
|
|
44
|
-
return
|
|
45
|
-
<Alert type="error" header="Validation error">
|
|
46
|
-
{error}
|
|
47
|
-
</Alert>
|
|
48
|
-
) : runtimeConfig ? (
|
|
52
|
+
return runtimeConfig ? (
|
|
49
53
|
<RuntimeConfigContext.Provider value={runtimeConfig}>
|
|
50
54
|
{children}
|
|
51
55
|
</RuntimeConfigContext.Provider>
|
package/src/cloudscape-website/runtime-config/files/app/components/RuntimeConfig/index.tsx.template
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Spinner } from '@cloudscape-design/components';
|
|
2
2
|
import React, { createContext, PropsWithChildren, useEffect, useState } from 'react';
|
|
3
3
|
import type { IRuntimeConfig } from '<%= scopeAlias %>common-types';
|
|
4
4
|
|
|
@@ -7,6 +7,17 @@ import type { IRuntimeConfig } from '<%= scopeAlias %>common-types';
|
|
|
7
7
|
*/
|
|
8
8
|
export const RuntimeConfigContext = createContext<IRuntimeConfig | undefined>(undefined);
|
|
9
9
|
|
|
10
|
+
/**
|
|
11
|
+
* Apply any overrides to point to local servers/resources here
|
|
12
|
+
* for the serve-local target
|
|
13
|
+
*/
|
|
14
|
+
const applyOverrides = (runtimeConfig: IRuntimeConfig) => {
|
|
15
|
+
if (import.meta.env.MODE === 'serve-local') {
|
|
16
|
+
// Add local server urls here
|
|
17
|
+
}
|
|
18
|
+
return runtimeConfig;
|
|
19
|
+
};
|
|
20
|
+
|
|
10
21
|
/**
|
|
11
22
|
* Sets up the runtimeConfig.
|
|
12
23
|
*
|
|
@@ -16,26 +27,17 @@ const RuntimeConfigProvider: React.FC<PropsWithChildren> = ({ children }) => {
|
|
|
16
27
|
const [runtimeConfig, setRuntimeConfig] = useState<
|
|
17
28
|
IRuntimeConfig | undefined
|
|
18
29
|
>();
|
|
19
|
-
const [error, setError] = useState<string | undefined>();
|
|
20
|
-
|
|
21
30
|
useEffect(() => {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
.catch(() => {
|
|
30
|
-
setError('No runtime-config.json detected');
|
|
31
|
-
});
|
|
31
|
+
(async () => {
|
|
32
|
+
try {
|
|
33
|
+
setRuntimeConfig(applyOverrides(await (await fetch('/runtime-config.json')).json()));
|
|
34
|
+
} catch {
|
|
35
|
+
setRuntimeConfig(applyOverrides({ apis: {} } as any));
|
|
36
|
+
}
|
|
37
|
+
})();
|
|
32
38
|
}, [setRuntimeConfig]);
|
|
33
39
|
|
|
34
|
-
return
|
|
35
|
-
<Alert type="error" header="Validation error">
|
|
36
|
-
{error}
|
|
37
|
-
</Alert>
|
|
38
|
-
) : runtimeConfig ? (
|
|
40
|
+
return runtimeConfig ? (
|
|
39
41
|
<RuntimeConfigContext.Provider value={runtimeConfig}>
|
|
40
42
|
{children}
|
|
41
43
|
</RuntimeConfigContext.Provider>
|