@nx/workspace 18.0.0-beta.0 → 18.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "18.0.0-beta.0",
+  "version": "18.0.0-beta.2",
   "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": {
@@ -61,13 +61,13 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "18.0.0-beta.0",
+    "@nx/devkit": "18.0.0-beta.2",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "18.0.0-beta.0",
-    "@nrwl/workspace": "18.0.0-beta.0"
+    "nx": "18.0.0-beta.2",
+    "@nrwl/workspace": "18.0.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/ci-workflow/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWorkspaceCIWorkflow",
   "title": "Generate a CI workflow.",
   "description": "Generate a CI workflow.",

package/src/generators/convert-to-monorepo/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWorkspaceConvertToMonorepo",
   "cli": "nx",
   "title": "Nx Convert to Monorepo",

package/src/generators/convert-to-nx-project/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "SchematicsConvertToNxProject",
   "title": "@nx/workspace:fix-configuration",
   "description": "Migrates v1 config to v2 standalone configuration.",

package/src/generators/move/lib/normalize-schema.js

@@ -133,7 +133,7 @@ function logDeprecationMessage(formats, options) {
         ? '@nx/angular:move'
         : '@nx/workspace:move';
     devkit_1.logger.warn((0, devkit_1.stripIndents) `
-    In Nx 18, the project name and destination will no longer be derived.
+    In Nx 19, the project name and destination will no longer be derived.
     Please provide the exact new project name and destination in the future.
     Example: nx g ${callingGenerator} --projectName ${options.projectName} --destination ${formats['derived'].destination}` +
         (options.projectName !== formats['derived'].newProjectName

package/src/generators/move/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWorkspaceMove",
   "cli": "nx",
   "title": "Nx Move",

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

@@ -48,7 +48,7 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
         affected: {
             defaultBase,
         },
-        targetDefaults: process.env.NX_PCV3 !== 'true'
+        targetDefaults: process.env.NX_ADD_PLUGINS === 'false'
             ? {
                 build: {
                     cache: true,
@@ -69,7 +69,7 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
             production: ['default'],
             sharedGlobals: [],
         };
-        if (process.env.NX_PCV3 !== 'true') {
+        if (process.env.NX_ADD_PLUGINS === 'false') {
             nxJson.targetDefaults.build.inputs = ['production', '^production'];
         }
     }

package/src/generators/new/new.js

@@ -13,14 +13,16 @@ async function newGenerator(tree, opts) {
     await (0, generate_workspace_files_1.generateWorkspaceFiles)(tree, { ...options, nxCloud: undefined });
     (0, generate_preset_1.addPresetDependencies)(tree, options);
     return async () => {
-        const pmc = (0, devkit_1.getPackageManagerCommand)(options.packageManager);
-        if (pmc.preInstall) {
-            (0, child_process_1.execSync)(pmc.preInstall, {
-                cwd: (0, devkit_1.joinPathFragments)(tree.root, options.directory),
-                stdio: process.env.NX_GENERATE_QUIET === 'true' ? 'ignore' : 'inherit',
-            });
+        if (!options.skipInstall) {
+            const pmc = (0, devkit_1.getPackageManagerCommand)(options.packageManager);
+            if (pmc.preInstall) {
+                (0, child_process_1.execSync)(pmc.preInstall, {
+                    cwd: (0, devkit_1.joinPathFragments)(tree.root, options.directory),
+                    stdio: process.env.NX_GENERATE_QUIET === 'true' ? 'ignore' : 'inherit',
+                });
+            }
+            (0, devkit_1.installPackagesTask)(tree, false, options.directory, options.packageManager);
         }
-        (0, devkit_1.installPackagesTask)(tree, false, options.directory, options.packageManager);
         // TODO: move all of these into create-nx-workspace
         if (options.preset !== presets_1.Preset.NPM && !options.isCustomPreset) {
             await (0, generate_preset_1.generatePreset)(tree, options);

package/src/generators/new/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWorkspaceNew",
   "title": "Create an empty workspace",
   "description": "Create an empty workspace.",

package/src/generators/npm-package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWorkspaceNpmPackage",
   "title": "Add a minimal npm package",
   "description": "Add a minimal npm package.",

package/src/generators/preset/preset.js

@@ -16,6 +16,7 @@ async function presetGenerator(tree, options) {
 exports.presetGenerator = presetGenerator;
 exports.default = presetGenerator;
 async function createPreset(tree, options) {
+    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false';
     if (options.preset === presets_1.Preset.Apps) {
         return;
     }
@@ -32,6 +33,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             bundler: options.bundler,
             ssr: options.ssr,
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.AngularStandalone) {
@@ -48,6 +50,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             bundler: options.bundler,
             ssr: options.ssr,
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.ReactMonorepo) {
@@ -61,6 +64,7 @@ async function createPreset(tree, options) {
             linter: options.linter,
             bundler: options.bundler ?? 'webpack',
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.ReactStandalone) {
@@ -76,6 +80,7 @@ async function createPreset(tree, options) {
             bundler: options.bundler ?? 'vite',
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             unitTestRunner: options.bundler === 'vite' ? 'vitest' : 'jest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.VueMonorepo) {
@@ -88,6 +93,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.VueStandalone) {
@@ -102,6 +108,7 @@ async function createPreset(tree, options) {
             rootProject: true,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             unitTestRunner: 'vitest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.Nuxt) {
@@ -114,6 +121,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.NuxtStandalone) {
@@ -128,6 +136,7 @@ async function createPreset(tree, options) {
             rootProject: true,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             unitTestRunner: 'vitest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.NextJs) {
@@ -142,6 +151,7 @@ async function createPreset(tree, options) {
             appDir: options.nextAppDir,
             src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.NextJsStandalone) {
@@ -157,6 +167,7 @@ async function createPreset(tree, options) {
             src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             rootProject: true,
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.WebComponents) {
@@ -170,6 +181,7 @@ async function createPreset(tree, options) {
             linter: options.linter,
             bundler: 'vite',
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.Nest) {
@@ -181,6 +193,7 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.Express) {
@@ -191,6 +204,7 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.ReactNative) {
@@ -202,6 +216,7 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.Expo) {
@@ -212,6 +227,7 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.TS) {
@@ -229,6 +245,7 @@ async function createPreset(tree, options) {
             testEnvironment: 'node',
             js: options.js,
             rootProject: true,
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.NodeStandalone) {
@@ -246,6 +263,7 @@ async function createPreset(tree, options) {
             docker: options.docker,
             rootProject: true,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.NodeMonorepo) {
@@ -262,6 +280,7 @@ async function createPreset(tree, options) {
             docker: options.docker,
             rootProject: false,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            addPlugin,
         });
     }
     else {

package/src/generators/preset/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWorkspacePreset",
   "cli": "nx",
   "title": "Creates applications in a new workspace",
@@ -39,11 +39,11 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)  [ http://sass-lang.com   ]"
+            "label": "SASS(.scss)  [ https://sass-lang.com   ]"
           },
           {
             "value": "less",
-            "label": "LESS         [ http://lesscss.org     ]"
+            "label": "LESS         [ https://lesscss.org     ]"
           }
         ]
       }

package/src/generators/remove/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWorkspaceRemove",
   "cli": "nx",
   "title": "Nx Remove",

package/src/generators/run-commands/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "SchematicsRunCommands",
   "title": "Create a custom target to run any command",
   "description": "Create a custom target to run any command.",

package/src/generators/utils/presets.js

@@ -4,7 +4,7 @@ exports.Preset = void 0;
 var Preset;
 (function (Preset) {
     Preset["Apps"] = "apps";
-    // TODO(v18): Remove Empty and Core presets
+    // TODO(v19): Remove Empty and Core presets
     /** @deprecated Use Apps instead
      */
     Preset["Empty"] = "empty";