@nx/workspace 20.2.0-canary.20241129-2cb58b9 → 20.2.0-canary.20241130-ec5a5e6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "20.2.0-canary.20241129-2cb58b9",
+  "version": "20.2.0-canary.20241130-ec5a5e6",
   "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,12 +38,12 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "20.2.0-canary.20241129-2cb58b9",
+    "@nx/devkit": "20.2.0-canary.20241130-ec5a5e6",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "20.2.0-canary.20241129-2cb58b9"
+    "nx": "20.2.0-canary.20241130-ec5a5e6"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/new/generate-preset.js

@@ -71,6 +71,7 @@ function generatePreset(host, opts) {
             opts.prefix !== undefined ? `--prefix=${opts.prefix}` : null,
             opts.nxCloudToken ? `--nxCloudToken=${opts.nxCloudToken}` : null,
             opts.formatter ? `--formatter=${opts.formatter}` : null,
+            opts.workspaces ? `--workspaces` : null,
         ].filter((e) => !!e);
     }
 }

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

@@ -325,15 +325,22 @@ function setUpWorkspacesInPackageJson(tree, options) {
     if (options.preset === presets_1.Preset.NPM ||
         (options.preset === presets_1.Preset.TS &&
             process.env.NX_ADD_PLUGINS !== 'false' &&
-            process.env.NX_ADD_TS_PLUGIN !== 'false')) {
+            process.env.NX_ADD_TS_PLUGIN !== 'false') ||
+        ((options.preset === presets_1.Preset.Expo ||
+            options.preset === presets_1.Preset.NextJs ||
+            options.preset === presets_1.Preset.ReactMonorepo ||
+            options.preset === presets_1.Preset.ReactNative ||
+            options.preset === presets_1.Preset.RemixMonorepo) &&
+            options.workspaces)) {
+        const workspaces = options.workspaceGlobs ?? ['packages/**'];
         if (options.packageManager === 'pnpm') {
-            tree.write((0, path_1.join)(options.directory, 'pnpm-workspace.yaml'), `packages:
-  - 'packages/*'
+            tree.write((0, path_1.join)(options.directory, 'pnpm-workspace.yaml'), `packages: 
+  - ${workspaces.join('\n  - ')}
 `);
         }
         else {
             (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
-                json.workspaces = ['packages/*'];
+                json.workspaces = workspaces;
                 return json;
             });
         }

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

@@ -24,11 +24,14 @@ interface Schema {
     useGitHub?: boolean;
     nxCloud?: 'yes' | 'skip' | 'circleci' | 'github';
     formatter?: 'none' | 'prettier';
+    workspaces?: boolean;
+    workspaceGlobs?: string | string[];
 }
 export interface NormalizedSchema extends Schema {
     presetVersion?: string;
     isCustomPreset: boolean;
     nxCloudToken?: string;
+    workspaceGlobs?: string[];
 }
 export declare function newGenerator(tree: Tree, opts: Schema): Promise<() => Promise<void>>;
 export default newGenerator;

package/src/generators/new/new.js

@@ -71,6 +71,11 @@ function parsePresetName(input) {
 function normalizeOptions(options) {
     const normalized = {
         ...options,
+        workspaceGlobs: Array.isArray(options.workspaceGlobs)
+            ? options.workspaceGlobs
+            : options.workspaceGlobs
+                ? [options.workspaceGlobs]
+                : undefined,
     };
     if (!options.directory) {
         normalized.directory = normalized.name;

package/src/generators/new/schema.json

@@ -50,7 +50,7 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint"],
+      "enum": ["eslint", "none"],
       "default": "eslint"
     },
     "packageManager": {
@@ -92,6 +92,11 @@
       "type": "string",
       "enum": ["none", "prettier"],
       "default": "none"
+    },
+    "workspaces": {
+      "description": "Whether to use package manager workspaces.",
+      "type": "boolean",
+      "default": false
     }
   },
   "additionalProperties": true

package/src/generators/preset/preset.js

@@ -65,6 +65,8 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
+            useTsSolution: options.workspaces,
+            formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.ReactStandalone) {
@@ -81,6 +83,7 @@ async function createPreset(tree, options) {
             unitTestRunner: options.bundler === 'vite' ? 'vitest' : 'jest',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
+            formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.RemixMonorepo) {
@@ -94,6 +97,8 @@ async function createPreset(tree, options) {
             unitTestRunner: 'vitest',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
+            useTsSolution: options.workspaces,
+            formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.RemixStandalone) {
@@ -108,6 +113,7 @@ async function createPreset(tree, options) {
             unitTestRunner: 'vitest',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
+            formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.VueMonorepo) {
@@ -178,6 +184,8 @@ async function createPreset(tree, options) {
             src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             addPlugin,
+            useTsSolution: options.workspaces,
+            formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.NextJsStandalone) {
@@ -193,6 +201,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             rootProject: true,
             addPlugin,
+            formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.WebComponents) {
@@ -241,6 +250,8 @@ async function createPreset(tree, options) {
             addPlugin,
             nxCloudToken: options.nxCloudToken,
             bundler: options.bundler ?? 'webpack',
+            useTsSolution: options.workspaces,
+            formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.Expo) {
@@ -252,6 +263,8 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
+            useTsSolution: options.workspaces,
+            formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.TS) {

package/src/generators/preset/schema.d.ts

@@ -7,6 +7,7 @@ export interface Schema {
   style?: string;
   linter?: string;
   formatter?: 'none' | 'prettier';
+  workspaces?: boolean;
   standaloneConfig?: boolean;
   framework?: string;
   packageManager?: PackageManager;

package/src/generators/preset/schema.json

@@ -17,7 +17,7 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint"],
+      "enum": ["eslint", "none"],
       "default": "eslint"
     },
     "routing": {
@@ -103,6 +103,17 @@
     "prefix": {
       "description": "The prefix to use for Angular component and directive selectors.",
       "type": "string"
+    },
+    "formatter": {
+      "description": "The tool to use for code formatting.",
+      "type": "string",
+      "enum": ["none", "prettier"],
+      "default": "none"
+    },
+    "workspaces": {
+      "description": "Whether to use package manager workspaces.",
+      "type": "boolean",
+      "default": false
     }
   },
   "required": ["preset", "name"]