@aws/nx-plugin 1.0.0-rc.23 → 1.0.0-rc.25

package/src/ts/website/app/schema.d.ts

@@ -13,10 +13,10 @@ export interface TsWebsiteGeneratorSchema {
   framework?: WebsiteFramework;
   directory?: string;
   subDirectory?: string;
-  skipInstall?: boolean;
   tanstackRouter?: boolean;
   tailwind?: boolean;
   ux?: UxOption;
   infra?: WebsiteInfraOption;
   iac: IacOption;
+  preferInstallDependencies?: boolean;
 }

package/src/ts/website/app/schema.json

@@ -48,7 +48,7 @@
       "description": "The preferred UX provider.",
       "enum": ["none", "cloudscape", "shadcn"],
       "x-priority": "important",
-      "default": "cloudscape",
+      "default": "shadcn",
       "x-prompt": {
         "message": "Which UX provider should we scaffold for this app?",
         "type": "list",
@@ -57,16 +57,16 @@
             "value": "none",
             "label": "None (plain React/Vite without a UI kit)"
           },
-          {
-            "value": "cloudscape",
-            "label": "Cloudscape (AWS-first components with ready-made layouts)"
-          },
           {
             "value": "shadcn",
             "label": "Shadcn (shared UI library under packages/common/shadcn)"
+          },
+          {
+            "value": "cloudscape",
+            "label": "Cloudscape (AWS-first components with ready-made layouts)"
           }
         ],
-        "default": "cloudscape"
+        "default": "shadcn"
       }
     },
     "tailwind": {
@@ -98,6 +98,11 @@
       "x-priority": "important",
       "default": "inherit",
       "x-prompt": "Which provider would you like to manage your infrastructure? (default: inherit)"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["name"],

package/src/ts/website/auth/generator.d.ts

@@ -6,5 +6,5 @@ import type { Tree } from '@nx/devkit';
 import { type NxGeneratorInfo } from '../../../utils/nx';
 import type { TsWebsiteAuthGeneratorSchema } from './schema';
 export declare const TS_WEBSITE_AUTH_GENERATOR_INFO: NxGeneratorInfo;
-export declare function tsWebsiteAuthGenerator(tree: Tree, schema: TsWebsiteAuthGeneratorSchema): Promise<() => void>;
+export declare function tsWebsiteAuthGenerator(tree: Tree, schema: TsWebsiteAuthGeneratorSchema): Promise<() => Promise<void>>;
 export default tsWebsiteAuthGenerator;

package/src/ts/website/auth/generator.js

@@ -1,17 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TS_WEBSITE_AUTH_GENERATOR_INFO = void 0;
-exports.tsWebsiteAuthGenerator = tsWebsiteAuthGenerator;
-const nx_1 = require("../../../utils/nx");
-const generator_1 = require("../../react-website/cognito-auth/generator");
-exports.TS_WEBSITE_AUTH_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-async function tsWebsiteAuthGenerator(tree, schema) {
-    return (0, generator_1.tsReactWebsiteAuthGenerator)(tree, {
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { getGeneratorInfo } from "../../../utils/nx.js";
+import { tsReactWebsiteAuthGenerator } from "../../react-website/cognito-auth/generator.js";
+export const TS_WEBSITE_AUTH_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export async function tsWebsiteAuthGenerator(tree, schema) {
+    return tsReactWebsiteAuthGenerator(tree, {
         project: schema.project,
         allowSignup: schema.allowSignup,
         cognitoDomain: schema.cognitoDomain,
         iac: schema.iac,
+        preferInstallDependencies: schema.preferInstallDependencies
     });
 }
-exports.default = tsWebsiteAuthGenerator;
+export default tsWebsiteAuthGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/ts/website/auth/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/website/auth/generator.ts"],"names":[],"mappings":";;;AAYA,wDAUC;AAjBD,0CAA2E;AAC3E,0EAAyF;AAG5E,QAAA,8BAA8B,GACzC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,KAAK,UAAU,sBAAsB,CAC1C,IAAU,EACV,MAAoC;IAEpC,OAAO,IAAA,uCAA2B,EAAC,IAAI,EAAE;QACvC,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,GAAG,EAAE,MAAM,CAAC,GAAG;KAChB,CAAC,CAAC;AACL,CAAC;AAED,kBAAe,sBAAsB,CAAC"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/website/auth/generator.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 { getGeneratorInfo, type NxGeneratorInfo } from '../../../utils/nx';\nimport { tsReactWebsiteAuthGenerator } from '../../react-website/cognito-auth/generator';\nimport type { TsWebsiteAuthGeneratorSchema } from './schema';\n\nexport const TS_WEBSITE_AUTH_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport async function tsWebsiteAuthGenerator(\n  tree: Tree,\n  schema: TsWebsiteAuthGeneratorSchema,\n) {\n  return tsReactWebsiteAuthGenerator(tree, {\n    project: schema.project,\n    allowSignup: schema.allowSignup,\n    cognitoDomain: schema.cognitoDomain,\n    iac: schema.iac,\n    preferInstallDependencies: schema.preferInstallDependencies,\n  });\n}\n\nexport default tsWebsiteAuthGenerator;\n"],"names":["getGeneratorInfo","tsReactWebsiteAuthGenerator","TS_WEBSITE_AUTH_GENERATOR_INFO","filename","tsWebsiteAuthGenerator","tree","schema","project","allowSignup","cognitoDomain","iac","preferInstallDependencies"],"mappings":"AAAA;;;CAGC,GAED,SAASA,gBAAgB,QAA8B,uBAAoB;AAC3E,SAASC,2BAA2B,QAAQ,gDAA6C;AAGzF,OAAO,MAAMC,iCAAkDF,iBAC7D,YAAYG,QAAQ,EACpB;AAEF,OAAO,eAAeC,uBACpBC,IAAU,EACVC,MAAoC;IAEpC,OAAOL,4BAA4BI,MAAM;QACvCE,SAASD,OAAOC,OAAO;QACvBC,aAAaF,OAAOE,WAAW;QAC/BC,eAAeH,OAAOG,aAAa;QACnCC,KAAKJ,OAAOI,GAAG;QACfC,2BAA2BL,OAAOK,yBAAyB;IAC7D;AACF;AAEA,eAAeP,uBAAuB"}

package/src/ts/website/auth/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/ts/website/auth/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/website/auth/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { IacOption } from '../../../utils/iac';\n\nexport interface TsWebsiteAuthGeneratorSchema {\n  project: string;\n  allowSignup: boolean;\n  cognitoDomain?: string;\n  iac: IacOption;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAGD,WAMC"}

package/src/ts/website/auth/schema.d.ts

@@ -9,4 +9,5 @@ export interface TsWebsiteAuthGeneratorSchema {
   allowSignup: boolean;
   cognitoDomain?: string;
   iac: IacOption;
+  preferInstallDependencies?: boolean;
 }

package/src/ts/website/auth/schema.json

@@ -40,6 +40,11 @@
       "x-priority": "important",
       "default": "inherit",
       "x-prompt": "Which provider would you like to manage your infrastructure? (default: inherit)"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["project"]

package/src/utils/agent-chat/agent-chat.d.ts

@@ -23,7 +23,7 @@ export interface AddAgentChatScriptsOptions {
 }
 /**
  * Emit the chat CLI scripts for an agent. Every protocol gets a small
- * `chat.ts` that connects to the local `serve-local` server by default, and
+ * `chat.ts` that connects to the local `dev` server by default, and
  * to the deployed agent on Bedrock AgentCore (resolved from runtime config)
  * when `RUNTIME_CONFIG_APP_ID` is set. The shared `agentcore.ts` helper
  * handles ARN resolution and request authentication.

package/src/utils/agent-chat/agent-chat.js

@@ -1,30 +1,29 @@
-"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.addAgentChatScripts = void 0;
-const devkit_1 = require("@nx/devkit");
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy } from "@nx/devkit";
 /**
  * Emit the chat CLI scripts for an agent. Every protocol gets a small
- * `chat.ts` that connects to the local `serve-local` server by default, and
+ * `chat.ts` that connects to the local `dev` server by default, and
  * to the deployed agent on Bedrock AgentCore (resolved from runtime config)
  * when `RUNTIME_CONFIG_APP_ID` is set. The shared `agentcore.ts` helper
  * handles ARN resolution and request authentication.
- */
-const addAgentChatScripts = (tree, options) => {
+ */ export const addAgentChatScripts = (tree, options)=>{
     const templateContext = {
         agentNameClassName: options.agentNameClassName,
         auth: options.auth,
-        relativeAgentImport: options.relativeAgentImport ?? '',
+        relativeAgentImport: options.relativeAgentImport ?? ''
     };
     // Shared remote-resolution + auth helper, used by every protocol.
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'common'), options.scriptsDir, templateContext, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'common'), options.scriptsDir, templateContext, {
+        overwriteStrategy: OverwriteStrategy.KeepExisting
+    });
     // Protocol-specific chat adapter. HTTP differs by server language; A2A and
     // AG-UI speak standard protocols so the same script serves both languages.
     const protocolDir = options.protocol === 'http' ? `http-${options.language}` : options.protocol;
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', protocolDir), options.scriptsDir, templateContext, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', protocolDir), options.scriptsDir, templateContext, {
+        overwriteStrategy: OverwriteStrategy.KeepExisting
+    });
 };
-exports.addAgentChatScripts = addAgentChatScripts;
+
 //# sourceMappingURL=agent-chat.js.map

package/src/utils/agent-chat/agent-chat.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-chat.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/agent-chat/agent-chat.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,uCAIoB;AAsBpB;;;;;;GAMG;AACI,MAAM,mBAAmB,GAAG,CACjC,IAAU,EACV,OAAmC,EAC7B,EAAE;IACR,MAAM,eAAe,GAAG;QACtB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,IAAI,EAAE;KACvD,CAAC;IAEF,kEAAkE;IAClE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,EAC/C,OAAO,CAAC,UAAU,EAClB,eAAe,EACf,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IAEF,2EAA2E;IAC3E,2EAA2E;IAC3E,MAAM,WAAW,GACf,OAAO,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC9E,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,EAClD,OAAO,CAAC,UAAU,EAClB,eAAe,EACf,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,mBAAmB,uBA8B9B"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/agent-chat/agent-chat.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport type { Tree } from '@nx/devkit';\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n} from '@nx/devkit';\n\nexport type AgentChatProtocol = 'http' | 'a2a' | 'ag-ui';\nexport type AgentChatAuth = 'iam' | 'cognito';\n\nexport interface AddAgentChatScriptsOptions {\n  /** Absolute (tree) directory to emit the chat scripts into. */\n  scriptsDir: string;\n  protocol: AgentChatProtocol;\n  /** Agent server language. Only affects the HTTP chat adapter. */\n  language: 'ts' | 'py';\n  /** Construct class name — the runtime-config key for the deployed agent. */\n  agentNameClassName: string;\n  /** Authentication used by the deployed agent. */\n  auth: AgentChatAuth;\n  /**\n   * Import path to the agent's `client.ts` (TypeScript HTTP agents only),\n   * relative to the chat script.\n   */\n  relativeAgentImport?: string;\n}\n\n/**\n * Emit the chat CLI scripts for an agent. Every protocol gets a small\n * `chat.ts` that connects to the local `dev` server by default, and\n * to the deployed agent on Bedrock AgentCore (resolved from runtime config)\n * when `RUNTIME_CONFIG_APP_ID` is set. The shared `agentcore.ts` helper\n * handles ARN resolution and request authentication.\n */\nexport const addAgentChatScripts = (\n  tree: Tree,\n  options: AddAgentChatScriptsOptions,\n): void => {\n  const templateContext = {\n    agentNameClassName: options.agentNameClassName,\n    auth: options.auth,\n    relativeAgentImport: options.relativeAgentImport ?? '',\n  };\n\n  // Shared remote-resolution + auth helper, used by every protocol.\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'common'),\n    options.scriptsDir,\n    templateContext,\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Protocol-specific chat adapter. HTTP differs by server language; A2A and\n  // AG-UI speak standard protocols so the same script serves both languages.\n  const protocolDir =\n    options.protocol === 'http' ? `http-${options.language}` : options.protocol;\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', protocolDir),\n    options.scriptsDir,\n    templateContext,\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n};\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","addAgentChatScripts","tree","options","templateContext","agentNameClassName","auth","relativeAgentImport","dirname","scriptsDir","overwriteStrategy","KeepExisting","protocolDir","protocol","language"],"mappings":"AAAA;;;CAGC,GAGD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,QACZ,aAAa;AAsBpB;;;;;;CAMC,GACD,OAAO,MAAMC,sBAAsB,CACjCC,MACAC;IAEA,MAAMC,kBAAkB;QACtBC,oBAAoBF,QAAQE,kBAAkB;QAC9CC,MAAMH,QAAQG,IAAI;QAClBC,qBAAqBJ,QAAQI,mBAAmB,IAAI;IACtD;IAEA,kEAAkE;IAClET,cACEI,MACAH,kBAAkB,YAAYS,OAAO,EAAE,SAAS,WAChDL,QAAQM,UAAU,EAClBL,iBACA;QAAEM,mBAAmBV,kBAAkBW,YAAY;IAAC;IAGtD,2EAA2E;IAC3E,2EAA2E;IAC3E,MAAMC,cACJT,QAAQU,QAAQ,KAAK,SAAS,CAAC,KAAK,EAAEV,QAAQW,QAAQ,EAAE,GAAGX,QAAQU,QAAQ;IAC7Ef,cACEI,MACAH,kBAAkB,YAAYS,OAAO,EAAE,SAASI,cAChDT,QAAQM,UAAU,EAClBL,iBACA;QAAEM,mBAAmBV,kBAAkBW,YAAY;IAAC;AAExD,EAAE"}

package/src/utils/agent-chat/files/a2a/chat.ts.template

@@ -1,5 +1,5 @@
 // Chat CLI for <%- agentNameClassName %> (A2A protocol). Connects to the local
-// `serve-local` server, or the deployed agent when `RUNTIME_CONFIG_APP_ID` is set.
+// `dev` server, or the deployed agent when `RUNTIME_CONFIG_APP_ID` is set.
 import {
   ClientFactory,
   ClientFactoryOptions,

package/src/utils/agent-chat/files/ag-ui/chat.ts.template

@@ -1,5 +1,5 @@
 // Chat CLI for <%- agentNameClassName %> (AG-UI protocol). Connects to the local
-// `serve-local` server, or the deployed agent when `RUNTIME_CONFIG_APP_ID` is set.
+// `dev` server, or the deployed agent when `RUNTIME_CONFIG_APP_ID` is set.
 import { AGUIChatAdapter, chatLoop } from 'agent-chat-cli';
 import { createAgentCoreFetch, resolveRemoteAgent } from './agentcore.js';
 

package/src/utils/agent-chat/files/http-py/chat.ts.template

@@ -1,5 +1,5 @@
 // Chat CLI for <%- agentNameClassName %> (Python FastAPI / JSONL streaming), using the
-// generated client. Connects to the local `serve-local` server, or the deployed
+// generated client. Connects to the local `dev` server, or the deployed
 // agent when `RUNTIME_CONFIG_APP_ID` is set.
 import { chatLoop, type ChatAdapter } from 'agent-chat-cli';
 import { <%- agentNameClassName %> } from './generated/client.gen.js';

package/src/utils/agent-chat/files/http-ts/chat.ts.template

@@ -1,5 +1,5 @@
 // Chat CLI for <%- agentNameClassName %> (HTTP / tRPC WebSocket). Connects to the local
-// `serve-local` server, or the deployed agent when `RUNTIME_CONFIG_APP_ID` is set.
+// `dev` server, or the deployed agent when `RUNTIME_CONFIG_APP_ID` is set.
 import { chatLoop, type ChatAdapter } from 'agent-chat-cli';
 import { <%- agentNameClassName %>Client } from '<%- relativeAgentImport %>/client.js';
 import {