@aws/nx-plugin 1.0.0-rc.32 → 1.0.0-rc.34

package/src/utils/shared-constructs.js

@@ -6,6 +6,7 @@ import terraformProjectGenerator from "../terraform/project/generator.js";
 import tsProjectGenerator from "../ts/lib/generator.js";
 import { readAwsNxPluginConfig } from "./config/utils.js";
 import { formatFilesInSubtree } from "./format.js";
+import { esmVars } from "./module-format.js";
 import { getNpmScopePrefix, toScopeAlias } from "./npm-scope.js";
 import { getPackageManagerDisplayCommands } from "./pkg-manager.js";
 import { PACKAGES_DIR, SHARED_CONSTRUCTS_DIR, SHARED_CONSTRUCTS_NAME, SHARED_TERRAFORM_DIR, SHARED_TERRAFORM_NAME } from "./shared-constructs-constants.js";
@@ -25,7 +26,8 @@ export async function sharedConstructsGenerator(tree, options) {
             generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', SHARED_CONSTRUCTS_DIR, 'src'), joinPathFragments(PACKAGES_DIR, SHARED_CONSTRUCTS_DIR, 'src'), {
                 npmScopePrefix,
                 scopeAlias: toScopeAlias(npmScopePrefix),
-                tags: (await readAwsNxPluginConfig(tree))?.tags ?? []
+                tags: (await readAwsNxPluginConfig(tree))?.tags ?? [],
+                ...esmVars(tree)
             }, {
                 overwriteStrategy: OverwriteStrategy.KeepExisting
             });
@@ -54,27 +56,18 @@ export async function sharedConstructsGenerator(tree, options) {
                 directory: joinPathFragments(PACKAGES_DIR, 'common'),
                 type: 'library'
             });
-            // Add target to reset runtime config as part of the build, ensuring any plan/apply target
-            // which depends on shared terraform will build runtime-config.json from scratch, meaning no old
-            // values will remain when resources are removed.
-            // NB: runtime-config.json starts as an empty object to keep the reader terraform module simple
+            // `build` is a no-op orchestration target that produces no files of its
+            // own. Terraform writes runtime-config entries into
+            // `dist/{projectRoot}/runtime-config` at apply time, and other terraform
+            // projects contribute their own entries to the same directory. Without
+            // explicit outputs, Nx infers `dist/{projectRoot}` as this target's
+            // cached output and, on a cache hit, restores the cached copy over the
+            // freshly-applied config — wiping the very values consumers read. Declare
+            // no outputs so Nx never treats runtime config as a cacheable artifact.
             updateJson(tree, joinPathFragments(PACKAGES_DIR, SHARED_TERRAFORM_DIR, 'project.json'), (projectConfig)=>{
                 projectConfig.targets ??= {};
-                projectConfig.targets['reset-runtime-config'] = {
-                    executor: 'nx:run-commands',
-                    options: {
-                        command: 'tsx scripts/reset-runtime-config.ts',
-                        cwd: '{projectRoot}',
-                        env: {
-                            DIST_DIR: '{workspaceRoot}/dist/{projectRoot}'
-                        }
-                    }
-                };
                 projectConfig.targets.build ??= {};
-                projectConfig.targets.build.dependsOn = [
-                    ...(projectConfig.targets.build.dependsOn ?? []).filter((t)=>t !== 'reset-runtime-config'),
-                    'reset-runtime-config'
-                ];
+                projectConfig.targets.build.outputs = [];
                 return projectConfig;
             });
             tree.delete(joinPathFragments(terraformLibPath, 'src', 'main.tf'));
@@ -84,9 +77,6 @@ export async function sharedConstructsGenerator(tree, options) {
             }, {
                 overwriteStrategy: OverwriteStrategy.KeepExisting
             });
-            addDependenciesToPackageJson(tree, {}, withVersions([
-                'tsx'
-            ]));
             await formatFilesInSubtree(tree);
         }
     }

package/src/utils/shared-constructs.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-constructs.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport terraformProjectGenerator from '../terraform/project/generator';\nimport tsProjectGenerator from '../ts/lib/generator';\nimport { readAwsNxPluginConfig } from './config/utils';\nimport { formatFilesInSubtree } from './format';\nimport type { Iac } from './iac';\nimport { getNpmScopePrefix, toScopeAlias } from './npm-scope';\nimport { getPackageManagerDisplayCommands } from './pkg-manager';\nimport {\n  PACKAGES_DIR,\n  SHARED_CONSTRUCTS_DIR,\n  SHARED_CONSTRUCTS_NAME,\n  SHARED_TERRAFORM_DIR,\n  SHARED_TERRAFORM_NAME,\n} from './shared-constructs-constants';\nimport { terraformProviderVersions, withVersions } from './versions';\n\nexport interface SharedConstructsGeneratorOptions {\n  iac: Iac;\n}\n\nexport async function sharedConstructsGenerator(\n  tree: Tree,\n  options: SharedConstructsGeneratorOptions,\n) {\n  const { iac } = options;\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  updateGitignore(tree);\n\n  if (iac === 'cdk') {\n    if (\n      !tree.exists(\n        joinPathFragments(PACKAGES_DIR, SHARED_CONSTRUCTS_DIR, 'project.json'),\n      )\n    ) {\n      await tsProjectGenerator(tree, {\n        name: SHARED_CONSTRUCTS_NAME,\n        directory: PACKAGES_DIR,\n        subDirectory: SHARED_CONSTRUCTS_DIR,\n      });\n      tree.delete(\n        joinPathFragments(PACKAGES_DIR, SHARED_CONSTRUCTS_DIR, 'src'),\n      );\n      generateFiles(\n        tree,\n        joinPathFragments(\n          import.meta.dirname,\n          'files',\n          SHARED_CONSTRUCTS_DIR,\n          'src',\n        ),\n        joinPathFragments(PACKAGES_DIR, SHARED_CONSTRUCTS_DIR, 'src'),\n        {\n          npmScopePrefix,\n          scopeAlias: toScopeAlias(npmScopePrefix),\n          tags: (await readAwsNxPluginConfig(tree))?.tags ?? [],\n        },\n        {\n          overwriteStrategy: OverwriteStrategy.KeepExisting,\n        },\n      );\n      generateFiles(\n        tree,\n        joinPathFragments(import.meta.dirname, 'files', 'common', 'readme'),\n        joinPathFragments(PACKAGES_DIR, SHARED_CONSTRUCTS_DIR),\n        {\n          fullyQualifiedName: `${npmScopePrefix}${SHARED_CONSTRUCTS_NAME}`,\n          name: SHARED_CONSTRUCTS_NAME,\n          pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n        },\n        {\n          overwriteStrategy: OverwriteStrategy.Overwrite,\n        },\n      );\n      addDependenciesToPackageJson(\n        tree,\n        withVersions(['constructs', 'aws-cdk-lib']),\n        withVersions(['@types/node']),\n      );\n      await formatFilesInSubtree(tree);\n    }\n  }\n\n  // Handle Terraform provider\n  if (iac === 'terraform') {\n    const terraformLibPath = joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_TERRAFORM_DIR,\n    );\n    if (!tree.exists(joinPathFragments(terraformLibPath, 'project.json'))) {\n      await terraformProjectGenerator(tree, {\n        name: SHARED_TERRAFORM_NAME,\n        directory: joinPathFragments(PACKAGES_DIR, 'common'),\n        type: 'library',\n      });\n\n      // Add target to reset runtime config as part of the build, ensuring any plan/apply target\n      // which depends on shared terraform will build runtime-config.json from scratch, meaning no old\n      // values will remain when resources are removed.\n      // NB: runtime-config.json starts as an empty object to keep the reader terraform module simple\n      updateJson(\n        tree,\n        joinPathFragments(PACKAGES_DIR, SHARED_TERRAFORM_DIR, 'project.json'),\n        (projectConfig: ProjectConfiguration) => {\n          projectConfig.targets ??= {};\n          projectConfig.targets['reset-runtime-config'] = {\n            executor: 'nx:run-commands',\n            options: {\n              command: 'tsx scripts/reset-runtime-config.ts',\n              cwd: '{projectRoot}',\n              env: {\n                DIST_DIR: '{workspaceRoot}/dist/{projectRoot}',\n              },\n            },\n          };\n          projectConfig.targets.build ??= {};\n          projectConfig.targets.build.dependsOn = [\n            ...(projectConfig.targets.build.dependsOn ?? []).filter(\n              (t) => t !== 'reset-runtime-config',\n            ),\n            'reset-runtime-config',\n          ];\n          return projectConfig;\n        },\n      );\n\n      tree.delete(joinPathFragments(terraformLibPath, 'src', 'main.tf'));\n\n      // Create the metrics.tf file with empty initial values\n      generateFiles(\n        tree,\n        joinPathFragments(import.meta.dirname, 'files', 'terraform'),\n        terraformLibPath,\n        { ...terraformProviderVersions() },\n        {\n          overwriteStrategy: OverwriteStrategy.KeepExisting,\n        },\n      );\n\n      addDependenciesToPackageJson(tree, {}, withVersions(['tsx']));\n\n      await formatFilesInSubtree(tree);\n    }\n  }\n}\n\nconst updateGitignore = (tree: Tree) => {\n  const gitignore = tree.exists('.gitignore')\n    ? tree.read('.gitignore', 'utf-8')\n    : '';\n  const regex = /runtime-config.json/gm;\n  const hasRuntimeConfig = regex.test(gitignore ?? '');\n  if (hasRuntimeConfig) {\n    return;\n  }\n  tree.write('.gitignore', `${gitignore}\\n\\nruntime-config.json`);\n};\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","updateJson","terraformProjectGenerator","tsProjectGenerator","readAwsNxPluginConfig","formatFilesInSubtree","getNpmScopePrefix","toScopeAlias","getPackageManagerDisplayCommands","PACKAGES_DIR","SHARED_CONSTRUCTS_DIR","SHARED_CONSTRUCTS_NAME","SHARED_TERRAFORM_DIR","SHARED_TERRAFORM_NAME","terraformProviderVersions","withVersions","sharedConstructsGenerator","tree","options","iac","npmScopePrefix","updateGitignore","exists","name","directory","subDirectory","delete","dirname","scopeAlias","tags","overwriteStrategy","KeepExisting","fullyQualifiedName","pkgMgrCmd","exec","Overwrite","terraformLibPath","type","projectConfig","targets","executor","command","cwd","env","DIST_DIR","build","dependsOn","filter","t","gitignore","read","regex","hasRuntimeConfig","test","write"],"mappings":"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"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-constructs.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport terraformProjectGenerator from '../terraform/project/generator';\nimport tsProjectGenerator from '../ts/lib/generator';\nimport { readAwsNxPluginConfig } from './config/utils';\nimport { formatFilesInSubtree } from './format';\nimport type { Iac } from './iac';\nimport { esmVars } from './module-format';\nimport { getNpmScopePrefix, toScopeAlias } from './npm-scope';\nimport { getPackageManagerDisplayCommands } from './pkg-manager';\nimport {\n  PACKAGES_DIR,\n  SHARED_CONSTRUCTS_DIR,\n  SHARED_CONSTRUCTS_NAME,\n  SHARED_TERRAFORM_DIR,\n  SHARED_TERRAFORM_NAME,\n} from './shared-constructs-constants';\nimport { terraformProviderVersions, withVersions } from './versions';\n\nexport interface SharedConstructsGeneratorOptions {\n  iac: Iac;\n}\n\nexport async function sharedConstructsGenerator(\n  tree: Tree,\n  options: SharedConstructsGeneratorOptions,\n) {\n  const { iac } = options;\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  updateGitignore(tree);\n\n  if (iac === 'cdk') {\n    if (\n      !tree.exists(\n        joinPathFragments(PACKAGES_DIR, SHARED_CONSTRUCTS_DIR, 'project.json'),\n      )\n    ) {\n      await tsProjectGenerator(tree, {\n        name: SHARED_CONSTRUCTS_NAME,\n        directory: PACKAGES_DIR,\n        subDirectory: SHARED_CONSTRUCTS_DIR,\n      });\n      tree.delete(\n        joinPathFragments(PACKAGES_DIR, SHARED_CONSTRUCTS_DIR, 'src'),\n      );\n      generateFiles(\n        tree,\n        joinPathFragments(\n          import.meta.dirname,\n          'files',\n          SHARED_CONSTRUCTS_DIR,\n          'src',\n        ),\n        joinPathFragments(PACKAGES_DIR, SHARED_CONSTRUCTS_DIR, 'src'),\n        {\n          npmScopePrefix,\n          scopeAlias: toScopeAlias(npmScopePrefix),\n          tags: (await readAwsNxPluginConfig(tree))?.tags ?? [],\n          ...esmVars(tree),\n        },\n        {\n          overwriteStrategy: OverwriteStrategy.KeepExisting,\n        },\n      );\n      generateFiles(\n        tree,\n        joinPathFragments(import.meta.dirname, 'files', 'common', 'readme'),\n        joinPathFragments(PACKAGES_DIR, SHARED_CONSTRUCTS_DIR),\n        {\n          fullyQualifiedName: `${npmScopePrefix}${SHARED_CONSTRUCTS_NAME}`,\n          name: SHARED_CONSTRUCTS_NAME,\n          pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n        },\n        {\n          overwriteStrategy: OverwriteStrategy.Overwrite,\n        },\n      );\n      addDependenciesToPackageJson(\n        tree,\n        withVersions(['constructs', 'aws-cdk-lib']),\n        withVersions(['@types/node']),\n      );\n      await formatFilesInSubtree(tree);\n    }\n  }\n\n  // Handle Terraform provider\n  if (iac === 'terraform') {\n    const terraformLibPath = joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_TERRAFORM_DIR,\n    );\n    if (!tree.exists(joinPathFragments(terraformLibPath, 'project.json'))) {\n      await terraformProjectGenerator(tree, {\n        name: SHARED_TERRAFORM_NAME,\n        directory: joinPathFragments(PACKAGES_DIR, 'common'),\n        type: 'library',\n      });\n\n      // `build` is a no-op orchestration target that produces no files of its\n      // own. Terraform writes runtime-config entries into\n      // `dist/{projectRoot}/runtime-config` at apply time, and other terraform\n      // projects contribute their own entries to the same directory. Without\n      // explicit outputs, Nx infers `dist/{projectRoot}` as this target's\n      // cached output and, on a cache hit, restores the cached copy over the\n      // freshly-applied config — wiping the very values consumers read. Declare\n      // no outputs so Nx never treats runtime config as a cacheable artifact.\n      updateJson(\n        tree,\n        joinPathFragments(PACKAGES_DIR, SHARED_TERRAFORM_DIR, 'project.json'),\n        (projectConfig: ProjectConfiguration) => {\n          projectConfig.targets ??= {};\n          projectConfig.targets.build ??= {};\n          projectConfig.targets.build.outputs = [];\n          return projectConfig;\n        },\n      );\n\n      tree.delete(joinPathFragments(terraformLibPath, 'src', 'main.tf'));\n\n      // Create the metrics.tf file with empty initial values\n      generateFiles(\n        tree,\n        joinPathFragments(import.meta.dirname, 'files', 'terraform'),\n        terraformLibPath,\n        { ...terraformProviderVersions() },\n        {\n          overwriteStrategy: OverwriteStrategy.KeepExisting,\n        },\n      );\n\n      await formatFilesInSubtree(tree);\n    }\n  }\n}\n\nconst updateGitignore = (tree: Tree) => {\n  const gitignore = tree.exists('.gitignore')\n    ? tree.read('.gitignore', 'utf-8')\n    : '';\n  const regex = /runtime-config.json/gm;\n  const hasRuntimeConfig = regex.test(gitignore ?? '');\n  if (hasRuntimeConfig) {\n    return;\n  }\n  tree.write('.gitignore', `${gitignore}\\n\\nruntime-config.json`);\n};\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","updateJson","terraformProjectGenerator","tsProjectGenerator","readAwsNxPluginConfig","formatFilesInSubtree","esmVars","getNpmScopePrefix","toScopeAlias","getPackageManagerDisplayCommands","PACKAGES_DIR","SHARED_CONSTRUCTS_DIR","SHARED_CONSTRUCTS_NAME","SHARED_TERRAFORM_DIR","SHARED_TERRAFORM_NAME","terraformProviderVersions","withVersions","sharedConstructsGenerator","tree","options","iac","npmScopePrefix","updateGitignore","exists","name","directory","subDirectory","delete","dirname","scopeAlias","tags","overwriteStrategy","KeepExisting","fullyQualifiedName","pkgMgrCmd","exec","Overwrite","terraformLibPath","type","projectConfig","targets","build","outputs","gitignore","read","regex","hasRuntimeConfig","test","write"],"mappings":"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"}

package/src/utils/shared-infra-config.js

@@ -4,6 +4,7 @@
  */ import { generateFiles, joinPathFragments, OverwriteStrategy } from "@nx/devkit";
 import tsProjectGenerator from "../ts/lib/generator.js";
 import { formatFilesInSubtree } from "./format.js";
+import { esmVars } from "./module-format.js";
 import { getNpmScopePrefix } from "./npm-scope.js";
 import { getPackageManagerDisplayCommands } from "./pkg-manager.js";
 import { PACKAGES_DIR, SHARED_INFRA_CONFIG_DIR, SHARED_INFRA_CONFIG_NAME } from "./shared-constructs-constants.js";
@@ -27,7 +28,8 @@ import { PACKAGES_DIR, SHARED_INFRA_CONFIG_DIR, SHARED_INFRA_CONFIG_NAME } from
     // Replace default src/ with our templates
     tree.delete(joinPathFragments(configDir, 'src'));
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', SHARED_INFRA_CONFIG_DIR, 'src'), joinPathFragments(configDir, 'src'), {
-        pkgMgrRunNx: `${displayCmds.exec} nx`
+        pkgMgrRunNx: `${displayCmds.exec} nx`,
+        ...esmVars(tree)
     }, {
         overwriteStrategy: OverwriteStrategy.KeepExisting
     });

package/src/utils/shared-infra-config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-infra-config.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n} from '@nx/devkit';\nimport tsProjectGenerator from '../ts/lib/generator';\nimport { formatFilesInSubtree } from './format';\nimport { getNpmScopePrefix } from './npm-scope';\nimport { getPackageManagerDisplayCommands } from './pkg-manager';\nimport {\n  PACKAGES_DIR,\n  SHARED_INFRA_CONFIG_DIR,\n  SHARED_INFRA_CONFIG_NAME,\n} from './shared-constructs-constants';\n\n/**\n * Lazily creates the shared infra-config package at packages/common/infra-config/.\n * Contains stage configuration types and the user's stage-to-credential mappings.\n * Importable from any package via ts project references.\n */\nexport async function sharedInfraConfigGenerator(tree: Tree): Promise<void> {\n  const configDir = joinPathFragments(PACKAGES_DIR, SHARED_INFRA_CONFIG_DIR);\n\n  // Don't recreate if it already exists\n  if (tree.exists(joinPathFragments(configDir, 'project.json'))) {\n    return;\n  }\n\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const displayCmds = getPackageManagerDisplayCommands();\n\n  await tsProjectGenerator(tree, {\n    name: SHARED_INFRA_CONFIG_NAME,\n    directory: PACKAGES_DIR,\n    subDirectory: SHARED_INFRA_CONFIG_DIR,\n  });\n\n  // Replace default src/ with our templates\n  tree.delete(joinPathFragments(configDir, 'src'));\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      SHARED_INFRA_CONFIG_DIR,\n      'src',\n    ),\n    joinPathFragments(configDir, 'src'),\n    {\n      pkgMgrRunNx: `${displayCmds.exec} nx`,\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Generate README\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'common', 'readme'),\n    configDir,\n    {\n      fullyQualifiedName: `${npmScopePrefix}${SHARED_INFRA_CONFIG_NAME}`,\n      name: SHARED_INFRA_CONFIG_NAME,\n      pkgMgrCmd: displayCmds.exec,\n    },\n    { overwriteStrategy: OverwriteStrategy.Overwrite },\n  );\n\n  await formatFilesInSubtree(tree);\n}\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","tsProjectGenerator","formatFilesInSubtree","getNpmScopePrefix","getPackageManagerDisplayCommands","PACKAGES_DIR","SHARED_INFRA_CONFIG_DIR","SHARED_INFRA_CONFIG_NAME","sharedInfraConfigGenerator","tree","configDir","exists","npmScopePrefix","displayCmds","name","directory","subDirectory","delete","dirname","pkgMgrRunNx","exec","overwriteStrategy","KeepExisting","fullyQualifiedName","pkgMgrCmd","Overwrite"],"mappings":"AAAA;;;CAGC,GACD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,QAEZ,aAAa;AACpB,OAAOC,wBAAwB,yBAAsB;AACrD,SAASC,oBAAoB,QAAQ,cAAW;AAChD,SAASC,iBAAiB,QAAQ,iBAAc;AAChD,SAASC,gCAAgC,QAAQ,mBAAgB;AACjE,SACEC,YAAY,EACZC,uBAAuB,EACvBC,wBAAwB,QACnB,mCAAgC;AAEvC;;;;CAIC,GACD,OAAO,eAAeC,2BAA2BC,IAAU;IACzD,MAAMC,YAAYX,kBAAkBM,cAAcC;IAElD,sCAAsC;IACtC,IAAIG,KAAKE,MAAM,CAACZ,kBAAkBW,WAAW,kBAAkB;QAC7D;IACF;IAEA,MAAME,iBAAiBT,kBAAkBM;IACzC,MAAMI,cAAcT;IAEpB,MAAMH,mBAAmBQ,MAAM;QAC7BK,MAAMP;QACNQ,WAAWV;QACXW,cAAcV;IAChB;IAEA,0CAA0C;IAC1CG,KAAKQ,MAAM,CAAClB,kBAAkBW,WAAW;IACzCZ,cACEW,MACAV,kBACE,YAAYmB,OAAO,EACnB,SACAZ,yBACA,QAEFP,kBAAkBW,WAAW,QAC7B;QACES,aAAa,GAAGN,YAAYO,IAAI,CAAC,GAAG,CAAC;IACvC,GACA;QAAEC,mBAAmBrB,kBAAkBsB,YAAY;IAAC;IAGtD,kBAAkB;IAClBxB,cACEW,MACAV,kBAAkB,YAAYmB,OAAO,EAAE,SAAS,UAAU,WAC1DR,WACA;QACEa,oBAAoB,GAAGX,iBAAiBL,0BAA0B;QAClEO,MAAMP;QACNiB,WAAWX,YAAYO,IAAI;IAC7B,GACA;QAAEC,mBAAmBrB,kBAAkByB,SAAS;IAAC;IAGnD,MAAMvB,qBAAqBO;AAC7B"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-infra-config.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n} from '@nx/devkit';\nimport tsProjectGenerator from '../ts/lib/generator';\nimport { formatFilesInSubtree } from './format';\nimport { esmVars } from './module-format';\nimport { getNpmScopePrefix } from './npm-scope';\nimport { getPackageManagerDisplayCommands } from './pkg-manager';\nimport {\n  PACKAGES_DIR,\n  SHARED_INFRA_CONFIG_DIR,\n  SHARED_INFRA_CONFIG_NAME,\n} from './shared-constructs-constants';\n\n/**\n * Lazily creates the shared infra-config package at packages/common/infra-config/.\n * Contains stage configuration types and the user's stage-to-credential mappings.\n * Importable from any package via ts project references.\n */\nexport async function sharedInfraConfigGenerator(tree: Tree): Promise<void> {\n  const configDir = joinPathFragments(PACKAGES_DIR, SHARED_INFRA_CONFIG_DIR);\n\n  // Don't recreate if it already exists\n  if (tree.exists(joinPathFragments(configDir, 'project.json'))) {\n    return;\n  }\n\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const displayCmds = getPackageManagerDisplayCommands();\n\n  await tsProjectGenerator(tree, {\n    name: SHARED_INFRA_CONFIG_NAME,\n    directory: PACKAGES_DIR,\n    subDirectory: SHARED_INFRA_CONFIG_DIR,\n  });\n\n  // Replace default src/ with our templates\n  tree.delete(joinPathFragments(configDir, 'src'));\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      SHARED_INFRA_CONFIG_DIR,\n      'src',\n    ),\n    joinPathFragments(configDir, 'src'),\n    {\n      pkgMgrRunNx: `${displayCmds.exec} nx`,\n      ...esmVars(tree),\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Generate README\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'common', 'readme'),\n    configDir,\n    {\n      fullyQualifiedName: `${npmScopePrefix}${SHARED_INFRA_CONFIG_NAME}`,\n      name: SHARED_INFRA_CONFIG_NAME,\n      pkgMgrCmd: displayCmds.exec,\n    },\n    { overwriteStrategy: OverwriteStrategy.Overwrite },\n  );\n\n  await formatFilesInSubtree(tree);\n}\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","tsProjectGenerator","formatFilesInSubtree","esmVars","getNpmScopePrefix","getPackageManagerDisplayCommands","PACKAGES_DIR","SHARED_INFRA_CONFIG_DIR","SHARED_INFRA_CONFIG_NAME","sharedInfraConfigGenerator","tree","configDir","exists","npmScopePrefix","displayCmds","name","directory","subDirectory","delete","dirname","pkgMgrRunNx","exec","overwriteStrategy","KeepExisting","fullyQualifiedName","pkgMgrCmd","Overwrite"],"mappings":"AAAA;;;CAGC,GACD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,QAEZ,aAAa;AACpB,OAAOC,wBAAwB,yBAAsB;AACrD,SAASC,oBAAoB,QAAQ,cAAW;AAChD,SAASC,OAAO,QAAQ,qBAAkB;AAC1C,SAASC,iBAAiB,QAAQ,iBAAc;AAChD,SAASC,gCAAgC,QAAQ,mBAAgB;AACjE,SACEC,YAAY,EACZC,uBAAuB,EACvBC,wBAAwB,QACnB,mCAAgC;AAEvC;;;;CAIC,GACD,OAAO,eAAeC,2BAA2BC,IAAU;IACzD,MAAMC,YAAYZ,kBAAkBO,cAAcC;IAElD,sCAAsC;IACtC,IAAIG,KAAKE,MAAM,CAACb,kBAAkBY,WAAW,kBAAkB;QAC7D;IACF;IAEA,MAAME,iBAAiBT,kBAAkBM;IACzC,MAAMI,cAAcT;IAEpB,MAAMJ,mBAAmBS,MAAM;QAC7BK,MAAMP;QACNQ,WAAWV;QACXW,cAAcV;IAChB;IAEA,0CAA0C;IAC1CG,KAAKQ,MAAM,CAACnB,kBAAkBY,WAAW;IACzCb,cACEY,MACAX,kBACE,YAAYoB,OAAO,EACnB,SACAZ,yBACA,QAEFR,kBAAkBY,WAAW,QAC7B;QACES,aAAa,GAAGN,YAAYO,IAAI,CAAC,GAAG,CAAC;QACrC,GAAGlB,QAAQO,KAAK;IAClB,GACA;QAAEY,mBAAmBtB,kBAAkBuB,YAAY;IAAC;IAGtD,kBAAkB;IAClBzB,cACEY,MACAX,kBAAkB,YAAYoB,OAAO,EAAE,SAAS,UAAU,WAC1DR,WACA;QACEa,oBAAoB,GAAGX,iBAAiBL,0BAA0B;QAClEO,MAAMP;QACNiB,WAAWX,YAAYO,IAAI;IAC7B,GACA;QAAEC,mBAAmBtB,kBAAkB0B,SAAS;IAAC;IAGnD,MAAMxB,qBAAqBQ;AAC7B"}

package/src/utils/shared-infra-scripts.js

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */ import { addDependenciesToPackageJson, generateFiles, joinPathFragments, OverwriteStrategy } from "@nx/devkit";
 import { formatFilesInSubtree } from "./format.js";
+import { esmVars } from "./module-format.js";
 import { getNpmScopePrefix, toScopeAlias } from "./npm-scope.js";
 import { getPackageManagerDisplayCommands } from "./pkg-manager.js";
 import { PACKAGES_DIR, SHARED_SCRIPTS_DIR, SHARED_SCRIPTS_NAME } from "./shared-constructs-constants.js";
@@ -18,7 +19,8 @@ import { withVersions } from "./versions.js";
     const npmScopePrefix = getNpmScopePrefix(tree);
     const scopeAlias = toScopeAlias(npmScopePrefix);
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', SHARED_SCRIPTS_DIR, 'src', 'infra'), joinPathFragments(scriptsDir, 'src', 'infra'), {
-        scopeAlias
+        scopeAlias,
+        ...esmVars(tree)
     }, {
         overwriteStrategy: OverwriteStrategy.KeepExisting
     });

package/src/utils/shared-infra-scripts.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-infra-scripts.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n} from '@nx/devkit';\nimport { formatFilesInSubtree } from './format';\nimport { getNpmScopePrefix, toScopeAlias } from './npm-scope';\nimport { getPackageManagerDisplayCommands } from './pkg-manager';\nimport {\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n  SHARED_SCRIPTS_NAME,\n} from './shared-constructs-constants';\nimport { ensureSharedScriptsProject } from './shared-scripts';\nimport { withVersions } from './versions';\n\n/**\n * Ensures the shared scripts package exists and adds infra-deploy/infra-destroy\n * scripts to packages/common/scripts/src/infra/. Called by ts#infra when\n * stageConfig is enabled.\n */\nexport async function sharedInfraScriptsGenerator(tree: Tree): Promise<void> {\n  const scriptsDir = joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR);\n\n  await ensureSharedScriptsProject(tree);\n\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const scopeAlias = toScopeAlias(npmScopePrefix);\n\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      SHARED_SCRIPTS_DIR,\n      'src',\n      'infra',\n    ),\n    joinPathFragments(scriptsDir, 'src', 'infra'),\n    { scopeAlias },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Used by deploy-time scripts for assumeRole\n  addDependenciesToPackageJson(\n    tree,\n    {},\n    withVersions(['@aws-sdk/client-sts', '@aws-sdk/credential-providers']),\n  );\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'common', 'readme'),\n    scriptsDir,\n    {\n      fullyQualifiedName: `${npmScopePrefix}${SHARED_SCRIPTS_NAME}`,\n      name: SHARED_SCRIPTS_NAME,\n      pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n    },\n    { overwriteStrategy: OverwriteStrategy.Overwrite },\n  );\n\n  await formatFilesInSubtree(tree);\n}\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","formatFilesInSubtree","getNpmScopePrefix","toScopeAlias","getPackageManagerDisplayCommands","PACKAGES_DIR","SHARED_SCRIPTS_DIR","SHARED_SCRIPTS_NAME","ensureSharedScriptsProject","withVersions","sharedInfraScriptsGenerator","tree","scriptsDir","npmScopePrefix","scopeAlias","dirname","overwriteStrategy","KeepExisting","fullyQualifiedName","name","pkgMgrCmd","exec","Overwrite"],"mappings":"AAAA;;;CAGC,GACD,SACEA,4BAA4B,EAC5BC,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,QAEZ,aAAa;AACpB,SAASC,oBAAoB,QAAQ,cAAW;AAChD,SAASC,iBAAiB,EAAEC,YAAY,QAAQ,iBAAc;AAC9D,SAASC,gCAAgC,QAAQ,mBAAgB;AACjE,SACEC,YAAY,EACZC,kBAAkB,EAClBC,mBAAmB,QACd,mCAAgC;AACvC,SAASC,0BAA0B,QAAQ,sBAAmB;AAC9D,SAASC,YAAY,QAAQ,gBAAa;AAE1C;;;;CAIC,GACD,OAAO,eAAeC,4BAA4BC,IAAU;IAC1D,MAAMC,aAAab,kBAAkBM,cAAcC;IAEnD,MAAME,2BAA2BG;IAEjC,MAAME,iBAAiBX,kBAAkBS;IACzC,MAAMG,aAAaX,aAAaU;IAEhCf,cACEa,MACAZ,kBACE,YAAYgB,OAAO,EACnB,SACAT,oBACA,OACA,UAEFP,kBAAkBa,YAAY,OAAO,UACrC;QAAEE;IAAW,GACb;QAAEE,mBAAmBhB,kBAAkBiB,YAAY;IAAC;IAGtD,6CAA6C;IAC7CpB,6BACEc,MACA,CAAC,GACDF,aAAa;QAAC;QAAuB;KAAgC;IAGvEX,cACEa,MACAZ,kBAAkB,YAAYgB,OAAO,EAAE,SAAS,UAAU,WAC1DH,YACA;QACEM,oBAAoB,GAAGL,iBAAiBN,qBAAqB;QAC7DY,MAAMZ;QACNa,WAAWhB,mCAAmCiB,IAAI;IACpD,GACA;QAAEL,mBAAmBhB,kBAAkBsB,SAAS;IAAC;IAGnD,MAAMrB,qBAAqBU;AAC7B"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-infra-scripts.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n} from '@nx/devkit';\nimport { formatFilesInSubtree } from './format';\nimport { esmVars } from './module-format';\nimport { getNpmScopePrefix, toScopeAlias } from './npm-scope';\nimport { getPackageManagerDisplayCommands } from './pkg-manager';\nimport {\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n  SHARED_SCRIPTS_NAME,\n} from './shared-constructs-constants';\nimport { ensureSharedScriptsProject } from './shared-scripts';\nimport { withVersions } from './versions';\n\n/**\n * Ensures the shared scripts package exists and adds infra-deploy/infra-destroy\n * scripts to packages/common/scripts/src/infra/. Called by ts#infra when\n * stageConfig is enabled.\n */\nexport async function sharedInfraScriptsGenerator(tree: Tree): Promise<void> {\n  const scriptsDir = joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR);\n\n  await ensureSharedScriptsProject(tree);\n\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const scopeAlias = toScopeAlias(npmScopePrefix);\n\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      SHARED_SCRIPTS_DIR,\n      'src',\n      'infra',\n    ),\n    joinPathFragments(scriptsDir, 'src', 'infra'),\n    { scopeAlias, ...esmVars(tree) },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Used by deploy-time scripts for assumeRole\n  addDependenciesToPackageJson(\n    tree,\n    {},\n    withVersions(['@aws-sdk/client-sts', '@aws-sdk/credential-providers']),\n  );\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'common', 'readme'),\n    scriptsDir,\n    {\n      fullyQualifiedName: `${npmScopePrefix}${SHARED_SCRIPTS_NAME}`,\n      name: SHARED_SCRIPTS_NAME,\n      pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n    },\n    { overwriteStrategy: OverwriteStrategy.Overwrite },\n  );\n\n  await formatFilesInSubtree(tree);\n}\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","formatFilesInSubtree","esmVars","getNpmScopePrefix","toScopeAlias","getPackageManagerDisplayCommands","PACKAGES_DIR","SHARED_SCRIPTS_DIR","SHARED_SCRIPTS_NAME","ensureSharedScriptsProject","withVersions","sharedInfraScriptsGenerator","tree","scriptsDir","npmScopePrefix","scopeAlias","dirname","overwriteStrategy","KeepExisting","fullyQualifiedName","name","pkgMgrCmd","exec","Overwrite"],"mappings":"AAAA;;;CAGC,GACD,SACEA,4BAA4B,EAC5BC,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,QAEZ,aAAa;AACpB,SAASC,oBAAoB,QAAQ,cAAW;AAChD,SAASC,OAAO,QAAQ,qBAAkB;AAC1C,SAASC,iBAAiB,EAAEC,YAAY,QAAQ,iBAAc;AAC9D,SAASC,gCAAgC,QAAQ,mBAAgB;AACjE,SACEC,YAAY,EACZC,kBAAkB,EAClBC,mBAAmB,QACd,mCAAgC;AACvC,SAASC,0BAA0B,QAAQ,sBAAmB;AAC9D,SAASC,YAAY,QAAQ,gBAAa;AAE1C;;;;CAIC,GACD,OAAO,eAAeC,4BAA4BC,IAAU;IAC1D,MAAMC,aAAad,kBAAkBO,cAAcC;IAEnD,MAAME,2BAA2BG;IAEjC,MAAME,iBAAiBX,kBAAkBS;IACzC,MAAMG,aAAaX,aAAaU;IAEhChB,cACEc,MACAb,kBACE,YAAYiB,OAAO,EACnB,SACAT,oBACA,OACA,UAEFR,kBAAkBc,YAAY,OAAO,UACrC;QAAEE;QAAY,GAAGb,QAAQU,KAAK;IAAC,GAC/B;QAAEK,mBAAmBjB,kBAAkBkB,YAAY;IAAC;IAGtD,6CAA6C;IAC7CrB,6BACEe,MACA,CAAC,GACDF,aAAa;QAAC;QAAuB;KAAgC;IAGvEZ,cACEc,MACAb,kBAAkB,YAAYiB,OAAO,EAAE,SAAS,UAAU,WAC1DH,YACA;QACEM,oBAAoB,GAAGL,iBAAiBN,qBAAqB;QAC7DY,MAAMZ;QACNa,WAAWhB,mCAAmCiB,IAAI;IACpD,GACA;QAAEL,mBAAmBjB,kBAAkBuB,SAAS;IAAC;IAGnD,MAAMtB,qBAAqBW;AAC7B"}

package/src/utils/shared-rdb-scripts.js

@@ -1,9 +1,10 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { generateFiles, joinPathFragments, OverwriteStrategy } from "@nx/devkit";
+ */ import { addDependenciesToPackageJson, generateFiles, joinPathFragments, OverwriteStrategy } from "@nx/devkit";
 import { PACKAGES_DIR, SHARED_SCRIPTS_DIR } from "./shared-constructs-constants.js";
 import { ensureSharedScriptsProject } from "./shared-scripts.js";
+import { withVersions } from "./versions.js";
 /**
  * Ensures the shared scripts package exists and adds RDB local-dev scripts
  * to packages/common/scripts/src/rdb/. Used by ts#rdb.
@@ -23,6 +24,9 @@ import { ensureSharedScriptsProject } from "./shared-scripts.js";
     generateFiles(tree, joinPathFragments(rdbScriptsDir, engine), targetDir, {}, {
         overwriteStrategy: OverwriteStrategy.KeepExisting
     });
+    addDependenciesToPackageJson(tree, {}, withVersions([
+        'tsx'
+    ]));
 }
 
 //# sourceMappingURL=shared-rdb-scripts.js.map

package/src/utils/shared-rdb-scripts.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-rdb-scripts.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n} from '@nx/devkit';\nimport {\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n} from './shared-constructs-constants';\nimport { ensureSharedScriptsProject } from './shared-scripts';\n\n/**\n * Ensures the shared scripts package exists and adds RDB local-dev scripts\n * to packages/common/scripts/src/rdb/. Used by ts#rdb.\n *\n * Engine-agnostic scripts (pull-image, start-container) are always vended.\n * Only the wait-for-db script for the requested engine is vended so that\n * projects do not reference database client packages they don't install.\n * The engine-specific file names allow postgres and mysql projects to\n * coexist in the same workspace.\n */\nexport async function sharedRdbScriptsGenerator(\n  tree: Tree,\n  engine: 'postgres' | 'mysql',\n): Promise<void> {\n  await ensureSharedScriptsProject(tree);\n\n  const rdbScriptsDir = joinPathFragments(\n    import.meta.dirname,\n    'files',\n    SHARED_SCRIPTS_DIR,\n    'src',\n    'rdb',\n  );\n  const targetDir = joinPathFragments(\n    PACKAGES_DIR,\n    SHARED_SCRIPTS_DIR,\n    'src',\n    'rdb',\n  );\n\n  generateFiles(\n    tree,\n    joinPathFragments(rdbScriptsDir, 'shared'),\n    targetDir,\n    {},\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n  generateFiles(\n    tree,\n    joinPathFragments(rdbScriptsDir, engine),\n    targetDir,\n    {},\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n}\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","PACKAGES_DIR","SHARED_SCRIPTS_DIR","ensureSharedScriptsProject","sharedRdbScriptsGenerator","tree","engine","rdbScriptsDir","dirname","targetDir","overwriteStrategy","KeepExisting"],"mappings":"AAAA;;;CAGC,GACD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,QAEZ,aAAa;AACpB,SACEC,YAAY,EACZC,kBAAkB,QACb,mCAAgC;AACvC,SAASC,0BAA0B,QAAQ,sBAAmB;AAE9D;;;;;;;;;CASC,GACD,OAAO,eAAeC,0BACpBC,IAAU,EACVC,MAA4B;IAE5B,MAAMH,2BAA2BE;IAEjC,MAAME,gBAAgBR,kBACpB,YAAYS,OAAO,EACnB,SACAN,oBACA,OACA;IAEF,MAAMO,YAAYV,kBAChBE,cACAC,oBACA,OACA;IAGFJ,cACEO,MACAN,kBAAkBQ,eAAe,WACjCE,WACA,CAAC,GACD;QAAEC,mBAAmBV,kBAAkBW,YAAY;IAAC;IAEtDb,cACEO,MACAN,kBAAkBQ,eAAeD,SACjCG,WACA,CAAC,GACD;QAAEC,mBAAmBV,kBAAkBW,YAAY;IAAC;AAExD"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-rdb-scripts.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n} from '@nx/devkit';\nimport {\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n} from './shared-constructs-constants';\nimport { ensureSharedScriptsProject } from './shared-scripts';\nimport { withVersions } from './versions';\n\n/**\n * Ensures the shared scripts package exists and adds RDB local-dev scripts\n * to packages/common/scripts/src/rdb/. Used by ts#rdb.\n *\n * Engine-agnostic scripts (pull-image, start-container) are always vended.\n * Only the wait-for-db script for the requested engine is vended so that\n * projects do not reference database client packages they don't install.\n * The engine-specific file names allow postgres and mysql projects to\n * coexist in the same workspace.\n */\nexport async function sharedRdbScriptsGenerator(\n  tree: Tree,\n  engine: 'postgres' | 'mysql',\n): Promise<void> {\n  await ensureSharedScriptsProject(tree);\n\n  const rdbScriptsDir = joinPathFragments(\n    import.meta.dirname,\n    'files',\n    SHARED_SCRIPTS_DIR,\n    'src',\n    'rdb',\n  );\n  const targetDir = joinPathFragments(\n    PACKAGES_DIR,\n    SHARED_SCRIPTS_DIR,\n    'src',\n    'rdb',\n  );\n\n  generateFiles(\n    tree,\n    joinPathFragments(rdbScriptsDir, 'shared'),\n    targetDir,\n    {},\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n  generateFiles(\n    tree,\n    joinPathFragments(rdbScriptsDir, engine),\n    targetDir,\n    {},\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  addDependenciesToPackageJson(tree, {}, withVersions(['tsx']));\n}\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","PACKAGES_DIR","SHARED_SCRIPTS_DIR","ensureSharedScriptsProject","withVersions","sharedRdbScriptsGenerator","tree","engine","rdbScriptsDir","dirname","targetDir","overwriteStrategy","KeepExisting"],"mappings":"AAAA;;;CAGC,GACD,SACEA,4BAA4B,EAC5BC,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,QAEZ,aAAa;AACpB,SACEC,YAAY,EACZC,kBAAkB,QACb,mCAAgC;AACvC,SAASC,0BAA0B,QAAQ,sBAAmB;AAC9D,SAASC,YAAY,QAAQ,gBAAa;AAE1C;;;;;;;;;CASC,GACD,OAAO,eAAeC,0BACpBC,IAAU,EACVC,MAA4B;IAE5B,MAAMJ,2BAA2BG;IAEjC,MAAME,gBAAgBT,kBACpB,YAAYU,OAAO,EACnB,SACAP,oBACA,OACA;IAEF,MAAMQ,YAAYX,kBAChBE,cACAC,oBACA,OACA;IAGFJ,cACEQ,MACAP,kBAAkBS,eAAe,WACjCE,WACA,CAAC,GACD;QAAEC,mBAAmBX,kBAAkBY,YAAY;IAAC;IAEtDd,cACEQ,MACAP,kBAAkBS,eAAeD,SACjCG,WACA,CAAC,GACD;QAAEC,mBAAmBX,kBAAkBY,YAAY;IAAC;IAGtDf,6BAA6BS,MAAM,CAAC,GAAGF,aAAa;QAAC;KAAM;AAC7D"}

package/src/utils/shared-shadcn.js

@@ -5,6 +5,7 @@
 import tsProjectGenerator from "../ts/lib/generator.js";
 import { configureTsProject } from "../ts/lib/ts-project-utils.js";
 import { formatFilesInSubtree } from "./format.js";
+import { esmVars } from "./module-format.js";
 import { getNpmScopePrefix, toScopeAlias } from "./npm-scope.js";
 import { ensurePnpmIgnoresWorkspaceRootCheck } from "./pnpm-workspace.js";
 import { PACKAGES_DIR, SHARED_SHADCN_DIR, SHARED_SHADCN_NAME } from "./shared-constructs-constants.js";
@@ -33,7 +34,8 @@ export async function sharedShadcnGenerator(tree) {
         });
         tree.delete(shadcnSrcRoot);
         generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', SHARED_SHADCN_DIR, 'src'), shadcnSrcRoot, {
-            scopeAlias
+            scopeAlias,
+            ...esmVars(tree)
         }, {
             overwriteStrategy: OverwriteStrategy.KeepExisting
         });

package/src/utils/shared-shadcn.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-shadcn.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport tsProjectGenerator from '../ts/lib/generator';\nimport { configureTsProject } from '../ts/lib/ts-project-utils';\nimport { formatFilesInSubtree } from './format';\nimport { getNpmScopePrefix, toScopeAlias } from './npm-scope';\nimport { ensurePnpmIgnoresWorkspaceRootCheck } from './pnpm-workspace';\nimport {\n  PACKAGES_DIR,\n  SHARED_SHADCN_DIR,\n  SHARED_SHADCN_NAME,\n} from './shared-constructs-constants';\nimport { type ITsDepVersion, withVersions } from './versions';\n\nconst SHADCN_DEPS = [\n  'class-variance-authority',\n  'clsx',\n  'tailwind-merge',\n  'lucide-react',\n  'tw-animate-css',\n  'radix-ui',\n] as const satisfies ITsDepVersion[];\n\nexport async function sharedShadcnGenerator(tree: Tree) {\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const scopeAlias = toScopeAlias(npmScopePrefix);\n  const sharedShadcnAlias = `${scopeAlias}${SHARED_SHADCN_NAME}`;\n  const fullyQualifiedName = `${npmScopePrefix}${SHARED_SHADCN_NAME}`;\n  const libraryRoot = joinPathFragments(PACKAGES_DIR, SHARED_SHADCN_DIR);\n  const shadcnSrcRoot = joinPathFragments(libraryRoot, 'src');\n  ensurePnpmIgnoresWorkspaceRootCheck(tree);\n\n  if (!tree.exists(joinPathFragments(libraryRoot, 'project.json'))) {\n    await tsProjectGenerator(tree, {\n      name: SHARED_SHADCN_NAME,\n      directory: PACKAGES_DIR,\n      subDirectory: SHARED_SHADCN_DIR,\n    });\n\n    tree.delete(shadcnSrcRoot);\n\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', SHARED_SHADCN_DIR, 'src'),\n      shadcnSrcRoot,\n      {\n        scopeAlias,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n\n    generateFiles(\n      tree,\n      joinPathFragments(\n        import.meta.dirname,\n        'files',\n        SHARED_SHADCN_DIR,\n        'readme',\n      ),\n      libraryRoot,\n      {\n        fullyQualifiedName,\n        scopeAlias,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.Overwrite,\n      },\n    );\n\n    await configureTsProject(tree, {\n      dir: libraryRoot,\n      fullyQualifiedName,\n    });\n\n    updateJson(\n      tree,\n      joinPathFragments(libraryRoot, 'tsconfig.lib.json'),\n      (json) => ({\n        ...json,\n        compilerOptions: {\n          ...json.compilerOptions,\n          jsx: 'react-jsx',\n          module: 'preserve',\n          moduleResolution: 'bundler',\n          lib: Array.from(\n            new Set([...(json.compilerOptions?.lib ?? []), 'DOM']),\n          ),\n        },\n        include: Array.from(new Set([...(json.include ?? []), 'src/**/*.tsx'])),\n      }),\n    );\n\n    addDependenciesToPackageJson(tree, withVersions([...SHADCN_DEPS]), {});\n  }\n\n  updateJson(tree, 'tsconfig.base.json', (json) => ({\n    ...json,\n    compilerOptions: {\n      ...json.compilerOptions,\n      paths: {\n        ...(json.compilerOptions?.paths ?? {}),\n        [`${sharedShadcnAlias}/*`]: [\n          `./${joinPathFragments(libraryRoot, 'src', '*')}`,\n        ],\n      },\n    },\n  }));\n\n  if (!tree.exists('components.json')) {\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', 'shadcn'),\n      '.',\n      {\n        sharedShadcnAlias,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n\n  await formatFilesInSubtree(tree);\n}\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","updateJson","tsProjectGenerator","configureTsProject","formatFilesInSubtree","getNpmScopePrefix","toScopeAlias","ensurePnpmIgnoresWorkspaceRootCheck","PACKAGES_DIR","SHARED_SHADCN_DIR","SHARED_SHADCN_NAME","withVersions","SHADCN_DEPS","sharedShadcnGenerator","tree","npmScopePrefix","scopeAlias","sharedShadcnAlias","fullyQualifiedName","libraryRoot","shadcnSrcRoot","exists","name","directory","subDirectory","delete","dirname","overwriteStrategy","KeepExisting","Overwrite","dir","json","compilerOptions","jsx","module","moduleResolution","lib","Array","from","Set","include","paths"],"mappings":"AAAA;;;CAGC,GACD,SACEA,4BAA4B,EAC5BC,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAEjBC,UAAU,QACL,aAAa;AACpB,OAAOC,wBAAwB,yBAAsB;AACrD,SAASC,kBAAkB,QAAQ,gCAA6B;AAChE,SAASC,oBAAoB,QAAQ,cAAW;AAChD,SAASC,iBAAiB,EAAEC,YAAY,QAAQ,iBAAc;AAC9D,SAASC,mCAAmC,QAAQ,sBAAmB;AACvE,SACEC,YAAY,EACZC,iBAAiB,EACjBC,kBAAkB,QACb,mCAAgC;AACvC,SAA6BC,YAAY,QAAQ,gBAAa;AAE9D,MAAMC,cAAc;IAClB;IACA;IACA;IACA;IACA;IACA;CACD;AAED,OAAO,eAAeC,sBAAsBC,IAAU;IACpD,MAAMC,iBAAiBV,kBAAkBS;IACzC,MAAME,aAAaV,aAAaS;IAChC,MAAME,oBAAoB,GAAGD,aAAaN,oBAAoB;IAC9D,MAAMQ,qBAAqB,GAAGH,iBAAiBL,oBAAoB;IACnE,MAAMS,cAAcpB,kBAAkBS,cAAcC;IACpD,MAAMW,gBAAgBrB,kBAAkBoB,aAAa;IACrDZ,oCAAoCO;IAEpC,IAAI,CAACA,KAAKO,MAAM,CAACtB,kBAAkBoB,aAAa,kBAAkB;QAChE,MAAMjB,mBAAmBY,MAAM;YAC7BQ,MAAMZ;YACNa,WAAWf;YACXgB,cAAcf;QAChB;QAEAK,KAAKW,MAAM,CAACL;QAEZtB,cACEgB,MACAf,kBAAkB,YAAY2B,OAAO,EAAE,SAASjB,mBAAmB,QACnEW,eACA;YACEJ;QACF,GACA;YACEW,mBAAmB3B,kBAAkB4B,YAAY;QACnD;QAGF9B,cACEgB,MACAf,kBACE,YAAY2B,OAAO,EACnB,SACAjB,mBACA,WAEFU,aACA;YACED;YACAF;QACF,GACA;YACEW,mBAAmB3B,kBAAkB6B,SAAS;QAChD;QAGF,MAAM1B,mBAAmBW,MAAM;YAC7BgB,KAAKX;YACLD;QACF;QAEAjB,WACEa,MACAf,kBAAkBoB,aAAa,sBAC/B,CAACY,OAAU,CAAA;gBACT,GAAGA,IAAI;gBACPC,iBAAiB;oBACf,GAAGD,KAAKC,eAAe;oBACvBC,KAAK;oBACLC,QAAQ;oBACRC,kBAAkB;oBAClBC,KAAKC,MAAMC,IAAI,CACb,IAAIC,IAAI;2BAAKR,KAAKC,eAAe,EAAEI,OAAO,EAAE;wBAAG;qBAAM;gBAEzD;gBACAI,SAASH,MAAMC,IAAI,CAAC,IAAIC,IAAI;uBAAKR,KAAKS,OAAO,IAAI,EAAE;oBAAG;iBAAe;YACvE,CAAA;QAGF3C,6BAA6BiB,MAAMH,aAAa;eAAIC;SAAY,GAAG,CAAC;IACtE;IAEAX,WAAWa,MAAM,sBAAsB,CAACiB,OAAU,CAAA;YAChD,GAAGA,IAAI;YACPC,iBAAiB;gBACf,GAAGD,KAAKC,eAAe;gBACvBS,OAAO;oBACL,GAAIV,KAAKC,eAAe,EAAES,SAAS,CAAC,CAAC;oBACrC,CAAC,GAAGxB,kBAAkB,EAAE,CAAC,CAAC,EAAE;wBAC1B,CAAC,EAAE,EAAElB,kBAAkBoB,aAAa,OAAO,MAAM;qBAClD;gBACH;YACF;QACF,CAAA;IAEA,IAAI,CAACL,KAAKO,MAAM,CAAC,oBAAoB;QACnCvB,cACEgB,MACAf,kBAAkB,YAAY2B,OAAO,EAAE,SAAS,WAChD,KACA;YACET;QACF,GACA;YACEU,mBAAmB3B,kBAAkB4B,YAAY;QACnD;IAEJ;IAEA,MAAMxB,qBAAqBU;AAC7B"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-shadcn.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport tsProjectGenerator from '../ts/lib/generator';\nimport { configureTsProject } from '../ts/lib/ts-project-utils';\nimport { formatFilesInSubtree } from './format';\nimport { esmVars } from './module-format';\nimport { getNpmScopePrefix, toScopeAlias } from './npm-scope';\nimport { ensurePnpmIgnoresWorkspaceRootCheck } from './pnpm-workspace';\nimport {\n  PACKAGES_DIR,\n  SHARED_SHADCN_DIR,\n  SHARED_SHADCN_NAME,\n} from './shared-constructs-constants';\nimport { type ITsDepVersion, withVersions } from './versions';\n\nconst SHADCN_DEPS = [\n  'class-variance-authority',\n  'clsx',\n  'tailwind-merge',\n  'lucide-react',\n  'tw-animate-css',\n  'radix-ui',\n] as const satisfies ITsDepVersion[];\n\nexport async function sharedShadcnGenerator(tree: Tree) {\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const scopeAlias = toScopeAlias(npmScopePrefix);\n  const sharedShadcnAlias = `${scopeAlias}${SHARED_SHADCN_NAME}`;\n  const fullyQualifiedName = `${npmScopePrefix}${SHARED_SHADCN_NAME}`;\n  const libraryRoot = joinPathFragments(PACKAGES_DIR, SHARED_SHADCN_DIR);\n  const shadcnSrcRoot = joinPathFragments(libraryRoot, 'src');\n  ensurePnpmIgnoresWorkspaceRootCheck(tree);\n\n  if (!tree.exists(joinPathFragments(libraryRoot, 'project.json'))) {\n    await tsProjectGenerator(tree, {\n      name: SHARED_SHADCN_NAME,\n      directory: PACKAGES_DIR,\n      subDirectory: SHARED_SHADCN_DIR,\n    });\n\n    tree.delete(shadcnSrcRoot);\n\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', SHARED_SHADCN_DIR, 'src'),\n      shadcnSrcRoot,\n      {\n        scopeAlias,\n        ...esmVars(tree),\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n\n    generateFiles(\n      tree,\n      joinPathFragments(\n        import.meta.dirname,\n        'files',\n        SHARED_SHADCN_DIR,\n        'readme',\n      ),\n      libraryRoot,\n      {\n        fullyQualifiedName,\n        scopeAlias,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.Overwrite,\n      },\n    );\n\n    await configureTsProject(tree, {\n      dir: libraryRoot,\n      fullyQualifiedName,\n    });\n\n    updateJson(\n      tree,\n      joinPathFragments(libraryRoot, 'tsconfig.lib.json'),\n      (json) => ({\n        ...json,\n        compilerOptions: {\n          ...json.compilerOptions,\n          jsx: 'react-jsx',\n          module: 'preserve',\n          moduleResolution: 'bundler',\n          lib: Array.from(\n            new Set([...(json.compilerOptions?.lib ?? []), 'DOM']),\n          ),\n        },\n        include: Array.from(new Set([...(json.include ?? []), 'src/**/*.tsx'])),\n      }),\n    );\n\n    addDependenciesToPackageJson(tree, withVersions([...SHADCN_DEPS]), {});\n  }\n\n  updateJson(tree, 'tsconfig.base.json', (json) => ({\n    ...json,\n    compilerOptions: {\n      ...json.compilerOptions,\n      paths: {\n        ...(json.compilerOptions?.paths ?? {}),\n        [`${sharedShadcnAlias}/*`]: [\n          `./${joinPathFragments(libraryRoot, 'src', '*')}`,\n        ],\n      },\n    },\n  }));\n\n  if (!tree.exists('components.json')) {\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', 'shadcn'),\n      '.',\n      {\n        sharedShadcnAlias,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n\n  await formatFilesInSubtree(tree);\n}\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","updateJson","tsProjectGenerator","configureTsProject","formatFilesInSubtree","esmVars","getNpmScopePrefix","toScopeAlias","ensurePnpmIgnoresWorkspaceRootCheck","PACKAGES_DIR","SHARED_SHADCN_DIR","SHARED_SHADCN_NAME","withVersions","SHADCN_DEPS","sharedShadcnGenerator","tree","npmScopePrefix","scopeAlias","sharedShadcnAlias","fullyQualifiedName","libraryRoot","shadcnSrcRoot","exists","name","directory","subDirectory","delete","dirname","overwriteStrategy","KeepExisting","Overwrite","dir","json","compilerOptions","jsx","module","moduleResolution","lib","Array","from","Set","include","paths"],"mappings":"AAAA;;;CAGC,GACD,SACEA,4BAA4B,EAC5BC,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAEjBC,UAAU,QACL,aAAa;AACpB,OAAOC,wBAAwB,yBAAsB;AACrD,SAASC,kBAAkB,QAAQ,gCAA6B;AAChE,SAASC,oBAAoB,QAAQ,cAAW;AAChD,SAASC,OAAO,QAAQ,qBAAkB;AAC1C,SAASC,iBAAiB,EAAEC,YAAY,QAAQ,iBAAc;AAC9D,SAASC,mCAAmC,QAAQ,sBAAmB;AACvE,SACEC,YAAY,EACZC,iBAAiB,EACjBC,kBAAkB,QACb,mCAAgC;AACvC,SAA6BC,YAAY,QAAQ,gBAAa;AAE9D,MAAMC,cAAc;IAClB;IACA;IACA;IACA;IACA;IACA;CACD;AAED,OAAO,eAAeC,sBAAsBC,IAAU;IACpD,MAAMC,iBAAiBV,kBAAkBS;IACzC,MAAME,aAAaV,aAAaS;IAChC,MAAME,oBAAoB,GAAGD,aAAaN,oBAAoB;IAC9D,MAAMQ,qBAAqB,GAAGH,iBAAiBL,oBAAoB;IACnE,MAAMS,cAAcrB,kBAAkBU,cAAcC;IACpD,MAAMW,gBAAgBtB,kBAAkBqB,aAAa;IACrDZ,oCAAoCO;IAEpC,IAAI,CAACA,KAAKO,MAAM,CAACvB,kBAAkBqB,aAAa,kBAAkB;QAChE,MAAMlB,mBAAmBa,MAAM;YAC7BQ,MAAMZ;YACNa,WAAWf;YACXgB,cAAcf;QAChB;QAEAK,KAAKW,MAAM,CAACL;QAEZvB,cACEiB,MACAhB,kBAAkB,YAAY4B,OAAO,EAAE,SAASjB,mBAAmB,QACnEW,eACA;YACEJ;YACA,GAAGZ,QAAQU,KAAK;QAClB,GACA;YACEa,mBAAmB5B,kBAAkB6B,YAAY;QACnD;QAGF/B,cACEiB,MACAhB,kBACE,YAAY4B,OAAO,EACnB,SACAjB,mBACA,WAEFU,aACA;YACED;YACAF;QACF,GACA;YACEW,mBAAmB5B,kBAAkB8B,SAAS;QAChD;QAGF,MAAM3B,mBAAmBY,MAAM;YAC7BgB,KAAKX;YACLD;QACF;QAEAlB,WACEc,MACAhB,kBAAkBqB,aAAa,sBAC/B,CAACY,OAAU,CAAA;gBACT,GAAGA,IAAI;gBACPC,iBAAiB;oBACf,GAAGD,KAAKC,eAAe;oBACvBC,KAAK;oBACLC,QAAQ;oBACRC,kBAAkB;oBAClBC,KAAKC,MAAMC,IAAI,CACb,IAAIC,IAAI;2BAAKR,KAAKC,eAAe,EAAEI,OAAO,EAAE;wBAAG;qBAAM;gBAEzD;gBACAI,SAASH,MAAMC,IAAI,CAAC,IAAIC,IAAI;uBAAKR,KAAKS,OAAO,IAAI,EAAE;oBAAG;iBAAe;YACvE,CAAA;QAGF5C,6BAA6BkB,MAAMH,aAAa;eAAIC;SAAY,GAAG,CAAC;IACtE;IAEAZ,WAAWc,MAAM,sBAAsB,CAACiB,OAAU,CAAA;YAChD,GAAGA,IAAI;YACPC,iBAAiB;gBACf,GAAGD,KAAKC,eAAe;gBACvBS,OAAO;oBACL,GAAIV,KAAKC,eAAe,EAAES,SAAS,CAAC,CAAC;oBACrC,CAAC,GAAGxB,kBAAkB,EAAE,CAAC,CAAC,EAAE;wBAC1B,CAAC,EAAE,EAAEnB,kBAAkBqB,aAAa,OAAO,MAAM;qBAClD;gBACH;YACF;QACF,CAAA;IAEA,IAAI,CAACL,KAAKO,MAAM,CAAC,oBAAoB;QACnCxB,cACEiB,MACAhB,kBAAkB,YAAY4B,OAAO,EAAE,SAAS,WAChD,KACA;YACET;QACF,GACA;YACEU,mBAAmB5B,kBAAkB6B,YAAY;QACnD;IAEJ;IAEA,MAAMzB,qBAAqBW;AAC7B"}

package/src/utils/test.d.ts

@@ -10,6 +10,8 @@ import { type Tree } from '@nx/devkit';
  * - package manager workspaces enabled (`pnpm-workspace.yaml` with `packages`)
  * - a root `tsconfig.json` extending `tsconfig.base.json` with empty `include`
  * - `composite: true` in `tsconfig.base.json`
+ * - a root `package.json` with `type: module`, matching the ESM default the
+ *   preset establishes
  */
 export declare const createTreeUsingTsSolutionSetup: () => Tree;
 /**

package/src/utils/test.js

@@ -1,7 +1,7 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { joinPathFragments, readJson, writeJson } from "@nx/devkit";
+ */ import { joinPathFragments, readJson, updateJson, writeJson } from "@nx/devkit";
 import { createTreeWithEmptyWorkspace } from "@nx/devkit/testing";
 import { expect } from "vitest";
 import { DEFAULT_BIOME_CONFIG } from "./format.js";
@@ -12,9 +12,15 @@ import { DEFAULT_BIOME_CONFIG } from "./format.js";
  * - package manager workspaces enabled (`pnpm-workspace.yaml` with `packages`)
  * - a root `tsconfig.json` extending `tsconfig.base.json` with empty `include`
  * - `composite: true` in `tsconfig.base.json`
+ * - a root `package.json` with `type: module`, matching the ESM default the
+ *   preset establishes
  */ export const createTreeUsingTsSolutionSetup = ()=>{
     const tree = createTreeWithEmptyWorkspace();
     tree.write('pnpm-workspace.yaml', `packages:\n  - packages/*`);
+    updateJson(tree, 'package.json', (json)=>({
+            ...json,
+            type: 'module'
+        }));
     const baseTsConfig = readJson(tree, 'tsconfig.base.json');
     writeJson(tree, 'tsconfig.base.json', {
         ...baseTsConfig,

package/src/utils/test.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/test.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { joinPathFragments, readJson, type Tree, writeJson } from '@nx/devkit';\nimport { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';\nimport { expect } from 'vitest';\nimport { DEFAULT_BIOME_CONFIG } from './format';\n\n/**\n * Create a workspace tree configured so that nx's `isUsingTsSolutionSetup`\n * reports `true`, matching the workspaces our preset generates. Rather than\n * mocking nx internals, we set up the real markers it checks for:\n * - package manager workspaces enabled (`pnpm-workspace.yaml` with `packages`)\n * - a root `tsconfig.json` extending `tsconfig.base.json` with empty `include`\n * - `composite: true` in `tsconfig.base.json`\n */\nexport const createTreeUsingTsSolutionSetup = (): Tree => {\n  const tree = createTreeWithEmptyWorkspace();\n\n  tree.write('pnpm-workspace.yaml', `packages:\\n  - packages/*`);\n\n  const baseTsConfig = readJson(tree, 'tsconfig.base.json');\n  writeJson(tree, 'tsconfig.base.json', {\n    ...baseTsConfig,\n    compilerOptions: { ...baseTsConfig.compilerOptions, composite: true },\n  });\n  writeJson(tree, 'tsconfig.json', {\n    extends: './tsconfig.base.json',\n    files: [],\n    include: [],\n    references: [],\n  });\n\n  // The preset always writes biome.json at the workspace root, so mirror that\n  // here for realistic lint-target configuration.\n  tree.write('biome.json', JSON.stringify(DEFAULT_BIOME_CONFIG, null, 2));\n  return tree;\n};\n\n/**\n * Snapshot all files within a directory in the given tree\n */\nexport const snapshotTreeDir = (tree: Tree, dir: string) => {\n  if (tree.isFile(dir)) {\n    expect(tree.read(dir, 'utf-8')).toMatchSnapshot(dir);\n  } else {\n    tree\n      .children(dir)\n      .forEach((subDir) =>\n        snapshotTreeDir(tree, joinPathFragments(dir, subDir)),\n      );\n  }\n};\n"],"names":["joinPathFragments","readJson","writeJson","createTreeWithEmptyWorkspace","expect","DEFAULT_BIOME_CONFIG","createTreeUsingTsSolutionSetup","tree","write","baseTsConfig","compilerOptions","composite","extends","files","include","references","JSON","stringify","snapshotTreeDir","dir","isFile","read","toMatchSnapshot","children","forEach","subDir"],"mappings":"AAAA;;;CAGC,GAED,SAASA,iBAAiB,EAAEC,QAAQ,EAAaC,SAAS,QAAQ,aAAa;AAC/E,SAASC,4BAA4B,QAAQ,qBAAqB;AAClE,SAASC,MAAM,QAAQ,SAAS;AAChC,SAASC,oBAAoB,QAAQ,cAAW;AAEhD;;;;;;;CAOC,GACD,OAAO,MAAMC,iCAAiC;IAC5C,MAAMC,OAAOJ;IAEbI,KAAKC,KAAK,CAAC,uBAAuB,CAAC,yBAAyB,CAAC;IAE7D,MAAMC,eAAeR,SAASM,MAAM;IACpCL,UAAUK,MAAM,sBAAsB;QACpC,GAAGE,YAAY;QACfC,iBAAiB;YAAE,GAAGD,aAAaC,eAAe;YAAEC,WAAW;QAAK;IACtE;IACAT,UAAUK,MAAM,iBAAiB;QAC/BK,SAAS;QACTC,OAAO,EAAE;QACTC,SAAS,EAAE;QACXC,YAAY,EAAE;IAChB;IAEA,4EAA4E;IAC5E,gDAAgD;IAChDR,KAAKC,KAAK,CAAC,cAAcQ,KAAKC,SAAS,CAACZ,sBAAsB,MAAM;IACpE,OAAOE;AACT,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMW,kBAAkB,CAACX,MAAYY;IAC1C,IAAIZ,KAAKa,MAAM,CAACD,MAAM;QACpBf,OAAOG,KAAKc,IAAI,CAACF,KAAK,UAAUG,eAAe,CAACH;IAClD,OAAO;QACLZ,KACGgB,QAAQ,CAACJ,KACTK,OAAO,CAAC,CAACC,SACRP,gBAAgBX,MAAMP,kBAAkBmB,KAAKM;IAEnD;AACF,EAAE"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/test.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport {\n  joinPathFragments,\n  readJson,\n  type Tree,\n  updateJson,\n  writeJson,\n} from '@nx/devkit';\nimport { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';\nimport { expect } from 'vitest';\nimport { DEFAULT_BIOME_CONFIG } from './format';\n\n/**\n * Create a workspace tree configured so that nx's `isUsingTsSolutionSetup`\n * reports `true`, matching the workspaces our preset generates. Rather than\n * mocking nx internals, we set up the real markers it checks for:\n * - package manager workspaces enabled (`pnpm-workspace.yaml` with `packages`)\n * - a root `tsconfig.json` extending `tsconfig.base.json` with empty `include`\n * - `composite: true` in `tsconfig.base.json`\n * - a root `package.json` with `type: module`, matching the ESM default the\n *   preset establishes\n */\nexport const createTreeUsingTsSolutionSetup = (): Tree => {\n  const tree = createTreeWithEmptyWorkspace();\n\n  tree.write('pnpm-workspace.yaml', `packages:\\n  - packages/*`);\n\n  updateJson(tree, 'package.json', (json) => ({ ...json, type: 'module' }));\n\n  const baseTsConfig = readJson(tree, 'tsconfig.base.json');\n  writeJson(tree, 'tsconfig.base.json', {\n    ...baseTsConfig,\n    compilerOptions: { ...baseTsConfig.compilerOptions, composite: true },\n  });\n  writeJson(tree, 'tsconfig.json', {\n    extends: './tsconfig.base.json',\n    files: [],\n    include: [],\n    references: [],\n  });\n\n  // The preset always writes biome.json at the workspace root, so mirror that\n  // here for realistic lint-target configuration.\n  tree.write('biome.json', JSON.stringify(DEFAULT_BIOME_CONFIG, null, 2));\n  return tree;\n};\n\n/**\n * Snapshot all files within a directory in the given tree\n */\nexport const snapshotTreeDir = (tree: Tree, dir: string) => {\n  if (tree.isFile(dir)) {\n    expect(tree.read(dir, 'utf-8')).toMatchSnapshot(dir);\n  } else {\n    tree\n      .children(dir)\n      .forEach((subDir) =>\n        snapshotTreeDir(tree, joinPathFragments(dir, subDir)),\n      );\n  }\n};\n"],"names":["joinPathFragments","readJson","updateJson","writeJson","createTreeWithEmptyWorkspace","expect","DEFAULT_BIOME_CONFIG","createTreeUsingTsSolutionSetup","tree","write","json","type","baseTsConfig","compilerOptions","composite","extends","files","include","references","JSON","stringify","snapshotTreeDir","dir","isFile","read","toMatchSnapshot","children","forEach","subDir"],"mappings":"AAAA;;;CAGC,GAED,SACEA,iBAAiB,EACjBC,QAAQ,EAERC,UAAU,EACVC,SAAS,QACJ,aAAa;AACpB,SAASC,4BAA4B,QAAQ,qBAAqB;AAClE,SAASC,MAAM,QAAQ,SAAS;AAChC,SAASC,oBAAoB,QAAQ,cAAW;AAEhD;;;;;;;;;CASC,GACD,OAAO,MAAMC,iCAAiC;IAC5C,MAAMC,OAAOJ;IAEbI,KAAKC,KAAK,CAAC,uBAAuB,CAAC,yBAAyB,CAAC;IAE7DP,WAAWM,MAAM,gBAAgB,CAACE,OAAU,CAAA;YAAE,GAAGA,IAAI;YAAEC,MAAM;QAAS,CAAA;IAEtE,MAAMC,eAAeX,SAASO,MAAM;IACpCL,UAAUK,MAAM,sBAAsB;QACpC,GAAGI,YAAY;QACfC,iBAAiB;YAAE,GAAGD,aAAaC,eAAe;YAAEC,WAAW;QAAK;IACtE;IACAX,UAAUK,MAAM,iBAAiB;QAC/BO,SAAS;QACTC,OAAO,EAAE;QACTC,SAAS,EAAE;QACXC,YAAY,EAAE;IAChB;IAEA,4EAA4E;IAC5E,gDAAgD;IAChDV,KAAKC,KAAK,CAAC,cAAcU,KAAKC,SAAS,CAACd,sBAAsB,MAAM;IACpE,OAAOE;AACT,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMa,kBAAkB,CAACb,MAAYc;IAC1C,IAAId,KAAKe,MAAM,CAACD,MAAM;QACpBjB,OAAOG,KAAKgB,IAAI,CAACF,KAAK,UAAUG,eAAe,CAACH;IAClD,OAAO;QACLd,KACGkB,QAAQ,CAACJ,KACTK,OAAO,CAAC,CAACC,SACRP,gBAAgBb,MAAMR,kBAAkBsB,KAAKM;IAEnD;AACF,EAAE"}