@nx/workspace 19.8.0 → 20.0.0-beta.0

package/generators.json

@@ -10,7 +10,7 @@
       "hidden": true
     },
     "move": {
-      "factory": "./src/generators/move/move#moveGeneratorInternal",
+      "factory": "./src/generators/move/move",
       "schema": "./src/generators/move/schema.json",
       "aliases": ["mv"],
       "description": "Move an application or library to another folder."
@@ -45,7 +45,7 @@
       "description": "Fixes projects configuration"
     },
     "npm-package": {
-      "factory": "./src/generators/npm-package/npm-package#npmPackageGeneratorInternal",
+      "factory": "./src/generators/npm-package/npm-package#npmPackageGenerator",
       "schema": "./src/generators/npm-package/schema.json",
       "description": "Create a minimal NPM package.",
       "x-type": "library"

package/package.json

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

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

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSchema = normalizeSchema;
-const devkit_1 = require("@nx/devkit");
-const enquirer_1 = require("enquirer");
 const get_import_path_1 = require("../../../utilities/get-import-path");
 const utils_1 = require("./utils");
 async function normalizeSchema(tree, schema, projectConfiguration) {
@@ -16,25 +14,14 @@ async function normalizeSchema(tree, schema, projectConfiguration) {
     };
 }
 async function determineProjectNameAndRootOptions(tree, options, projectConfiguration) {
-    if (!options.projectNameAndRootFormat &&
-        (process.env.NX_INTERACTIVE !== 'true' || !isTTY())) {
-        options.projectNameAndRootFormat = 'derived';
-    }
-    validateName(options.newProjectName, options.projectNameAndRootFormat, projectConfiguration);
-    const formats = getProjectNameAndRootFormats(tree, options, projectConfiguration);
-    const format = options.projectNameAndRootFormat ?? (await determineFormat(formats));
-    if (format === 'derived') {
-        logDeprecationMessage(formats, options);
-    }
-    return formats[format];
+    validateName(options.newProjectName, projectConfiguration);
+    const projectNameAndRootOptions = getProjectNameAndRootOptions(tree, options, projectConfiguration);
+    return projectNameAndRootOptions;
 }
-function validateName(name, projectNameAndRootFormat, projectConfiguration) {
+function validateName(name, 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:
      *
@@ -60,7 +47,7 @@ function validateName(name, projectNameAndRootFormat, projectConfiguration) {
         }
     }
 }
-function getProjectNameAndRootFormats(tree, options, projectConfiguration) {
+function getProjectNameAndRootOptions(tree, options, projectConfiguration) {
     let destination = (0, utils_1.normalizePathSlashes)(options.destination);
     if (options.newProjectName &&
         options.newProjectName.includes('/') &&
@@ -69,75 +56,7 @@ function getProjectNameAndRootFormats(tree, options, projectConfiguration) {
             `Please provide a valid name without path segments and the full destination with the "--destination" option.`);
     }
     const asProvidedOptions = getAsProvidedOptions(tree, { ...options, destination }, projectConfiguration);
-    if (options.projectNameAndRootFormat === 'as-provided') {
-        return {
-            'as-provided': asProvidedOptions,
-            derived: undefined,
-        };
-    }
-    if (asProvidedOptions.newProjectName.startsWith('@')) {
-        if (!options.projectNameAndRootFormat) {
-            devkit_1.output.warn({
-                title: `The provided new project name "${asProvidedOptions.newProjectName}" is a scoped project name and this is not supported by the move generator when using the "derived" format.`,
-                bodyLines: [
-                    `The generator will try to move the project using the "as-provided" format with the new name "${asProvidedOptions.newProjectName}" located at "${asProvidedOptions.destination}".`,
-                ],
-            });
-            return {
-                'as-provided': asProvidedOptions,
-                derived: undefined,
-            };
-        }
-        throw new Error(`The provided new project name "${options.newProjectName}" is a scoped project name and this is not supported by the move generator when using the "derived" format. ` +
-            `Please provide a name without "@" or use the "as-provided" format.`);
-    }
-    const derivedOptions = getDerivedOptions(tree, { ...options, destination }, projectConfiguration);
-    return {
-        'as-provided': asProvidedOptions,
-        derived: derivedOptions,
-    };
-}
-async function determineFormat(formats) {
-    if (!formats.derived) {
-        return 'as-provided';
-    }
-    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: 0,
-    }).then(({ format }) => format === asProvidedSelectedValue ? 'as-provided' : 'derived');
-    return result;
-}
-function logDeprecationMessage(formats, options) {
-    const callingGenerator = process.env.NX_ANGULAR_MOVE_INVOKED === 'true'
-        ? '@nx/angular:move'
-        : '@nx/workspace:move';
-    devkit_1.logger.warn((0, devkit_1.stripIndents) `
-    In Nx 20, 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
-            ? ` --newProjectName ${formats['derived'].newProjectName}`
-            : ''));
+    return asProvidedOptions;
 }
 function getAsProvidedOptions(tree, options, projectConfiguration) {
     const newProjectName = options.newProjectName ?? options.projectName;
@@ -164,19 +83,3 @@ function getAsProvidedOptions(tree, options, projectConfiguration) {
     }
     return { destination, newProjectName, importPath };
 }
-function getDerivedOptions(tree, options, projectConfiguration) {
-    const newProjectName = options.newProjectName
-        ? (0, devkit_1.names)(options.newProjectName).fileName
-        : (0, utils_1.getNewProjectName)(options.destination);
-    const destination = (0, utils_1.getDestination)(tree, options, projectConfiguration);
-    let importPath;
-    if (projectConfiguration.projectType === 'library') {
-        importPath =
-            options.importPath ??
-                (0, utils_1.normalizePathSlashes)((0, get_import_path_1.getImportPath)(tree, options.destination));
-    }
-    return { destination, newProjectName, importPath };
-}
-function isTTY() {
-    return !!process.stdout.isTTY && process.env['CI'] !== 'true';
-}

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

@@ -1,5 +1,4 @@
 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;

package/src/generators/move/move.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.moveGenerator = moveGenerator;
-exports.moveGeneratorInternal = moveGeneratorInternal;
 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");
@@ -21,12 +20,6 @@ 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,
-    });
-}
-async function moveGeneratorInternal(tree, rawSchema) {
     let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, rawSchema.projectName);
     const schema = await (0, normalize_schema_1.normalizeSchema)(tree, rawSchema, projectConfig);
     (0, check_destination_1.checkDestination)(tree, schema, rawSchema.destination);

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

@@ -5,5 +5,4 @@ export interface ProjectOptions {
     directory?: string;
     projectNameAndRootFormat?: ProjectNameAndRootFormat;
 }
-export declare function npmPackageGenerator(tree: Tree, options: ProjectOptions): Promise<void>;
-export declare function npmPackageGeneratorInternal(tree: Tree, _options: ProjectOptions): Promise<void>;
+export declare function npmPackageGenerator(tree: Tree, _options: ProjectOptions): Promise<void>;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.npmPackageGenerator = npmPackageGenerator;
-exports.npmPackageGeneratorInternal = npmPackageGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const path_1 = require("path");
@@ -12,7 +11,6 @@ async function normalizeOptions(tree, options) {
         projectType: 'library',
         directory: options.directory,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/workspace:npm-package',
     });
     return {
         ...options,
@@ -31,13 +29,7 @@ function addFiles(projectRoot, tree, options) {
     });
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), projectRoot, {});
 }
-async function npmPackageGenerator(tree, options) {
-    return await npmPackageGeneratorInternal(tree, {
-        projectNameAndRootFormat: 'derived',
-        ...options,
-    });
-}
-async function npmPackageGeneratorInternal(tree, _options) {
+async function npmPackageGenerator(tree, _options) {
     const options = await normalizeOptions(tree, _options);
     (0, devkit_1.addProjectConfiguration)(tree, options.name, {
         root: options.projectRoot,