@nx/workspace 0.0.0-pr-28808-ae8ea8d → 0.0.0-pr-28808-41aa4e0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "0.0.0-pr-28808-ae8ea8d",
+  "version": "0.0.0-pr-28808-41aa4e0",
   "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": "0.0.0-pr-28808-ae8ea8d",
+    "@nx/devkit": "0.0.0-pr-28808-41aa4e0",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "0.0.0-pr-28808-ae8ea8d"
+    "nx": "0.0.0-pr-28808-41aa4e0"
   },
   "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

@@ -323,14 +323,15 @@ function normalizeOptions(options) {
 }
 function setUpWorkspacesInPackageJson(tree, options) {
     if (options.preset === presets_1.Preset.NPM ||
-        ((options.preset === presets_1.Preset.TS ||
-            options.preset === presets_1.Preset.Expo ||
+        (options.preset === presets_1.Preset.TS &&
+            process.env.NX_ADD_PLUGINS !== '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) &&
-            process.env.NX_ADD_PLUGINS !== 'false' &&
-            process.env.NX_ADD_TS_PLUGIN !== 'false')) {
+            options.workspaces)) {
         const workspaces = options.workspaceGlobs ?? ['packages/*'];
         if (options.packageManager === 'pnpm') {
             tree.write((0, path_1.join)(options.directory, 'pnpm-workspace.yaml'), `packages: 

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

@@ -24,6 +24,7 @@ interface Schema {
     useGitHub?: boolean;
     nxCloud?: 'yes' | 'skip' | 'circleci' | 'github';
     formatter?: 'none' | 'prettier';
+    workspaces?: boolean;
     workspaceGlobs?: string | string[];
 }
 export interface NormalizedSchema extends Schema {

package/src/generators/new/schema.json

@@ -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,7 +65,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
-            useTsSolution: true,
+            useTsSolution: options.workspaces,
             formatter: options.formatter,
         });
     }
@@ -97,7 +97,7 @@ async function createPreset(tree, options) {
             unitTestRunner: 'vitest',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
-            useTsSolution: true,
+            useTsSolution: options.workspaces,
             formatter: options.formatter,
         });
     }
@@ -184,7 +184,7 @@ async function createPreset(tree, options) {
             src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             addPlugin,
-            useTsSolution: true,
+            useTsSolution: options.workspaces,
             formatter: options.formatter,
         });
     }
@@ -250,7 +250,7 @@ async function createPreset(tree, options) {
             addPlugin,
             nxCloudToken: options.nxCloudToken,
             bundler: options.bundler ?? 'webpack',
-            useTsSolution: true,
+            useTsSolution: options.workspaces,
             formatter: options.formatter,
         });
     }
@@ -263,7 +263,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
-            useTsSolution: true,
+            useTsSolution: options.workspaces,
             formatter: options.formatter,
         });
     }

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

@@ -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"]