@nx/workspace 20.6.1 → 20.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "20.6.1",
+  "version": "20.6.3",
   "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,14 +38,14 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "20.6.1",
+    "@nx/devkit": "20.6.3",
     "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "picomatch": "4.0.2",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "20.6.1"
+    "nx": "20.6.3"
   },
   "publishConfig": {
     "access": "public"

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

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

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

@@ -29,6 +29,7 @@ interface Schema {
     formatter?: 'none' | 'prettier';
     workspaces?: boolean;
     workspaceGlobs?: string | string[];
+    useProjectJson?: boolean;
 }
 export interface NormalizedSchema extends Schema {
     presetVersion?: string;

package/src/generators/new/schema.json

@@ -111,6 +111,10 @@
       "description": "Whether to use package manager workspaces.",
       "type": "boolean",
       "default": true
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "additionalProperties": true

package/src/generators/preset/preset.js

@@ -75,7 +75,7 @@ async function createPreset(tree, options) {
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
-            useProjectJson: !options.workspaces,
+            useProjectJson: options.useProjectJson,
         });
     }
     else if (options.preset === presets_1.Preset.ReactStandalone) {
@@ -112,7 +112,7 @@ async function createPreset(tree, options) {
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
-            useProjectJson: !options.workspaces,
+            useProjectJson: options.useProjectJson,
         });
     }
     else if (options.preset === presets_1.Preset.VueStandalone) {
@@ -144,7 +144,7 @@ async function createPreset(tree, options) {
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
-            useProjectJson: !options.workspaces,
+            useProjectJson: options.useProjectJson,
         });
     }
     else if (options.preset === presets_1.Preset.NuxtStandalone) {
@@ -177,7 +177,7 @@ async function createPreset(tree, options) {
             addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
-            useProjectJson: !options.workspaces,
+            useProjectJson: options.useProjectJson,
         });
     }
     else if (options.preset === presets_1.Preset.NextJsStandalone) {
@@ -223,7 +223,7 @@ async function createPreset(tree, options) {
             addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
-            useProjectJson: !options.workspaces,
+            useProjectJson: options.useProjectJson,
         });
     }
     else if (options.preset === presets_1.Preset.Express) {
@@ -237,7 +237,7 @@ async function createPreset(tree, options) {
             addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
-            useProjectJson: !options.workspaces,
+            useProjectJson: options.useProjectJson,
         });
     }
     else if (options.preset === presets_1.Preset.ReactNative) {
@@ -254,7 +254,7 @@ async function createPreset(tree, options) {
             bundler: options.bundler ?? 'webpack',
             useTsSolution: options.workspaces,
             formatter: options.formatter,
-            useProjectJson: !options.workspaces,
+            useProjectJson: options.useProjectJson,
         });
     }
     else if (options.preset === presets_1.Preset.Expo) {
@@ -269,7 +269,7 @@ async function createPreset(tree, options) {
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
-            useProjectJson: !options.workspaces,
+            useProjectJson: options.useProjectJson,
         });
     }
     else if (options.preset === presets_1.Preset.TS) {
@@ -327,7 +327,7 @@ async function createPreset(tree, options) {
             addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
-            useProjectJson: !options.workspaces,
+            useProjectJson: options.useProjectJson,
         });
     }
     else {

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

@@ -25,4 +25,5 @@ export interface Schema {
   serverRouting?: boolean;
   prefix?: string;
   nxCloudToken?: string;
+  useProjectJson?: boolean;
 }

package/src/generators/preset/schema.json

@@ -128,6 +128,10 @@
       "description": "Whether to use package manager workspaces.",
       "type": "boolean",
       "default": true
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["preset", "name"]