@nx/workspace 21.6.1-beta.4 → 21.6.1-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "21.6.1-beta.4",
+  "version": "21.6.1-rc.0",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -38,7 +38,7 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "21.6.1-beta.4",
+    "@nx/devkit": "21.6.1-rc.0",
     "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
@@ -46,10 +46,10 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "21.6.1-beta.4"
+    "nx": "21.6.1-rc.0"
   },
   "devDependencies": {
-    "nx": "21.6.1-beta.4"
+    "nx": "21.6.1-rc.0"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/new/generate-workspace-files.d.ts

@@ -1,4 +1,7 @@
 import { type Tree } from '@nx/devkit';
 import type { NormalizedSchema } from './new';
-export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSchema): Promise<string>;
+export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSchema): Promise<{
+    token: string;
+    aiAgentsCallback: () => unknown | undefined;
+}>;
 //# sourceMappingURL=generate-workspace-files.d.ts.map

package/src/generators/new/generate-workspace-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-workspace-files.d.ts","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-workspace-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AA0I9C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,mBAuD1B"}
+{"version":3,"file":"generate-workspace-files.d.ts","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-workspace-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AA0I9C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB;;4BA8BG,OAAO,GAAG,SAAS;GA6BhD"}

package/src/generators/new/generate-workspace-files.js

@@ -134,11 +134,15 @@ async function generateWorkspaceFiles(tree, options) {
         }, nxJson)
         : null;
     await createReadme(tree, options, token);
-    await (0, set_up_ai_agents_1.setupAiAgentsGenerator)(tree, {
-        directory: options.directory,
-        writeNxCloudRules: options.nxCloud !== 'skip',
-        packageVersion: 'latest',
-    });
+    let aiAgentsCallback = undefined;
+    if (options.aiAgents && options.aiAgents.length > 0) {
+        aiAgentsCallback = await (0, set_up_ai_agents_1.setupAiAgentsGenerator)(tree, {
+            directory: options.directory,
+            writeNxCloudRules: options.nxCloud !== 'skip',
+            packageVersion: 'latest',
+            agents: [...options.aiAgents],
+        });
+    }
     const [packageMajor] = packageManagerVersion.split('.');
     if (options.packageManager === 'pnpm' && +packageMajor >= 7) {
         if ((0, semver_1.gte)(packageManagerVersion, '10.6.0')) {
@@ -158,7 +162,7 @@ async function generateWorkspaceFiles(tree, options) {
     setPresetProperty(tree, options);
     addNpmScripts(tree, options);
     setUpWorkspacesInPackageJson(tree, options);
-    return token;
+    return { token, aiAgentsCallback };
 }
 function setPresetProperty(tree, options) {
     if (options.preset === presets_1.Preset.NPM) {

package/src/generators/new/new.d.ts

@@ -1,5 +1,6 @@
 import { Tree } from '@nx/devkit';
 import { Linter, LinterType } from '../../utils/lint';
+import { Agent } from 'nx/src/ai/utils';
 interface Schema {
     directory: string;
     name: string;
@@ -29,12 +30,14 @@ interface Schema {
     workspaces?: boolean;
     workspaceGlobs?: string | string[];
     useProjectJson?: boolean;
+    aiAgents?: Agent[] | Agent;
 }
 export interface NormalizedSchema extends Schema {
     presetVersion?: string;
     isCustomPreset: boolean;
     nxCloudToken?: string;
     workspaceGlobs?: string[];
+    aiAgents?: Agent[];
 }
 export declare function newGenerator(tree: Tree, opts: Schema): Promise<() => Promise<void>>;
 export default newGenerator;

package/src/generators/new/new.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAKtD,UAAU,MAAM;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,UAAU,GAAG,QAAQ,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACnC,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,gCAmC1D;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAItD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,UAAU,MAAM;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,UAAU,GAAG,QAAQ,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACnC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;CACpB;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,gCA4C1D;AAED,eAAe,YAAY,CAAC"}

package/src/generators/new/new.js

@@ -10,7 +10,8 @@ const child_process_1 = require("child_process");
 async function newGenerator(tree, opts) {
     const options = normalizeOptions(opts);
     validateOptions(options, tree);
-    options.nxCloudToken = await (0, generate_workspace_files_1.generateWorkspaceFiles)(tree, options);
+    const { token, aiAgentsCallback } = await (0, generate_workspace_files_1.generateWorkspaceFiles)(tree, options);
+    options.nxCloudToken = token;
     (0, generate_preset_1.addPresetDependencies)(tree, options);
     await (0, devkit_1.formatFiles)(tree);
     return async () => {
@@ -29,6 +30,10 @@ async function newGenerator(tree, opts) {
         if (options.preset !== presets_1.Preset.NPM && !options.isCustomPreset) {
             await (0, generate_preset_1.generatePreset)(tree, options);
         }
+        // if we move this into create-nx-workspace, we can also easily log things out like nx console install success
+        if (aiAgentsCallback) {
+            await aiAgentsCallback();
+        }
     };
 }
 exports.default = newGenerator;
@@ -76,6 +81,11 @@ function normalizeOptions(options) {
             : options.workspaceGlobs
                 ? [options.workspaceGlobs]
                 : undefined,
+        aiAgents: Array.isArray(options.aiAgents)
+            ? options.aiAgents
+            : options.aiAgents
+                ? [options.aiAgents]
+                : undefined,
     };
     if (!options.directory) {
         normalized.directory = normalized.name;