@aws/nx-plugin 1.0.0-rc.94 → 1.0.0-rc.95

package/migrations.json

@@ -67,6 +67,26 @@
       "description": "Cache the AgentCore ADOT install in its own target so editing an agent no longer re-runs it",
       "implementation": "./src/migrations/latest/agent-core-vendor-target/migration"
     },
+    "latest-rolldown-config-bundle-transient": {
+      "version": "1.0.0-rc.95",
+      "description": "Exclude the transient bundle rolldown writes while loading a TypeScript config from Biome and from git, so a concurrent format or lint target cannot fail on it",
+      "implementation": "./src/migrations/latest/rolldown-config-bundle-transient/migration"
+    },
+    "latest-agent-connection-pin-strands-peers": {
+      "version": "1.0.0-rc.95",
+      "description": "Declare @aws-sdk/client-s3 in the shared agent-connection project so @strands-agents/sdk resolves to a single peer-suffixed instance",
+      "implementation": "./src/migrations/latest/agent-connection-pin-strands-peers/migration"
+    },
+    "latest-ignore-package-manager-temp-files": {
+      "version": "1.0.0-rc.95",
+      "description": "Ignore the temporary files pnpm writes at the workspace root while materialising packages, which otherwise invalidate the Nx project graph",
+      "implementation": "./src/migrations/latest/ignore-package-manager-temp-files/migration"
+    },
+    "latest-shadcn-package-imports-exports": {
+      "version": "1.0.0-rc.95",
+      "description": "Move the shared shadcn package from a tsconfig paths alias to package.json imports/exports, matching the shadcn CLI's own monorepo resolution",
+      "implementation": "./src/migrations/latest/shadcn-package-imports-exports/migration"
+    },
     "v1.0.0-rc.50-0001-modernize-function-props-cast": {
       "version": "1.0.0-rc.50",
       "description": "Replace the legacy angle-bracket FunctionProps type assertion with the modern as syntax in generated API constructs",
@@ -308,7 +328,7 @@
       "implementation": "./src/migrations/v1.0.0-rc.89/0001-nx-parallel-default/migration"
     },
     "sync-vended-versions": {
-      "version": "1.0.0-rc.94",
+      "version": "1.0.0-rc.95",
       "description": "Sync vended dependency versions and the tracked plugin version to those vended by this release",
       "implementation": "./src/utils/version-upgrade-migration/migration"
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/nx-plugin",
-  "version": "1.0.0-rc.94",
+  "version": "1.0.0-rc.95",
   "repository": {
     "type": "git",
     "url": "https://github.com/awslabs/nx-plugin-for-aws.git",

package/src/migrations/latest/agent-connection-pin-strands-peers/metadata.json

@@ -0,0 +1,3 @@
+{
+  "description": "Declare @aws-sdk/client-s3 in the shared agent-connection project so @strands-agents/sdk resolves to a single peer-suffixed instance"
+}

package/src/migrations/latest/agent-connection-pin-strands-peers/migration.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type Tree } from '@nx/devkit';
+/**
+ * `@aws-sdk/client-s3` is an optional peer of `@strands-agents/sdk` that the
+ * shared agent-connection project never imports, so it went undeclared. pnpm
+ * then auto-installs its own copy there while a project that does declare it
+ * gets the catalog's, and those two resolutions give `@strands-agents/sdk` two
+ * peer-suffixed instances of the same version.
+ *
+ * Anything importing both projects then sees two nominal identities of every SDK
+ * type — `Agent`, `McpClient`, `Plugin` — and fails to compile with "Types have
+ * separate declarations of a private property". Declaring it keeps the version
+ * on the catalog, collapsing both to one instance.
+ */
+export default function migration(tree: Tree): Promise<void>;

package/src/migrations/latest/agent-connection-pin-strands-peers/migration.js

@@ -0,0 +1,38 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { joinPathFragments } from "@nx/devkit";
+import { AGENT_CONNECTION_PROJECT_DIR } from "../../../utils/agent-connection/agent-connection.js";
+import { addDependenciesToPackageJson } from "../../../utils/dependencies.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+import { TS_VERSIONS } from "../../../utils/versions.js";
+const CLIENT_S3 = '@aws-sdk/client-s3';
+const STRANDS_SDK = '@strands-agents/sdk';
+/**
+ * `@aws-sdk/client-s3` is an optional peer of `@strands-agents/sdk` that the
+ * shared agent-connection project never imports, so it went undeclared. pnpm
+ * then auto-installs its own copy there while a project that does declare it
+ * gets the catalog's, and those two resolutions give `@strands-agents/sdk` two
+ * peer-suffixed instances of the same version.
+ *
+ * Anything importing both projects then sees two nominal identities of every SDK
+ * type — `Agent`, `McpClient`, `Plugin` — and fails to compile with "Types have
+ * separate declarations of a private property". Declaring it keeps the version
+ * on the catalog, collapsing both to one instance.
+ */ export default async function migration(tree) {
+    const packageJsonPath = joinPathFragments(AGENT_CONNECTION_PROJECT_DIR, 'package.json');
+    if (!tree.exists(packageJsonPath)) {
+        return;
+    }
+    // Only where a strands client is actually present — that is what pulls the peer.
+    const packageJson = JSON.parse(tree.read(packageJsonPath, 'utf-8') ?? '{}');
+    if (!packageJson.dependencies?.[STRANDS_SDK]) {
+        return;
+    }
+    addDependenciesToPackageJson(tree, {
+        [CLIENT_S3]: TS_VERSIONS[CLIENT_S3]
+    }, {}, packageJsonPath);
+    await formatFilesInSubtree(tree);
+}
+
+//# sourceMappingURL=migration.js.map

package/src/migrations/latest/agent-connection-pin-strands-peers/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/latest/agent-connection-pin-strands-peers/migration.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 { AGENT_CONNECTION_PROJECT_DIR } from '../../../utils/agent-connection/agent-connection.js';\nimport { addDependenciesToPackageJson } from '../../../utils/dependencies.js';\nimport { formatFilesInSubtree } from '../../../utils/format.js';\nimport { TS_VERSIONS } from '../../../utils/versions.js';\n\nconst CLIENT_S3 = '@aws-sdk/client-s3';\nconst STRANDS_SDK = '@strands-agents/sdk';\n\n/**\n * `@aws-sdk/client-s3` is an optional peer of `@strands-agents/sdk` that the\n * shared agent-connection project never imports, so it went undeclared. pnpm\n * then auto-installs its own copy there while a project that does declare it\n * gets the catalog's, and those two resolutions give `@strands-agents/sdk` two\n * peer-suffixed instances of the same version.\n *\n * Anything importing both projects then sees two nominal identities of every SDK\n * type — `Agent`, `McpClient`, `Plugin` — and fails to compile with \"Types have\n * separate declarations of a private property\". Declaring it keeps the version\n * on the catalog, collapsing both to one instance.\n */\nexport default async function migration(tree: Tree): Promise<void> {\n  const packageJsonPath = joinPathFragments(\n    AGENT_CONNECTION_PROJECT_DIR,\n    'package.json',\n  );\n  if (!tree.exists(packageJsonPath)) {\n    return;\n  }\n\n  // Only where a strands client is actually present — that is what pulls the peer.\n  const packageJson = JSON.parse(tree.read(packageJsonPath, 'utf-8') ?? '{}');\n  if (!packageJson.dependencies?.[STRANDS_SDK]) {\n    return;\n  }\n\n  addDependenciesToPackageJson(\n    tree,\n    { [CLIENT_S3]: TS_VERSIONS[CLIENT_S3] },\n    {},\n    packageJsonPath,\n  );\n\n  await formatFilesInSubtree(tree);\n}\n"],"names":["joinPathFragments","AGENT_CONNECTION_PROJECT_DIR","addDependenciesToPackageJson","formatFilesInSubtree","TS_VERSIONS","CLIENT_S3","STRANDS_SDK","migration","tree","packageJsonPath","exists","packageJson","JSON","parse","read","dependencies"],"mappings":"AAAA;;;CAGC,GACD,SAASA,iBAAiB,QAAmB,aAAa;AAC1D,SAASC,4BAA4B,QAAQ,sDAAsD;AACnG,SAASC,4BAA4B,QAAQ,iCAAiC;AAC9E,SAASC,oBAAoB,QAAQ,2BAA2B;AAChE,SAASC,WAAW,QAAQ,6BAA6B;AAEzD,MAAMC,YAAY;AAClB,MAAMC,cAAc;AAEpB;;;;;;;;;;;CAWC,GACD,eAAe,eAAeC,UAAUC,IAAU;IAChD,MAAMC,kBAAkBT,kBACtBC,8BACA;IAEF,IAAI,CAACO,KAAKE,MAAM,CAACD,kBAAkB;QACjC;IACF;IAEA,iFAAiF;IACjF,MAAME,cAAcC,KAAKC,KAAK,CAACL,KAAKM,IAAI,CAACL,iBAAiB,YAAY;IACtE,IAAI,CAACE,YAAYI,YAAY,EAAE,CAACT,YAAY,EAAE;QAC5C;IACF;IAEAJ,6BACEM,MACA;QAAE,CAACH,UAAU,EAAED,WAAW,CAACC,UAAU;IAAC,GACtC,CAAC,GACDI;IAGF,MAAMN,qBAAqBK;AAC7B"}

package/src/migrations/latest/ignore-package-manager-temp-files/metadata.json

@@ -0,0 +1,3 @@
+{
+  "description": "Ignore the temporary files pnpm writes at the workspace root while materialising packages, which otherwise invalidate the Nx project graph"
+}

package/src/migrations/latest/ignore-package-manager-temp-files/migration.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Tree } from '@nx/devkit';
+/**
+ * pnpm creates `_tmp_<pid>_<hash>` files at the workspace root while it
+ * materialises packages. Left unignored, Nx's watcher invalidates the project
+ * graph on every install, so a watch-mode `dev` target running at the time
+ * rebuilds the graph continuously and never starts the command it wraps.
+ */
+export default function migration(tree: Tree): Promise<void>;

package/src/migrations/latest/ignore-package-manager-temp-files/migration.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { formatFilesInSubtree } from "../../../utils/format.js";
+import { updateGitIgnore } from "../../../utils/git.js";
+/** The temporary files pnpm writes while materialising packages. */ const TEMP_FILE_PATTERN = '_tmp_*';
+/**
+ * pnpm creates `_tmp_<pid>_<hash>` files at the workspace root while it
+ * materialises packages. Left unignored, Nx's watcher invalidates the project
+ * graph on every install, so a watch-mode `dev` target running at the time
+ * rebuilds the graph continuously and never starts the command it wraps.
+ */ export default async function migration(tree) {
+    // Only pnpm writes these, so key off its lockfile rather than the workspace
+    // file — a workspace on another package manager may still carry one.
+    if (!tree.exists('pnpm-lock.yaml')) {
+        return;
+    }
+    updateGitIgnore(tree, '.', (patterns)=>patterns.includes(TEMP_FILE_PATTERN) ? patterns : [
+            ...patterns,
+            TEMP_FILE_PATTERN
+        ]);
+    await formatFilesInSubtree(tree);
+}
+
+//# sourceMappingURL=migration.js.map

package/src/migrations/latest/ignore-package-manager-temp-files/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/latest/ignore-package-manager-temp-files/migration.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { Tree } from '@nx/devkit';\nimport { formatFilesInSubtree } from '../../../utils/format.js';\nimport { updateGitIgnore } from '../../../utils/git.js';\n\n/** The temporary files pnpm writes while materialising packages. */\nconst TEMP_FILE_PATTERN = '_tmp_*';\n\n/**\n * pnpm creates `_tmp_<pid>_<hash>` files at the workspace root while it\n * materialises packages. Left unignored, Nx's watcher invalidates the project\n * graph on every install, so a watch-mode `dev` target running at the time\n * rebuilds the graph continuously and never starts the command it wraps.\n */\nexport default async function migration(tree: Tree): Promise<void> {\n  // Only pnpm writes these, so key off its lockfile rather than the workspace\n  // file — a workspace on another package manager may still carry one.\n  if (!tree.exists('pnpm-lock.yaml')) {\n    return;\n  }\n\n  updateGitIgnore(tree, '.', (patterns) =>\n    patterns.includes(TEMP_FILE_PATTERN)\n      ? patterns\n      : [...patterns, TEMP_FILE_PATTERN],\n  );\n\n  await formatFilesInSubtree(tree);\n}\n"],"names":["formatFilesInSubtree","updateGitIgnore","TEMP_FILE_PATTERN","migration","tree","exists","patterns","includes"],"mappings":"AAAA;;;CAGC,GAED,SAASA,oBAAoB,QAAQ,2BAA2B;AAChE,SAASC,eAAe,QAAQ,wBAAwB;AAExD,kEAAkE,GAClE,MAAMC,oBAAoB;AAE1B;;;;;CAKC,GACD,eAAe,eAAeC,UAAUC,IAAU;IAChD,4EAA4E;IAC5E,qEAAqE;IACrE,IAAI,CAACA,KAAKC,MAAM,CAAC,mBAAmB;QAClC;IACF;IAEAJ,gBAAgBG,MAAM,KAAK,CAACE,WAC1BA,SAASC,QAAQ,CAACL,qBACdI,WACA;eAAIA;YAAUJ;SAAkB;IAGtC,MAAMF,qBAAqBI;AAC7B"}

package/src/migrations/latest/rolldown-config-bundle-transient/metadata.json

@@ -0,0 +1,3 @@
+{
+  "description": "Exclude the transient bundle rolldown writes while loading a TypeScript config from Biome and from git, so a concurrent format or lint target cannot fail on it"
+}

package/src/migrations/latest/rolldown-config-bundle-transient/migration.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type MigrationReturnObject, type Tree } from '@nx/devkit';
+export default function migration(tree: Tree): Promise<MigrationReturnObject>;

package/src/migrations/latest/rolldown-config-bundle-transient/migration.js

@@ -0,0 +1,80 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { getProjects, joinPathFragments, updateJson } from "@nx/devkit";
+import { BIOME_ROLLDOWN_CONFIG_BUNDLE_EXCLUDE, formatFilesInSubtree, ROLLDOWN_CONFIG_BUNDLE_GLOB } from "../../../utils/format.js";
+import { updateGitIgnore } from "../../../utils/git.js";
+/**
+ * Keep rolldown's transient config bundle out of Biome's and git's reach.
+ *
+ * Loading a `rolldown.config.ts` bundles it to `rolldown.config.<hash>.js` in the
+ * config's own directory, imports it, then unlinks it. The `bundle`, `format` and
+ * `lint` targets of a project all run concurrently, so a `format` sweeping the
+ * project mid-bundle sees a machine-generated file and reports it unformatted —
+ * failing the target for no fault of the source. Being git-visible, the file
+ * could also be committed, or picked up by `license#sync`, which builds its
+ * candidate set from git-visible files rather than from `biome.json`.
+ *
+ * Guardrails:
+ * - The Biome exclude is anchored to the excludes we vend. A workspace whose
+ *   `files.includes` has diverged keeps its own list, and is reported via
+ *   `nextSteps` instead.
+ * - Only projects carrying a `rolldown.config.ts` get the git ignore, matching
+ *   where the generator writes it.
+ * - Idempotent: both edits are guarded on the pattern already being present.
+ */ /** The config filename whose loading produces the transient bundle. */ const ROLLDOWN_CONFIG = 'rolldown.config.ts';
+/**
+ * Exclude the transient bundle from Biome. Anchored to `!**\/out-tsc`, the
+ * build-output exclude the vended list places these next to — without it the list
+ * has diverged from the one we vend, so leave it to the user.
+ */ const excludeFromBiome = (tree)=>{
+    if (!tree.exists('biome.json')) {
+        return [];
+    }
+    let unrecognised = false;
+    updateJson(tree, 'biome.json', (biome)=>{
+        const includes = biome?.files?.includes;
+        if (!Array.isArray(includes) || includes.includes(BIOME_ROLLDOWN_CONFIG_BUNDLE_EXCLUDE)) {
+            return biome;
+        }
+        if (!includes.includes('!**/out-tsc')) {
+            unrecognised = true;
+            return biome;
+        }
+        return {
+            ...biome,
+            files: {
+                ...biome.files,
+                includes: includes.flatMap((include)=>include === '!**/out-tsc' ? [
+                        include,
+                        BIOME_ROLLDOWN_CONFIG_BUNDLE_EXCLUDE
+                    ] : [
+                        include
+                    ])
+            }
+        };
+    });
+    return unrecognised ? [
+        `\`biome.json\`: add \`"${BIOME_ROLLDOWN_CONFIG_BUNDLE_EXCLUDE}"\` to \`files.includes\` so the transient bundle rolldown writes while loading a TypeScript config is never formatted or linted. Its \`files.includes\` has diverged from the vended list, so it was left as it is.`
+    ] : [];
+};
+export default async function migration(tree) {
+    const nextSteps = [
+        ...excludeFromBiome(tree)
+    ];
+    for (const [, project] of getProjects(tree)){
+        if (!tree.exists(joinPathFragments(project.root, ROLLDOWN_CONFIG))) {
+            continue;
+        }
+        updateGitIgnore(tree, project.root, (patterns)=>patterns.includes(ROLLDOWN_CONFIG_BUNDLE_GLOB) ? patterns : [
+                ...patterns,
+                ROLLDOWN_CONFIG_BUNDLE_GLOB
+            ]);
+    }
+    await formatFilesInSubtree(tree);
+    return {
+        nextSteps
+    };
+}
+
+//# sourceMappingURL=migration.js.map

package/src/migrations/latest/rolldown-config-bundle-transient/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/latest/rolldown-config-bundle-transient/migration.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  getProjects,\n  joinPathFragments,\n  type MigrationReturnObject,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport {\n  BIOME_ROLLDOWN_CONFIG_BUNDLE_EXCLUDE,\n  formatFilesInSubtree,\n  ROLLDOWN_CONFIG_BUNDLE_GLOB,\n} from '../../../utils/format.js';\nimport { updateGitIgnore } from '../../../utils/git.js';\n\n/**\n * Keep rolldown's transient config bundle out of Biome's and git's reach.\n *\n * Loading a `rolldown.config.ts` bundles it to `rolldown.config.<hash>.js` in the\n * config's own directory, imports it, then unlinks it. The `bundle`, `format` and\n * `lint` targets of a project all run concurrently, so a `format` sweeping the\n * project mid-bundle sees a machine-generated file and reports it unformatted —\n * failing the target for no fault of the source. Being git-visible, the file\n * could also be committed, or picked up by `license#sync`, which builds its\n * candidate set from git-visible files rather than from `biome.json`.\n *\n * Guardrails:\n * - The Biome exclude is anchored to the excludes we vend. A workspace whose\n *   `files.includes` has diverged keeps its own list, and is reported via\n *   `nextSteps` instead.\n * - Only projects carrying a `rolldown.config.ts` get the git ignore, matching\n *   where the generator writes it.\n * - Idempotent: both edits are guarded on the pattern already being present.\n */\n\n/** The config filename whose loading produces the transient bundle. */\nconst ROLLDOWN_CONFIG = 'rolldown.config.ts';\n\n/**\n * Exclude the transient bundle from Biome. Anchored to `!**\\/out-tsc`, the\n * build-output exclude the vended list places these next to — without it the list\n * has diverged from the one we vend, so leave it to the user.\n */\nconst excludeFromBiome = (tree: Tree): string[] => {\n  if (!tree.exists('biome.json')) {\n    return [];\n  }\n  let unrecognised = false;\n  updateJson(tree, 'biome.json', (biome) => {\n    const includes: unknown = biome?.files?.includes;\n    if (\n      !Array.isArray(includes) ||\n      includes.includes(BIOME_ROLLDOWN_CONFIG_BUNDLE_EXCLUDE)\n    ) {\n      return biome;\n    }\n    if (!includes.includes('!**/out-tsc')) {\n      unrecognised = true;\n      return biome;\n    }\n    return {\n      ...biome,\n      files: {\n        ...biome.files,\n        includes: includes.flatMap((include) =>\n          include === '!**/out-tsc'\n            ? [include, BIOME_ROLLDOWN_CONFIG_BUNDLE_EXCLUDE]\n            : [include],\n        ),\n      },\n    };\n  });\n  return unrecognised\n    ? [\n        `\\`biome.json\\`: add \\`\"${BIOME_ROLLDOWN_CONFIG_BUNDLE_EXCLUDE}\"\\` to \\`files.includes\\` so the transient bundle rolldown writes while loading a TypeScript config is never formatted or linted. Its \\`files.includes\\` has diverged from the vended list, so it was left as it is.`,\n      ]\n    : [];\n};\n\nexport default async function migration(\n  tree: Tree,\n): Promise<MigrationReturnObject> {\n  const nextSteps: string[] = [...excludeFromBiome(tree)];\n\n  for (const [, project] of getProjects(tree)) {\n    if (!tree.exists(joinPathFragments(project.root, ROLLDOWN_CONFIG))) {\n      continue;\n    }\n    updateGitIgnore(tree, project.root, (patterns) =>\n      patterns.includes(ROLLDOWN_CONFIG_BUNDLE_GLOB)\n        ? patterns\n        : [...patterns, ROLLDOWN_CONFIG_BUNDLE_GLOB],\n    );\n  }\n\n  await formatFilesInSubtree(tree);\n\n  return { nextSteps };\n}\n"],"names":["getProjects","joinPathFragments","updateJson","BIOME_ROLLDOWN_CONFIG_BUNDLE_EXCLUDE","formatFilesInSubtree","ROLLDOWN_CONFIG_BUNDLE_GLOB","updateGitIgnore","ROLLDOWN_CONFIG","excludeFromBiome","tree","exists","unrecognised","biome","includes","files","Array","isArray","flatMap","include","migration","nextSteps","project","root","patterns"],"mappings":"AAAA;;;CAGC,GACD,SACEA,WAAW,EACXC,iBAAiB,EAGjBC,UAAU,QACL,aAAa;AACpB,SACEC,oCAAoC,EACpCC,oBAAoB,EACpBC,2BAA2B,QACtB,2BAA2B;AAClC,SAASC,eAAe,QAAQ,wBAAwB;AAExD;;;;;;;;;;;;;;;;;;CAkBC,GAED,qEAAqE,GACrE,MAAMC,kBAAkB;AAExB;;;;CAIC,GACD,MAAMC,mBAAmB,CAACC;IACxB,IAAI,CAACA,KAAKC,MAAM,CAAC,eAAe;QAC9B,OAAO,EAAE;IACX;IACA,IAAIC,eAAe;IACnBT,WAAWO,MAAM,cAAc,CAACG;QAC9B,MAAMC,WAAoBD,OAAOE,OAAOD;QACxC,IACE,CAACE,MAAMC,OAAO,CAACH,aACfA,SAASA,QAAQ,CAACV,uCAClB;YACA,OAAOS;QACT;QACA,IAAI,CAACC,SAASA,QAAQ,CAAC,gBAAgB;YACrCF,eAAe;YACf,OAAOC;QACT;QACA,OAAO;YACL,GAAGA,KAAK;YACRE,OAAO;gBACL,GAAGF,MAAME,KAAK;gBACdD,UAAUA,SAASI,OAAO,CAAC,CAACC,UAC1BA,YAAY,gBACR;wBAACA;wBAASf;qBAAqC,GAC/C;wBAACe;qBAAQ;YAEjB;QACF;IACF;IACA,OAAOP,eACH;QACE,CAAC,uBAAuB,EAAER,qCAAqC,oNAAoN,CAAC;KACrR,GACD,EAAE;AACR;AAEA,eAAe,eAAegB,UAC5BV,IAAU;IAEV,MAAMW,YAAsB;WAAIZ,iBAAiBC;KAAM;IAEvD,KAAK,MAAM,GAAGY,QAAQ,IAAIrB,YAAYS,MAAO;QAC3C,IAAI,CAACA,KAAKC,MAAM,CAACT,kBAAkBoB,QAAQC,IAAI,EAAEf,mBAAmB;YAClE;QACF;QACAD,gBAAgBG,MAAMY,QAAQC,IAAI,EAAE,CAACC,WACnCA,SAASV,QAAQ,CAACR,+BACdkB,WACA;mBAAIA;gBAAUlB;aAA4B;IAElD;IAEA,MAAMD,qBAAqBK;IAE3B,OAAO;QAAEW;IAAU;AACrB"}

package/src/migrations/latest/shadcn-package-imports-exports/metadata.json

@@ -0,0 +1,3 @@
+{
+  "description": "Move the shared shadcn package from a tsconfig paths alias to package.json imports/exports, matching the shadcn CLI's own monorepo resolution"
+}

package/src/migrations/latest/shadcn-package-imports-exports/migration.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type MigrationReturnObject, type Tree } from '@nx/devkit';
+export default function migration(tree: Tree): Promise<MigrationReturnObject>;

package/src/migrations/latest/shadcn-package-imports-exports/migration.js

@@ -0,0 +1,184 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { getProjects, joinPathFragments, readJson, updateJson } from "@nx/devkit";
+import { REACT_WEBSITE_APP_GENERATOR_INFO } from "../../../ts/react-website/app/generator.js";
+import { applyGritQL, matchGritQL } from "../../../utils/ast.js";
+import { addDependenciesToPackageJson, getLocalDependencySpecifier } from "../../../utils/dependencies.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+import { PACKAGES_DIR, SHARED_SHADCN_DIR } from "../../../utils/shared-constructs-constants.js";
+import { getSharedShadcnFullyQualifiedName } from "../../../utils/shared-shadcn.js";
+/**
+ * Move the shared shadcn package off a `tsconfig.base.json` `paths` alias onto
+ * `package.json` `imports`/`exports`.
+ *
+ * shadcn 4.x's CLI resolves `components.json`'s aliases via Node's package
+ * resolution (`imports`/`exports`), not tsconfig `paths` - its own resolver
+ * naively joins a tsconfig-declared alias against whichever directory it's
+ * invoked from, so the repo-root-relative `paths` mapping this plugin used to
+ * vend breaks the moment `shadcn add` is run with `-c packages/common/shadcn`
+ * (as its own monorepo-root preflight now tells the user to). This migration
+ * carries an existing workspace onto the shape today's generators produce:
+ * local `#...` imports for the package's own internal component references,
+ * a public `exports` map for every other consumer, and a real `workspace:*`
+ * dependency on each consumer so that map actually resolves.
+ *
+ * How to write a migration:
+ * - https://nx.dev/docs/kb/migration-generators
+ * - What `nextSteps` means: https://nx.dev/docs/reference/devkit/MigrationReturnObject
+ *
+ * Guardrails:
+ * - Only touches a `packages/common/shadcn` this plugin's generators produced
+ *   (guarded by `components.json`'s aliases still matching the old shape).
+ * - Internal imports are rewritten by exact module specifier per file found
+ *   under `src/{components/ui,lib,hooks}`, so a component a user added by hand
+ *   after the original generation is covered too, and a specifier the
+ *   migration doesn't recognise is left alone and reported.
+ * - Idempotent: every write is guarded by the old shape still being present.
+ */ const libraryRoot = joinPathFragments(PACKAGES_DIR, SHARED_SHADCN_DIR);
+const componentsJsonPath = joinPathFragments(libraryRoot, 'components.json');
+const packageJsonPath = joinPathFragments(libraryRoot, 'package.json');
+const oldAliases = (fqn)=>({
+        components: `${fqn}/components`,
+        utils: `${fqn}/lib/utils`,
+        hooks: `${fqn}/hooks`,
+        lib: `${fqn}/lib`,
+        ui: `${fqn}/components/ui`
+    });
+const newAliases = {
+    components: '#components',
+    utils: '#lib/utils',
+    hooks: '#hooks',
+    lib: '#lib',
+    ui: '#components/ui'
+};
+const newPackageManifestFields = {
+    imports: {
+        '#components/*': './src/components/*.tsx',
+        '#lib/*': './src/lib/*.ts',
+        '#hooks/*': './src/hooks/*.ts'
+    },
+    exports: {
+        '.': './src/index.ts',
+        './styles/*': './src/styles/*',
+        './components/*': './src/components/*.tsx',
+        './lib/*': './src/lib/*.ts',
+        './hooks/*': './src/hooks/*.ts'
+    }
+};
+/**
+ * Rewrite an import's module specifier, keeping its bindings - `$bindings`
+ * holds whatever the file imports, so a binding a user added survives.
+ */ const importPattern = (from, to)=>`\`import { $bindings } from '${from}'\` => \`import { $bindings } from '${to}'\``;
+/** Whether the file still imports the old specifier under any other form. */ const hasRemainingImport = (from)=>`\`import $_ from '${from}'\``;
+export default async function migration(tree) {
+    const nextSteps = [];
+    if (!tree.exists(componentsJsonPath) || !tree.exists(packageJsonPath)) {
+        return {
+            nextSteps
+        };
+    }
+    const fullyQualifiedName = getSharedShadcnFullyQualifiedName(tree);
+    const currentAliases = readJson(tree, componentsJsonPath).aliases ?? {};
+    const expectedOldAliases = oldAliases(fullyQualifiedName);
+    const onOldShape = Object.keys(newAliases).every((key)=>currentAliases[key] === expectedOldAliases[key]);
+    if (!onOldShape) {
+        if (Object.keys(newAliases).some((key)=>currentAliases[key] !== newAliases[key])) {
+            nextSteps.push(`${componentsJsonPath}: aliases have diverged from both the old and current generated shape - left untouched. Migrate them to the shadcn CLI's imports/exports monorepo pattern by hand: https://ui.shadcn.com/docs/monorepo`);
+        }
+        await formatFilesInSubtree(tree);
+        return {
+            nextSteps
+        };
+    }
+    // Rewrite every source file's internal references to this package's own
+    // components/lib/hooks, keyed off the files actually present so a
+    // hand-added component is covered too.
+    const internalDirs = [
+        {
+            dir: joinPathFragments(libraryRoot, 'src', 'components', 'ui'),
+            extension: '.tsx',
+            oldSubpath: 'components/ui',
+            newPrefix: '#components/ui'
+        },
+        {
+            dir: joinPathFragments(libraryRoot, 'src', 'lib'),
+            extension: '.ts',
+            oldSubpath: 'lib',
+            newPrefix: '#lib'
+        },
+        {
+            dir: joinPathFragments(libraryRoot, 'src', 'hooks'),
+            extension: '.ts',
+            oldSubpath: 'hooks',
+            newPrefix: '#hooks'
+        }
+    ];
+    const renames = [];
+    const sourceFiles = [];
+    for (const { dir, extension, oldSubpath, newPrefix } of internalDirs){
+        if (!tree.exists(dir)) {
+            continue;
+        }
+        for (const entry of tree.children(dir)){
+            if (!entry.endsWith(extension)) {
+                continue;
+            }
+            const baseName = entry.slice(0, -extension.length);
+            renames.push({
+                old: `${fullyQualifiedName}/${oldSubpath}/${baseName}`,
+                renamed: `${newPrefix}/${baseName}`
+            });
+            sourceFiles.push(joinPathFragments(dir, entry));
+        }
+    }
+    for (const sourceFile of sourceFiles){
+        for (const { old, renamed } of renames){
+            await applyGritQL(tree, sourceFile, importPattern(old, renamed));
+            // A namespace or default import of the same specifier is left as it
+            // is - reported rather than rewritten, so a diverged file is never
+            // clobbered.
+            if (await matchGritQL(tree, sourceFile, hasRemainingImport(old))) {
+                nextSteps.push(`${sourceFile}: still imports '${old}' in a form this migration does not rewrite - update it to '${renamed}' by hand.`);
+            }
+        }
+    }
+    updateJson(tree, componentsJsonPath, (json)=>({
+            ...json,
+            aliases: newAliases
+        }));
+    updateJson(tree, packageJsonPath, (json)=>({
+            ...json,
+            ...newPackageManifestFields
+        }));
+    updateJson(tree, 'tsconfig.base.json', (json)=>{
+        const paths = {
+            ...json.compilerOptions?.paths ?? {}
+        };
+        delete paths[`${fullyQualifiedName}/*`];
+        return {
+            ...json,
+            compilerOptions: {
+                ...json.compilerOptions,
+                paths
+            }
+        };
+    });
+    // Every website generated with ux=shadcn needs a real dependency on the
+    // shared package now that it resolves through `exports`, not `paths`.
+    for (const project of getProjects(tree).values()){
+        const metadata = project.metadata;
+        if (metadata?.generator !== REACT_WEBSITE_APP_GENERATOR_INFO.id || metadata.ux !== 'shadcn') {
+            continue;
+        }
+        addDependenciesToPackageJson(tree, {
+            [fullyQualifiedName]: getLocalDependencySpecifier(tree)
+        }, {}, joinPathFragments(project.root, 'package.json'));
+    }
+    await formatFilesInSubtree(tree);
+    return {
+        nextSteps
+    };
+}
+
+//# sourceMappingURL=migration.js.map

package/src/migrations/latest/shadcn-package-imports-exports/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/latest/shadcn-package-imports-exports/migration.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  getProjects,\n  joinPathFragments,\n  type MigrationReturnObject,\n  readJson,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport { REACT_WEBSITE_APP_GENERATOR_INFO } from '../../../ts/react-website/app/generator.js';\nimport { applyGritQL, matchGritQL } from '../../../utils/ast.js';\nimport {\n  addDependenciesToPackageJson,\n  getLocalDependencySpecifier,\n} from '../../../utils/dependencies.js';\nimport { formatFilesInSubtree } from '../../../utils/format.js';\nimport {\n  PACKAGES_DIR,\n  SHARED_SHADCN_DIR,\n} from '../../../utils/shared-constructs-constants.js';\nimport { getSharedShadcnFullyQualifiedName } from '../../../utils/shared-shadcn.js';\n\n/**\n * Move the shared shadcn package off a `tsconfig.base.json` `paths` alias onto\n * `package.json` `imports`/`exports`.\n *\n * shadcn 4.x's CLI resolves `components.json`'s aliases via Node's package\n * resolution (`imports`/`exports`), not tsconfig `paths` - its own resolver\n * naively joins a tsconfig-declared alias against whichever directory it's\n * invoked from, so the repo-root-relative `paths` mapping this plugin used to\n * vend breaks the moment `shadcn add` is run with `-c packages/common/shadcn`\n * (as its own monorepo-root preflight now tells the user to). This migration\n * carries an existing workspace onto the shape today's generators produce:\n * local `#...` imports for the package's own internal component references,\n * a public `exports` map for every other consumer, and a real `workspace:*`\n * dependency on each consumer so that map actually resolves.\n *\n * How to write a migration:\n * - https://nx.dev/docs/kb/migration-generators\n * - What `nextSteps` means: https://nx.dev/docs/reference/devkit/MigrationReturnObject\n *\n * Guardrails:\n * - Only touches a `packages/common/shadcn` this plugin's generators produced\n *   (guarded by `components.json`'s aliases still matching the old shape).\n * - Internal imports are rewritten by exact module specifier per file found\n *   under `src/{components/ui,lib,hooks}`, so a component a user added by hand\n *   after the original generation is covered too, and a specifier the\n *   migration doesn't recognise is left alone and reported.\n * - Idempotent: every write is guarded by the old shape still being present.\n */\n\nconst libraryRoot = joinPathFragments(PACKAGES_DIR, SHARED_SHADCN_DIR);\nconst componentsJsonPath = joinPathFragments(libraryRoot, 'components.json');\nconst packageJsonPath = joinPathFragments(libraryRoot, 'package.json');\n\ninterface ComponentsJsonAliases {\n  readonly components?: string;\n  readonly utils?: string;\n  readonly hooks?: string;\n  readonly lib?: string;\n  readonly ui?: string;\n}\n\nconst oldAliases = (fqn: string): ComponentsJsonAliases => ({\n  components: `${fqn}/components`,\n  utils: `${fqn}/lib/utils`,\n  hooks: `${fqn}/hooks`,\n  lib: `${fqn}/lib`,\n  ui: `${fqn}/components/ui`,\n});\n\nconst newAliases: Required<ComponentsJsonAliases> = {\n  components: '#components',\n  utils: '#lib/utils',\n  hooks: '#hooks',\n  lib: '#lib',\n  ui: '#components/ui',\n};\n\nconst newPackageManifestFields = {\n  imports: {\n    '#components/*': './src/components/*.tsx',\n    '#lib/*': './src/lib/*.ts',\n    '#hooks/*': './src/hooks/*.ts',\n  },\n  exports: {\n    '.': './src/index.ts',\n    './styles/*': './src/styles/*',\n    './components/*': './src/components/*.tsx',\n    './lib/*': './src/lib/*.ts',\n    './hooks/*': './src/hooks/*.ts',\n  },\n};\n\n/**\n * Rewrite an import's module specifier, keeping its bindings - `$bindings`\n * holds whatever the file imports, so a binding a user added survives.\n */\nconst importPattern = (from: string, to: string): string =>\n  `\\`import { $bindings } from '${from}'\\` => \\`import { $bindings } from '${to}'\\``;\n\n/** Whether the file still imports the old specifier under any other form. */\nconst hasRemainingImport = (from: string): string =>\n  `\\`import $_ from '${from}'\\``;\n\nexport default async function migration(\n  tree: Tree,\n): Promise<MigrationReturnObject> {\n  const nextSteps: string[] = [];\n\n  if (!tree.exists(componentsJsonPath) || !tree.exists(packageJsonPath)) {\n    return { nextSteps };\n  }\n\n  const fullyQualifiedName = getSharedShadcnFullyQualifiedName(tree);\n  const currentAliases =\n    readJson<{ aliases?: ComponentsJsonAliases }>(tree, componentsJsonPath)\n      .aliases ?? {};\n  const expectedOldAliases = oldAliases(fullyQualifiedName);\n  const onOldShape = (\n    Object.keys(newAliases) as (keyof ComponentsJsonAliases)[]\n  ).every((key) => currentAliases[key] === expectedOldAliases[key]);\n\n  if (!onOldShape) {\n    if (\n      (Object.keys(newAliases) as (keyof ComponentsJsonAliases)[]).some(\n        (key) => currentAliases[key] !== newAliases[key],\n      )\n    ) {\n      nextSteps.push(\n        `${componentsJsonPath}: aliases have diverged from both the old and current generated shape - left untouched. Migrate them to the shadcn CLI's imports/exports monorepo pattern by hand: https://ui.shadcn.com/docs/monorepo`,\n      );\n    }\n    await formatFilesInSubtree(tree);\n    return { nextSteps };\n  }\n\n  // Rewrite every source file's internal references to this package's own\n  // components/lib/hooks, keyed off the files actually present so a\n  // hand-added component is covered too.\n  const internalDirs: Array<{\n    dir: string;\n    extension: string;\n    oldSubpath: string;\n    newPrefix: string;\n  }> = [\n    {\n      dir: joinPathFragments(libraryRoot, 'src', 'components', 'ui'),\n      extension: '.tsx',\n      oldSubpath: 'components/ui',\n      newPrefix: '#components/ui',\n    },\n    {\n      dir: joinPathFragments(libraryRoot, 'src', 'lib'),\n      extension: '.ts',\n      oldSubpath: 'lib',\n      newPrefix: '#lib',\n    },\n    {\n      dir: joinPathFragments(libraryRoot, 'src', 'hooks'),\n      extension: '.ts',\n      oldSubpath: 'hooks',\n      newPrefix: '#hooks',\n    },\n  ];\n\n  const renames: Array<{ old: string; renamed: string }> = [];\n  const sourceFiles: string[] = [];\n  for (const { dir, extension, oldSubpath, newPrefix } of internalDirs) {\n    if (!tree.exists(dir)) {\n      continue;\n    }\n    for (const entry of tree.children(dir)) {\n      if (!entry.endsWith(extension)) {\n        continue;\n      }\n      const baseName = entry.slice(0, -extension.length);\n      renames.push({\n        old: `${fullyQualifiedName}/${oldSubpath}/${baseName}`,\n        renamed: `${newPrefix}/${baseName}`,\n      });\n      sourceFiles.push(joinPathFragments(dir, entry));\n    }\n  }\n\n  for (const sourceFile of sourceFiles) {\n    for (const { old, renamed } of renames) {\n      await applyGritQL(tree, sourceFile, importPattern(old, renamed));\n      // A namespace or default import of the same specifier is left as it\n      // is - reported rather than rewritten, so a diverged file is never\n      // clobbered.\n      if (await matchGritQL(tree, sourceFile, hasRemainingImport(old))) {\n        nextSteps.push(\n          `${sourceFile}: still imports '${old}' in a form this migration does not rewrite - update it to '${renamed}' by hand.`,\n        );\n      }\n    }\n  }\n\n  updateJson(tree, componentsJsonPath, (json) => ({\n    ...json,\n    aliases: newAliases,\n  }));\n\n  updateJson(tree, packageJsonPath, (json) => ({\n    ...json,\n    ...newPackageManifestFields,\n  }));\n\n  updateJson(tree, 'tsconfig.base.json', (json) => {\n    const paths = { ...(json.compilerOptions?.paths ?? {}) };\n    delete paths[`${fullyQualifiedName}/*`];\n    return {\n      ...json,\n      compilerOptions: {\n        ...json.compilerOptions,\n        paths,\n      },\n    };\n  });\n\n  // Every website generated with ux=shadcn needs a real dependency on the\n  // shared package now that it resolves through `exports`, not `paths`.\n  for (const project of getProjects(tree).values()) {\n    const metadata = project.metadata as\n      | { generator?: string; ux?: string }\n      | undefined;\n    if (\n      metadata?.generator !== REACT_WEBSITE_APP_GENERATOR_INFO.id ||\n      metadata.ux !== 'shadcn'\n    ) {\n      continue;\n    }\n    addDependenciesToPackageJson(\n      tree,\n      { [fullyQualifiedName]: getLocalDependencySpecifier(tree) },\n      {},\n      joinPathFragments(project.root, 'package.json'),\n    );\n  }\n\n  await formatFilesInSubtree(tree);\n\n  return { nextSteps };\n}\n"],"names":["getProjects","joinPathFragments","readJson","updateJson","REACT_WEBSITE_APP_GENERATOR_INFO","applyGritQL","matchGritQL","addDependenciesToPackageJson","getLocalDependencySpecifier","formatFilesInSubtree","PACKAGES_DIR","SHARED_SHADCN_DIR","getSharedShadcnFullyQualifiedName","libraryRoot","componentsJsonPath","packageJsonPath","oldAliases","fqn","components","utils","hooks","lib","ui","newAliases","newPackageManifestFields","imports","exports","importPattern","from","to","hasRemainingImport","migration","tree","nextSteps","exists","fullyQualifiedName","currentAliases","aliases","expectedOldAliases","onOldShape","Object","keys","every","key","some","push","internalDirs","dir","extension","oldSubpath","newPrefix","renames","sourceFiles","entry","children","endsWith","baseName","slice","length","old","renamed","sourceFile","json","paths","compilerOptions","project","values","metadata","generator","id","ux","root"],"mappings":"AAAA;;;CAGC,GACD,SACEA,WAAW,EACXC,iBAAiB,EAEjBC,QAAQ,EAERC,UAAU,QACL,aAAa;AACpB,SAASC,gCAAgC,QAAQ,6CAA6C;AAC9F,SAASC,WAAW,EAAEC,WAAW,QAAQ,wBAAwB;AACjE,SACEC,4BAA4B,EAC5BC,2BAA2B,QACtB,iCAAiC;AACxC,SAASC,oBAAoB,QAAQ,2BAA2B;AAChE,SACEC,YAAY,EACZC,iBAAiB,QACZ,gDAAgD;AACvD,SAASC,iCAAiC,QAAQ,kCAAkC;AAEpF;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BC,GAED,MAAMC,cAAcZ,kBAAkBS,cAAcC;AACpD,MAAMG,qBAAqBb,kBAAkBY,aAAa;AAC1D,MAAME,kBAAkBd,kBAAkBY,aAAa;AAUvD,MAAMG,aAAa,CAACC,MAAwC,CAAA;QAC1DC,YAAY,GAAGD,IAAI,WAAW,CAAC;QAC/BE,OAAO,GAAGF,IAAI,UAAU,CAAC;QACzBG,OAAO,GAAGH,IAAI,MAAM,CAAC;QACrBI,KAAK,GAAGJ,IAAI,IAAI,CAAC;QACjBK,IAAI,GAAGL,IAAI,cAAc,CAAC;IAC5B,CAAA;AAEA,MAAMM,aAA8C;IAClDL,YAAY;IACZC,OAAO;IACPC,OAAO;IACPC,KAAK;IACLC,IAAI;AACN;AAEA,MAAME,2BAA2B;IAC/BC,SAAS;QACP,iBAAiB;QACjB,UAAU;QACV,YAAY;IACd;IACAC,SAAS;QACP,KAAK;QACL,cAAc;QACd,kBAAkB;QAClB,WAAW;QACX,aAAa;IACf;AACF;AAEA;;;CAGC,GACD,MAAMC,gBAAgB,CAACC,MAAcC,KACnC,CAAC,6BAA6B,EAAED,KAAK,oCAAoC,EAAEC,GAAG,GAAG,CAAC;AAEpF,2EAA2E,GAC3E,MAAMC,qBAAqB,CAACF,OAC1B,CAAC,kBAAkB,EAAEA,KAAK,GAAG,CAAC;AAEhC,eAAe,eAAeG,UAC5BC,IAAU;IAEV,MAAMC,YAAsB,EAAE;IAE9B,IAAI,CAACD,KAAKE,MAAM,CAACpB,uBAAuB,CAACkB,KAAKE,MAAM,CAACnB,kBAAkB;QACrE,OAAO;YAAEkB;QAAU;IACrB;IAEA,MAAME,qBAAqBvB,kCAAkCoB;IAC7D,MAAMI,iBACJlC,SAA8C8B,MAAMlB,oBACjDuB,OAAO,IAAI,CAAC;IACjB,MAAMC,qBAAqBtB,WAAWmB;IACtC,MAAMI,aAAa,AACjBC,OAAOC,IAAI,CAAClB,YACZmB,KAAK,CAAC,CAACC,MAAQP,cAAc,CAACO,IAAI,KAAKL,kBAAkB,CAACK,IAAI;IAEhE,IAAI,CAACJ,YAAY;QACf,IACE,AAACC,OAAOC,IAAI,CAAClB,YAAgDqB,IAAI,CAC/D,CAACD,MAAQP,cAAc,CAACO,IAAI,KAAKpB,UAAU,CAACoB,IAAI,GAElD;YACAV,UAAUY,IAAI,CACZ,GAAG/B,mBAAmB,sMAAsM,CAAC;QAEjO;QACA,MAAML,qBAAqBuB;QAC3B,OAAO;YAAEC;QAAU;IACrB;IAEA,wEAAwE;IACxE,kEAAkE;IAClE,uCAAuC;IACvC,MAAMa,eAKD;QACH;YACEC,KAAK9C,kBAAkBY,aAAa,OAAO,cAAc;YACzDmC,WAAW;YACXC,YAAY;YACZC,WAAW;QACb;QACA;YACEH,KAAK9C,kBAAkBY,aAAa,OAAO;YAC3CmC,WAAW;YACXC,YAAY;YACZC,WAAW;QACb;QACA;YACEH,KAAK9C,kBAAkBY,aAAa,OAAO;YAC3CmC,WAAW;YACXC,YAAY;YACZC,WAAW;QACb;KACD;IAED,MAAMC,UAAmD,EAAE;IAC3D,MAAMC,cAAwB,EAAE;IAChC,KAAK,MAAM,EAAEL,GAAG,EAAEC,SAAS,EAAEC,UAAU,EAAEC,SAAS,EAAE,IAAIJ,aAAc;QACpE,IAAI,CAACd,KAAKE,MAAM,CAACa,MAAM;YACrB;QACF;QACA,KAAK,MAAMM,SAASrB,KAAKsB,QAAQ,CAACP,KAAM;YACtC,IAAI,CAACM,MAAME,QAAQ,CAACP,YAAY;gBAC9B;YACF;YACA,MAAMQ,WAAWH,MAAMI,KAAK,CAAC,GAAG,CAACT,UAAUU,MAAM;YACjDP,QAAQN,IAAI,CAAC;gBACXc,KAAK,GAAGxB,mBAAmB,CAAC,EAAEc,WAAW,CAAC,EAAEO,UAAU;gBACtDI,SAAS,GAAGV,UAAU,CAAC,EAAEM,UAAU;YACrC;YACAJ,YAAYP,IAAI,CAAC5C,kBAAkB8C,KAAKM;QAC1C;IACF;IAEA,KAAK,MAAMQ,cAAcT,YAAa;QACpC,KAAK,MAAM,EAAEO,GAAG,EAAEC,OAAO,EAAE,IAAIT,QAAS;YACtC,MAAM9C,YAAY2B,MAAM6B,YAAYlC,cAAcgC,KAAKC;YACvD,oEAAoE;YACpE,mEAAmE;YACnE,aAAa;YACb,IAAI,MAAMtD,YAAY0B,MAAM6B,YAAY/B,mBAAmB6B,OAAO;gBAChE1B,UAAUY,IAAI,CACZ,GAAGgB,WAAW,iBAAiB,EAAEF,IAAI,4DAA4D,EAAEC,QAAQ,UAAU,CAAC;YAE1H;QACF;IACF;IAEAzD,WAAW6B,MAAMlB,oBAAoB,CAACgD,OAAU,CAAA;YAC9C,GAAGA,IAAI;YACPzB,SAASd;QACX,CAAA;IAEApB,WAAW6B,MAAMjB,iBAAiB,CAAC+C,OAAU,CAAA;YAC3C,GAAGA,IAAI;YACP,GAAGtC,wBAAwB;QAC7B,CAAA;IAEArB,WAAW6B,MAAM,sBAAsB,CAAC8B;QACtC,MAAMC,QAAQ;YAAE,GAAID,KAAKE,eAAe,EAAED,SAAS,CAAC,CAAC;QAAE;QACvD,OAAOA,KAAK,CAAC,GAAG5B,mBAAmB,EAAE,CAAC,CAAC;QACvC,OAAO;YACL,GAAG2B,IAAI;YACPE,iBAAiB;gBACf,GAAGF,KAAKE,eAAe;gBACvBD;YACF;QACF;IACF;IAEA,wEAAwE;IACxE,sEAAsE;IACtE,KAAK,MAAME,WAAWjE,YAAYgC,MAAMkC,MAAM,GAAI;QAChD,MAAMC,WAAWF,QAAQE,QAAQ;QAGjC,IACEA,UAAUC,cAAchE,iCAAiCiE,EAAE,IAC3DF,SAASG,EAAE,KAAK,UAChB;YACA;QACF;QACA/D,6BACEyB,MACA;YAAE,CAACG,mBAAmB,EAAE3B,4BAA4BwB;QAAM,GAC1D,CAAC,GACD/B,kBAAkBgE,QAAQM,IAAI,EAAE;IAEpC;IAEA,MAAM9D,qBAAqBuB;IAE3B,OAAO;QAAEC;IAAU;AACrB"}

package/src/preset/__snapshots__/generator.spec.ts.snap

@@ -31,7 +31,10 @@ exports[`preset generator > should run successfully > .gemini/settings.json 1`]
 "
 `;
 
-exports[`preset generator > should run successfully > .gitignore 1`] = `".grit"`;
+exports[`preset generator > should run successfully > .gitignore 1`] = `
+".grit
+_tmp_*"
+`;
 
 exports[`preset generator > should run successfully > .kiro/settings/mcp.json 1`] = `
 "{
@@ -299,6 +302,7 @@ exports[`preset generator > should run successfully > biome.json 1`] = `
       "!**/dist",
       "!**/out-tsc",
       "!**/test-output",
+      "!**/rolldown.config.*.*js",
       "!**/node_modules",
       "!**/.nx",
       "!**/.venv",

package/src/smithy/ts/api/__snapshots__/generator.spec.ts.snap

@@ -1,6 +1,9 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`tsSmithyApiGenerator > should configure git ignores for generated code > gitignore 1`] = `"src/generated"`;
+exports[`tsSmithyApiGenerator > should configure git ignores for generated code > gitignore 1`] = `
+"**/rolldown.config.*.*js
+src/generated"
+`;
 
 exports[`tsSmithyApiGenerator > should generate smithy ts api with Cognito auth > cognito-auth-infra.ts 1`] = `
 "import { Construct } from 'constructs';

package/src/ts/agent/a2a-connection/generator.d.ts

@@ -50,6 +50,10 @@ export declare const DEPENDENCIES: import("../../../utils/declared-dependencies.
     readonly name: "@strands-agents/sdk";
 } & {
     versionOnly: true;
+}, {
+    readonly name: "@aws-sdk/client-s3";
+} & {
+    versionOnly: true;
 }], readonly import("../../../utils/declared-dependencies.js").DeclaredPyDependency<"ruff" | "a2a-sdk" | "ag-ui-langgraph" | "ag-ui-protocol" | "ag-ui-strands" | "aiosqlite" | "aws-lambda-powertools" | "aws-lambda-powertools[tracer]" | "aws-lambda-powertools[parser]" | "aws-opentelemetry-distro" | "bedrock-agentcore" | "boto3" | "checkov" | "fastapi" | "fastapi[standard]" | "httpx" | "langchain" | "langchain-aws" | "langchain-mcp-adapters" | "langgraph" | "langgraph-checkpoint-aws" | "langgraph-checkpoint-sqlite" | "mcp" | "pip-check-updates" | "pip-licenses" | "strands-agents" | "strands-agents[a2a]" | "strands-agents-tools" | "ty" | "pynamodb" | "uvicorn" | "sqlmodel" | "alembic" | "aiomysql" | "asyncpg" | "greenlet", Record<string, never>>[]>;
 export declare const TS_AGENT_A2A_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
 export declare const tsAgentA2aConnectionGenerator: (tree: Tree, options: TsAgentA2aConnectionGeneratorSchema) => Promise<GeneratorCallback>;

package/src/ts/agent/gateway-connection/generator.d.ts

@@ -41,6 +41,10 @@ export declare const DEPENDENCIES: import("../../../utils/declared-dependencies.
     readonly name: "@strands-agents/sdk";
 } & {
     versionOnly: true;
+}, {
+    readonly name: "@aws-sdk/client-s3";
+} & {
+    versionOnly: true;
 }], readonly import("../../../utils/declared-dependencies.js").DeclaredPyDependency<"ruff" | "a2a-sdk" | "ag-ui-langgraph" | "ag-ui-protocol" | "ag-ui-strands" | "aiosqlite" | "aws-lambda-powertools" | "aws-lambda-powertools[tracer]" | "aws-lambda-powertools[parser]" | "aws-opentelemetry-distro" | "bedrock-agentcore" | "boto3" | "checkov" | "fastapi" | "fastapi[standard]" | "httpx" | "langchain" | "langchain-aws" | "langchain-mcp-adapters" | "langgraph" | "langgraph-checkpoint-aws" | "langgraph-checkpoint-sqlite" | "mcp" | "pip-check-updates" | "pip-licenses" | "strands-agents" | "strands-agents[a2a]" | "strands-agents-tools" | "ty" | "pynamodb" | "uvicorn" | "sqlmodel" | "alembic" | "aiomysql" | "asyncpg" | "greenlet", Record<string, never>>[]>;
 export declare const TS_AGENT_GATEWAY_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
 export declare const tsAgentGatewayConnectionGenerator: (tree: Tree, options: TsAgentGatewayConnectionGeneratorSchema) => Promise<GeneratorCallback>;

package/src/ts/agent/generator.d.ts

@@ -133,6 +133,10 @@ export declare const DEPENDENCIES: import("../../utils/declared-dependencies.js"
     readonly name: "@strands-agents/sdk";
 } & {
     versionOnly: true;
+}, {
+    readonly name: "@aws-sdk/client-s3";
+} & {
+    versionOnly: true;
 }, {
     readonly name: "rolldown";
 } & {

package/src/ts/agent/mcp-connection/generator.d.ts

@@ -41,6 +41,10 @@ export declare const DEPENDENCIES: import("../../../utils/declared-dependencies.
     readonly name: "@strands-agents/sdk";
 } & {
     versionOnly: true;
+}, {
+    readonly name: "@aws-sdk/client-s3";
+} & {
+    versionOnly: true;
 }], readonly import("../../../utils/declared-dependencies.js").DeclaredPyDependency<"ruff" | "a2a-sdk" | "ag-ui-langgraph" | "ag-ui-protocol" | "ag-ui-strands" | "aiosqlite" | "aws-lambda-powertools" | "aws-lambda-powertools[tracer]" | "aws-lambda-powertools[parser]" | "aws-opentelemetry-distro" | "bedrock-agentcore" | "boto3" | "checkov" | "fastapi" | "fastapi[standard]" | "httpx" | "langchain" | "langchain-aws" | "langchain-mcp-adapters" | "langgraph" | "langgraph-checkpoint-aws" | "langgraph-checkpoint-sqlite" | "mcp" | "pip-check-updates" | "pip-licenses" | "strands-agents" | "strands-agents[a2a]" | "strands-agents-tools" | "ty" | "pynamodb" | "uvicorn" | "sqlmodel" | "alembic" | "aiomysql" | "asyncpg" | "greenlet", Record<string, never>>[]>;
 export declare const TS_AGENT_MCP_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
 export declare const tsAgentMcpConnectionGenerator: (tree: Tree, options: TsAgentMcpConnectionGeneratorSchema) => Promise<GeneratorCallback>;

package/src/ts/react-website/agui/generator.js

@@ -9,7 +9,7 @@ import { declareDependencies, ownedElsewhere } from "../../../utils/declared-dep
 import { kebabCase } from "../../../utils/names.js";
 import { getNpmScopePrefix } from "../../../utils/npm-scope.js";
 import { registerPnpmBuiltDependencies } from "../../../utils/pnpm-workspace.js";
-import { SHADCN_DEPENDENCIES, sharedShadcnGenerator } from "../../../utils/shared-shadcn.js";
+import { addSharedShadcnDependency, SHADCN_DEPENDENCIES, sharedShadcnGenerator } from "../../../utils/shared-shadcn.js";
 import { runtimeConfigGenerator } from "../runtime-config/generator.js";
 // Each entry names the theme or auth branch it belongs to, so the same
 // declaration drives both adding and the version sync.
@@ -90,6 +90,7 @@ export const DEPENDENCIES = declareDependencies()({
     // Shadcn theme imports from the shared shadcn library, so it must exist.
     if (theme === 'shadcn') {
         await sharedShadcnGenerator(tree, DEPENDENCIES);
+        addSharedShadcnDependency(tree, frontendProjectConfig.root);
     }
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', theme), frontendProjectConfig.root, {
         scopeAlias