@nx/workspace 20.0.0-canary.20241001-8fa7065 → 20.0.0-canary.20241002-1d10a19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "20.0.0-canary.20241001-8fa7065",
+  "version": "20.0.0-canary.20241002-1d10a19",
   "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.0.0-canary.20241001-8fa7065",
+    "@nx/devkit": "20.0.0-canary.20241002-1d10a19",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "20.0.0-canary.20241001-8fa7065"
+    "nx": "20.0.0-canary.20241002-1d10a19"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/convert-to-monorepo/convert-to-monorepo.js

@@ -45,7 +45,6 @@ async function monorepoGenerator(tree, options) {
                 ? (0, devkit_1.joinPathFragments)(appsDir, project.root === '.' ? project.name : project.root)
                 : (0, devkit_1.joinPathFragments)(libsDir, project.root === '.' ? project.name : project.root),
             updateImportPath: project.projectType === 'library',
-            projectNameAndRootFormat: 'as-provided',
         });
     }
 }

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

@@ -1,5 +1,3 @@
-import { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-
 export interface Schema {
   projectName: string;
   destination: string;
@@ -7,7 +5,6 @@ export interface Schema {
   updateImportPath: boolean;
   skipFormat?: boolean;
   newProjectName?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/move/schema.json

@@ -33,11 +33,6 @@
         "index": 0
       }
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the new project name and destination as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "importPath": {
       "type": "string",
       "description": "The new import path to use in the `tsconfig.base.json`."

package/src/generators/npm-package/npm-package.d.ts

@@ -1,8 +1,6 @@
 import { Tree } from '@nx/devkit';
-import { type ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 export interface ProjectOptions {
-    name: string;
-    directory?: string;
-    projectNameAndRootFormat?: ProjectNameAndRootFormat;
+    directory: string;
+    name?: string;
 }
 export declare function npmPackageGenerator(tree: Tree, _options: ProjectOptions): Promise<void>;

package/src/generators/npm-package/npm-package.js

@@ -6,11 +6,11 @@ const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project
 const path_1 = require("path");
 const get_import_path_1 = require("../../utilities/get-import-path");
 async function normalizeOptions(tree, options) {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'library');
     const { projectName, projectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
     });
     return {
         ...options,

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

@@ -6,26 +6,20 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "Package name.",
+      "description": "A directory where the package is placed.",
+      "alias": "dir",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name of your npm package?",
-      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$"
-    },
-    "directory": {
-      "type": "string",
-      "description": "A directory where the package is placed.",
-      "alias": "dir"
+      "x-prompt": "Which directory do you want to create the package in?"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+    "name": {
       "type": "string",
-      "enum": ["as-provided", "derived"]
+      "description": "Package name."
     }
   },
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/generators/preset/preset.js

@@ -25,7 +25,6 @@ async function createPreset(tree, options) {
         return angularApplicationGenerator(tree, {
             name: options.name,
             directory: (0, path_1.join)('apps', options.name),
-            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             standalone: options.standaloneApi,
@@ -42,7 +41,6 @@ async function createPreset(tree, options) {
         return angularApplicationGenerator(tree, {
             name: options.name,
             directory: '.',
-            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             routing: options.routing,
@@ -61,7 +59,6 @@ async function createPreset(tree, options) {
         return reactApplicationGenerator(tree, {
             name: options.name,
             directory: (0, path_1.join)('apps', options.name),
-            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             bundler: options.bundler ?? 'webpack',
@@ -76,7 +73,6 @@ async function createPreset(tree, options) {
         return reactApplicationGenerator(tree, {
             name: options.name,
             directory: '.',
-            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             rootProject: true,
@@ -93,7 +89,6 @@ async function createPreset(tree, options) {
         return remixApplicationGenerator(tree, {
             name: options.name,
             directory: (0, path_1.join)('apps', options.name),
-            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             unitTestRunner: 'vitest',
@@ -107,7 +102,6 @@ async function createPreset(tree, options) {
         return remixApplicationGenerator(tree, {
             name: options.name,
             directory: '.',
-            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             rootProject: true,
@@ -122,7 +116,6 @@ async function createPreset(tree, options) {
         return vueApplicationGenerator(tree, {
             name: options.name,
             directory: (0, path_1.join)('apps', options.name),
-            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
@@ -136,7 +129,6 @@ async function createPreset(tree, options) {
         return vueApplicationGenerator(tree, {
             name: options.name,
             directory: '.',
-            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             rootProject: true,
@@ -152,7 +144,6 @@ async function createPreset(tree, options) {
         return nuxtApplicationGenerator(tree, {
             name: options.name,
             directory: (0, path_1.join)('apps', options.name),
-            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
@@ -166,7 +157,6 @@ async function createPreset(tree, options) {
         return nuxtApplicationGenerator(tree, {
             name: options.name,
             directory: '.',
-            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             rootProject: true,
@@ -182,7 +172,6 @@ async function createPreset(tree, options) {
         return nextApplicationGenerator(tree, {
             name: options.name,
             directory: (0, path_1.join)('apps', options.name),
-            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             appDir: options.nextAppDir,
@@ -197,7 +186,6 @@ async function createPreset(tree, options) {
         return nextApplicationGenerator(tree, {
             name: options.name,
             directory: '.',
-            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             appDir: options.nextAppDir,
@@ -213,7 +201,6 @@ async function createPreset(tree, options) {
         return webApplicationGenerator(tree, {
             name: options.name,
             directory: (0, path_1.join)('apps', options.name),
-            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             bundler: 'vite',
@@ -228,7 +215,6 @@ async function createPreset(tree, options) {
         return nestApplicationGenerator(tree, {
             name: options.name,
             directory: (0, path_1.join)('apps', options.name),
-            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
             addPlugin,
@@ -239,7 +225,6 @@ async function createPreset(tree, options) {
         return expressApplicationGenerator(tree, {
             name: options.name,
             directory: (0, path_1.join)('apps', options.name),
-            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
             addPlugin,
@@ -251,7 +236,6 @@ async function createPreset(tree, options) {
         return reactNativeApplicationGenerator(tree, {
             name: options.name,
             directory: (0, path_1.join)('apps', options.name),
-            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
             addPlugin,
@@ -263,7 +247,6 @@ async function createPreset(tree, options) {
         return expoApplicationGenerator(tree, {
             name: options.name,
             directory: (0, path_1.join)('apps', options.name),
-            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
             addPlugin,
@@ -283,7 +266,6 @@ async function createPreset(tree, options) {
         return libraryGenerator(tree, {
             name: options.name,
             directory: '.',
-            projectNameAndRootFormat: 'as-provided',
             bundler: 'tsc',
             unitTestRunner: 'vitest',
             testEnvironment: 'node',
@@ -300,7 +282,6 @@ async function createPreset(tree, options) {
             bundler,
             name: options.name,
             directory: '.',
-            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             standaloneConfig: options.standaloneConfig,
             framework: options.framework,
@@ -318,7 +299,6 @@ async function createPreset(tree, options) {
             bundler,
             name: options.name,
             directory: (0, path_1.join)('apps', options.name),
-            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             framework: options.framework,
             docker: options.docker,

package/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.js

@@ -119,7 +119,7 @@ async function createNewPlugin(tree) {
     const importPath = npmScope ? `@${npmScope}/${PROJECT_NAME}` : PROJECT_NAME;
     await pluginGenerator(tree, {
         minimal: true,
-        name: PROJECT_NAME,
+        directory: PROJECT_NAME,
         importPath: importPath,
         skipTsConfig: false,
         compiler: 'tsc',
@@ -142,7 +142,6 @@ function moveGeneratedPlugin(tree, destination, importPath) {
             newProjectName: PROJECT_NAME,
             updateImportPath: true,
             importPath: importPath,
-            projectNameAndRootFormat: 'as-provided',
         });
     }
 }