@aws/nx-plugin 1.0.0-rc.6 → 1.0.0-rc.60

package/src/utils/shared-scripts.js

@@ -1,48 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sharedScriptsGenerator = sharedScriptsGenerator;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const generator_1 = tslib_1.__importDefault(require("../ts/lib/generator"));
-const format_1 = require("./format");
-const npm_scope_1 = require("./npm-scope");
-const pkg_manager_1 = require("./pkg-manager");
-const shared_constructs_constants_1 = require("./shared-constructs-constants");
-const versions_1 = require("./versions");
+ */ import { joinPathFragments } from "@nx/devkit";
+import tsProjectGenerator from "../ts/lib/generator.js";
+import { PACKAGES_DIR, SHARED_SCRIPTS_DIR, SHARED_SCRIPTS_NAME } from "./shared-constructs-constants.js";
 /**
  * Lazily creates the shared scripts package at packages/common/scripts/.
- * Contains infra-deploy and infra-destroy scripts that resolve
- * credentials from infra-config and call CDK.
- * Invoked via `tsx packages/common/scripts/src/infra-deploy.ts` from NX targets.
- */
-async function sharedScriptsGenerator(tree) {
-    const scriptsDir = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_SCRIPTS_DIR);
-    // Don't recreate if it already exists
-    if (tree.exists((0, devkit_1.joinPathFragments)(scriptsDir, 'project.json'))) {
+ */ export async function ensureSharedScriptsProject(tree) {
+    const scriptsDir = joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR);
+    if (tree.exists(joinPathFragments(scriptsDir, 'project.json'))) {
         return;
     }
-    const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
-    const scopeAlias = (0, npm_scope_1.toScopeAlias)(npmScopePrefix);
-    await (0, generator_1.default)(tree, {
-        name: shared_constructs_constants_1.SHARED_SCRIPTS_NAME,
-        directory: shared_constructs_constants_1.PACKAGES_DIR,
-        subDirectory: shared_constructs_constants_1.SHARED_SCRIPTS_DIR,
+    await tsProjectGenerator(tree, {
+        name: SHARED_SCRIPTS_NAME,
+        directory: PACKAGES_DIR,
+        subDirectory: SHARED_SCRIPTS_DIR
     });
-    // Replace default src/ with our templates
-    tree.delete((0, devkit_1.joinPathFragments)(scriptsDir, 'src'));
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_SCRIPTS_DIR, 'src'), (0, devkit_1.joinPathFragments)(scriptsDir, 'src'), { scopeAlias }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
-    // Add AWS SDK deps as dev dependencies (used by deploy-time scripts for assumeRole)
-    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, (0, versions_1.withVersions)(['@aws-sdk/client-sts', '@aws-sdk/credential-providers']));
-    // Generate README
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'common', 'readme'), scriptsDir, {
-        fullyQualifiedName: `${npmScopePrefix}${shared_constructs_constants_1.SHARED_SCRIPTS_NAME}`,
-        name: shared_constructs_constants_1.SHARED_SCRIPTS_NAME,
-        pkgMgrCmd: (0, pkg_manager_1.getPackageManagerDisplayCommands)().exec,
-    }, { overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite });
-    await (0, format_1.formatFilesInSubtree)(tree);
+    tree.delete(joinPathFragments(scriptsDir, 'src'));
 }
+
 //# sourceMappingURL=shared-scripts.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"shared-scripts.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-scripts.ts"],"names":[],"mappings":";;AA4BA,wDAgDC;;AA5ED;;;GAGG;AACH,uCAMoB;AACpB,4EAAqD;AACrD,qCAAgD;AAChD,2CAA8D;AAC9D,+CAAiE;AACjE,+EAIuC;AACvC,yCAA0C;AAE1C;;;;;GAKG;AACI,KAAK,UAAU,sBAAsB,CAAC,IAAU;IACrD,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAAC,0CAAY,EAAE,gDAAkB,CAAC,CAAC;IAEvE,sCAAsC;IACtC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;QAC/D,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,IAAA,wBAAY,EAAC,cAAc,CAAC,CAAC;IAEhD,MAAM,IAAA,mBAAkB,EAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,iDAAmB;QACzB,SAAS,EAAE,0CAAY;QACvB,YAAY,EAAE,gDAAkB;KACjC,CAAC,CAAC;IAEH,0CAA0C;IAC1C,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;IAClD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,gDAAkB,EAAE,KAAK,CAAC,EAChE,IAAA,0BAAiB,EAAC,UAAU,EAAE,KAAK,CAAC,EACpC,EAAE,UAAU,EAAE,EACd,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IAEF,oFAAoF;IACpF,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF,IAAA,uBAAY,EAAC,CAAC,qBAAqB,EAAE,+BAA+B,CAAC,CAAC,CACvE,CAAC;IAEF,kBAAkB;IAClB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,EACzD,UAAU,EACV;QACE,kBAAkB,EAAE,GAAG,cAAc,GAAG,iDAAmB,EAAE;QAC7D,IAAI,EAAE,iDAAmB;QACzB,SAAS,EAAE,IAAA,8CAAgC,GAAE,CAAC,IAAI;KACnD,EACD,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,SAAS,EAAE,CACnD,CAAC;IAEF,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/shared-scripts.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { joinPathFragments, type Tree } from '@nx/devkit';\nimport tsProjectGenerator from '../ts/lib/generator';\nimport {\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n  SHARED_SCRIPTS_NAME,\n} from './shared-constructs-constants';\n\n/**\n * Lazily creates the shared scripts package at packages/common/scripts/.\n */\nexport async function ensureSharedScriptsProject(tree: Tree): Promise<void> {\n  const scriptsDir = joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR);\n  if (tree.exists(joinPathFragments(scriptsDir, 'project.json'))) {\n    return;\n  }\n  await tsProjectGenerator(tree, {\n    name: SHARED_SCRIPTS_NAME,\n    directory: PACKAGES_DIR,\n    subDirectory: SHARED_SCRIPTS_DIR,\n  });\n  tree.delete(joinPathFragments(scriptsDir, 'src'));\n}\n"],"names":["joinPathFragments","tsProjectGenerator","PACKAGES_DIR","SHARED_SCRIPTS_DIR","SHARED_SCRIPTS_NAME","ensureSharedScriptsProject","tree","scriptsDir","exists","name","directory","subDirectory","delete"],"mappings":"AAAA;;;CAGC,GACD,SAASA,iBAAiB,QAAmB,aAAa;AAC1D,OAAOC,wBAAwB,yBAAsB;AACrD,SACEC,YAAY,EACZC,kBAAkB,EAClBC,mBAAmB,QACd,mCAAgC;AAEvC;;CAEC,GACD,OAAO,eAAeC,2BAA2BC,IAAU;IACzD,MAAMC,aAAaP,kBAAkBE,cAAcC;IACnD,IAAIG,KAAKE,MAAM,CAACR,kBAAkBO,YAAY,kBAAkB;QAC9D;IACF;IACA,MAAMN,mBAAmBK,MAAM;QAC7BG,MAAML;QACNM,WAAWR;QACXS,cAAcR;IAChB;IACAG,KAAKM,MAAM,CAACZ,kBAAkBO,YAAY;AAC5C"}

package/src/utils/shared-shadcn.d.ts

@@ -3,4 +3,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type Tree } from '@nx/devkit';
-export declare function sharedShadcnGenerator(tree: Tree): Promise<void>;
+import { type DependencyDeclaration, type MustDeclare } from './declared-dependencies';
+/** Dependencies a caller must declare to use the shared shadcn project. */
+export declare const SHADCN_DEPENDENCIES: readonly [{
+    readonly name: "react";
+}, {
+    readonly name: "react-dom";
+}, {
+    readonly name: "class-variance-authority";
+}, {
+    readonly name: "clsx";
+}, {
+    readonly name: "tailwind-merge";
+}, {
+    readonly name: "lucide-react";
+}, {
+    readonly name: "tw-animate-css";
+}, {
+    readonly name: "radix-ui";
+}, {
+    readonly name: "vite";
+}, {
+    readonly name: "vitest";
+}, {
+    readonly name: "@vitest/coverage-v8";
+}];
+export declare function sharedShadcnGenerator<const D extends DependencyDeclaration>(tree: Tree, declaration: D & MustDeclare<typeof SHADCN_DEPENDENCIES, D>): Promise<void>;

package/src/utils/shared-shadcn.js

@@ -1,89 +1,115 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sharedShadcnGenerator = sharedShadcnGenerator;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const generator_1 = tslib_1.__importDefault(require("../ts/lib/generator"));
-const ts_project_utils_1 = require("../ts/lib/ts-project-utils");
-const format_1 = require("./format");
-const npm_scope_1 = require("./npm-scope");
-const pnpm_workspace_1 = require("./pnpm-workspace");
-const shared_constructs_constants_1 = require("./shared-constructs-constants");
-const versions_1 = require("./versions");
-const SHADCN_DEPS = [
-    'class-variance-authority',
-    'clsx',
-    'tailwind-merge',
-    'lucide-react',
-    'tw-animate-css',
-    'radix-ui',
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy, updateJson } from "@nx/devkit";
+import tsProjectGenerator from "../ts/lib/generator.js";
+import { configureTsProject } from "../ts/lib/ts-project-utils.js";
+import { VITEST_DEPENDENCIES } from "../ts/lib/vitest.js";
+import { declaredNames, forDependencies } from "./declared-dependencies.js";
+import { addDependenciesToPackageJson } from "./dependencies.js";
+import { formatFilesInSubtree } from "./format.js";
+import { esmVars } from "./module-format.js";
+import { getNpmScopePrefix } from "./npm-scope.js";
+import { PACKAGES_DIR, SHARED_SHADCN_DIR, SHARED_SHADCN_NAME } from "./shared-constructs-constants.js";
+import { withVersions } from "./versions.js";
+/** Dependencies a caller must declare to use the shared shadcn project. */ export const SHADCN_DEPENDENCIES = [
+    {
+        name: 'react'
+    },
+    {
+        name: 'react-dom'
+    },
+    {
+        name: 'class-variance-authority'
+    },
+    {
+        name: 'clsx'
+    },
+    {
+        name: 'tailwind-merge'
+    },
+    {
+        name: 'lucide-react'
+    },
+    {
+        name: 'tw-animate-css'
+    },
+    {
+        name: 'radix-ui'
+    },
+    ...VITEST_DEPENDENCIES
 ];
-async function sharedShadcnGenerator(tree) {
-    const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
-    const scopeAlias = (0, npm_scope_1.toScopeAlias)(npmScopePrefix);
-    const sharedShadcnAlias = `${scopeAlias}${shared_constructs_constants_1.SHARED_SHADCN_NAME}`;
-    const fullyQualifiedName = `${npmScopePrefix}${shared_constructs_constants_1.SHARED_SHADCN_NAME}`;
-    const libraryRoot = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_SHADCN_DIR);
-    const shadcnSrcRoot = (0, devkit_1.joinPathFragments)(libraryRoot, 'src');
-    (0, pnpm_workspace_1.ensurePnpmIgnoresWorkspaceRootCheck)(tree);
-    if (!tree.exists((0, devkit_1.joinPathFragments)(libraryRoot, 'project.json'))) {
-        await (0, generator_1.default)(tree, {
-            name: shared_constructs_constants_1.SHARED_SHADCN_NAME,
-            directory: shared_constructs_constants_1.PACKAGES_DIR,
-            subDirectory: shared_constructs_constants_1.SHARED_SHADCN_DIR,
+export async function sharedShadcnGenerator(tree, declaration) {
+    const npmScopePrefix = getNpmScopePrefix(tree);
+    const scopeAlias = npmScopePrefix;
+    const sharedShadcnAlias = `${scopeAlias}${SHARED_SHADCN_NAME}`;
+    const fullyQualifiedName = `${npmScopePrefix}${SHARED_SHADCN_NAME}`;
+    const libraryRoot = joinPathFragments(PACKAGES_DIR, SHARED_SHADCN_DIR);
+    const shadcnSrcRoot = joinPathFragments(libraryRoot, 'src');
+    if (!tree.exists(joinPathFragments(libraryRoot, 'project.json'))) {
+        await tsProjectGenerator(tree, {
+            name: SHARED_SHADCN_NAME,
+            directory: PACKAGES_DIR,
+            subDirectory: SHARED_SHADCN_DIR
         });
         tree.delete(shadcnSrcRoot);
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_SHADCN_DIR, 'src'), shadcnSrcRoot, {
+        generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', SHARED_SHADCN_DIR, 'src'), shadcnSrcRoot, {
             scopeAlias,
+            ...esmVars(tree)
         }, {
-            overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+            overwriteStrategy: OverwriteStrategy.KeepExisting
         });
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_SHADCN_DIR, 'readme'), libraryRoot, {
+        generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', SHARED_SHADCN_DIR, 'readme'), libraryRoot, {
             fullyQualifiedName,
-            scopeAlias,
+            scopeAlias
         }, {
-            overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
+            overwriteStrategy: OverwriteStrategy.Overwrite
         });
-        await (0, ts_project_utils_1.configureTsProject)(tree, {
+        await configureTsProject(tree, {
             dir: libraryRoot,
-            fullyQualifiedName,
-        });
-        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(libraryRoot, 'tsconfig.lib.json'), (json) => ({
+            fullyQualifiedName
+        }, forDependencies(declaration));
+        updateJson(tree, joinPathFragments(libraryRoot, 'tsconfig.lib.json'), (json)=>({
+                ...json,
+                compilerOptions: {
+                    ...json.compilerOptions,
+                    jsx: 'react-jsx',
+                    module: 'preserve',
+                    moduleResolution: 'bundler',
+                    lib: Array.from(new Set([
+                        ...json.compilerOptions?.lib ?? [],
+                        'DOM'
+                    ]))
+                },
+                include: Array.from(new Set([
+                    ...json.include ?? [],
+                    'src/**/*.tsx'
+                ]))
+            }));
+        addDependenciesToPackageJson(tree, withVersions(forDependencies(declaration), declaredNames(SHADCN_DEPENDENCIES)), {}, joinPathFragments(libraryRoot, 'package.json'));
+    }
+    updateJson(tree, 'tsconfig.base.json', (json)=>({
             ...json,
             compilerOptions: {
                 ...json.compilerOptions,
-                jsx: 'react-jsx',
-                module: 'preserve',
-                moduleResolution: 'bundler',
-                lib: Array.from(new Set([...(json.compilerOptions?.lib ?? []), 'DOM'])),
-            },
-            include: Array.from(new Set([...(json.include ?? []), 'src/**/*.tsx'])),
+                paths: {
+                    ...json.compilerOptions?.paths ?? {},
+                    [`${sharedShadcnAlias}/*`]: [
+                        `./${joinPathFragments(libraryRoot, 'src', '*')}`
+                    ]
+                }
+            }
         }));
-        (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([...SHADCN_DEPS]), {});
-    }
-    (0, devkit_1.updateJson)(tree, 'tsconfig.base.json', (json) => ({
-        ...json,
-        compilerOptions: {
-            ...json.compilerOptions,
-            paths: {
-                ...(json.compilerOptions?.paths ?? {}),
-                [`${sharedShadcnAlias}/*`]: [
-                    `./${(0, devkit_1.joinPathFragments)(libraryRoot, 'src', '*')}`,
-                ],
-            },
-        },
-    }));
-    if (!tree.exists('components.json')) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'shadcn'), '.', {
-            sharedShadcnAlias,
+    // components.json lives in the package so `shadcn add` runs there and
+    // installs component dependencies into the package's own manifest.
+    if (!tree.exists(joinPathFragments(libraryRoot, 'components.json'))) {
+        generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'shadcn'), libraryRoot, {
+            sharedShadcnAlias
         }, {
-            overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+            overwriteStrategy: OverwriteStrategy.KeepExisting
         });
     }
-    await (0, format_1.formatFilesInSubtree)(tree);
+    await formatFilesInSubtree(tree);
 }
+
 //# sourceMappingURL=shared-shadcn.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"shared-shadcn.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-shadcn.ts"],"names":[],"mappings":"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"}
+{"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  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 { VITEST_DEPENDENCIES } from '../ts/lib/vitest';\nimport {\n  type DependencyDeclaration,\n  declaredNames,\n  forDependencies,\n  type MustDeclare,\n} from './declared-dependencies';\nimport { addDependenciesToPackageJson } from './dependencies';\nimport { formatFilesInSubtree } from './format';\nimport { esmVars } from './module-format';\nimport { getNpmScopePrefix } from './npm-scope';\nimport {\n  PACKAGES_DIR,\n  SHARED_SHADCN_DIR,\n  SHARED_SHADCN_NAME,\n} from './shared-constructs-constants';\nimport { type ITsDepVersion, withVersions } from './versions';\n\n/** Dependencies a caller must declare to use the shared shadcn project. */\nexport const SHADCN_DEPENDENCIES = [\n  { name: 'react' },\n  { name: 'react-dom' },\n  { name: 'class-variance-authority' },\n  { name: 'clsx' },\n  { name: 'tailwind-merge' },\n  { name: 'lucide-react' },\n  { name: 'tw-animate-css' },\n  { name: 'radix-ui' },\n  ...VITEST_DEPENDENCIES,\n] as const satisfies readonly { name: ITsDepVersion }[];\n\nexport async function sharedShadcnGenerator<\n  const D extends DependencyDeclaration,\n>(tree: Tree, declaration: D & MustDeclare<typeof SHADCN_DEPENDENCIES, D>) {\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const scopeAlias = 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\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(\n      tree,\n      {\n        dir: libraryRoot,\n        fullyQualifiedName,\n      },\n      forDependencies<typeof SHADCN_DEPENDENCIES>(declaration),\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(\n      tree,\n      withVersions(\n        forDependencies<typeof SHADCN_DEPENDENCIES>(declaration),\n        declaredNames(SHADCN_DEPENDENCIES),\n      ),\n      {},\n      joinPathFragments(libraryRoot, 'package.json'),\n    );\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  // components.json lives in the package so `shadcn add` runs there and\n  // installs component dependencies into the package's own manifest.\n  if (!tree.exists(joinPathFragments(libraryRoot, 'components.json'))) {\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', 'shadcn'),\n      libraryRoot,\n      {\n        sharedShadcnAlias,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n\n  await formatFilesInSubtree(tree);\n}\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateJson","tsProjectGenerator","configureTsProject","VITEST_DEPENDENCIES","declaredNames","forDependencies","addDependenciesToPackageJson","formatFilesInSubtree","esmVars","getNpmScopePrefix","PACKAGES_DIR","SHARED_SHADCN_DIR","SHARED_SHADCN_NAME","withVersions","SHADCN_DEPENDENCIES","name","sharedShadcnGenerator","tree","declaration","npmScopePrefix","scopeAlias","sharedShadcnAlias","fullyQualifiedName","libraryRoot","shadcnSrcRoot","exists","directory","subDirectory","delete","dirname","overwriteStrategy","KeepExisting","Overwrite","dir","json","compilerOptions","jsx","module","moduleResolution","lib","Array","from","Set","include","paths"],"mappings":"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"}

package/src/utils/test-git.d.ts

@@ -0,0 +1,39 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Isolate every git invocation in the surrounding tests from the machine's real
+ * git configuration, and point the test identity at a throwaway config file.
+ *
+ * Two leaks are prevented:
+ *
+ * 1. Inherited `GIT_*` variables. When the test suite runs from a git hook (the
+ *    repo's `pre-commit` runs the unit tests), git exports `GIT_DIR` and
+ *    `GIT_INDEX_FILE` pointing at the surrounding repository. Those take
+ *    precedence over `cwd`, so `git init`/`git config`/`git commit` in a temp
+ *    directory operate on the real repository instead — writing `user.*` into
+ *    its `.git/config` and committing test fixtures.
+ * 2. Reads of, and writes to, the user's global and system config. Pointing
+ *    `GIT_CONFIG_GLOBAL`/`GIT_CONFIG_SYSTEM` at files inside a temp directory
+ *    means a stray `git config --global` lands there and is deleted with it,
+ *    and the developer's real `user.email` can neither leak into assertions nor
+ *    be overwritten.
+ *
+ * Both env vars are restored after each test.
+ */
+export declare const useIsolatedGitEnv: () => void;
+/**
+ * Run a git command in `cwd`, with the ambient `GIT_DIR`/`GIT_INDEX_FILE`
+ * cleared so it cannot escape to a surrounding repository even if
+ * `useIsolatedGitEnv` is not in effect. `execFileSync` (no shell) keeps
+ * arguments from being re-split.
+ */
+export declare const runGit: (args: string[], cwd: string) => string;
+/**
+ * Create a git repository in `dir` for a test to work in. The identity comes
+ * from the isolated global config set up by `useIsolatedGitEnv`, so nothing is
+ * written outside `dir`. Hooks are disabled — the repo under test has a
+ * `pre-commit` hook that runs the whole test suite.
+ */
+export declare const initTestGitRepo: (dir: string) => void;

package/src/utils/test-git.js

@@ -0,0 +1,117 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { execFileSync } from "node:child_process";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach } from "vitest";
+/**
+ * Identity used by the temp repositories these helpers create. Only ever
+ * written to a throwaway `GIT_CONFIG_GLOBAL` file, never to the developer's
+ * real config.
+ */ const TEST_GIT_USER_NAME = 'nx-plugin-for-aws-test';
+const TEST_GIT_USER_EMAIL = 'nx-plugin-for-aws-test@example.invalid';
+/**
+ * Isolate every git invocation in the surrounding tests from the machine's real
+ * git configuration, and point the test identity at a throwaway config file.
+ *
+ * Two leaks are prevented:
+ *
+ * 1. Inherited `GIT_*` variables. When the test suite runs from a git hook (the
+ *    repo's `pre-commit` runs the unit tests), git exports `GIT_DIR` and
+ *    `GIT_INDEX_FILE` pointing at the surrounding repository. Those take
+ *    precedence over `cwd`, so `git init`/`git config`/`git commit` in a temp
+ *    directory operate on the real repository instead — writing `user.*` into
+ *    its `.git/config` and committing test fixtures.
+ * 2. Reads of, and writes to, the user's global and system config. Pointing
+ *    `GIT_CONFIG_GLOBAL`/`GIT_CONFIG_SYSTEM` at files inside a temp directory
+ *    means a stray `git config --global` lands there and is deleted with it,
+ *    and the developer's real `user.email` can neither leak into assertions nor
+ *    be overwritten.
+ *
+ * Both env vars are restored after each test.
+ */ export const useIsolatedGitEnv = ()=>{
+    const savedEnv = {};
+    let configDir;
+    beforeEach(()=>{
+        for (const key of Object.keys(process.env)){
+            if (key.startsWith('GIT_')) {
+                savedEnv[key] = process.env[key];
+                delete process.env[key];
+            }
+        }
+        configDir = mkdtempSync(join(tmpdir(), 'nx-plugin-gitconfig-'));
+        // Seed the identity here rather than per-repo, so temp repos need no
+        // `git config` call at all and cannot write to a real repository.
+        writeFileSync(join(configDir, 'global'), `[user]\n\tname = ${TEST_GIT_USER_NAME}\n\temail = ${TEST_GIT_USER_EMAIL}\n`);
+        // Empty, so system config (which may set user.* or hook paths) cannot leak.
+        writeFileSync(join(configDir, 'system'), '');
+        for (const key of [
+            'GIT_CONFIG_GLOBAL',
+            'GIT_CONFIG_SYSTEM'
+        ]){
+            savedEnv[key] ??= process.env[key];
+        }
+        process.env.GIT_CONFIG_GLOBAL = join(configDir, 'global');
+        process.env.GIT_CONFIG_SYSTEM = join(configDir, 'system');
+    });
+    afterEach(()=>{
+        // Clear every GIT_* variable first, so any set *during* the test (and
+        // therefore absent from savedEnv) cannot leak into the next one.
+        for (const key of Object.keys(process.env)){
+            if (key.startsWith('GIT_')) {
+                delete process.env[key];
+            }
+        }
+        for (const [key, value] of Object.entries(savedEnv)){
+            if (value !== undefined) {
+                process.env[key] = value;
+            }
+        }
+        for (const key of Object.keys(savedEnv)){
+            delete savedEnv[key];
+        }
+        if (configDir) {
+            rmSync(configDir, {
+                force: true,
+                recursive: true
+            });
+            configDir = undefined;
+        }
+    });
+};
+/**
+ * Run a git command in `cwd`, with the ambient `GIT_DIR`/`GIT_INDEX_FILE`
+ * cleared so it cannot escape to a surrounding repository even if
+ * `useIsolatedGitEnv` is not in effect. `execFileSync` (no shell) keeps
+ * arguments from being re-split.
+ */ export const runGit = (args, cwd)=>execFileSync('git', args, {
+        cwd,
+        encoding: 'utf-8',
+        stdio: 'pipe',
+        env: {
+            ...process.env,
+            GIT_DIR: undefined,
+            GIT_WORK_TREE: undefined,
+            GIT_INDEX_FILE: undefined,
+            GIT_COMMON_DIR: undefined
+        }
+    });
+/**
+ * Create a git repository in `dir` for a test to work in. The identity comes
+ * from the isolated global config set up by `useIsolatedGitEnv`, so nothing is
+ * written outside `dir`. Hooks are disabled — the repo under test has a
+ * `pre-commit` hook that runs the whole test suite.
+ */ export const initTestGitRepo = (dir)=>{
+    runGit([
+        'init'
+    ], dir);
+    runGit([
+        'config',
+        'core.hooksPath',
+        '/dev/null'
+    ], dir);
+};
+
+//# sourceMappingURL=test-git.js.map

package/src/utils/test-git.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/test-git.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { execFileSync } from 'node:child_process';\nimport { mkdtempSync, rmSync, writeFileSync } from 'node:fs';\nimport { tmpdir } from 'node:os';\nimport { join } from 'node:path';\nimport { afterEach, beforeEach } from 'vitest';\n\n/**\n * Identity used by the temp repositories these helpers create. Only ever\n * written to a throwaway `GIT_CONFIG_GLOBAL` file, never to the developer's\n * real config.\n */\nconst TEST_GIT_USER_NAME = 'nx-plugin-for-aws-test';\nconst TEST_GIT_USER_EMAIL = 'nx-plugin-for-aws-test@example.invalid';\n\n/**\n * Isolate every git invocation in the surrounding tests from the machine's real\n * git configuration, and point the test identity at a throwaway config file.\n *\n * Two leaks are prevented:\n *\n * 1. Inherited `GIT_*` variables. When the test suite runs from a git hook (the\n *    repo's `pre-commit` runs the unit tests), git exports `GIT_DIR` and\n *    `GIT_INDEX_FILE` pointing at the surrounding repository. Those take\n *    precedence over `cwd`, so `git init`/`git config`/`git commit` in a temp\n *    directory operate on the real repository instead — writing `user.*` into\n *    its `.git/config` and committing test fixtures.\n * 2. Reads of, and writes to, the user's global and system config. Pointing\n *    `GIT_CONFIG_GLOBAL`/`GIT_CONFIG_SYSTEM` at files inside a temp directory\n *    means a stray `git config --global` lands there and is deleted with it,\n *    and the developer's real `user.email` can neither leak into assertions nor\n *    be overwritten.\n *\n * Both env vars are restored after each test.\n */\nexport const useIsolatedGitEnv = () => {\n  const savedEnv: Record<string, string | undefined> = {};\n  let configDir: string | undefined;\n\n  beforeEach(() => {\n    for (const key of Object.keys(process.env)) {\n      if (key.startsWith('GIT_')) {\n        savedEnv[key] = process.env[key];\n        delete process.env[key];\n      }\n    }\n\n    configDir = mkdtempSync(join(tmpdir(), 'nx-plugin-gitconfig-'));\n    // Seed the identity here rather than per-repo, so temp repos need no\n    // `git config` call at all and cannot write to a real repository.\n    writeFileSync(\n      join(configDir, 'global'),\n      `[user]\\n\\tname = ${TEST_GIT_USER_NAME}\\n\\temail = ${TEST_GIT_USER_EMAIL}\\n`,\n    );\n    // Empty, so system config (which may set user.* or hook paths) cannot leak.\n    writeFileSync(join(configDir, 'system'), '');\n\n    for (const key of ['GIT_CONFIG_GLOBAL', 'GIT_CONFIG_SYSTEM'] as const) {\n      savedEnv[key] ??= process.env[key];\n    }\n    process.env.GIT_CONFIG_GLOBAL = join(configDir, 'global');\n    process.env.GIT_CONFIG_SYSTEM = join(configDir, 'system');\n  });\n\n  afterEach(() => {\n    // Clear every GIT_* variable first, so any set *during* the test (and\n    // therefore absent from savedEnv) cannot leak into the next one.\n    for (const key of Object.keys(process.env)) {\n      if (key.startsWith('GIT_')) {\n        delete process.env[key];\n      }\n    }\n    for (const [key, value] of Object.entries(savedEnv)) {\n      if (value !== undefined) {\n        process.env[key] = value;\n      }\n    }\n    for (const key of Object.keys(savedEnv)) {\n      delete savedEnv[key];\n    }\n    if (configDir) {\n      rmSync(configDir, { force: true, recursive: true });\n      configDir = undefined;\n    }\n  });\n};\n\n/**\n * Run a git command in `cwd`, with the ambient `GIT_DIR`/`GIT_INDEX_FILE`\n * cleared so it cannot escape to a surrounding repository even if\n * `useIsolatedGitEnv` is not in effect. `execFileSync` (no shell) keeps\n * arguments from being re-split.\n */\nexport const runGit = (args: string[], cwd: string): string =>\n  execFileSync('git', args, {\n    cwd,\n    encoding: 'utf-8',\n    stdio: 'pipe',\n    env: {\n      ...process.env,\n      GIT_DIR: undefined,\n      GIT_WORK_TREE: undefined,\n      GIT_INDEX_FILE: undefined,\n      GIT_COMMON_DIR: undefined,\n    } as NodeJS.ProcessEnv,\n  });\n\n/**\n * Create a git repository in `dir` for a test to work in. The identity comes\n * from the isolated global config set up by `useIsolatedGitEnv`, so nothing is\n * written outside `dir`. Hooks are disabled — the repo under test has a\n * `pre-commit` hook that runs the whole test suite.\n */\nexport const initTestGitRepo = (dir: string): void => {\n  runGit(['init'], dir);\n  runGit(['config', 'core.hooksPath', '/dev/null'], dir);\n};\n"],"names":["execFileSync","mkdtempSync","rmSync","writeFileSync","tmpdir","join","afterEach","beforeEach","TEST_GIT_USER_NAME","TEST_GIT_USER_EMAIL","useIsolatedGitEnv","savedEnv","configDir","key","Object","keys","process","env","startsWith","GIT_CONFIG_GLOBAL","GIT_CONFIG_SYSTEM","value","entries","undefined","force","recursive","runGit","args","cwd","encoding","stdio","GIT_DIR","GIT_WORK_TREE","GIT_INDEX_FILE","GIT_COMMON_DIR","initTestGitRepo","dir"],"mappings":"AAAA;;;CAGC,GAED,SAASA,YAAY,QAAQ,qBAAqB;AAClD,SAASC,WAAW,EAAEC,MAAM,EAAEC,aAAa,QAAQ,UAAU;AAC7D,SAASC,MAAM,QAAQ,UAAU;AACjC,SAASC,IAAI,QAAQ,YAAY;AACjC,SAASC,SAAS,EAAEC,UAAU,QAAQ,SAAS;AAE/C;;;;CAIC,GACD,MAAMC,qBAAqB;AAC3B,MAAMC,sBAAsB;AAE5B;;;;;;;;;;;;;;;;;;;CAmBC,GACD,OAAO,MAAMC,oBAAoB;IAC/B,MAAMC,WAA+C,CAAC;IACtD,IAAIC;IAEJL,WAAW;QACT,KAAK,MAAMM,OAAOC,OAAOC,IAAI,CAACC,QAAQC,GAAG,EAAG;YAC1C,IAAIJ,IAAIK,UAAU,CAAC,SAAS;gBAC1BP,QAAQ,CAACE,IAAI,GAAGG,QAAQC,GAAG,CAACJ,IAAI;gBAChC,OAAOG,QAAQC,GAAG,CAACJ,IAAI;YACzB;QACF;QAEAD,YAAYX,YAAYI,KAAKD,UAAU;QACvC,qEAAqE;QACrE,kEAAkE;QAClED,cACEE,KAAKO,WAAW,WAChB,CAAC,iBAAiB,EAAEJ,mBAAmB,YAAY,EAAEC,oBAAoB,EAAE,CAAC;QAE9E,4EAA4E;QAC5EN,cAAcE,KAAKO,WAAW,WAAW;QAEzC,KAAK,MAAMC,OAAO;YAAC;YAAqB;SAAoB,CAAW;YACrEF,QAAQ,CAACE,IAAI,KAAKG,QAAQC,GAAG,CAACJ,IAAI;QACpC;QACAG,QAAQC,GAAG,CAACE,iBAAiB,GAAGd,KAAKO,WAAW;QAChDI,QAAQC,GAAG,CAACG,iBAAiB,GAAGf,KAAKO,WAAW;IAClD;IAEAN,UAAU;QACR,sEAAsE;QACtE,iEAAiE;QACjE,KAAK,MAAMO,OAAOC,OAAOC,IAAI,CAACC,QAAQC,GAAG,EAAG;YAC1C,IAAIJ,IAAIK,UAAU,CAAC,SAAS;gBAC1B,OAAOF,QAAQC,GAAG,CAACJ,IAAI;YACzB;QACF;QACA,KAAK,MAAM,CAACA,KAAKQ,MAAM,IAAIP,OAAOQ,OAAO,CAACX,UAAW;YACnD,IAAIU,UAAUE,WAAW;gBACvBP,QAAQC,GAAG,CAACJ,IAAI,GAAGQ;YACrB;QACF;QACA,KAAK,MAAMR,OAAOC,OAAOC,IAAI,CAACJ,UAAW;YACvC,OAAOA,QAAQ,CAACE,IAAI;QACtB;QACA,IAAID,WAAW;YACbV,OAAOU,WAAW;gBAAEY,OAAO;gBAAMC,WAAW;YAAK;YACjDb,YAAYW;QACd;IACF;AACF,EAAE;AAEF;;;;;CAKC,GACD,OAAO,MAAMG,SAAS,CAACC,MAAgBC,MACrC5B,aAAa,OAAO2B,MAAM;QACxBC;QACAC,UAAU;QACVC,OAAO;QACPb,KAAK;YACH,GAAGD,QAAQC,GAAG;YACdc,SAASR;YACTS,eAAeT;YACfU,gBAAgBV;YAChBW,gBAAgBX;QAClB;IACF,GAAG;AAEL;;;;;CAKC,GACD,OAAO,MAAMY,kBAAkB,CAACC;IAC9BV,OAAO;QAAC;KAAO,EAAEU;IACjBV,OAAO;QAAC;QAAU;QAAkB;KAAY,EAAEU;AACpD,EAAE"}

package/src/utils/test.d.ts

@@ -3,6 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type Tree } from '@nx/devkit';
+/**
+ * Create a workspace tree configured so that nx's `isUsingTsSolutionSetup`
+ * reports `true`, matching the workspaces our preset generates. Rather than
+ * mocking nx internals, we set up the real markers it checks for:
+ * - 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;
 /**
  * Snapshot all files within a directory in the given tree

package/src/utils/test.js

@@ -1,39 +1,58 @@
-"use strict";
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.snapshotTreeDir = exports.createTreeUsingTsSolutionSetup = void 0;
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const testing_1 = require("@nx/devkit/testing");
-const ts_solution_setup_1 = tslib_1.__importDefault(require("@nx/js/src/utils/typescript/ts-solution-setup"));
-const vitest_1 = require("vitest");
-const format_1 = require("./format");
-const createTreeUsingTsSolutionSetup = () => {
-    vitest_1.vi.spyOn(ts_solution_setup_1.default, 'isUsingTsSolutionSetup').mockImplementation(() => true);
-    const tree = (0, testing_1.createTreeWithEmptyWorkspace)();
+ */ import { joinPathFragments, readJson, updateJson, writeJson } from "@nx/devkit";
+import { createTreeWithEmptyWorkspace } from "@nx/devkit/testing";
+import { expect } from "vitest";
+import { getDefaultBiomeConfig } from "./format.js";
+/**
+ * Create a workspace tree configured so that nx's `isUsingTsSolutionSetup`
+ * reports `true`, matching the workspaces our preset generates. Rather than
+ * mocking nx internals, we set up the real markers it checks for:
+ * - 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/*`);
-    tree.write('tsconfig.json', '{}');
+    // Write both workspace markers so package-manager detection finds workspaces
+    // enabled whether tests run via pnpm or npm/npx.
+    updateJson(tree, 'package.json', (json)=>({
+            ...json,
+            type: 'module',
+            workspaces: [
+                'packages/*'
+            ]
+        }));
+    const baseTsConfig = readJson(tree, 'tsconfig.base.json');
+    writeJson(tree, 'tsconfig.base.json', {
+        ...baseTsConfig,
+        compilerOptions: {
+            ...baseTsConfig.compilerOptions,
+            composite: true
+        }
+    });
+    writeJson(tree, 'tsconfig.json', {
+        extends: './tsconfig.base.json',
+        files: [],
+        include: [],
+        references: []
+    });
     // The preset always writes biome.json at the workspace root, so mirror that
     // here for realistic lint-target configuration.
-    tree.write('biome.json', JSON.stringify(format_1.DEFAULT_BIOME_CONFIG, null, 2));
+    tree.write('biome.json', JSON.stringify(getDefaultBiomeConfig(tree), null, 2));
     return tree;
 };
-exports.createTreeUsingTsSolutionSetup = createTreeUsingTsSolutionSetup;
 /**
  * Snapshot all files within a directory in the given tree
- */
-const snapshotTreeDir = (tree, dir) => {
+ */ export const snapshotTreeDir = (tree, dir)=>{
     if (tree.isFile(dir)) {
-        (0, vitest_1.expect)(tree.read(dir, 'utf-8')).toMatchSnapshot(dir);
-    }
-    else {
-        tree
-            .children(dir)
-            .forEach((subDir) => (0, exports.snapshotTreeDir)(tree, (0, devkit_1.joinPathFragments)(dir, subDir)));
+        expect(tree.read(dir, 'utf-8')).toMatchSnapshot(dir);
+    } else {
+        tree.children(dir).forEach((subDir)=>snapshotTreeDir(tree, joinPathFragments(dir, subDir)));
     }
 };
-exports.snapshotTreeDir = snapshotTreeDir;
+
 //# sourceMappingURL=test.js.map