npm - @aws/nx-plugin - Versions diffs - 0.114.0 → 0.114.1 - Mend

@aws/nx-plugin 0.114.0 → 0.114.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/package.json CHANGED Viewed

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

package/src/py/fast-api/__snapshots__/generator.spec.ts.snap CHANGED Viewed

@@ -2275,7 +2275,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -2936,7 +2936,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -3584,7 +3584,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -4249,7 +4249,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -5065,7 +5065,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -5883,7 +5883,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5

package/src/py/lambda-function/__snapshots__/generator.spec.ts.snap CHANGED Viewed

@@ -188,7 +188,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "lambdas/test-project-test-function/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "lambdas/test-project-test-function/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -369,7 +369,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "lambdas/test-project-snapshot-function/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "lambdas/test-project-snapshot-function/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5

package/src/py/strands-agent/files/ag-ui/main.py.template CHANGED Viewed

@@ -1,11 +1,17 @@
 import logging
+import uuid
 from ag_ui_strands import StrandsAgent, create_strands_app
+from fastapi import Request
+from <%- agentConnectionModuleName %> import session_id_context
+from starlette.middleware.base import BaseHTTPMiddleware
 from .agent import get_agent
 logging.basicConfig(level=logging.INFO)
+SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
 # Create AG-UI agent wrapper
 _agent_ctx = get_agent()
 _agent = _agent_ctx.__enter__()
@@ -16,5 +22,16 @@ agui_agent = StrandsAgent(
     description="A Strands Agent exposed via the AG-UI protocol.",
 )
+class _SessionIdMiddleware(BaseHTTPMiddleware):
+    """Bind the session ID for this request so downstream MCP / A2A clients forward it on outbound calls."""
+    async def dispatch(self, request: Request, call_next):
+        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
+        with session_id_context(session_id):
+            return await call_next(request)
 # Create FastAPI app with AG-UI endpoint and health check
 app = create_strands_app(agui_agent, path="/invocations")
+app.add_middleware(_SessionIdMiddleware)

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

@@ -776,7 +776,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -1970,7 +1970,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -2755,7 +2755,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -3276,7 +3276,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/custom-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/custom-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5

package/src/trpc/backend/__snapshots__/generator.spec.ts.snap CHANGED Viewed

@@ -3279,7 +3279,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -3922,7 +3922,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -4552,7 +4552,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -5199,7 +5199,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -5985,7 +5985,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -6773,7 +6773,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5

package/src/ts/lambda-function/__snapshots__/generator.spec.ts.snap CHANGED Viewed

@@ -257,7 +257,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "lambdas/test-project-test-function/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "lambdas/test-project-test-function/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -438,7 +438,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "lambdas/test-project-snapshot-function/\${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "lambdas/test-project-snapshot-function/\${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5

package/src/ts/strands-agent/__snapshots__/generator.spec.ts.snap CHANGED Viewed

@@ -913,7 +913,6 @@ console.log(\`TRPC server listening on port \${PORT}\`);
 exports[`ts#strands-agent generator > should match snapshot for generated files > strands-agent-init.ts 1`] = `
 "import { initTRPC } from '@trpc/server';
-import { enterSessionContext } from ':proj/agent-connection';
 export interface Context {
   sessionId: string;
@@ -921,17 +920,7 @@ export interface Context {
 export const t = initTRPC.context<Context>().create();
-/**
- * Bind the inbound session onto the current async flow so downstream MCP /
- * A2A clients forward it on outbound calls. Uses \`enterWith\` so the binding
- * persists across subscription iterations.
- */
-const sessionMiddleware = t.middleware(({ ctx, next }) => {
-  enterSessionContext(ctx.sessionId);
-  return next();
-});
-export const publicProcedure = t.procedure.use(sessionMiddleware);
+export const publicProcedure = t.procedure;
 "
 `;
@@ -939,7 +928,7 @@ exports[`ts#strands-agent generator > should match snapshot for generated files
 "import { publicProcedure, t } from './init.js';
 import { z } from 'zod';
 import { zAsyncIterable } from './schema/z-async-iterable.js';
-import { withSessionId } from ':proj/agent-connection';
+import { enterSessionContext, withSessionId } from ':proj/agent-connection';
 import { getAgent } from './agent.js';
 export const router = t.router;
@@ -956,6 +945,8 @@ export const appRouter = router({
       }),
     )
     .subscription(async function* (opts) {
+      // Bind the session ID for this subscription so downstream MCP / A2A clients forward it on outbound calls.
+      enterSessionContext(opts.ctx.sessionId);
       for await (const event of agent.stream(opts.input.message)) {
         if (
           event.type === 'modelStreamUpdateEvent' &&

package/src/ts/strands-agent/files/http/init.ts.template CHANGED Viewed

@@ -1,5 +1,4 @@
 import { initTRPC } from '@trpc/server';
-import { enterSessionContext } from '<%- agentConnectionImport %>';
 export interface Context {
   sessionId: string;
@@ -7,14 +6,4 @@ export interface Context {
 export const t = initTRPC.context<Context>().create();
-/**
- * Bind the inbound session onto the current async flow so downstream MCP /
- * A2A clients forward it on outbound calls. Uses `enterWith` so the binding
- * persists across subscription iterations.
- */
-const sessionMiddleware = t.middleware(({ ctx, next }) => {
-  enterSessionContext(ctx.sessionId);
-  return next();
-});
-export const publicProcedure = t.procedure.use(sessionMiddleware);
+export const publicProcedure = t.procedure;

package/src/ts/strands-agent/files/http/router.ts.template CHANGED Viewed

@@ -1,7 +1,7 @@
 import { publicProcedure, t } from './init.js';
 import { z } from 'zod';
 import { zAsyncIterable } from './schema/z-async-iterable.js';
-import { withSessionId } from '<%- agentConnectionImport %>';
+import { enterSessionContext, withSessionId } from '<%- agentConnectionImport %>';
 import { getAgent } from './agent.js';
 export const router = t.router;
@@ -18,6 +18,8 @@ export const appRouter = router({
       }),
     )
     .subscription(async function* (opts) {
+      // Bind the session ID for this subscription so downstream MCP / A2A clients forward it on outbound calls.
+      enterSessionContext(opts.ctx.sessionId);
       for await (const event of agent.stream(opts.input.message)) {
         if (
           event.type === 'modelStreamUpdateEvent' &&

package/src/utils/api-constructs/files/terraform/app/apis/http/__apiNameKebabCase__/__apiNameKebabCase__.tf.template CHANGED Viewed

@@ -108,7 +108,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/<%- apiNameKebabCase %>/${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/<%- apiNameKebabCase %>/${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5

package/src/utils/api-constructs/files/terraform/app/apis/rest/__apiNameKebabCase__/__apiNameKebabCase__.tf.template CHANGED Viewed

@@ -98,7 +98,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "apis/<%- apiNameKebabCase %>/${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "apis/<%- apiNameKebabCase %>/${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5

package/src/utils/function-constructs/files/terraform/app/lambda-functions/__functionNameKebabCase__/__functionNameKebabCase__.tf.template CHANGED Viewed

@@ -120,7 +120,7 @@ data "archive_file" "lambda_zip" {
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "lambdas/<%- functionNameKebabCase %>/${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  key         = "lambdas/<%- functionNameKebabCase %>/${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5

package/src/utils/pnpm-workspace.d.ts CHANGED Viewed

@@ -20,3 +20,14 @@ import { Tree } from '@nx/devkit';
  * allowlist has no equivalent of the `false` decision).
  */
 export declare const registerPnpmBuiltDependencies: (tree: Tree, entries: Record<string, boolean>) => void;
+/**
+ * Set `ignoreWorkspaceRootCheck: true` in `pnpm-workspace.yaml` so `pnpm add`
+ * from the workspace root does not error with `ERR_PNPM_ADDING_TO_ROOT`.
+ *
+ * pnpm 11 no longer honours `ignore-workspace-root-check=true` in `.npmrc`;
+ * it must live in `pnpm-workspace.yaml` as the camelCased key. pnpm 10 also
+ * accepts the yaml form, so writing it here works for both majors.
+ *
+ * No-op for non-pnpm workspaces or when `pnpm-workspace.yaml` is absent.
+ */
+export declare const ensurePnpmIgnoresWorkspaceRootCheck: (tree: Tree) => boolean;

package/src/utils/pnpm-workspace.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerPnpmBuiltDependencies = void 0;
+exports.ensurePnpmIgnoresWorkspaceRootCheck = exports.registerPnpmBuiltDependencies = void 0;
 const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
@@ -55,4 +55,31 @@ const registerPnpmBuiltDependencies = (tree, entries) => {
     tree.write(WORKSPACE_FILE, js_yaml_1.default.dump(parsed, { quotingType: "'" }));
 };
 exports.registerPnpmBuiltDependencies = registerPnpmBuiltDependencies;
+/**
+ * Set `ignoreWorkspaceRootCheck: true` in `pnpm-workspace.yaml` so `pnpm add`
+ * from the workspace root does not error with `ERR_PNPM_ADDING_TO_ROOT`.
+ *
+ * pnpm 11 no longer honours `ignore-workspace-root-check=true` in `.npmrc`;
+ * it must live in `pnpm-workspace.yaml` as the camelCased key. pnpm 10 also
+ * accepts the yaml form, so writing it here works for both majors.
+ *
+ * No-op for non-pnpm workspaces or when `pnpm-workspace.yaml` is absent.
+ */
+const ensurePnpmIgnoresWorkspaceRootCheck = (tree) => {
+    if ((0, devkit_1.detectPackageManager)(tree.root) !== 'pnpm') {
+        return false;
+    }
+    if (!tree.exists(WORKSPACE_FILE)) {
+        return false;
+    }
+    const original = tree.read(WORKSPACE_FILE, 'utf-8') ?? '';
+    const parsed = js_yaml_1.default.load(original) ?? {};
+    if (parsed.ignoreWorkspaceRootCheck === true) {
+        return false;
+    }
+    parsed.ignoreWorkspaceRootCheck = true;
+    tree.write(WORKSPACE_FILE, js_yaml_1.default.dump(parsed, { quotingType: "'" }));
+    return true;
+};
+exports.ensurePnpmIgnoresWorkspaceRootCheck = ensurePnpmIgnoresWorkspaceRootCheck;
 //# sourceMappingURL=pnpm-workspace.js.map

package/src/utils/pnpm-workspace.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pnpm-workspace.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/pnpm-workspace.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAAwD;AACxD,8DAA2B;AAE3B,MAAM,cAAc,GAAG,qBAAqB,CAAC;~~AAQ7C~~;;;;;;;;;;;;;;;GAeG;AACI,MAAM,6BAA6B,GAAG,CAC3C,IAAU,EACV,OAAgC,EAC1B,EAAE;IACR,IAAI,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC;QAC/C,OAAO;IACT,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;QACjC,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAI,iBAAI,CAAC,IAAI,CAAC,QAAQ,CAA8B,IAAI,EAAE,CAAC;IAEvE,MAAM,WAAW,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,CAAC;IACtD,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;IAC1E,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,KAAK,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACtD,IAAI,WAAW,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;YAClC,WAAW,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;YAC5B,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QACD,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACzD,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/B,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;IACH,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IAED,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,MAAM,CAAC,qBAAqB,GAAG,CAAC,GAAG,qBAAqB,CAAC,CAAC;IAE1D,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,iBAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;AArCW,QAAA,6BAA6B,iCAqCxC"}
1	+ {"version":3,"file":"pnpm-workspace.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/pnpm-workspace.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAAwD;AACxD,8DAA2B;AAE3B,MAAM,cAAc,GAAG,qBAAqB,CAAC;AAS7C;;;;;;;;;;;;;;;GAeG;AACI,MAAM,6BAA6B,GAAG,CAC3C,IAAU,EACV,OAAgC,EAC1B,EAAE;IACR,IAAI,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC;QAC/C,OAAO;IACT,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;QACjC,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAI,iBAAI,CAAC,IAAI,CAAC,QAAQ,CAA8B,IAAI,EAAE,CAAC;IAEvE,MAAM,WAAW,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,CAAC;IACtD,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;IAC1E,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,KAAK,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACtD,IAAI,WAAW,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;YAClC,WAAW,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;YAC5B,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QACD,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACzD,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/B,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;IACH,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IAED,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,MAAM,CAAC,qBAAqB,GAAG,CAAC,GAAG,qBAAqB,CAAC,CAAC;IAE1D,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,iBAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;AArCW,QAAA,6BAA6B,iCAqCxC;AAEF;;;;;;;;;GASG;AACI,MAAM,mCAAmC,GAAG,CAAC,IAAU,EAAW,EAAE;IACzE,IAAI,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC;QAC/C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAI,iBAAI,CAAC,IAAI,CAAC,QAAQ,CAA8B,IAAI,EAAE,CAAC;IAEvE,IAAI,MAAM,CAAC,wBAAwB,KAAK,IAAI,EAAE,CAAC;QAC7C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,CAAC,wBAAwB,GAAG,IAAI,CAAC;IACvC,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,iBAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IACpE,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAlBW,QAAA,mCAAmC,uCAkB9C"}

package/src/utils/shared-shadcn.js CHANGED Viewed

@@ -14,6 +14,7 @@ const npm_scope_1 = require("./npm-scope");
 const ast_1 = require("./ast");
 const shared_constructs_constants_1 = require("./shared-constructs-constants");
 const versions_1 = require("./versions");
+const pnpm_workspace_1 = require("./pnpm-workspace");
 const SHADCN_DEPS = [
     'class-variance-authority',
     'clsx',
@@ -22,24 +23,6 @@ const SHADCN_DEPS = [
     'tw-animate-css',
     'radix-ui',
 ];
-const NPMRC_IGNORE_WORKSPACE_ROOT_CHECK = 'ignore-workspace-root-check=true';
-const ensureNpmrcIgnoresWorkspaceRoot = (tree) => {
-    const npmrcPath = '.npmrc';
-    if (tree.exists(npmrcPath)) {
-        const npmrcContent = tree.read(npmrcPath, 'utf-8');
-        const alreadyConfigured = npmrcContent
-            .split(/\r?\n/)
-            .some((line) => line.trim() === NPMRC_IGNORE_WORKSPACE_ROOT_CHECK);
-        if (alreadyConfigured) {
-            return false;
-        }
-        const needsTrailingNewline = npmrcContent.length > 0 && !npmrcContent.endsWith('\n');
-        tree.write(npmrcPath, `${npmrcContent}${needsTrailingNewline ? '\n' : ''}${NPMRC_IGNORE_WORKSPACE_ROOT_CHECK}\n`);
-        return true;
-    }
-    tree.write(npmrcPath, `${NPMRC_IGNORE_WORKSPACE_ROOT_CHECK}\n`);
-    return true;
-};
 const addSharedShadcnEslintRules = async (tree, eslintConfigPath) => {
     if (!tree.exists(eslintConfigPath)) {
         return;
@@ -57,7 +40,7 @@ async function sharedShadcnGenerator(tree) {
     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');
     const eslintConfigPath = (0, devkit_1.joinPathFragments)(libraryRoot, 'eslint.config.mjs');
-    ensureNpmrcIgnoresWorkspaceRoot(tree);
+    (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,

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

	@@ -1 +1 @@
1	- {"version":3,"file":"shared-shadcn.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-shadcn.ts"],"names":[],"mappings":";;~~AA8EA~~,sDAoGC;;~~AAlLD~~;;;GAGG;AACH,uCAOoB;AACpB,4EAAqD;AACrD,iEAAgE;AAChE,qCAAgD;AAChD,2CAA8D;AAC9D,+BAAoC;AACpC,+EAIuC;AACvC,yCAAyD;~~AAEzD~~,MAAM,WAAW,GAAG;IAClB,0BAA0B;IAC1B,MAAM;IACN,gBAAgB;IAChB,cAAc;IACd,gBAAgB;IAChB,UAAU;CACwB,CAAC;AAErC,MAAM,iCAAiC,GAAG,kCAAkC,CAAC;AAE7E,MAAM,+BAA+B,GAAG,CAAC,IAAU,EAAW,EAAE;IAC9D,MAAM,SAAS,GAAG,QAAQ,CAAC;IAC3B,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACnD,MAAM,iBAAiB,GAAG,YAAY;aACnC,KAAK,CAAC,OAAO,CAAC;aACd,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,iCAAiC,CAAC,CAAC;QAErE,IAAI,iBAAiB,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,oBAAoB,GACxB,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,CACR,SAAS,EACT,GAAG,YAAY,GAAG,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,iCAAiC,IAAI,CAC3F,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,iCAAiC,IAAI,CAAC,CAAC;IAChE,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,KAAK,EACtC,IAAU,EACV,gBAAwB,EACT,EAAE;IACjB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACnC,OAAO;IACT,CAAC;IAED,iFAAiF;IACjF,gFAAgF;IAChF,kDAAkD;IAClD,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,gBAAgB,EAChB,gMAAgM,CACjM,CAAC;AACJ,CAAC,CAAC;AAEK,KAAK,UAAU,qBAAqB,CAAC,IAAU;IACpD,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,IAAA,wBAAY,EAAC,cAAc,CAAC,CAAC;IAChD,MAAM,iBAAiB,GAAG,GAAG,UAAU,GAAG,gDAAkB,EAAE,CAAC;IAC/D,MAAM,kBAAkB,GAAG,GAAG,cAAc,GAAG,gDAAkB,EAAE,CAAC;IACpE,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,0CAAY,EAAE,+CAAiB,CAAC,CAAC;IACvE,MAAM,aAAa,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAC5D,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;IAE7E~~,+BAA+B~~,~~CAAC~~,IAAI,CAAC,CAAC;~~IAEtC~~,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;QACjE,MAAM,IAAA,mBAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,gDAAkB;YACxB,SAAS,EAAE,0CAAY;YACvB,YAAY,EAAE,+CAAiB;SAChC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAE3B,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,+CAAiB,EAAE,KAAK,CAAC,EAC/D,aAAa,EACb;YACE,UAAU;SACX,EACD;YACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;SAClD,CACF,CAAC;QAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,+CAAiB,EAAE,QAAQ,CAAC,EAClE,WAAW,EACX;YACE,kBAAkB;YAClB,UAAU;SACX,EACD;YACE,iBAAiB,EAAE,0BAAiB,CAAC,SAAS;SAC/C,CACF,CAAC;QAEF,MAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE;YAC7B,GAAG,EAAE,WAAW;YAChB,kBAAkB;SACnB,CAAC,CAAC;QAEH,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,WAAW,EAAE,mBAAmB,CAAC,EACnD,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACT,GAAG,IAAI;YACP,eAAe,EAAE;gBACf,GAAG,IAAI,CAAC,eAAe;gBACvB,GAAG,EAAE,WAAW;gBAChB,MAAM,EAAE,UAAU;gBAClB,gBAAgB,EAAE,SAAS;gBAC3B,GAAG,EAAE,KAAK,CAAC,IAAI,CACb,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CACvD;aACF;YACD,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;SACxE,CAAC,CACH,CAAC;QAEF,MAAM,0BAA0B,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACzD,IAAA,qCAA4B,EAAC,IAAI,EAAE,IAAA,uBAAY,EAAC,CAAC,GAAG,WAAW,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChD,GAAG,IAAI;QACP,eAAe,EAAE;YACf,GAAG,IAAI,CAAC,eAAe;YACvB,KAAK,EAAE;gBACL,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC;gBACtC,CAAC,GAAG,iBAAiB,IAAI,CAAC,EAAE;oBAC1B,KAAK,IAAA,0BAAiB,EAAC,WAAW,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE;iBAClD;aACF;SACF;KACF,CAAC,CAAC,CAAC;IAEJ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACpC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,EAC/C,GAAG,EACH;YACE,iBAAiB;SAClB,EACD;YACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;SAClD,CACF,CAAC;IACJ,CAAC;IAED,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC"}
1	+ {"version":3,"file":"shared-shadcn.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-shadcn.ts"],"names":[],"mappings":"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"}