@nx/workspace 16.8.0-beta.7 → 16.8.0

package/generators.json

@@ -47,7 +47,7 @@
       "hidden": true
     },
     "move": {
-      "factory": "./src/generators/move/move#moveGenerator",
+      "factory": "./src/generators/move/move#moveGeneratorInternal",
       "schema": "./src/generators/move/schema.json",
       "aliases": ["mv"],
       "description": "Move an application or library to another folder."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "16.8.0-beta.7",
+  "version": "16.8.0",
   "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": {
@@ -33,39 +33,40 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/js": "16.8.0-beta.7",
-      "@nrwl/jest": "16.8.0-beta.7",
-      "@nrwl/linter": "16.8.0-beta.7",
-      "@nrwl/angular": "16.8.0-beta.7",
-      "@nrwl/cypress": "16.8.0-beta.7",
-      "@nrwl/detox": "16.8.0-beta.7",
-      "@nrwl/devkit": "16.8.0-beta.7",
-      "@nrwl/esbuild": "16.8.0-beta.7",
-      "@nrwl/eslint-plugin-nx": "16.8.0-beta.7",
-      "@nrwl/expo": "16.8.0-beta.7",
-      "@nrwl/express": "16.8.0-beta.7",
-      "@nrwl/nest": "16.8.0-beta.7",
-      "@nrwl/next": "16.8.0-beta.7",
-      "@nrwl/node": "16.8.0-beta.7",
+      "@nrwl/js": "16.8.0",
+      "@nrwl/jest": "16.8.0",
+      "@nrwl/linter": "16.8.0",
+      "@nrwl/angular": "16.8.0",
+      "@nrwl/cypress": "16.8.0",
+      "@nrwl/detox": "16.8.0",
+      "@nrwl/devkit": "16.8.0",
+      "@nrwl/esbuild": "16.8.0",
+      "@nrwl/eslint-plugin-nx": "16.8.0",
+      "@nrwl/expo": "16.8.0",
+      "@nrwl/express": "16.8.0",
+      "@nrwl/nest": "16.8.0",
+      "@nrwl/next": "16.8.0",
+      "@nrwl/node": "16.8.0",
       "nx-cloud": "latest",
-      "@nrwl/nx-plugin": "16.8.0-beta.7",
-      "@nrwl/react-native": "16.8.0-beta.7",
-      "@nrwl/react": "16.8.0-beta.7",
-      "@nrwl/rollup": "16.8.0-beta.7",
-      "@nrwl/storybook": "16.8.0-beta.7",
-      "@nrwl/tao": "16.8.0-beta.7",
-      "@nrwl/vite": "16.8.0-beta.7",
-      "@nrwl/web": "16.8.0-beta.7",
-      "@nrwl/webpack": "16.8.0-beta.7",
-      "nx": "16.8.0-beta.7"
+      "@nrwl/nx-plugin": "16.8.0",
+      "@nrwl/react-native": "16.8.0",
+      "@nrwl/react": "16.8.0",
+      "@nrwl/rollup": "16.8.0",
+      "@nrwl/storybook": "16.8.0",
+      "@nrwl/tao": "16.8.0",
+      "@nrwl/vite": "16.8.0",
+      "@nrwl/web": "16.8.0",
+      "@nrwl/webpack": "16.8.0",
+      "nx": "16.8.0"
     }
   },
   "dependencies": {
-    "@nrwl/workspace": "16.8.0-beta.7",
-    "@nx/devkit": "16.8.0-beta.7",
+    "@nrwl/workspace": "16.8.0",
+    "@nx/devkit": "16.8.0",
     "chalk": "^4.1.0",
+    "enquirer": "~2.3.6",
     "ignore": "^5.0.4",
-    "nx": "16.8.0-beta.7",
+    "nx": "16.8.0",
     "rxjs": "^7.8.0",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1"
@@ -74,5 +75,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "6175b0f2033a80504bdc79d6212de9377843d787"
+  "gitHead": "af53c7cfb21c0ebc7be2dab33b712f8d10bc81f7"
 }

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

@@ -28,8 +28,8 @@ async function monorepoGenerator(tree, options) {
             destination: project.projectType === 'application'
                 ? (0, devkit_1.joinPathFragments)(appsDir, project.root === '.' ? project.name : project.root)
                 : (0, devkit_1.joinPathFragments)(libsDir, project.root === '.' ? project.name : project.root),
-            destinationRelativeToRoot: true,
             updateImportPath: project.projectType === 'library',
+            projectNameAndRootFormat: 'as-provided',
         });
     }
 }

package/src/generators/move/lib/check-destination.d.ts

@@ -1,5 +1,5 @@
-import { ProjectConfiguration, Tree } from '@nx/devkit';
-import { Schema } from '../schema';
+import type { Tree } from '@nx/devkit';
+import type { NormalizedSchema } from '../schema';
 /**
  * Checks whether the destination folder is valid
  *
@@ -8,4 +8,4 @@ import { Schema } from '../schema';
  *
  * @param schema The options provided to the schematic
  */
-export declare function checkDestination(tree: Tree, schema: Schema, projectConfig: ProjectConfiguration): void;
+export declare function checkDestination(tree: Tree, schema: NormalizedSchema, providedDestination: string): void;

package/src/generators/move/lib/check-destination.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkDestination = void 0;
-const utils_1 = require("./utils");
 /**
  * Checks whether the destination folder is valid
  *
@@ -10,13 +9,12 @@ const utils_1 = require("./utils");
  *
  * @param schema The options provided to the schematic
  */
-function checkDestination(tree, schema, projectConfig) {
-    const INVALID_DESTINATION = `Invalid destination: [${schema.destination}]`;
-    if (schema.destination.includes('..')) {
+function checkDestination(tree, schema, providedDestination) {
+    const INVALID_DESTINATION = `Invalid destination: [${providedDestination}]`;
+    if (providedDestination.includes('..')) {
         throw new Error(`${INVALID_DESTINATION} - Please specify explicit path.`);
     }
-    const destination = (0, utils_1.getDestination)(tree, schema, projectConfig);
-    if (tree.children(destination).length > 0) {
+    if (tree.children(schema.relativeToRootDestination).length > 0) {
         throw new Error(`${INVALID_DESTINATION} - Path is not empty.`);
     }
 }

package/src/generators/move/lib/normalize-schema.d.ts

@@ -1,3 +1,3 @@
 import { ProjectConfiguration, Tree } from '@nx/devkit';
 import type { NormalizedSchema, Schema } from '../schema';
-export declare function normalizeSchema(tree: Tree, schema: Schema, projectConfiguration: ProjectConfiguration): NormalizedSchema;
+export declare function normalizeSchema(tree: Tree, schema: Schema, projectConfiguration: ProjectConfiguration): Promise<NormalizedSchema>;

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

@@ -1,18 +1,176 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSchema = void 0;
-const utils_1 = require("./utils");
+const devkit_1 = require("@nx/devkit");
+const enquirer_1 = require("enquirer");
 const get_import_path_1 = require("../../../utilities/get-import-path");
-function normalizeSchema(tree, schema, projectConfiguration) {
-    const destination = (0, utils_1.normalizePathSlashes)(schema.destination);
-    const newProjectName = schema.newProjectName ?? (0, utils_1.getNewProjectName)(destination);
+const utils_1 = require("./utils");
+async function normalizeSchema(tree, schema, projectConfiguration) {
+    const { destination, newProjectName, importPath } = await determineProjectNameAndRootOptions(tree, schema, projectConfiguration);
     return {
         ...schema,
-        destination,
-        importPath: schema.importPath ??
-            (0, utils_1.normalizePathSlashes)((0, get_import_path_1.getImportPath)(tree, destination)),
+        destination: (0, utils_1.normalizePathSlashes)(schema.destination),
+        importPath,
         newProjectName,
-        relativeToRootDestination: (0, utils_1.getDestination)(tree, schema, projectConfiguration),
+        relativeToRootDestination: destination,
     };
 }
 exports.normalizeSchema = normalizeSchema;
+async function determineProjectNameAndRootOptions(tree, options, projectConfiguration) {
+    validateName(options.newProjectName, options.projectNameAndRootFormat, projectConfiguration);
+    const formats = getProjectNameAndRootFormats(tree, options, projectConfiguration);
+    const format = options.projectNameAndRootFormat ??
+        (await determineFormat(tree, formats, options));
+    return formats[format];
+}
+function validateName(name, projectNameAndRootFormat, projectConfiguration) {
+    if (!name) {
+        return;
+    }
+    if (projectNameAndRootFormat === 'derived' && name.startsWith('@')) {
+        throw new Error(`The new project name "${name}" cannot start with "@" when the "projectNameAndRootFormat" is "derived".`);
+    }
+    /**
+     * Matches two types of project names:
+     *
+     * 1. Valid npm package names (e.g., '@scope/name' or 'name').
+     * 2. Names starting with a letter and can contain any character except whitespace and ':'.
+     *
+     * The second case is to support the legacy behavior (^[a-zA-Z].*$) with the difference
+     * that it doesn't allow the ":" character. It was wrong to allow it because it would
+     * conflict with the notation for tasks.
+     */
+    const libraryPattern = '(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$';
+    const appPattern = '^[a-zA-Z][^:]*$';
+    if (projectConfiguration.projectType === 'application') {
+        const validationRegex = new RegExp(appPattern);
+        if (!validationRegex.test(name)) {
+            throw new Error(`The new project name should match the pattern "${appPattern}". The provided value "${name}" does not match.`);
+        }
+    }
+    else if (projectConfiguration.projectType === 'library') {
+        const validationRegex = new RegExp(libraryPattern);
+        if (!validationRegex.test(name)) {
+            throw new Error(`The new project name should match the pattern "${libraryPattern}". The provided value "${name}" does not match.`);
+        }
+    }
+}
+function getProjectNameAndRootFormats(tree, schema, projectConfiguration) {
+    let destination = (0, utils_1.normalizePathSlashes)(schema.destination);
+    const normalizedNewProjectName = schema.newProjectName
+        ? (0, devkit_1.names)(schema.newProjectName).fileName
+        : undefined;
+    const asProvidedProjectName = normalizedNewProjectName ?? schema.projectName;
+    const asProvidedDestination = destination;
+    if (normalizedNewProjectName?.startsWith('@')) {
+        return {
+            'as-provided': {
+                destination: asProvidedDestination,
+                importPath: schema.importPath ??
+                    // keep the existing import path if the name didn't change
+                    (normalizedNewProjectName &&
+                        schema.projectName !== normalizedNewProjectName
+                        ? asProvidedProjectName
+                        : undefined),
+                newProjectName: asProvidedProjectName,
+            },
+        };
+    }
+    let npmScope;
+    let asProvidedImportPath = schema.importPath;
+    if (!asProvidedImportPath &&
+        schema.newProjectName &&
+        projectConfiguration.projectType === 'library') {
+        npmScope = (0, get_import_path_1.getNpmScope)(tree);
+        asProvidedImportPath = npmScope
+            ? `${npmScope === '@' ? '' : '@'}${npmScope}/${asProvidedProjectName}`
+            : asProvidedProjectName;
+    }
+    const derivedProjectName = schema.newProjectName ?? (0, utils_1.getNewProjectName)(destination);
+    const derivedDestination = (0, utils_1.getDestination)(tree, schema, projectConfiguration);
+    let derivedImportPath;
+    if (projectConfiguration.projectType === 'library') {
+        derivedImportPath =
+            schema.importPath ??
+                (0, utils_1.normalizePathSlashes)((0, get_import_path_1.getImportPath)(tree, destination));
+    }
+    return {
+        'as-provided': {
+            destination: asProvidedDestination,
+            newProjectName: asProvidedProjectName,
+            importPath: asProvidedImportPath,
+        },
+        derived: {
+            destination: derivedDestination,
+            newProjectName: derivedProjectName,
+            importPath: derivedImportPath,
+        },
+    };
+}
+async function determineFormat(tree, formats, schema) {
+    if (!formats.derived) {
+        return 'as-provided';
+    }
+    if (process.env.NX_INTERACTIVE !== 'true' || !isTTY()) {
+        return 'derived';
+    }
+    const asProvidedDescription = `As provided:
+    Name: ${formats['as-provided'].newProjectName}
+    Destination: ${formats['as-provided'].destination}`;
+    const asProvidedSelectedValue = `${formats['as-provided'].newProjectName} @ ${formats['as-provided'].destination}`;
+    const derivedDescription = `Derived:
+    Name: ${formats['derived'].newProjectName}
+    Destination: ${formats['derived'].destination}`;
+    const derivedSelectedValue = `${formats['derived'].newProjectName} @ ${formats['derived'].destination}`;
+    const result = await (0, enquirer_1.prompt)({
+        type: 'select',
+        name: 'format',
+        message: 'What should be the new project name and where should it be moved to?',
+        choices: [
+            {
+                message: asProvidedDescription,
+                name: asProvidedSelectedValue,
+            },
+            {
+                message: derivedDescription,
+                name: derivedSelectedValue,
+            },
+        ],
+        initial: 'as-provided',
+    }).then(({ format }) => format === asProvidedSelectedValue ? 'as-provided' : 'derived');
+    const callingGenerator = process.env.NX_ANGULAR_MOVE_INVOKED === 'true'
+        ? '@nx/angular:move'
+        : '@nx/workspace:move';
+    const deprecationWarning = (0, devkit_1.stripIndents) `
+    In Nx 18, the project name and destination will no longer be derived.
+    Please provide the exact new project name and destination in the future.`;
+    if (result === 'as-provided') {
+        const { saveDefault } = await (0, enquirer_1.prompt)({
+            type: 'confirm',
+            message: `Would you like to configure Nx to always take the project name and destination as provided for ${callingGenerator}?`,
+            name: 'saveDefault',
+            initial: true,
+        });
+        if (saveDefault) {
+            const nxJson = (0, devkit_1.readNxJson)(tree);
+            nxJson.generators ??= {};
+            nxJson.generators[callingGenerator] ??= {};
+            nxJson.generators[callingGenerator].projectNameAndRootFormat = result;
+            (0, devkit_1.updateNxJson)(tree, nxJson);
+        }
+        else {
+            devkit_1.logger.warn(deprecationWarning);
+        }
+    }
+    else {
+        const example = `Example: nx g ${callingGenerator} --projectName ${schema.projectName} --destination ${formats[result].destination}` +
+            (schema.projectName !== formats[result].newProjectName
+                ? ` --newProjectName ${formats[result].newProjectName}`
+                : '');
+        devkit_1.logger.warn(deprecationWarning + '\n' + example);
+    }
+    return result;
+}
+function isTTY() {
+    return !!process.stdout.isTTY && process.env['CI'] !== 'true';
+}

package/src/generators/move/lib/run-angular-plugin.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nx/devkit';
+import type { Schema } from '../schema';
+export declare function runAngularPlugin(tree: Tree, schema: Schema): Promise<void>;

package/src/generators/move/lib/run-angular-plugin.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runAngularPlugin = void 0;
+async function runAngularPlugin(tree, schema) {
+    let move;
+    try {
+        // nx-ignore-next-line
+        move = require('@nx/angular/src/generators/move/move-impl').move;
+    }
+    catch { }
+    if (!move) {
+        return;
+    }
+    await move(tree, {
+        oldProjectName: schema.projectName,
+        newProjectName: schema.newProjectName,
+    });
+}
+exports.runAngularPlugin = runAngularPlugin;

package/src/generators/move/lib/update-imports.js

@@ -15,7 +15,6 @@ let tsModule;
  */
 function updateImports(tree, schema, project) {
     if (project.projectType === 'application') {
-        // These shouldn't be imported anywhere?
         return;
     }
     const { libsDir } = (0, devkit_1.getWorkspaceLayout)(tree);
@@ -44,7 +43,7 @@ function updateImports(tree, schema, project) {
             // if the import path doesn't start with the main entry point import path,
             // it's a custom import path we don't know how to update the name, we keep
             // it as-is, but we'll update the path it points to
-            to: p.startsWith(mainEntryPointImportPath)
+            to: schema.importPath && p.startsWith(mainEntryPointImportPath)
                 ? p.replace(mainEntryPointImportPath, schema.importPath)
                 : null,
         })),

package/src/generators/move/lib/update-jest-config.js

@@ -13,12 +13,24 @@ function updateJestConfig(tree, schema, project) {
     const jestConfigPath = path.join(schema.relativeToRootDestination, 'jest.config.ts');
     if (tree.exists(jestConfigPath)) {
         const oldContent = tree.read(jestConfigPath, 'utf-8');
-        // ensure both single and double quotes are replaced
-        const findName = new RegExp(`'${schema.projectName}'|"${schema.projectName}"|\`${schema.projectName}\``, 'g');
-        const findDir = new RegExp(project.root, 'g');
-        const newContent = oldContent
-            .replace(findName, `'${schema.newProjectName}'`)
-            .replace(findDir, schema.relativeToRootDestination);
+        let newContent = oldContent;
+        if (schema.projectName !== schema.newProjectName) {
+            // ensure both single and double quotes are replaced
+            const findName = new RegExp(`'${schema.projectName}'|"${schema.projectName}"|\`${schema.projectName}\``, 'g');
+            newContent = oldContent.replace(findName, `'${schema.newProjectName}'`);
+        }
+        let dirRegex = new RegExp(`\\/${project.root}\\/`, 'g');
+        if (dirRegex.test(newContent)) {
+            newContent = newContent.replace(dirRegex, `/${schema.relativeToRootDestination}/`);
+        }
+        dirRegex = new RegExp(`\\/${project.root}['"\`]`, 'g');
+        if (dirRegex.test(newContent)) {
+            newContent = newContent.replace(dirRegex, `/${schema.relativeToRootDestination}'`);
+        }
+        dirRegex = new RegExp(`['"\`]${project.root}\\/`, 'g');
+        if (dirRegex.test(newContent)) {
+            newContent = newContent.replace(dirRegex, `'${schema.relativeToRootDestination}/`);
+        }
         tree.write(jestConfigPath, newContent);
     }
     // update root jest.config.ts

package/src/generators/move/lib/update-package-json.js

@@ -9,6 +9,9 @@ const path = require("path");
  * @param schema The options provided to the schematic
  */
 function updatePackageJson(tree, schema) {
+    if (!schema.importPath) {
+        return;
+    }
     const packageJsonPath = path.join(schema.relativeToRootDestination, 'package.json');
     if (!tree.exists(packageJsonPath)) {
         // nothing to do

package/src/generators/move/lib/utils.js

@@ -10,9 +10,6 @@ const devkit_1 = require("@nx/devkit");
  * folders. In that case, they're on their own :/
  */
 function getDestination(host, schema, project) {
-    if (schema.destinationRelativeToRoot) {
-        return schema.destination;
-    }
     const projectType = project.projectType;
     const workspaceLayout = (0, devkit_1.getWorkspaceLayout)(host);
     let rootFolder = workspaceLayout.libsDir;

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

@@ -1,5 +1,6 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function moveGenerator(tree: Tree, rawSchema: Schema): Promise<void>;
+export declare function moveGeneratorInternal(tree: Tree, rawSchema: Schema): Promise<void>;
 export default moveGenerator;
 export declare const moveSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/move/move.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.moveSchematic = exports.moveGenerator = void 0;
+exports.moveSchematic = exports.moveGeneratorInternal = exports.moveGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const check_destination_1 = require("./lib/check-destination");
 const create_project_configuration_in_new_destination_1 = require("./lib/create-project-configuration-in-new-destination");
 const move_project_files_1 = require("./lib/move-project-files");
 const normalize_schema_1 = require("./lib/normalize-schema");
+const run_angular_plugin_1 = require("./lib/run-angular-plugin");
 const update_build_targets_1 = require("./lib/update-build-targets");
 const update_cypress_config_1 = require("./lib/update-cypress-config");
 const update_default_project_1 = require("./lib/update-default-project");
@@ -19,9 +20,16 @@ const update_readme_1 = require("./lib/update-readme");
 const update_storybook_config_1 = require("./lib/update-storybook-config");
 const extract_base_configs_1 = require("./lib/extract-base-configs");
 async function moveGenerator(tree, rawSchema) {
+    await moveGeneratorInternal(tree, {
+        projectNameAndRootFormat: 'derived',
+        ...rawSchema,
+    });
+}
+exports.moveGenerator = moveGenerator;
+async function moveGeneratorInternal(tree, rawSchema) {
     let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, rawSchema.projectName);
-    (0, check_destination_1.checkDestination)(tree, rawSchema, projectConfig);
-    const schema = (0, normalize_schema_1.normalizeSchema)(tree, rawSchema, projectConfig);
+    const schema = await (0, normalize_schema_1.normalizeSchema)(tree, rawSchema, projectConfig);
+    (0, check_destination_1.checkDestination)(tree, schema, rawSchema.destination);
     if (projectConfig.root === '.') {
         (0, extract_base_configs_1.maybeExtractTsConfigBase)(tree);
         await (0, extract_base_configs_1.maybeExtractJestConfigBase)(tree);
@@ -43,10 +51,11 @@ async function moveGenerator(tree, rawSchema) {
     (0, update_build_targets_1.updateBuildTargets)(tree, schema);
     (0, update_default_project_1.updateDefaultProject)(tree, schema);
     (0, update_implicit_dependencies_1.updateImplicitDependencies)(tree, schema);
+    await (0, run_angular_plugin_1.runAngularPlugin)(tree, schema);
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }
-exports.moveGenerator = moveGenerator;
+exports.moveGeneratorInternal = moveGeneratorInternal;
 exports.default = moveGenerator;
 exports.moveSchematic = (0, devkit_1.convertNxGenerator)(moveGenerator);

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

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

package/src/generators/move/schema.json

@@ -18,6 +18,13 @@
       "description": "The name of the project to move.",
       "x-dropdown": "projects"
     },
+    "newProjectName": {
+      "type": "string",
+      "alias": "project",
+      "description": "The new name of the project after the move.",
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$",
+      "x-priority": "important"
+    },
     "destination": {
       "type": "string",
       "description": "The folder to move the project into.",
@@ -26,6 +33,11 @@
         "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/new/generate-workspace-files.js

@@ -30,7 +30,6 @@ async function generateWorkspaceFiles(tree, options) {
     }
     setPresetProperty(tree, options);
     addNpmScripts(tree, options);
-    createAppsAndLibsFolders(tree, options);
     setUpWorkspacesInPackageJson(tree, options);
     await (0, devkit_1.formatFiles)(tree);
 }
@@ -41,7 +40,6 @@ function setPresetProperty(tree, options) {
             addPropertyWithStableKeys(json, 'extends', 'nx/presets/npm.json');
             delete json.implicitDependencies;
             delete json.targetDefaults;
-            delete json.workspaceLayout;
         }
         return json;
     });

package/src/generators/preset/preset.js

@@ -164,7 +164,7 @@ async function createPreset(tree, options) {
         const { libraryGenerator } = require('@nx' + '/js');
         return libraryGenerator(tree, {
             name: options.name,
-            directory: (0, path_1.join)('packages', options.name),
+            directory: '.',
             projectNameAndRootFormat: 'as-provided',
             bundler: 'tsc',
             unitTestRunner: 'vitest',

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

@@ -35,7 +35,7 @@ async function moveWorkspaceGeneratorsToLocalPlugin(tree) {
         }));
         project = (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME);
     }
-    await updateExistingPlugin(tree, project);
+    updateExistingPlugin(tree, project);
     return tasks;
 }
 function hasWorkspaceGenerators(tree) {
@@ -129,7 +129,7 @@ async function createNewPlugin(tree) {
         e2eTestRunner: 'none',
         publishable: false,
     });
-    getCreateGeneratorsJson()(tree, (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME).root, PROJECT_NAME);
+    await getCreateGeneratorsJson()(tree, (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME).root, PROJECT_NAME);
     await moveGeneratedPlugin(tree, DESTINATION, importPath);
 }
 function moveGeneratedPlugin(tree, destination, importPath) {
@@ -140,8 +140,8 @@ function moveGeneratedPlugin(tree, destination, importPath) {
             projectName: PROJECT_NAME,
             newProjectName: PROJECT_NAME,
             updateImportPath: true,
-            destinationRelativeToRoot: true,
             importPath: importPath,
+            projectNameAndRootFormat: 'as-provided',
         });
     }
 }

package/src/utilities/get-import-path.d.ts

@@ -1,2 +1,3 @@
 import { Tree } from 'nx/src/generators/tree';
 export declare function getImportPath(tree: Tree, projectDirectory: string): string;
+export declare function getNpmScope(tree: Tree): string;

package/src/utilities/get-import-path.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getImportPath = void 0;
+exports.getNpmScope = exports.getImportPath = void 0;
 const nx_json_1 = require("nx/src/generators/utils/nx-json");
 const json_1 = require("nx/src/generators/utils/json");
 function getImportPath(tree, projectDirectory) {
@@ -23,3 +23,4 @@ function getNpmScope(tree) {
         return name.split('/')[0].substring(1);
     }
 }
+exports.getNpmScope = getNpmScope;

package/src/generators/new/files-integrated-repo/tools/tsconfig.tools.json

@@ -1,12 +0,0 @@
-{
-  "extends": "../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "../dist/out-tsc/tools",
-    "rootDir": ".",
-    "module": "commonjs",
-    "target": "es5",
-    "types": ["node"],
-    "importHelpers": false
-  },
-  "include": ["**/*.ts"]
-}