@aws/nx-plugin 0.87.0 → 0.88.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.
Files changed (108) hide show
  1. package/generators.json +7 -0
  2. package/package.json +2 -1
  3. package/src/connection/generator.js +5 -0
  4. package/src/connection/generator.js.map +1 -1
  5. package/src/connection/serve-local.d.ts +1 -1
  6. package/src/connection/serve-local.js +5 -7
  7. package/src/connection/serve-local.js.map +1 -1
  8. package/src/preset/generator.js +0 -2
  9. package/src/preset/generator.js.map +1 -1
  10. package/src/py/fast-api/__snapshots__/generator.spec.ts.snap +17 -8
  11. package/src/py/fast-api/generator.js +1 -1
  12. package/src/py/fast-api/generator.js.map +1 -1
  13. package/src/py/fast-api/react/__snapshots__/generator.spec.ts.snap +5 -3
  14. package/src/py/lambda-function/__snapshots__/generator.spec.ts.snap +2 -1
  15. package/src/py/lambda-function/generator.js +1 -1
  16. package/src/py/lambda-function/generator.js.map +1 -1
  17. package/src/py/mcp-server/__snapshots__/generator.spec.ts.snap +1 -1
  18. package/src/py/mcp-server/generator.js +1 -1
  19. package/src/py/mcp-server/generator.js.map +1 -1
  20. package/src/py/strands-agent/__snapshots__/generator.spec.ts.snap +11 -2
  21. package/src/py/strands-agent/generator.js +1 -1
  22. package/src/py/strands-agent/generator.js.map +1 -1
  23. package/src/py/strands-agent/mcp-connection/__snapshots__/generator.spec.ts.snap +211 -0
  24. package/src/py/strands-agent/mcp-connection/files/agent-connection/app/__mcpServerSnakeCase___client.py.template +45 -0
  25. package/src/py/strands-agent/mcp-connection/generator.d.ts +10 -0
  26. package/src/py/strands-agent/mcp-connection/generator.js +171 -0
  27. package/src/py/strands-agent/mcp-connection/generator.js.map +1 -0
  28. package/src/py/strands-agent/mcp-connection/schema.d.ts +15 -0
  29. package/src/py/strands-agent/mcp-connection/schema.json +26 -0
  30. package/src/smithy/ts/api/generator.js +1 -1
  31. package/src/smithy/ts/api/generator.js.map +1 -1
  32. package/src/trpc/backend/generator.js +1 -1
  33. package/src/trpc/backend/generator.js.map +1 -1
  34. package/src/trpc/react/generator.js +3 -3
  35. package/src/trpc/react/generator.js.map +1 -1
  36. package/src/ts/lambda-function/generator.js +1 -1
  37. package/src/ts/lambda-function/generator.js.map +1 -1
  38. package/src/ts/lib/eslint.d.ts +1 -1
  39. package/src/ts/lib/eslint.js +4 -3
  40. package/src/ts/lib/eslint.js.map +1 -1
  41. package/src/ts/lib/generator.js +1 -1
  42. package/src/ts/lib/generator.js.map +1 -1
  43. package/src/ts/lib/ts-project-utils.d.ts +1 -1
  44. package/src/ts/lib/ts-project-utils.js +4 -3
  45. package/src/ts/lib/ts-project-utils.js.map +1 -1
  46. package/src/ts/mcp-server/generator.js +1 -1
  47. package/src/ts/mcp-server/generator.js.map +1 -1
  48. package/src/ts/nx-generator/generator.js +3 -12
  49. package/src/ts/nx-generator/generator.js.map +1 -1
  50. package/src/ts/react-website/app/generator.js +7 -7
  51. package/src/ts/react-website/app/generator.js.map +1 -1
  52. package/src/ts/react-website/cognito-auth/__snapshots__/generator.spec.ts.snap +1 -5
  53. package/src/ts/react-website/cognito-auth/generator.js +7 -7
  54. package/src/ts/react-website/cognito-auth/generator.js.map +1 -1
  55. package/src/ts/react-website/cognito-auth/grit/cloudscape-auth-menu.grit +19 -0
  56. package/src/ts/react-website/cognito-auth/grit/none-auth-menu.grit +24 -0
  57. package/src/ts/react-website/cognito-auth/grit/shadcn-auth-menu.grit +39 -0
  58. package/src/ts/react-website/cognito-auth/grit/shadcn-state-declarations.grit +15 -0
  59. package/src/ts/react-website/cognito-auth/utils.d.ts +3 -3
  60. package/src/ts/react-website/cognito-auth/utils.js +18 -186
  61. package/src/ts/react-website/cognito-auth/utils.js.map +1 -1
  62. package/src/ts/react-website/runtime-config/generator.js +9 -17
  63. package/src/ts/react-website/runtime-config/generator.js.map +1 -1
  64. package/src/ts/strands-agent/generator.js +1 -1
  65. package/src/ts/strands-agent/generator.js.map +1 -1
  66. package/src/ts/strands-agent/mcp-connection/generator.js +15 -41
  67. package/src/ts/strands-agent/mcp-connection/generator.js.map +1 -1
  68. package/src/utils/agent-connection/agent-connection.d.ts +24 -0
  69. package/src/utils/agent-connection/agent-connection.js +112 -0
  70. package/src/utils/agent-connection/agent-connection.js.map +1 -1
  71. package/src/{py/strands-agent/files/app → utils/agent-connection/files/py-core}/agentcore_mcp_client.py.template +33 -14
  72. package/src/utils/agent-core-constructs/agent-core-constructs.d.ts +2 -2
  73. package/src/utils/agent-core-constructs/agent-core-constructs.js +14 -13
  74. package/src/utils/agent-core-constructs/agent-core-constructs.js.map +1 -1
  75. package/src/utils/api-constructs/api-constructs.d.ts +1 -1
  76. package/src/utils/api-constructs/api-constructs.js +8 -7
  77. package/src/utils/api-constructs/api-constructs.js.map +1 -1
  78. package/src/utils/ast/website.d.ts +1 -1
  79. package/src/utils/ast/website.js +4 -3
  80. package/src/utils/ast/website.js.map +1 -1
  81. package/src/utils/ast.d.ts +12 -3
  82. package/src/utils/ast.js +88 -54
  83. package/src/utils/ast.js.map +1 -1
  84. package/src/utils/connection/open-api/react.js +3 -3
  85. package/src/utils/connection/open-api/react.js.map +1 -1
  86. package/src/utils/files/terraform/src/metrics/metrics.tf.template +7 -1
  87. package/src/utils/format.d.ts +2 -1
  88. package/src/utils/format.js +81 -8
  89. package/src/utils/format.js.map +1 -1
  90. package/src/utils/function-constructs/function-constructs.d.ts +1 -1
  91. package/src/utils/function-constructs/function-constructs.js +8 -7
  92. package/src/utils/function-constructs/function-constructs.js.map +1 -1
  93. package/src/utils/identity-constructs/identity-constructs.d.ts +1 -1
  94. package/src/utils/identity-constructs/identity-constructs.js +7 -6
  95. package/src/utils/identity-constructs/identity-constructs.js.map +1 -1
  96. package/src/utils/metrics.d.ts +0 -1
  97. package/src/utils/metrics.js +23 -39
  98. package/src/utils/metrics.js.map +1 -1
  99. package/src/utils/py.d.ts +5 -0
  100. package/src/utils/py.js +31 -1
  101. package/src/utils/py.js.map +1 -1
  102. package/src/utils/shared-constructs.js +1 -5
  103. package/src/utils/shared-constructs.js.map +1 -1
  104. package/src/utils/shared-shadcn.js +1 -1
  105. package/src/utils/shared-shadcn.js.map +1 -1
  106. package/src/utils/website-constructs/website-constructs.d.ts +1 -1
  107. package/src/utils/website-constructs/website-constructs.js +9 -8
  108. package/src/utils/website-constructs/website-constructs.js.map +1 -1
@@ -1,13 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.addGeneratorMetricsIfApplicable = exports.metricsAspectVariableQuery = exports.TERRAFORM_METRICS_FILE_PATH = exports.METRICS_ASPECT_FILE_PATH = exports.METRIC_ID = void 0;
3
+ exports.addGeneratorMetricsIfApplicable = exports.TERRAFORM_METRICS_FILE_PATH = exports.METRICS_ASPECT_FILE_PATH = exports.METRIC_ID = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  /**
6
6
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
7
7
  * SPDX-License-Identifier: Apache-2.0
8
8
  */
9
9
  const devkit_1 = require("@nx/devkit");
10
- const typescript_1 = require("typescript");
11
10
  const ast_1 = require("./ast");
12
11
  const format_1 = require("./format");
13
12
  const nx_1 = require("./nx");
@@ -18,9 +17,8 @@ exports.METRIC_ID = 'uksb-4wk0bqpg5s';
18
17
  exports.METRICS_ASPECT_FILE_PATH = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'core', 'app.ts');
19
18
  // File in which the Terraform metrics CloudFormation stack may exist
20
19
  exports.TERRAFORM_METRICS_FILE_PATH = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_TERRAFORM_DIR, 'src', 'metrics', 'metrics.tf');
21
- // Query to find a particular metrics aspect variable
22
- const metricsAspectVariableQuery = (variableName, valueQuery) => `ClassDeclaration[name.name="MetricsAspect"] MethodDeclaration[name.name="visit"] VariableDeclaration:has(Identifier[name="${variableName}"]) ${valueQuery}`;
23
- exports.metricsAspectVariableQuery = metricsAspectVariableQuery;
20
+ // GritQL `within` clause to scope matches to the MetricsAspect class body
21
+ const WITHIN_METRICS_ASPECT = '$old <: within `class MetricsAspect implements $_ { $_ }`';
24
22
  /**
25
23
  * Instruments metrics by updating the MetricsAspect in common/constructs/src/core/app.ts if the file exists,
26
24
  * or updating the Terraform metrics CloudFormation stack if it exists
@@ -29,23 +27,19 @@ const addGeneratorMetricsIfApplicable = (tree, generatorInfo) => tslib_1.__await
29
27
  // Handle CDK metrics
30
28
  if (tree.exists(exports.METRICS_ASPECT_FILE_PATH)) {
31
29
  // Update the id
32
- (0, ast_1.replaceIfExists)(tree, exports.METRICS_ASPECT_FILE_PATH, (0, exports.metricsAspectVariableQuery)('id', 'StringLiteral'), () => {
33
- return typescript_1.factory.createStringLiteral(exports.METRIC_ID, true);
34
- });
30
+ yield (0, ast_1.applyGritQLTransform)(tree, exports.METRICS_ASPECT_FILE_PATH, `\`const id = $old\` => \`const id = '${exports.METRIC_ID}'\`` +
31
+ ` where { ${WITHIN_METRICS_ASPECT} }`);
35
32
  // Update the version
36
- (0, ast_1.replaceIfExists)(tree, exports.METRICS_ASPECT_FILE_PATH, (0, exports.metricsAspectVariableQuery)('version', 'StringLiteral'), () => {
37
- return typescript_1.factory.createStringLiteral((0, nx_1.getPackageVersion)(), true);
38
- });
33
+ yield (0, ast_1.applyGritQLTransform)(tree, exports.METRICS_ASPECT_FILE_PATH, `\`const version = $old\` => \`const version = '${(0, nx_1.getPackageVersion)()}'\`` +
34
+ ` where { ${WITHIN_METRICS_ASPECT} }`);
39
35
  // Add each generator as a tag
40
- (0, ast_1.replaceIfExists)(tree, exports.METRICS_ASPECT_FILE_PATH, (0, exports.metricsAspectVariableQuery)('tags', 'ArrayLiteralExpression'), (node) => {
41
- const existingMetrics = new Set(node.elements.map((element) => element === null || element === void 0 ? void 0 : element.text));
42
- return typescript_1.factory.createArrayLiteralExpression([
43
- ...node.elements,
44
- ...generatorInfo
45
- .filter((info) => !existingMetrics.has(info.metric))
46
- .map((info) => typescript_1.factory.createStringLiteral(info.metric, true)),
47
- ]);
48
- });
36
+ for (const info of generatorInfo) {
37
+ yield (0, ast_1.applyGritQLTransform)(tree, exports.METRICS_ASPECT_FILE_PATH, `\`const tags: string[] = $old\`` +
38
+ ` where { ${WITHIN_METRICS_ASPECT},` +
39
+ ` if ($old <: \`[]\`) { $old => \`['${info.metric}']\` }` +
40
+ ` else { $old <: \`[$items]\` where { $items += \`, '${info.metric}'\` } },` +
41
+ ` $old <: not contains \`'${info.metric}'\` }`);
42
+ }
49
43
  yield (0, format_1.formatFilesInSubtree)(tree, exports.METRICS_ASPECT_FILE_PATH);
50
44
  }
51
45
  // Handle Terraform metrics
@@ -58,25 +52,15 @@ exports.addGeneratorMetricsIfApplicable = addGeneratorMetricsIfApplicable;
58
52
  * Updates the Terraform metrics CloudFormation stack with generator information
59
53
  */
60
54
  const updateTerraformMetrics = (tree, generatorInfo) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
61
- const content = tree.read(exports.TERRAFORM_METRICS_FILE_PATH, 'utf-8') || '';
62
- // Extract existing tags from the Description field in the CloudFormation template
63
- const descriptionMatch = content.match(/Description\s*=\s*"([^"]*)"/);
64
- const existingDescription = descriptionMatch ? descriptionMatch[1] : '';
65
- // Parse existing metrics from description
66
- const existingMetrics = new Set();
67
- const tagMatch = existingDescription.match(/\(tag:([^)]*)\)/);
68
- if (tagMatch && tagMatch[1]) {
69
- tagMatch[1].split(',').forEach((tag) => existingMetrics.add(tag.trim()));
55
+ // Update metric_id
56
+ yield (0, ast_1.applyGritQLTransform)(tree, exports.TERRAFORM_METRICS_FILE_PATH, `\`metric_id = $old\` => \`metric_id = "${exports.METRIC_ID}"\``);
57
+ // Update metric_version
58
+ yield (0, ast_1.applyGritQLTransform)(tree, exports.TERRAFORM_METRICS_FILE_PATH, `\`metric_version = $old\` => \`metric_version = "${(0, nx_1.getPackageVersion)()}"\``);
59
+ // Update metric_tags
60
+ for (const info of generatorInfo) {
61
+ yield (0, ast_1.applyGritQLTransform)(tree, exports.TERRAFORM_METRICS_FILE_PATH, `or { \`metric_tags = []\` => \`metric_tags = ["${info.metric}"]\`,` +
62
+ ` \`metric_tags = [$items]\` where { $items += \`, "${info.metric}"\` }` +
63
+ ` where { $items <: not contains \`"${info.metric}"\` } }`);
70
64
  }
71
- // Add new metrics
72
- const newTags = generatorInfo
73
- .filter((info) => !existingMetrics.has(info.metric))
74
- .map((info) => info.metric);
75
- const allTags = [...existingMetrics, ...newTags];
76
- // Build new description
77
- const newDescription = `(${exports.METRIC_ID}) (version:${(0, nx_1.getPackageVersion)()}) (tag:${allTags.join(',')})`;
78
- // Update the Description in the CloudFormation template within the Terraform file
79
- const updatedContent = content.replace(/Description\s*=\s*"[^"]*"/, `Description = "${newDescription}"`);
80
- tree.write(exports.TERRAFORM_METRICS_FILE_PATH, updatedContent);
81
65
  });
82
66
  //# sourceMappingURL=metrics.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/metrics.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/metrics.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAAqD;AACrD,+BAA6C;AAC7C,qCAAgD;AAChD,6BAA0D;AAC1D,+EAIuC;AAEvC,iDAAiD;AACpC,QAAA,SAAS,GAAG,iBAAiB,CAAC;AAE3C,kDAAkD;AACrC,QAAA,wBAAwB,GAAG,IAAA,0BAAiB,EACvD,0CAAY,EACZ,mDAAqB,EACrB,KAAK,EACL,MAAM,EACN,QAAQ,CACT,CAAC;AAEF,qEAAqE;AACxD,QAAA,2BAA2B,GAAG,IAAA,0BAAiB,EAC1D,0CAAY,EACZ,kDAAoB,EACpB,KAAK,EACL,SAAS,EACT,YAAY,CACb,CAAC;AAEF,0EAA0E;AAC1E,MAAM,qBAAqB,GACzB,2DAA2D,CAAC;AAE9D;;;GAGG;AACI,MAAM,+BAA+B,GAAG,CAC7C,IAAU,EACV,aAAgC,EAChC,EAAE;IACF,qBAAqB;IACrB,IAAI,IAAI,CAAC,MAAM,CAAC,gCAAwB,CAAC,EAAE,CAAC;QAC1C,gBAAgB;QAChB,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,gCAAwB,EACxB,wCAAwC,iBAAS,KAAK;YACpD,YAAY,qBAAqB,IAAI,CACxC,CAAC;QAEF,qBAAqB;QACrB,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,gCAAwB,EACxB,kDAAkD,IAAA,sBAAiB,GAAE,KAAK;YACxE,YAAY,qBAAqB,IAAI,CACxC,CAAC;QAEF,8BAA8B;QAC9B,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,gCAAwB,EACxB,iCAAiC;gBAC/B,YAAY,qBAAqB,GAAG;gBACpC,sCAAsC,IAAI,CAAC,MAAM,QAAQ;gBACzD,uDAAuD,IAAI,CAAC,MAAM,UAAU;gBAC5E,4BAA4B,IAAI,CAAC,MAAM,OAAO,CACjD,CAAC;QACJ,CAAC;QAED,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE,gCAAwB,CAAC,CAAC;IAC7D,CAAC;IAED,2BAA2B;IAC3B,IAAI,IAAI,CAAC,MAAM,CAAC,mCAA2B,CAAC,EAAE,CAAC;QAC7C,MAAM,sBAAsB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACpD,CAAC;AACH,CAAC,CAAA,CAAC;AA1CW,QAAA,+BAA+B,mCA0C1C;AAEF;;GAEG;AACH,MAAM,sBAAsB,GAAG,CAC7B,IAAU,EACV,aAAgC,EAChC,EAAE;IACF,mBAAmB;IACnB,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,mCAA2B,EAC3B,0CAA0C,iBAAS,KAAK,CACzD,CAAC;IAEF,wBAAwB;IACxB,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,mCAA2B,EAC3B,oDAAoD,IAAA,sBAAiB,GAAE,KAAK,CAC7E,CAAC;IAEF,qBAAqB;IACrB,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QACjC,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,mCAA2B,EAC3B,kDAAkD,IAAI,CAAC,MAAM,OAAO;YAClE,sDAAsD,IAAI,CAAC,MAAM,OAAO;YACxE,sCAAsC,IAAI,CAAC,MAAM,SAAS,CAC7D,CAAC;IACJ,CAAC;AACH,CAAC,CAAA,CAAC"}
package/src/utils/py.d.ts CHANGED
@@ -16,3 +16,8 @@ export interface UvxWithDep {
16
16
  * Optionally specify withDeps to render uvx --with dep==version
17
17
  */
18
18
  export declare const uvxCommand: (dep: IPyDepVersion, args?: string, withDeps?: UvxWithDep[]) => string;
19
+ /**
20
+ * Add a workspace dependency from one Python project to another.
21
+ * Adds the dependency to [project].dependencies and [tool.uv.sources].
22
+ */
23
+ export declare const addWorkspaceDependencyToPyProject: (tree: Tree, projectRoot: string, dependencyPackageName: string) => void;
package/src/utils/py.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.uvxCommand = exports.addDependenciesToDependencyGroupInPyProjectToml = exports.addDependenciesToPyProjectToml = void 0;
3
+ exports.addWorkspaceDependencyToPyProject = exports.uvxCommand = exports.addDependenciesToDependencyGroupInPyProjectToml = exports.addDependenciesToPyProjectToml = void 0;
4
4
  /**
5
5
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
6
6
  * SPDX-License-Identifier: Apache-2.0
@@ -9,6 +9,7 @@ const toml_1 = require("@iarna/toml");
9
9
  const devkit_1 = require("@nx/devkit");
10
10
  const versions_1 = require("./versions");
11
11
  const pip_requirements_js_1 = require("pip-requirements-js");
12
+ const toml_2 = require("./toml");
12
13
  /**
13
14
  * Add dependencies to a pyproject.toml file
14
15
  */
@@ -55,4 +56,33 @@ const uvxCommand = (dep, args, withDeps) => {
55
56
  : ''}${(0, versions_1.withPyVersions)([dep])[0]}${args ? ` ${args}` : ''}`;
56
57
  };
57
58
  exports.uvxCommand = uvxCommand;
59
+ /**
60
+ * Add a workspace dependency from one Python project to another.
61
+ * Adds the dependency to [project].dependencies and [tool.uv.sources].
62
+ */
63
+ const addWorkspaceDependencyToPyProject = (tree, projectRoot, dependencyPackageName) => {
64
+ const pyprojectPath = (0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml');
65
+ if (!tree.exists(pyprojectPath)) {
66
+ return;
67
+ }
68
+ (0, toml_2.updateToml)(tree, pyprojectPath, (toml) => {
69
+ var _a, _b, _c, _d, _e;
70
+ // Add to [project].dependencies if not already present
71
+ const deps = (_b = (_a = toml.project) === null || _a === void 0 ? void 0 : _a.dependencies) !== null && _b !== void 0 ? _b : [];
72
+ if (!deps.some((d) => d === dependencyPackageName ||
73
+ d.startsWith(`${dependencyPackageName}>=`) ||
74
+ d.startsWith(`${dependencyPackageName}==`))) {
75
+ toml.project.dependencies = [...deps, dependencyPackageName];
76
+ }
77
+ // Add to [tool.uv.sources] with workspace = true
78
+ toml.tool = (_c = toml.tool) !== null && _c !== void 0 ? _c : {};
79
+ toml.tool.uv = (_d = toml.tool.uv) !== null && _d !== void 0 ? _d : {};
80
+ toml.tool.uv.sources = (_e = toml.tool.uv.sources) !== null && _e !== void 0 ? _e : {};
81
+ toml.tool.uv.sources[dependencyPackageName] = {
82
+ workspace: true,
83
+ };
84
+ return toml;
85
+ });
86
+ };
87
+ exports.addWorkspaceDependencyToPyProject = addWorkspaceDependencyToPyProject;
58
88
  //# sourceMappingURL=py.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"py.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/py.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"py.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/py.ts"],"names":[],"mappings":"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"}
@@ -82,11 +82,7 @@ function sharedConstructsGenerator(tree, options) {
82
82
  });
83
83
  tree.delete((0, devkit_1.joinPathFragments)(terraformLibPath, 'src', 'main.tf'));
84
84
  // Create the metrics.tf file with empty initial values
85
- (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'terraform'), terraformLibPath, {
86
- metricId: '',
87
- version: '',
88
- tags: '',
89
- }, {
85
+ (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'terraform'), terraformLibPath, {}, {
90
86
  overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
91
87
  });
92
88
  yield (0, format_1.formatFilesInSubtree)(tree);
@@ -1 +1 @@
1
- {"version":3,"file":"shared-constructs.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-constructs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shared-constructs.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-constructs.ts"],"names":[],"mappings":"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"}
@@ -88,7 +88,7 @@ function sharedShadcnGenerator(tree) {
88
88
  }, {
89
89
  overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
90
90
  });
91
- (0, ts_project_utils_1.configureTsProject)(tree, {
91
+ yield (0, ts_project_utils_1.configureTsProject)(tree, {
92
92
  dir: libraryRoot,
93
93
  fullyQualifiedName,
94
94
  });
@@ -1 +1 @@
1
- {"version":3,"file":"shared-shadcn.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-shadcn.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shared-shadcn.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-shadcn.ts"],"names":[],"mappings":"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"}
@@ -16,4 +16,4 @@ export interface AddWebsiteInfraOptions {
16
16
  */
17
17
  export declare const addWebsiteInfra: (tree: Tree, options: AddWebsiteInfraOptions & {
18
18
  iacProvider: IacProvider;
19
- }) => void;
19
+ }) => Promise<void>;
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.addWebsiteInfra = void 0;
4
+ const tslib_1 = require("tslib");
4
5
  /**
5
6
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
6
7
  * SPDX-License-Identifier: Apache-2.0
@@ -11,9 +12,9 @@ const ast_1 = require("../ast");
11
12
  /**
12
13
  * Add infrastructure for a static website
13
14
  */
14
- const addWebsiteInfra = (tree, options) => {
15
+ const addWebsiteInfra = (tree, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
15
16
  if (options.iacProvider === 'CDK') {
16
- addWebsiteCdkConstructs(tree, options);
17
+ yield addWebsiteCdkConstructs(tree, options);
17
18
  }
18
19
  else if (options.iacProvider === 'Terraform') {
19
20
  addWebsiteTerraformModules(tree, options);
@@ -37,19 +38,19 @@ const addWebsiteInfra = (tree, options) => {
37
38
  ];
38
39
  return config;
39
40
  });
40
- };
41
+ });
41
42
  exports.addWebsiteInfra = addWebsiteInfra;
42
- const addWebsiteCdkConstructs = (tree, options) => {
43
+ const addWebsiteCdkConstructs = (tree, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
43
44
  (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'cdk', 'core'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'core'), options, {
44
45
  overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
45
46
  });
46
47
  (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'cdk', 'app'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'app'), options, {
47
48
  overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
48
49
  });
49
- (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');
50
- (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'), `./${options.websiteNameKebabCase}.js`);
51
- (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');
52
- };
50
+ yield (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');
51
+ yield (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'), `./${options.websiteNameKebabCase}.js`);
52
+ yield (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');
53
+ });
53
54
  const addWebsiteTerraformModules = (tree, options) => {
54
55
  (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'terraform', 'core'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_TERRAFORM_DIR, 'src', 'core'), options, {
55
56
  overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
@@ -1 +1 @@
1
- {"version":3,"file":"website-constructs.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/website-constructs/website-constructs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"website-constructs.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/website-constructs/website-constructs.ts"],"names":[],"mappings":"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"}