@nx/workspace 20.6.0-beta.0 → 20.6.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "20.6.0-beta.0",
+  "version": "20.6.0-beta.1",
   "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.0-beta.0",
+    "@nx/devkit": "20.6.0-beta.1",
     "@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.0-beta.0"
+    "nx": "20.6.0-beta.1"
   },
   "publishConfig": {
     "access": "public"

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

@@ -70,6 +70,9 @@ function generatePreset(host, opts) {
                 : null,
             parsedArgs.interactive ? '--interactive=true' : '--interactive=false',
             opts.routing !== undefined ? `--routing=${opts.routing}` : null,
+            opts.useReactRouter !== undefined
+                ? `--useReactRouter=${opts.useReactRouter}`
+                : null,
             opts.unitTestRunner !== undefined
                 ? `--unitTestRunner=${opts.unitTestRunner}`
                 : null,
@@ -81,7 +84,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,
+            opts.workspaces !== false ? `--workspaces` : `--no-workspaces`,
         ].filter((e) => !!e);
     }
 }
@@ -112,9 +115,6 @@ function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner,
         case presets_1.Preset.NextJs:
         case presets_1.Preset.NextJsStandalone:
             return { dependencies: { '@nx/next': versions_1.nxVersion }, dev: {} };
-        case presets_1.Preset.RemixStandalone:
-        case presets_1.Preset.RemixMonorepo:
-            return { dependencies: { '@nx/remix': versions_1.nxVersion }, dev: {} };
         case presets_1.Preset.VueMonorepo:
         case presets_1.Preset.VueStandalone:
             return {

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

@@ -52,16 +52,6 @@ const presetToPluginMap = {
         generateLibCmd: '@nx/react',
         learnMoreLink: 'https://nx.dev/nx-api/next?utm_source=nx_project&utm_medium=readme&utm_campaign=nx_projects',
     },
-    [presets_1.Preset.RemixMonorepo]: {
-        generateAppCmd: '@nx/remix',
-        generateLibCmd: '@nx/react',
-        learnMoreLink: 'https://nx.dev/nx-api/remix?utm_source=nx_project&utm_medium=readme&utm_campaign=nx_projects',
-    },
-    [presets_1.Preset.RemixStandalone]: {
-        generateAppCmd: '@nx/remix',
-        generateLibCmd: '@nx/react',
-        learnMoreLink: 'https://nx.dev/nx-api/remix?utm_source=nx_project&utm_medium=readme&utm_campaign=nx_projects',
-    },
     [presets_1.Preset.ReactNative]: {
         generateAppCmd: '@nx/react-native',
         generateLibCmd: '@nx/react',
@@ -207,12 +197,11 @@ function createFiles(tree, options) {
         options.preset === presets_1.Preset.NuxtStandalone ||
         options.preset === presets_1.Preset.NodeStandalone ||
         options.preset === presets_1.Preset.NextJsStandalone ||
-        options.preset === presets_1.Preset.RemixStandalone ||
         options.preset === presets_1.Preset.TsStandalone
         ? './files-root-app'
         : (options.preset === presets_1.Preset.TS &&
-            process.env.NX_ADD_PLUGINS !== 'false' &&
-            process.env.NX_ADD_TS_PLUGIN !== 'false') ||
+            options.workspaces &&
+            process.env.NX_ADD_PLUGINS !== 'false') ||
             options.preset === presets_1.Preset.NPM
             ? './files-package-based-repo'
             : './files-integrated-repo';
@@ -227,7 +216,7 @@ function createFiles(tree, options) {
         packageManager: options.packageManager,
     });
 }
-async function createReadme(tree, { name, appName, directory, preset, nxCloud }, nxCloudToken) {
+async function createReadme(tree, { name, appName, directory, preset, nxCloud, workspaces }, nxCloudToken) {
     const formattedNames = (0, devkit_1.names)(name);
     // default to an empty one for custom presets
     const presetInfo = presetToPluginMap[preset] ?? {
@@ -241,8 +230,7 @@ async function createReadme(tree, { name, appName, directory, preset, nxCloud },
         formattedNames,
         isJsStandalone: preset === presets_1.Preset.TsStandalone,
         isTsPreset: preset === presets_1.Preset.TS,
-        isUsingNewTsSolutionSetup: process.env.NX_ADD_PLUGINS !== 'false' &&
-            process.env.NX_ADD_TS_PLUGIN !== 'false',
+        isUsingNewTsSolutionSetup: process.env.NX_ADD_PLUGINS !== 'false' && workspaces,
         isEmptyRepo: !appName,
         appName,
         generateAppCmd: presetInfo.generateAppCmd,
@@ -325,12 +313,11 @@ 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') ||
+            options.workspaces) ||
         ((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.preset === presets_1.Preset.VueMonorepo ||
             options.preset === presets_1.Preset.Nuxt ||
             options.preset === presets_1.Preset.NodeMonorepo ||

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

@@ -17,6 +17,7 @@ interface Schema {
     bundler?: 'vite' | 'webpack';
     standaloneApi?: boolean;
     routing?: boolean;
+    useReactRouter?: boolean;
     packageManager?: PackageManager;
     unitTestRunner?: 'jest' | 'vitest' | 'none';
     e2eTestRunner?: 'cypress' | 'playwright' | 'detox' | 'jest' | 'none';

package/src/generators/new/schema.json

@@ -25,6 +25,11 @@
       "type": "boolean",
       "default": true
     },
+    "useReactRouter": {
+      "description": "Use React Router for routing.",
+      "type": "boolean",
+      "default": false
+    },
     "standaloneApi": {
       "description": "Use Standalone Components if generating an Angular application.",
       "type": "boolean",
@@ -105,7 +110,7 @@
     "workspaces": {
       "description": "Whether to use package manager workspaces.",
       "type": "boolean",
-      "default": false
+      "default": true
     }
   },
   "additionalProperties": true

package/src/generators/preset/preset.js

@@ -70,6 +70,8 @@ async function createPreset(tree, options) {
             unitTestRunner: options.unitTestRunner ??
                 (options.bundler === 'vite' ? 'vitest' : 'jest'),
             addPlugin,
+            routing: options.routing,
+            useReactRouter: options.useReactRouter,
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
@@ -87,6 +89,8 @@ async function createPreset(tree, options) {
             linter: options.linter,
             rootProject: true,
             bundler,
+            routing: options.routing,
+            useReactRouter: options.useReactRouter,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             unitTestRunner: options.unitTestRunner ?? (bundler === 'vite' ? 'vitest' : 'jest'),
             addPlugin,
@@ -94,37 +98,6 @@ async function createPreset(tree, options) {
             formatter: options.formatter,
         });
     }
-    else if (options.preset === presets_1.Preset.RemixMonorepo) {
-        const { applicationGenerator: remixApplicationGenerator } = require('@nx' +
-            '/remix/generators');
-        return remixApplicationGenerator(tree, {
-            name: options.name,
-            directory: (0, path_1.join)('apps', options.name),
-            linter: options.linter,
-            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
-            unitTestRunner: options.unitTestRunner ?? 'vitest',
-            addPlugin,
-            nxCloudToken: options.nxCloudToken,
-            useTsSolution: options.workspaces,
-            formatter: options.formatter,
-            useProjectJson: !options.workspaces,
-        });
-    }
-    else if (options.preset === presets_1.Preset.RemixStandalone) {
-        const { applicationGenerator: remixApplicationGenerator } = require('@nx' +
-            '/remix/generators');
-        return remixApplicationGenerator(tree, {
-            name: options.name,
-            directory: '.',
-            linter: options.linter,
-            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
-            rootProject: true,
-            unitTestRunner: options.unitTestRunner ?? 'vitest',
-            addPlugin,
-            nxCloudToken: options.nxCloudToken,
-            formatter: options.formatter,
-        });
-    }
     else if (options.preset === presets_1.Preset.VueMonorepo) {
         const { applicationGenerator: vueApplicationGenerator } = require('@nx' +
             '/vue');
@@ -303,8 +276,7 @@ async function createPreset(tree, options) {
         const { initGenerator } = require('@nx' + '/js');
         return initGenerator(tree, {
             formatter: options.formatter,
-            addTsPlugin: process.env.NX_ADD_PLUGINS !== 'false' &&
-                process.env.NX_ADD_TS_PLUGIN !== 'false',
+            addTsPlugin: process.env.NX_ADD_PLUGINS !== 'false' && options.workspaces,
         });
     }
     else if (options.preset === presets_1.Preset.TsStandalone) {

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

@@ -16,6 +16,7 @@ export interface Schema {
   nextAppDir?: boolean;
   nextSrcDir?: boolean;
   routing?: boolean;
+  useReactRouter?: boolean;
   standaloneApi?: boolean;
   unitTestRunner?: 'jest' | 'vitest' | 'none';
   e2eTestRunner?: 'cypress' | 'playwright' | 'jest' | 'detox' | 'none';

package/src/generators/preset/schema.json

@@ -25,6 +25,11 @@
       "type": "boolean",
       "default": true
     },
+    "useReactRouter": {
+      "description": "Use React Router for routing.",
+      "type": "boolean",
+      "default": false
+    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -122,7 +127,7 @@
     "workspaces": {
       "description": "Whether to use package manager workspaces.",
       "type": "boolean",
-      "default": false
+      "default": true
     }
   },
   "required": ["preset", "name"]

package/src/generators/utils/presets.d.ts

@@ -8,8 +8,6 @@ export declare enum Preset {
     ReactMonorepo = "react-monorepo",
     ReactStandalone = "react-standalone",
     NextJsStandalone = "nextjs-standalone",
-    RemixMonorepo = "remix-monorepo",
-    RemixStandalone = "remix-standalone",
     ReactNative = "react-native",
     VueMonorepo = "vue-monorepo",
     VueStandalone = "vue-standalone",

package/src/generators/utils/presets.js

@@ -12,8 +12,6 @@ var Preset;
     Preset["ReactMonorepo"] = "react-monorepo";
     Preset["ReactStandalone"] = "react-standalone";
     Preset["NextJsStandalone"] = "nextjs-standalone";
-    Preset["RemixMonorepo"] = "remix-monorepo";
-    Preset["RemixStandalone"] = "remix-standalone";
     Preset["ReactNative"] = "react-native";
     Preset["VueMonorepo"] = "vue-monorepo";
     Preset["VueStandalone"] = "vue-standalone";