@aws/nx-plugin 0.88.0 → 0.89.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/LICENSE-THIRD-PARTY +688 -54
- package/bin/aws-nx-mcp.js +3 -4
- package/bin/aws-nx-mcp.js.map +1 -1
- package/package.json +2 -2
- package/src/connection/generator.js +20 -26
- package/src/connection/generator.js.map +1 -1
- package/src/connection/serve-local.js +7 -9
- package/src/connection/serve-local.js.map +1 -1
- package/src/infra/app/generator.js +152 -143
- package/src/infra/app/generator.js.map +1 -1
- package/src/license/config.js +90 -79
- package/src/license/config.js.map +1 -1
- package/src/license/generator.js +20 -15
- package/src/license/generator.js.map +1 -1
- package/src/license/sync/generator.js +71 -77
- package/src/license/sync/generator.js.map +1 -1
- package/src/license/sync/project-file-sync.js +13 -6
- package/src/license/sync/project-file-sync.js.map +1 -1
- package/src/mcp-server/generator-info.js +28 -34
- package/src/mcp-server/generator-info.js.map +1 -1
- package/src/mcp-server/index.js +3 -4
- package/src/mcp-server/index.js.map +1 -1
- package/src/mcp-server/tools/general-guidance.js +8 -11
- package/src/mcp-server/tools/general-guidance.js.map +1 -1
- package/src/mcp-server/tools/generator-guide.js +3 -4
- package/src/mcp-server/tools/generator-guide.js.map +1 -1
- package/src/open-api/ts-client/generator.js +8 -8
- package/src/open-api/ts-client/generator.js.map +1 -1
- package/src/open-api/ts-hooks/generator.js +4 -4
- package/src/open-api/ts-hooks/generator.js.map +1 -1
- package/src/open-api/ts-metadata/generator.js +4 -4
- package/src/open-api/ts-metadata/generator.js.map +1 -1
- package/src/open-api/utils/codegen-data/languages.js +1 -2
- package/src/open-api/utils/codegen-data/languages.js.map +1 -1
- package/src/open-api/utils/codegen-data.js +90 -92
- package/src/open-api/utils/codegen-data.js.map +1 -1
- package/src/open-api/utils/normalise.js +34 -34
- package/src/open-api/utils/normalise.js.map +1 -1
- package/src/open-api/utils/parse.js +3 -3
- package/src/open-api/utils/parse.js.map +1 -1
- package/src/open-api/utils/refs.js +1 -1
- package/src/open-api/utils/refs.js.map +1 -1
- package/src/preset/__snapshots__/generator.spec.ts.snap +2 -1
- package/src/preset/generator.js +51 -24
- package/src/preset/generator.js.map +1 -1
- package/src/py/fast-api/generator.js +18 -13
- package/src/py/fast-api/generator.js.map +1 -1
- package/src/py/fast-api/react/generator.js +8 -10
- package/src/py/fast-api/react/generator.js.map +1 -1
- package/src/py/fast-api/react/open-api.js +15 -7
- package/src/py/fast-api/react/open-api.js.map +1 -1
- package/src/py/lambda-function/generator.js +18 -16
- package/src/py/lambda-function/generator.js.map +1 -1
- package/src/py/mcp-server/generator.js +36 -24
- package/src/py/mcp-server/generator.js.map +1 -1
- package/src/py/project/generator.js +36 -24
- package/src/py/project/generator.js.map +1 -1
- package/src/py/strands-agent/generator.js +21 -16
- package/src/py/strands-agent/generator.js.map +1 -1
- package/src/py/strands-agent/mcp-connection/generator.js +30 -32
- package/src/py/strands-agent/mcp-connection/generator.js.map +1 -1
- package/src/smithy/project/generator.js +6 -8
- package/src/smithy/project/generator.js.map +1 -1
- package/src/smithy/react-connection/generator.js +14 -17
- package/src/smithy/react-connection/generator.js.map +1 -1
- package/src/smithy/ts/api/generator.js +17 -11
- package/src/smithy/ts/api/generator.js.map +1 -1
- package/src/terraform/project/generator.js +191 -189
- package/src/terraform/project/generator.js.map +1 -1
- package/src/trpc/backend/generator.js +95 -83
- package/src/trpc/backend/generator.js.map +1 -1
- package/src/trpc/react/__snapshots__/generator.spec.ts.snap +12 -9
- package/src/trpc/react/files/src/components/__apiNameClassName__ClientProvider.tsx.template +1 -1
- package/src/trpc/react/files/src/hooks/use__apiNameClassName__.tsx.template +3 -3
- package/src/trpc/react/generator.js +75 -76
- package/src/trpc/react/generator.js.map +1 -1
- package/src/ts/lambda-function/generator.js +15 -12
- package/src/ts/lambda-function/generator.js.map +1 -1
- package/src/ts/lib/eslint.js +19 -8
- package/src/ts/lib/eslint.js.map +1 -1
- package/src/ts/lib/generator.js +44 -19
- package/src/ts/lib/generator.js.map +1 -1
- package/src/ts/lib/ts-project-utils.js +53 -30
- package/src/ts/lib/ts-project-utils.js.map +1 -1
- package/src/ts/lib/vitest.js +13 -3
- package/src/ts/lib/vitest.js.map +1 -1
- package/src/ts/mcp-server/generator.js +22 -17
- package/src/ts/mcp-server/generator.js.map +1 -1
- package/src/ts/nx-generator/generator.js +40 -31
- package/src/ts/nx-generator/generator.js.map +1 -1
- package/src/ts/nx-plugin/generator.js +14 -11
- package/src/ts/nx-plugin/generator.js.map +1 -1
- package/src/ts/nx-plugin/utils.js +11 -10
- package/src/ts/nx-plugin/utils.js.map +1 -1
- package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap +4 -6
- package/src/ts/react-website/app/generator.js +291 -253
- package/src/ts/react-website/app/generator.js.map +1 -1
- package/src/ts/react-website/cognito-auth/__snapshots__/generator.spec.ts.snap +1 -5
- package/src/ts/react-website/cognito-auth/generator.js +86 -90
- package/src/ts/react-website/cognito-auth/generator.js.map +1 -1
- package/src/ts/react-website/cognito-auth/utils.js +14 -21
- package/src/ts/react-website/cognito-auth/utils.js.map +1 -1
- package/src/ts/react-website/runtime-config/generator.js +33 -30
- package/src/ts/react-website/runtime-config/generator.js.map +1 -1
- package/src/ts/strands-agent/generator.js +18 -13
- package/src/ts/strands-agent/generator.js.map +1 -1
- package/src/ts/strands-agent/mcp-connection/generator.js +15 -17
- package/src/ts/strands-agent/mcp-connection/generator.js.map +1 -1
- package/src/ts/sync/generator.js +36 -14
- package/src/ts/sync/generator.js.map +1 -1
- package/src/utils/agent-connection/agent-connection.js +62 -68
- package/src/utils/agent-connection/agent-connection.js.map +1 -1
- package/src/utils/agent-core-constructs/agent-core-constructs.js +14 -16
- package/src/utils/agent-core-constructs/agent-core-constructs.js.map +1 -1
- package/src/utils/api-constructs/api-constructs.js +8 -10
- package/src/utils/api-constructs/api-constructs.js.map +1 -1
- package/src/utils/api-constructs/open-api-metadata.js +1 -2
- package/src/utils/api-constructs/open-api-metadata.js.map +1 -1
- package/src/utils/ast/website.js +3 -4
- package/src/utils/ast/website.js.map +1 -1
- package/src/utils/ast.js +20 -23
- package/src/utils/ast.js.map +1 -1
- package/src/utils/bundle/bundle.js +14 -14
- package/src/utils/bundle/bundle.js.map +1 -1
- package/src/utils/config/utils.js +9 -9
- package/src/utils/config/utils.js.map +1 -1
- package/src/utils/connection/open-api/react.js +28 -23
- package/src/utils/connection/open-api/react.js.map +1 -1
- package/src/utils/format.js +50 -47
- package/src/utils/format.js.map +1 -1
- package/src/utils/fs.js +1 -0
- package/src/utils/fs.js.map +1 -1
- package/src/utils/function-constructs/function-constructs.js +16 -12
- package/src/utils/function-constructs/function-constructs.js.map +1 -1
- package/src/utils/git.js +2 -3
- package/src/utils/git.js.map +1 -1
- package/src/utils/iac.js +4 -6
- package/src/utils/iac.js.map +1 -1
- package/src/utils/identity-constructs/identity-constructs.js +6 -7
- package/src/utils/identity-constructs/identity-constructs.js.map +1 -1
- package/src/utils/js.js +7 -8
- package/src/utils/js.js.map +1 -1
- package/src/utils/metrics.js +12 -13
- package/src/utils/metrics.js.map +1 -1
- package/src/utils/mock-project-graph.js +3 -6
- package/src/utils/mock-project-graph.js.map +1 -1
- package/src/utils/names.js +8 -3
- package/src/utils/names.js.map +1 -1
- package/src/utils/npm-scope.js +1 -1
- package/src/utils/npm-scope.js.map +1 -1
- package/src/utils/nx.js +42 -19
- package/src/utils/nx.js.map +1 -1
- package/src/utils/nxlv-python.d.ts +124 -5
- package/src/utils/nxlv-python.js +5 -14
- package/src/utils/nxlv-python.js.map +1 -1
- package/src/utils/pkg-manager.js +1 -1
- package/src/utils/pkg-manager.js.map +1 -1
- package/src/utils/port.js +4 -6
- package/src/utils/port.js.map +1 -1
- package/src/utils/py.js +12 -12
- package/src/utils/py.js.map +1 -1
- package/src/utils/shared-constructs.js +67 -72
- package/src/utils/shared-constructs.js.map +1 -1
- package/src/utils/shared-infra-config.js +24 -26
- package/src/utils/shared-infra-config.js.map +1 -1
- package/src/utils/shared-scripts.js +24 -26
- package/src/utils/shared-scripts.js.map +1 -1
- package/src/utils/shared-shadcn.js +64 -53
- package/src/utils/shared-shadcn.js.map +1 -1
- package/src/utils/versions.d.ts +5 -1
- package/src/utils/versions.js +8 -4
- package/src/utils/versions.js.map +1 -1
- package/src/utils/website-constructs/website-constructs.js +9 -11
- package/src/utils/website-constructs/website-constructs.js.map +1 -1
package/src/utils/nx.js
CHANGED
|
@@ -12,15 +12,23 @@ const package_json_1 = tslib_1.__importDefault(require("../../package.json"));
|
|
|
12
12
|
const path = tslib_1.__importStar(require("path"));
|
|
13
13
|
const npm_scope_1 = require("./npm-scope");
|
|
14
14
|
const names_1 = require("./names");
|
|
15
|
-
const GENERATORS = Object.entries(generators_json_1.default.generators).map(([id, info]) => (
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
:
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
15
|
+
const GENERATORS = Object.entries(generators_json_1.default.generators).map(([id, info]) => ({
|
|
16
|
+
id,
|
|
17
|
+
metric: info.metric,
|
|
18
|
+
resolvedFactoryPath: path.resolve(__dirname, '..', '..', info.factory),
|
|
19
|
+
resolvedSchemaPath: path.resolve(__dirname, '..', '..', info.schema),
|
|
20
|
+
description: info.description,
|
|
21
|
+
...('hidden' in info && info.hidden
|
|
22
|
+
? {
|
|
23
|
+
hidden: info.hidden,
|
|
24
|
+
}
|
|
25
|
+
: {}),
|
|
26
|
+
...('guidePages' in info && info.guidePages
|
|
27
|
+
? {
|
|
28
|
+
guidePages: info.guidePages,
|
|
29
|
+
}
|
|
30
|
+
: {}),
|
|
31
|
+
}));
|
|
24
32
|
/**
|
|
25
33
|
* List Nx Plugin for AWS generators
|
|
26
34
|
* @param includeHidden include hidden generators (default false)
|
|
@@ -64,20 +72,37 @@ exports.readProjectConfigurationUnqualified = readProjectConfigurationUnqualifie
|
|
|
64
72
|
*/
|
|
65
73
|
const addGeneratorMetadata = (tree, projectName, info, additionalMetadata) => {
|
|
66
74
|
const config = (0, exports.readProjectConfigurationUnqualified)(tree, projectName);
|
|
67
|
-
(0, devkit_1.updateProjectConfiguration)(tree, config.name,
|
|
75
|
+
(0, devkit_1.updateProjectConfiguration)(tree, config.name, {
|
|
76
|
+
...config,
|
|
77
|
+
metadata: {
|
|
78
|
+
...config?.metadata,
|
|
79
|
+
generator: info.id,
|
|
80
|
+
...additionalMetadata,
|
|
81
|
+
},
|
|
82
|
+
});
|
|
68
83
|
};
|
|
69
84
|
exports.addGeneratorMetadata = addGeneratorMetadata;
|
|
70
85
|
/**
|
|
71
86
|
* Add metadata about the generator that generated the component to the project.json
|
|
72
87
|
*/
|
|
73
88
|
const addComponentGeneratorMetadata = (tree, projectName, info, componentPath, componentName, additionalMetadata) => {
|
|
74
|
-
var _a, _b;
|
|
75
89
|
const config = (0, exports.readProjectConfigurationUnqualified)(tree, projectName);
|
|
76
|
-
const existingComponents =
|
|
90
|
+
const existingComponents = config?.metadata?.components ?? [];
|
|
77
91
|
const alreadyAdded = existingComponents.filter((c) => c.generator === info.id && c.name === componentName);
|
|
78
92
|
if (alreadyAdded.length === 0) {
|
|
79
|
-
const componentMetadata =
|
|
80
|
-
|
|
93
|
+
const componentMetadata = {
|
|
94
|
+
generator: info.id,
|
|
95
|
+
path: componentPath,
|
|
96
|
+
...(componentName ? { name: componentName } : {}),
|
|
97
|
+
...additionalMetadata,
|
|
98
|
+
};
|
|
99
|
+
(0, devkit_1.updateProjectConfiguration)(tree, config.name, {
|
|
100
|
+
...config,
|
|
101
|
+
metadata: {
|
|
102
|
+
...config?.metadata,
|
|
103
|
+
components: [...existingComponents, componentMetadata],
|
|
104
|
+
},
|
|
105
|
+
});
|
|
81
106
|
}
|
|
82
107
|
};
|
|
83
108
|
exports.addComponentGeneratorMetadata = addComponentGeneratorMetadata;
|
|
@@ -86,12 +111,10 @@ exports.addComponentGeneratorMetadata = addComponentGeneratorMetadata;
|
|
|
86
111
|
* Adds the target if not present.
|
|
87
112
|
*/
|
|
88
113
|
const addDependencyToTargetIfNotPresent = (project, target, dependency) => {
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
(_a = project.targets) !== null && _a !== void 0 ? _a : (project.targets = {});
|
|
92
|
-
(_b = (_d = project.targets)[target]) !== null && _b !== void 0 ? _b : (_d[target] = {});
|
|
114
|
+
project.targets ??= {};
|
|
115
|
+
project.targets[target] ??= {};
|
|
93
116
|
project.targets[target].dependsOn = [
|
|
94
|
-
...(
|
|
117
|
+
...(project.targets[target].dependsOn ?? []).filter((d) => d !== dependency),
|
|
95
118
|
dependency,
|
|
96
119
|
];
|
|
97
120
|
};
|
package/src/utils/nx.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/nx.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAMoB;AACpB,oFAAmD;AACnD,8EAA6C;AAC7C,mDAA6B;AAC7B,2CAA6D;AAC7D,mCAAsC;AAYtC,MAAM,UAAU,GAAsB,MAAM,CAAC,OAAO,CAClD,yBAAc,CAAC,UAAU,CAC1B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC
|
|
1
|
+
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/nx.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,127 @@
|
|
|
2
2
|
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
3
3
|
* SPDX-License-Identifier: Apache-2.0
|
|
4
4
|
*/
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
/**
|
|
6
|
+
* Re-exports internal modules from @nxlv/python that are not exposed
|
|
7
|
+
* via the package's "exports" field.
|
|
8
|
+
*
|
|
9
|
+
* Newer versions of Node.js and Vite strictly enforce the "exports" map
|
|
10
|
+
* in package.json, which prevents deep imports like:
|
|
11
|
+
* import { UVProvider } from '@nxlv/python/dist/provider/uv/provider'
|
|
12
|
+
*
|
|
13
|
+
* This module resolves the package location and loads the internal modules
|
|
14
|
+
* directly by filesystem path, bypassing the exports restriction.
|
|
15
|
+
*
|
|
16
|
+
* Type definitions are inlined from the @nxlv/python .d.ts files because
|
|
17
|
+
* moduleResolution: "bundler" does not allow deep path type imports for
|
|
18
|
+
* packages without proper exports.
|
|
19
|
+
*/
|
|
20
|
+
import { Tree } from '@nx/devkit';
|
|
21
|
+
export type UVPyprojectTomlIndex = {
|
|
22
|
+
name: string;
|
|
23
|
+
url: string;
|
|
24
|
+
};
|
|
25
|
+
export type UVPyprojectToml = {
|
|
26
|
+
project?: {
|
|
27
|
+
name: string;
|
|
28
|
+
version: string;
|
|
29
|
+
dependencies: string[];
|
|
30
|
+
'optional-dependencies': {
|
|
31
|
+
[key: string]: string[];
|
|
32
|
+
};
|
|
33
|
+
};
|
|
34
|
+
'dependency-groups': {
|
|
35
|
+
[key: string]: string[];
|
|
36
|
+
};
|
|
37
|
+
'build-system'?: {
|
|
38
|
+
requires?: string[];
|
|
39
|
+
'build-backend'?: string;
|
|
40
|
+
};
|
|
41
|
+
tool?: {
|
|
42
|
+
hatch?: {
|
|
43
|
+
build?: {
|
|
44
|
+
targets?: {
|
|
45
|
+
wheel?: {
|
|
46
|
+
packages: string[];
|
|
47
|
+
};
|
|
48
|
+
};
|
|
49
|
+
};
|
|
50
|
+
metadata?: {
|
|
51
|
+
'allow-direct-references'?: boolean;
|
|
52
|
+
};
|
|
53
|
+
};
|
|
54
|
+
uv?: {
|
|
55
|
+
sources?: {
|
|
56
|
+
[key: string]: {
|
|
57
|
+
path?: string;
|
|
58
|
+
workspace?: boolean;
|
|
59
|
+
index?: string;
|
|
60
|
+
};
|
|
61
|
+
};
|
|
62
|
+
index?: UVPyprojectTomlIndex[];
|
|
63
|
+
workspace?: {
|
|
64
|
+
members: string[];
|
|
65
|
+
};
|
|
66
|
+
'build-backend'?: {
|
|
67
|
+
'module-name'?: string[];
|
|
68
|
+
namespace?: boolean;
|
|
69
|
+
};
|
|
70
|
+
};
|
|
71
|
+
};
|
|
72
|
+
};
|
|
73
|
+
interface ILogger {
|
|
74
|
+
setOptions(options: {
|
|
75
|
+
silent: boolean;
|
|
76
|
+
}): void;
|
|
77
|
+
info(message: unknown): void;
|
|
78
|
+
}
|
|
79
|
+
interface IUVProvider {
|
|
80
|
+
install(): Promise<void>;
|
|
81
|
+
}
|
|
82
|
+
interface IUVProviderConstructor {
|
|
83
|
+
new (workspaceRoot: string, logger: ILogger, tree?: Tree): IUVProvider;
|
|
84
|
+
}
|
|
85
|
+
interface ILoggerConstructor {
|
|
86
|
+
new (): ILogger;
|
|
87
|
+
}
|
|
88
|
+
interface MigrateToSharedVenvSchema {
|
|
89
|
+
moveDevDependencies: boolean;
|
|
90
|
+
pyprojectPythonDependency: string;
|
|
91
|
+
pyenvPythonVersion: string | number;
|
|
92
|
+
autoActivate: boolean;
|
|
93
|
+
packageManager: 'poetry' | 'uv';
|
|
94
|
+
}
|
|
95
|
+
interface UVProjectGeneratorSchema {
|
|
96
|
+
name: string;
|
|
97
|
+
publishable: boolean;
|
|
98
|
+
buildLockedVersions: boolean;
|
|
99
|
+
buildBundleLocalDependencies: boolean;
|
|
100
|
+
linter: 'flake8' | 'ruff' | 'none';
|
|
101
|
+
devDependenciesProject?: string;
|
|
102
|
+
rootPyprojectDependencyGroup: string;
|
|
103
|
+
templateDir?: string;
|
|
104
|
+
pyprojectPythonDependency: string;
|
|
105
|
+
projectType: 'application' | 'library';
|
|
106
|
+
projectNameAndRootFormat: 'as-provided' | 'derived';
|
|
107
|
+
packageName?: string;
|
|
108
|
+
description?: string;
|
|
109
|
+
moduleName?: string;
|
|
110
|
+
pyenvPythonVersion?: string | number;
|
|
111
|
+
tags?: string;
|
|
112
|
+
directory?: string;
|
|
113
|
+
useSyncGenerators?: boolean;
|
|
114
|
+
unitTestRunner: 'pytest' | 'none';
|
|
115
|
+
codeCoverage: boolean;
|
|
116
|
+
codeCoverageHtmlReport: boolean;
|
|
117
|
+
codeCoverageXmlReport: boolean;
|
|
118
|
+
codeCoverageThreshold?: number;
|
|
119
|
+
unitTestHtmlReport: boolean;
|
|
120
|
+
unitTestJUnitReport: boolean;
|
|
121
|
+
buildSystem: 'hatch' | 'uv';
|
|
122
|
+
srcDir: boolean;
|
|
123
|
+
}
|
|
124
|
+
export declare const UVProvider: IUVProviderConstructor;
|
|
125
|
+
export declare const Logger: ILoggerConstructor;
|
|
126
|
+
export declare const migrateToSharedVenvGenerator: (tree: Tree, options: MigrateToSharedVenvSchema) => Promise<() => Promise<void>>;
|
|
127
|
+
export declare const uvProjectGenerator: (tree: Tree, options: UVProjectGeneratorSchema) => Promise<() => Promise<void>>;
|
|
128
|
+
export {};
|
package/src/utils/nxlv-python.js
CHANGED
|
@@ -3,22 +3,13 @@
|
|
|
3
3
|
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
var _a, _b;
|
|
7
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
7
|
exports.uvProjectGenerator = exports.migrateToSharedVenvGenerator = exports.Logger = exports.UVProvider = void 0;
|
|
9
8
|
const tslib_1 = require("tslib");
|
|
10
|
-
/**
|
|
11
|
-
* Re-exports internal modules from @nxlv/python that are not exposed
|
|
12
|
-
* via the package's "exports" field.
|
|
13
|
-
*
|
|
14
|
-
* Newer versions of Node.js and Vite strictly enforce the "exports" map
|
|
15
|
-
* in package.json, which prevents deep imports like:
|
|
16
|
-
* import { UVProvider } from '@nxlv/python/dist/provider/uv/provider'
|
|
17
|
-
*
|
|
18
|
-
* This module resolves the package location and loads the internal modules
|
|
19
|
-
* directly by filesystem path, bypassing the exports restriction.
|
|
20
|
-
*/
|
|
21
9
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
10
|
+
// ---------------------------------------------------------------------------
|
|
11
|
+
// Runtime module loading via filesystem paths
|
|
12
|
+
// ---------------------------------------------------------------------------
|
|
22
13
|
// Resolve the @nxlv/python package root by finding its package.json
|
|
23
14
|
// (which IS listed in the exports map as "./package.json")
|
|
24
15
|
const nxlvPythonPkgJson = require.resolve('@nxlv/python/package.json');
|
|
@@ -33,6 +24,6 @@ const migrateToSharedVenvModule = require(path_1.default.join(nxlvPythonRoot, 'd
|
|
|
33
24
|
const uvProjectModule = require(path_1.default.join(nxlvPythonRoot, 'dist/generators/uv-project/generator'));
|
|
34
25
|
exports.UVProvider = uvProviderModule.UVProvider;
|
|
35
26
|
exports.Logger = loggerModule.Logger;
|
|
36
|
-
exports.migrateToSharedVenvGenerator =
|
|
37
|
-
exports.uvProjectGenerator =
|
|
27
|
+
exports.migrateToSharedVenvGenerator = migrateToSharedVenvModule.default ?? migrateToSharedVenvModule;
|
|
28
|
+
exports.uvProjectGenerator = uvProjectModule.default ?? uvProjectModule;
|
|
38
29
|
//# sourceMappingURL=nxlv-python.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nxlv-python.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/nxlv-python.ts"],"names":[],"mappings":";AAAA;;;GAGG
|
|
1
|
+
{"version":3,"file":"nxlv-python.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/nxlv-python.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;AAkBH,wDAAwB;AAmHxB,8EAA8E;AAC9E,8CAA8C;AAC9C,8EAA8E;AAE9E,oEAAoE;AACpE,2DAA2D;AAC3D,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;AACvE,MAAM,cAAc,GAAG,cAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAEvD,iEAAiE;AACjE,MAAM,gBAAgB,GAAG,OAAO,CAC9B,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,2BAA2B,CAAC,CACvD,CAAC;AACF,iEAAiE;AACjE,MAAM,YAAY,GAAG,OAAO,CAC1B,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,6BAA6B,CAAC,CACzD,CAAC;AACF,iEAAiE;AACjE,MAAM,yBAAyB,GAAG,OAAO,CACvC,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,kDAAkD,CAAC,CAC9E,CAAC;AACF,iEAAiE;AACjE,MAAM,eAAe,GAAG,OAAO,CAC7B,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,sCAAsC,CAAC,CAClE,CAAC;AAEW,QAAA,UAAU,GAA2B,gBAAgB,CAAC,UAAU,CAAC;AAEjE,QAAA,MAAM,GAAuB,YAAY,CAAC,MAAM,CAAC;AAEjD,QAAA,4BAA4B,GAIvC,yBAAyB,CAAC,OAAO,IAAI,yBAAyB,CAAC;AAEpD,QAAA,kBAAkB,GAGK,eAAe,CAAC,OAAO,IAAI,eAAe,CAAC"}
|
package/src/utils/pkg-manager.js
CHANGED
|
@@ -15,6 +15,6 @@ const COMMANDS = {
|
|
|
15
15
|
/**
|
|
16
16
|
* Returns display-friendly command prefixes for the detected package manager.
|
|
17
17
|
*/
|
|
18
|
-
const getPackageManagerDisplayCommands = (pm = (0, devkit_1.detectPackageManager)()) =>
|
|
18
|
+
const getPackageManagerDisplayCommands = (pm = (0, devkit_1.detectPackageManager)()) => COMMANDS[pm] ?? COMMANDS['npm'];
|
|
19
19
|
exports.getPackageManagerDisplayCommands = getPackageManagerDisplayCommands;
|
|
20
20
|
//# sourceMappingURL=pkg-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pkg-manager.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/pkg-manager.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAAkD;AAyBlD,MAAM,QAAQ,GAAkD;IAC9D,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE;IACpC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE;IACnC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE;IACnC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE;CAClC,CAAC;AAEF;;GAEG;AACI,MAAM,gCAAgC,GAAG,CAC9C,EAAE,GAAG,IAAA,6BAAoB,GAAE,EACI,EAAE,
|
|
1
|
+
{"version":3,"file":"pkg-manager.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/pkg-manager.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAAkD;AAyBlD,MAAM,QAAQ,GAAkD;IAC9D,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE;IACpC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE;IACnC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE;IACnC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE;CAClC,CAAC;AAEF;;GAEG;AACI,MAAM,gCAAgC,GAAG,CAC9C,EAAE,GAAG,IAAA,6BAAoB,GAAE,EACI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC;AAFvD,QAAA,gCAAgC,oCAEuB"}
|
package/src/utils/port.js
CHANGED
|
@@ -11,17 +11,15 @@ const devkit_1 = require("@nx/devkit");
|
|
|
11
11
|
* Mutates the project to add/update its metadata.ports with the newly assigned port
|
|
12
12
|
*/
|
|
13
13
|
const assignPort = (tree, project, startPort) => {
|
|
14
|
-
var _a, _b;
|
|
15
|
-
var _c;
|
|
16
14
|
// Find all existing ports
|
|
17
15
|
const allPorts = new Set([...(0, devkit_1.getProjects)(tree).values()].flatMap((p) => {
|
|
18
16
|
const metadata = p.metadata;
|
|
19
17
|
const ports = [];
|
|
20
18
|
// Support old port assignment where each project registered a single port
|
|
21
|
-
if (
|
|
19
|
+
if (metadata?.port && typeof metadata.port === 'number') {
|
|
22
20
|
ports.push(metadata.port);
|
|
23
21
|
}
|
|
24
|
-
if (
|
|
22
|
+
if (metadata?.ports && typeof metadata.ports === 'object' && Array.isArray(metadata.ports)) {
|
|
25
23
|
ports.push(...metadata.ports);
|
|
26
24
|
}
|
|
27
25
|
return ports;
|
|
@@ -31,8 +29,8 @@ const assignPort = (tree, project, startPort) => {
|
|
|
31
29
|
while (allPorts.has(candidatePort)) {
|
|
32
30
|
candidatePort++;
|
|
33
31
|
}
|
|
34
|
-
|
|
35
|
-
|
|
32
|
+
project.metadata ??= {};
|
|
33
|
+
project.metadata.ports ??= [];
|
|
36
34
|
project.metadata.ports = [
|
|
37
35
|
...project.metadata.ports,
|
|
38
36
|
candidatePort,
|
package/src/utils/port.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/port.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAAqE;AAErE;;;GAGG;AACI,MAAM,UAAU,GAAG,CAAC,IAAU,EAAE,OAA6B,EAAE,SAAiB,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"port.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/port.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAAqE;AAErE;;;GAGG;AACI,MAAM,UAAU,GAAG,CAAC,IAAU,EAAE,OAA6B,EAAE,SAAiB,EAAE,EAAE;IACzF,0BAA0B;IAC1B,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACrE,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAe,CAAC;QACnC,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,0EAA0E;QAC1E,IAAI,QAAQ,EAAE,IAAI,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACxD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,IAAI,QAAQ,EAAE,KAAK,IAAI,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3F,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC,CAAC;IAEJ,0DAA0D;IAC1D,IAAI,aAAa,GAAG,SAAS,CAAC;IAC9B,OAAO,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;QACnC,aAAa,EAAE,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,QAAQ,KAAK,EAAE,CAAC;IACvB,OAAO,CAAC,QAAgB,CAAC,KAAK,KAAK,EAAE,CAAC;IACtC,OAAO,CAAC,QAAgB,CAAC,KAAK,GAAG;QAChC,GAAI,OAAO,CAAC,QAAgB,CAAC,KAAK;QAClC,aAAa;KACd,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AA7BW,QAAA,UAAU,cA6BrB"}
|
package/src/utils/py.js
CHANGED
|
@@ -14,12 +14,11 @@ const toml_2 = require("./toml");
|
|
|
14
14
|
* Add dependencies to a pyproject.toml file
|
|
15
15
|
*/
|
|
16
16
|
const addDependenciesToPyProjectToml = (tree, projectRoot, deps) => {
|
|
17
|
-
var _a, _b;
|
|
18
17
|
const projectToml = (0, toml_1.parse)(tree.read((0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml'), 'utf8'));
|
|
19
18
|
const newDeps = new Set(deps);
|
|
20
19
|
projectToml.project.dependencies = [
|
|
21
20
|
// Replace any dependencies that already exist
|
|
22
|
-
...(
|
|
21
|
+
...(projectToml.project?.dependencies ?? []).filter((dep) => {
|
|
23
22
|
const parsedDep = (0, pip_requirements_js_1.parsePipRequirementsLine)(dep);
|
|
24
23
|
return parsedDep.type !== 'ProjectName' || !newDeps.has(parsedDep.name);
|
|
25
24
|
}),
|
|
@@ -29,17 +28,19 @@ const addDependenciesToPyProjectToml = (tree, projectRoot, deps) => {
|
|
|
29
28
|
};
|
|
30
29
|
exports.addDependenciesToPyProjectToml = addDependenciesToPyProjectToml;
|
|
31
30
|
const addDependenciesToDependencyGroupInPyProjectToml = (tree, projectRoot, group, deps) => {
|
|
32
|
-
var _a, _b;
|
|
33
31
|
const projectToml = (0, toml_1.parse)(tree.read((0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml'), 'utf8'));
|
|
34
32
|
const newDeps = new Set(deps);
|
|
35
|
-
projectToml['dependency-groups'] =
|
|
33
|
+
projectToml['dependency-groups'] = {
|
|
34
|
+
...projectToml['dependency-groups'],
|
|
35
|
+
[group]: [
|
|
36
36
|
// Replace any dependencies that already exist
|
|
37
|
-
...(
|
|
37
|
+
...(projectToml['dependency-groups']?.[group] ?? []).filter((dep) => {
|
|
38
38
|
const parsedDep = (0, pip_requirements_js_1.parsePipRequirementsLine)(dep);
|
|
39
39
|
return parsedDep.type !== 'ProjectName' || !newDeps.has(parsedDep.name);
|
|
40
40
|
}),
|
|
41
41
|
...(0, versions_1.withPyVersions)(deps),
|
|
42
|
-
]
|
|
42
|
+
],
|
|
43
|
+
};
|
|
43
44
|
tree.write((0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml'), (0, toml_1.stringify)(projectToml));
|
|
44
45
|
};
|
|
45
46
|
exports.addDependenciesToDependencyGroupInPyProjectToml = addDependenciesToDependencyGroupInPyProjectToml;
|
|
@@ -51,7 +52,7 @@ exports.addDependenciesToDependencyGroupInPyProjectToml = addDependenciesToDepen
|
|
|
51
52
|
const uvxCommand = (dep, args, withDeps) => {
|
|
52
53
|
return `uvx ${withDeps
|
|
53
54
|
? `${withDeps
|
|
54
|
-
.map(({ dep, version, specifier }) => `--with ${dep}${specifier
|
|
55
|
+
.map(({ dep, version, specifier }) => `--with ${dep}${specifier ?? '=='}${version}`)
|
|
55
56
|
.join(' ')} `
|
|
56
57
|
: ''}${(0, versions_1.withPyVersions)([dep])[0]}${args ? ` ${args}` : ''}`;
|
|
57
58
|
};
|
|
@@ -66,18 +67,17 @@ const addWorkspaceDependencyToPyProject = (tree, projectRoot, dependencyPackageN
|
|
|
66
67
|
return;
|
|
67
68
|
}
|
|
68
69
|
(0, toml_2.updateToml)(tree, pyprojectPath, (toml) => {
|
|
69
|
-
var _a, _b, _c, _d, _e;
|
|
70
70
|
// Add to [project].dependencies if not already present
|
|
71
|
-
const deps =
|
|
71
|
+
const deps = toml.project?.dependencies ?? [];
|
|
72
72
|
if (!deps.some((d) => d === dependencyPackageName ||
|
|
73
73
|
d.startsWith(`${dependencyPackageName}>=`) ||
|
|
74
74
|
d.startsWith(`${dependencyPackageName}==`))) {
|
|
75
75
|
toml.project.dependencies = [...deps, dependencyPackageName];
|
|
76
76
|
}
|
|
77
77
|
// Add to [tool.uv.sources] with workspace = true
|
|
78
|
-
toml.tool =
|
|
79
|
-
toml.tool.uv =
|
|
80
|
-
toml.tool.uv.sources =
|
|
78
|
+
toml.tool = toml.tool ?? {};
|
|
79
|
+
toml.tool.uv = toml.tool.uv ?? {};
|
|
80
|
+
toml.tool.uv.sources = toml.tool.uv.sources ?? {};
|
|
81
81
|
toml.tool.uv.sources[dependencyPackageName] = {
|
|
82
82
|
workspace: true,
|
|
83
83
|
};
|
package/src/utils/py.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"py.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/py.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,sCAA+C;AAC/C,uCAAqD;AAErD,yCAA2D;AAC3D,6DAA+D;AAC/D,iCAAoC;AAEpC;;GAEG;AACI,MAAM,8BAA8B,GAAG,CAC5C,IAAU,EACV,WAAmB,EACnB,IAAqB,EACrB,EAAE
|
|
1
|
+
{"version":3,"file":"py.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/py.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,87 +15,82 @@ const format_1 = require("./format");
|
|
|
15
15
|
const pkg_manager_1 = require("./pkg-manager");
|
|
16
16
|
const shared_constructs_constants_1 = require("./shared-constructs-constants");
|
|
17
17
|
const utils_1 = require("./config/utils");
|
|
18
|
-
function sharedConstructsGenerator(tree, options) {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
(0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)(['constructs', 'aws-cdk-lib']), (0, versions_1.withVersions)(['@types/node']));
|
|
47
|
-
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
48
|
-
}
|
|
18
|
+
async function sharedConstructsGenerator(tree, options) {
|
|
19
|
+
const { iacProvider } = options;
|
|
20
|
+
const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
|
|
21
|
+
updateGitignore(tree);
|
|
22
|
+
if (iacProvider === 'CDK') {
|
|
23
|
+
if (!tree.exists((0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'project.json'))) {
|
|
24
|
+
await (0, generator_1.default)(tree, {
|
|
25
|
+
name: shared_constructs_constants_1.SHARED_CONSTRUCTS_NAME,
|
|
26
|
+
directory: shared_constructs_constants_1.PACKAGES_DIR,
|
|
27
|
+
subDirectory: shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR,
|
|
28
|
+
});
|
|
29
|
+
tree.delete((0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src'));
|
|
30
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src'), {
|
|
31
|
+
npmScopePrefix,
|
|
32
|
+
scopeAlias: (0, npm_scope_1.toScopeAlias)(npmScopePrefix),
|
|
33
|
+
tags: (await (0, utils_1.readAwsNxPluginConfig)(tree))?.tags ?? [],
|
|
34
|
+
}, {
|
|
35
|
+
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
36
|
+
});
|
|
37
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'common', 'readme'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR), {
|
|
38
|
+
fullyQualifiedName: `${npmScopePrefix}${shared_constructs_constants_1.SHARED_CONSTRUCTS_NAME}`,
|
|
39
|
+
name: shared_constructs_constants_1.SHARED_CONSTRUCTS_NAME,
|
|
40
|
+
pkgMgrCmd: (0, pkg_manager_1.getPackageManagerDisplayCommands)().exec,
|
|
41
|
+
}, {
|
|
42
|
+
overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
|
|
43
|
+
});
|
|
44
|
+
(0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)(['constructs', 'aws-cdk-lib']), (0, versions_1.withVersions)(['@types/node']));
|
|
45
|
+
await (0, format_1.formatFilesInSubtree)(tree);
|
|
49
46
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
DIST_DIR: 'dist/{projectRoot}',
|
|
73
|
-
},
|
|
47
|
+
}
|
|
48
|
+
// Handle Terraform provider
|
|
49
|
+
if (iacProvider === 'Terraform') {
|
|
50
|
+
const terraformLibPath = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_TERRAFORM_DIR);
|
|
51
|
+
if (!tree.exists((0, devkit_1.joinPathFragments)(terraformLibPath, 'project.json'))) {
|
|
52
|
+
await (0, generator_2.default)(tree, {
|
|
53
|
+
name: shared_constructs_constants_1.SHARED_TERRAFORM_NAME,
|
|
54
|
+
directory: (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, 'common'),
|
|
55
|
+
type: 'library',
|
|
56
|
+
});
|
|
57
|
+
// Add target to reset runtime config as part of the build, ensuring any plan/apply target
|
|
58
|
+
// which depends on shared terraform will build runtime-config.json from scratch, meaning no old
|
|
59
|
+
// values will remain when resources are removed.
|
|
60
|
+
// NB: runtime-config.json starts as an empty object to keep the reader terraform module simple
|
|
61
|
+
(0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_TERRAFORM_DIR, 'project.json'), (projectConfig) => {
|
|
62
|
+
projectConfig.targets ??= {};
|
|
63
|
+
projectConfig.targets['reset-runtime-config'] = {
|
|
64
|
+
executor: 'nx:run-commands',
|
|
65
|
+
options: {
|
|
66
|
+
command: "node -e \"const fs=require('fs');fs.mkdirSync(process.env.DIST_DIR,{recursive:true});fs.writeFileSync(process.env.DIST_DIR+'/runtime-config.json','{}');\"",
|
|
67
|
+
env: {
|
|
68
|
+
DIST_DIR: 'dist/{projectRoot}',
|
|
74
69
|
},
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
70
|
+
},
|
|
71
|
+
};
|
|
72
|
+
projectConfig.targets.build ??= {};
|
|
73
|
+
projectConfig.targets.build.dependsOn = [
|
|
74
|
+
...(projectConfig.targets.build.dependsOn ?? []).filter((t) => t !== 'reset-runtime-config'),
|
|
75
|
+
'reset-runtime-config',
|
|
76
|
+
];
|
|
77
|
+
return projectConfig;
|
|
78
|
+
});
|
|
79
|
+
tree.delete((0, devkit_1.joinPathFragments)(terraformLibPath, 'src', 'main.tf'));
|
|
80
|
+
// Create the metrics.tf file with empty initial values
|
|
81
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'terraform'), terraformLibPath, {}, {
|
|
82
|
+
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
83
|
+
});
|
|
84
|
+
await (0, format_1.formatFilesInSubtree)(tree);
|
|
90
85
|
}
|
|
91
|
-
}
|
|
86
|
+
}
|
|
92
87
|
}
|
|
93
88
|
const updateGitignore = (tree) => {
|
|
94
89
|
const gitignore = tree.exists('.gitignore')
|
|
95
90
|
? tree.read('.gitignore', 'utf-8')
|
|
96
91
|
: '';
|
|
97
92
|
const regex = /runtime-config.json/gm;
|
|
98
|
-
const hasRuntimeConfig = regex.test(gitignore
|
|
93
|
+
const hasRuntimeConfig = regex.test(gitignore ?? '');
|
|
99
94
|
if (hasRuntimeConfig) {
|
|
100
95
|
return;
|
|
101
96
|
}
|