@nx/workspace 16.8.0-beta.4 → 16.8.0-beta.6

package/package.json

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

package/src/executors/counter/counter.impl.js

@@ -1,47 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.batchCounter = void 0;
-const tslib_1 = require("tslib");
 const os_1 = require("os");
-function wait() {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return new Promise((res) => {
-            setTimeout(() => res(), 1000);
-        });
+async function wait() {
+    return new Promise((res) => {
+        setTimeout(() => res(), 1000);
     });
 }
-function counter(opts) {
-    return tslib_1.__asyncGenerator(this, arguments, function* counter_1() {
-        for (let i = 0; i < opts.to; ++i) {
-            console.log(i);
-            yield yield tslib_1.__await({ success: false });
-            yield tslib_1.__await(wait());
-        }
-        yield yield tslib_1.__await({ success: opts.result });
-    });
+async function* counter(opts) {
+    for (let i = 0; i < opts.to; ++i) {
+        console.log(i);
+        yield { success: false };
+        await wait();
+    }
+    yield { success: opts.result };
 }
 exports.default = counter;
-function batchCounter(taskGraph, inputs) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const result = {};
-        const results = yield Promise.all(taskGraph.roots
-            .map((rootTaskId) => [rootTaskId, inputs[rootTaskId]])
-            .map(([taskId, options]) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let terminalOutput = '';
-            for (let i = 0; i < options.to; ++i) {
-                console.log(i);
-                terminalOutput += i + os_1.EOL;
-                yield wait();
-            }
-            return [taskId, options.result, terminalOutput];
-        })));
-        for (const [taskId, taskResult, terminalOutput] of results) {
-            result[taskId] = {
-                success: taskResult,
-                terminalOutput,
-            };
+async function batchCounter(taskGraph, inputs) {
+    const result = {};
+    const results = await Promise.all(taskGraph.roots
+        .map((rootTaskId) => [rootTaskId, inputs[rootTaskId]])
+        .map(async ([taskId, options]) => {
+        let terminalOutput = '';
+        for (let i = 0; i < options.to; ++i) {
+            console.log(i);
+            terminalOutput += i + os_1.EOL;
+            await wait();
         }
-        return result;
-    });
+        return [taskId, options.result, terminalOutput];
+    }));
+    for (const [taskId, taskResult, terminalOutput] of results) {
+        result[taskId] = {
+            success: taskResult,
+            terminalOutput,
+        };
+    }
+    return result;
 }
 exports.batchCounter = batchCounter;

package/src/generators/ci-workflow/ci-workflow.js

@@ -1,25 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ciWorkflowGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const default_base_1 = require("../../utilities/default-base");
 const path_1 = require("path");
-function ciWorkflowGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const ci = schema.ci;
-        const options = normalizeOptions(schema);
-        const nxJson = (0, devkit_1.readJson)(host, 'nx.json');
-        const nxCloudUsed = Object.values(nxJson.tasksRunnerOptions).find((r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud');
-        if (!nxCloudUsed) {
-            throw new Error('This workspace is not connected to Nx Cloud.');
-        }
-        if (ci === 'bitbucket-pipelines' && defaultBranchNeedsOriginPrefix(nxJson)) {
-            (0, devkit_1.writeJson)(host, 'nx.json', appendOriginPrefix(nxJson));
-        }
-        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, 'files', ci), '', options);
-        yield (0, devkit_1.formatFiles)(host);
-    });
+async function ciWorkflowGenerator(host, schema) {
+    const ci = schema.ci;
+    const options = normalizeOptions(schema);
+    const nxJson = (0, devkit_1.readJson)(host, 'nx.json');
+    const nxCloudUsed = Object.values(nxJson.tasksRunnerOptions).find((r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud');
+    if (!nxCloudUsed) {
+        throw new Error('This workspace is not connected to Nx Cloud.');
+    }
+    if (ci === 'bitbucket-pipelines' && defaultBranchNeedsOriginPrefix(nxJson)) {
+        (0, devkit_1.writeJson)(host, 'nx.json', appendOriginPrefix(nxJson));
+    }
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, 'files', ci), '', options);
+    await (0, devkit_1.formatFiles)(host);
 }
 exports.ciWorkflowGenerator = ciWorkflowGenerator;
 function normalizeOptions(options) {
@@ -35,12 +32,16 @@ function normalizeOptions(options) {
     };
 }
 function defaultBranchNeedsOriginPrefix(nxJson) {
-    var _a, _b;
-    return !((_b = (_a = nxJson.affected) === null || _a === void 0 ? void 0 : _a.defaultBase) === null || _b === void 0 ? void 0 : _b.startsWith('origin/'));
+    return !nxJson.affected?.defaultBase?.startsWith('origin/');
 }
 function appendOriginPrefix(nxJson) {
-    var _a, _b;
-    return Object.assign(Object.assign({}, nxJson), { affected: Object.assign(Object.assign({}, ((_a = nxJson.affected) !== null && _a !== void 0 ? _a : {})), { defaultBase: ((_b = nxJson.affected) === null || _b === void 0 ? void 0 : _b.defaultBase)
+    return {
+        ...nxJson,
+        affected: {
+            ...(nxJson.affected ?? {}),
+            defaultBase: nxJson.affected?.defaultBase
                 ? `origin/${nxJson.affected.defaultBase}`
-                : 'origin/main' }) });
+                : 'origin/main',
+        },
+    };
 }

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

@@ -1,40 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.monorepoSchematic = exports.monorepoGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const move_1 = require("../move/move");
-function monorepoGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        (0, devkit_1.updateNxJson)(tree, nxJson);
-        let rootProject;
-        const projectsToMove = [];
-        // Need to determine libs vs packages directory base on the type of root project.
-        for (const [, project] of projects) {
-            if (project.root === '.')
-                rootProject = project;
-            projectsToMove.push(project);
-        }
-        // Currently, Nx only handles apps+libs or packages. You cannot mix and match them.
-        // If the standalone project is an app (React, Angular, etc), then use apps+libs.
-        // Otherwise, for TS standalone (lib), use packages.
-        const isRootProjectApp = rootProject.projectType === 'application';
-        const appsDir = isRootProjectApp ? 'apps' : 'packages';
-        const libsDir = isRootProjectApp ? 'libs' : 'packages';
-        for (const project of projectsToMove) {
-            yield (0, move_1.moveGenerator)(tree, {
-                projectName: project.name,
-                newProjectName: project.name,
-                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',
-            });
-        }
-    });
+async function monorepoGenerator(tree, options) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    let rootProject;
+    const projectsToMove = [];
+    // Need to determine libs vs packages directory base on the type of root project.
+    for (const [, project] of projects) {
+        if (project.root === '.')
+            rootProject = project;
+        projectsToMove.push(project);
+    }
+    // Currently, Nx only handles apps+libs or packages. You cannot mix and match them.
+    // If the standalone project is an app (React, Angular, etc), then use apps+libs.
+    // Otherwise, for TS standalone (lib), use packages.
+    const isRootProjectApp = rootProject.projectType === 'application';
+    const appsDir = isRootProjectApp ? 'apps' : 'packages';
+    const libsDir = isRootProjectApp ? 'libs' : 'packages';
+    for (const project of projectsToMove) {
+        await (0, move_1.moveGenerator)(tree, {
+            projectName: project.name,
+            newProjectName: project.name,
+            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',
+        });
+    }
 }
 exports.monorepoGenerator = monorepoGenerator;
 exports.default = monorepoGenerator;

package/src/generators/convert-to-nx-project/convert-to-nx-project.js

@@ -1,83 +1,78 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.validateSchema = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const angular_json_1 = require("nx/src/adapter/angular-json");
 const output_1 = require("../../utils/output");
-function validateSchema(schema, configName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (schema.project && schema.all) {
-            throw new Error('--project and --all are mutually exclusive');
-        }
-        if (schema.project && schema.reformat) {
-            throw new Error('--project and --reformat are mutually exclusive');
-        }
-        if (schema.all && schema.reformat) {
-            throw new Error('--all and --reformat are mutually exclusive');
-        }
-        if ((configName === 'workspace.json' && schema.project) ||
-            (configName === 'workspace.json' && schema.reformat)) {
-            throw new Error('workspace.json is no longer supported. Please pass --all to convert all projects and remove workspace.json.');
-        }
-        if (!schema.project && !schema.all && !schema.reformat) {
-            schema.all = true;
-        }
-    });
+async function validateSchema(schema, configName) {
+    if (schema.project && schema.all) {
+        throw new Error('--project and --all are mutually exclusive');
+    }
+    if (schema.project && schema.reformat) {
+        throw new Error('--project and --reformat are mutually exclusive');
+    }
+    if (schema.all && schema.reformat) {
+        throw new Error('--all and --reformat are mutually exclusive');
+    }
+    if ((configName === 'workspace.json' && schema.project) ||
+        (configName === 'workspace.json' && schema.reformat)) {
+        throw new Error('workspace.json is no longer supported. Please pass --all to convert all projects and remove workspace.json.');
+    }
+    if (!schema.project && !schema.all && !schema.reformat) {
+        schema.all = true;
+    }
 }
 exports.validateSchema = validateSchema;
-function convertToNxProjectGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const configName = host.exists('angular.json')
-            ? 'angular.json'
-            : 'workspace.json';
-        if (!host.exists(configName))
-            return;
-        yield validateSchema(schema, configName);
-        const projects = (0, angular_json_1.toNewFormat)((0, devkit_1.readJson)(host, configName)).projects;
-        const leftOverProjects = {};
-        for (const projectName of Object.keys(projects)) {
-            const config = projects[projectName];
-            if ((!schema.project || schema.project === projectName) &&
-                !schema.reformat) {
-                if (typeof config === 'string') {
-                    // configuration is in project.json
-                    const projectConfig = (0, devkit_1.readJson)(host, (0, path_1.join)(config, 'project.json'));
-                    if (projectConfig.name !== projectName) {
-                        projectConfig.name = projectName;
-                        projectConfig.root = config;
-                        (0, devkit_1.updateProjectConfiguration)(host, projectName, projectConfig);
-                    }
-                }
-                else {
-                    // configuration is an object in workspace.json
-                    const path = (0, path_1.join)(config.root, 'project.json');
-                    if (!host.exists(path)) {
-                        projects[projectName].name = projectName;
-                        (0, devkit_1.addProjectConfiguration)(host, path, projects[projectName]);
-                    }
+async function convertToNxProjectGenerator(host, schema) {
+    const configName = host.exists('angular.json')
+        ? 'angular.json'
+        : 'workspace.json';
+    if (!host.exists(configName))
+        return;
+    await validateSchema(schema, configName);
+    const projects = (0, angular_json_1.toNewFormat)((0, devkit_1.readJson)(host, configName)).projects;
+    const leftOverProjects = {};
+    for (const projectName of Object.keys(projects)) {
+        const config = projects[projectName];
+        if ((!schema.project || schema.project === projectName) &&
+            !schema.reformat) {
+            if (typeof config === 'string') {
+                // configuration is in project.json
+                const projectConfig = (0, devkit_1.readJson)(host, (0, path_1.join)(config, 'project.json'));
+                if (projectConfig.name !== projectName) {
+                    projectConfig.name = projectName;
+                    projectConfig.root = config;
+                    (0, devkit_1.updateProjectConfiguration)(host, projectName, projectConfig);
                 }
             }
             else {
-                leftOverProjects[projectName] = config;
+                // configuration is an object in workspace.json
+                const path = (0, path_1.join)(config.root, 'project.json');
+                if (!host.exists(path)) {
+                    projects[projectName].name = projectName;
+                    (0, devkit_1.addProjectConfiguration)(host, path, projects[projectName]);
+                }
             }
         }
-        if (Object.keys(leftOverProjects).length > 0) {
-            (0, devkit_1.writeJson)(host, 'angular.json', (0, angular_json_1.toOldFormat)({ version: 1, projects: leftOverProjects }));
-        }
         else {
-            host.delete(configName);
-        }
-        if (!schema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
+            leftOverProjects[projectName] = config;
         }
-        output_1.output.note({
-            title: 'Use "nx show projects" to read the list of projects.',
-            bodyLines: [
-                `If you read the list of projects from ${configName}, use "nx show projects" instead.`,
-            ],
-        });
+    }
+    if (Object.keys(leftOverProjects).length > 0) {
+        (0, devkit_1.writeJson)(host, 'angular.json', (0, angular_json_1.toOldFormat)({ version: 1, projects: leftOverProjects }));
+    }
+    else {
+        host.delete(configName);
+    }
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    output_1.output.note({
+        title: 'Use "nx show projects" to read the list of projects.',
+        bodyLines: [
+            `If you read the list of projects from ${configName}, use "nx show projects" instead.`,
+        ],
     });
 }
 exports.convertToNxProjectGenerator = convertToNxProjectGenerator;

package/src/generators/move/lib/create-project-configuration-in-new-destination.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProjectConfigurationInNewDestination = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 function createProjectConfigurationInNewDestination(tree, schema, projectConfig) {
-    var _a;
     projectConfig.name = schema.newProjectName;
     const isRootProject = projectConfig.root === '.';
     // Subtle bug if project name === path, where the updated name was being overrideen.
-    const { name } = projectConfig, rest = tslib_1.__rest(projectConfig, ["name"]);
+    const { name, ...rest } = projectConfig;
     // replace old root path with new one
     let newProjectString = JSON.stringify(rest);
     if (isRootProject) {
@@ -21,7 +19,10 @@ function createProjectConfigurationInNewDestination(tree, schema, projectConfig)
     else {
         newProjectString = newProjectString.replace(new RegExp(projectConfig.root, 'g'), schema.relativeToRootDestination);
     }
-    const newProject = Object.assign({ name }, JSON.parse(newProjectString));
+    const newProject = {
+        name,
+        ...JSON.parse(newProjectString),
+    };
     newProject.root = schema.relativeToRootDestination;
     // Correct "e2e" target and config since part of the rename will be wrong unless we make the project name "e2e" more unique.
     // e.g. my-app-e2e is safer to search and replace than "e2e".
@@ -30,7 +31,7 @@ function createProjectConfigurationInNewDestination(tree, schema, projectConfig)
             const wrongName = schema.relativeToRootDestination;
             if (targetName !== wrongName)
                 continue;
-            if (((_a = targetConfig.options) === null || _a === void 0 ? void 0 : _a.testingType) === wrongName) {
+            if (targetConfig.options?.testingType === wrongName) {
                 targetConfig.options.testingType = 'e2e';
             }
             newProject.targets['e2e'] = targetConfig;

package/src/generators/move/lib/extract-base-configs.js

@@ -1,32 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.maybeExtractEslintConfigIfRootProject = exports.maybeExtractJestConfigBase = exports.maybeExtractTsConfigBase = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 function maybeExtractTsConfigBase(tree) {
     let extractTsConfigBase;
     try {
         extractTsConfigBase = require('@nx/' + 'js').extractTsConfigBase;
     }
-    catch (_a) {
+    catch {
         // Not installed, skip
         return;
     }
     extractTsConfigBase(tree);
 }
 exports.maybeExtractTsConfigBase = maybeExtractTsConfigBase;
-function maybeExtractJestConfigBase(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let jestInitGenerator;
-        try {
-            jestInitGenerator = require('@nx/' + 'jest').jestInitGenerator;
-        }
-        catch (_a) {
-            // Not installed, skip
-            return;
-        }
-        yield jestInitGenerator(tree, {});
-    });
+async function maybeExtractJestConfigBase(tree) {
+    let jestInitGenerator;
+    try {
+        jestInitGenerator = require('@nx/' + 'jest').jestInitGenerator;
+    }
+    catch {
+        // Not installed, skip
+        return;
+    }
+    await jestInitGenerator(tree, {});
 }
 exports.maybeExtractJestConfigBase = maybeExtractJestConfigBase;
 function maybeExtractEslintConfigIfRootProject(tree, rootProject) {
@@ -39,12 +36,12 @@ function maybeExtractEslintConfigIfRootProject(tree, rootProject) {
         migrateConfigToMonorepoStyle = require('@nx/' +
             'linter/src/generators/init/init-migration').migrateConfigToMonorepoStyle;
     }
-    catch (_a) {
+    catch {
         // linter not install
     }
     // Only need to handle migrating the root rootProject.
     // If other libs/apps exist, then this migration is already done by `@nx/linter:lint-rootProject` generator.
-    migrateConfigToMonorepoStyle === null || migrateConfigToMonorepoStyle === void 0 ? void 0 : migrateConfigToMonorepoStyle([rootProject.name], tree, tree.exists((0, devkit_1.joinPathFragments)(rootProject.root, 'jest.config.ts')) ||
+    migrateConfigToMonorepoStyle?.([rootProject.name], tree, tree.exists((0, devkit_1.joinPathFragments)(rootProject.root, 'jest.config.ts')) ||
         tree.exists((0, devkit_1.joinPathFragments)(rootProject.root, 'jest.config.js'))
         ? 'jest'
         : 'none');

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

@@ -4,9 +4,15 @@ exports.normalizeSchema = void 0;
 const utils_1 = require("./utils");
 const get_import_path_1 = require("../../../utilities/get-import-path");
 function normalizeSchema(tree, schema, projectConfiguration) {
-    var _a, _b;
     const destination = (0, utils_1.normalizePathSlashes)(schema.destination);
-    const newProjectName = (_a = schema.newProjectName) !== null && _a !== void 0 ? _a : (0, utils_1.getNewProjectName)(destination);
-    return Object.assign(Object.assign({}, schema), { destination, importPath: (_b = schema.importPath) !== null && _b !== void 0 ? _b : (0, utils_1.normalizePathSlashes)((0, get_import_path_1.getImportPath)(tree, destination)), newProjectName, relativeToRootDestination: (0, utils_1.getDestination)(tree, schema, projectConfiguration) });
+    const newProjectName = schema.newProjectName ?? (0, utils_1.getNewProjectName)(destination);
+    return {
+        ...schema,
+        destination,
+        importPath: schema.importPath ??
+            (0, utils_1.normalizePathSlashes)((0, get_import_path_1.getImportPath)(tree, destination)),
+        newProjectName,
+        relativeToRootDestination: (0, utils_1.getDestination)(tree, schema, projectConfiguration),
+    };
 }
 exports.normalizeSchema = normalizeSchema;

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

@@ -18,7 +18,7 @@ function updateEslintConfig(tree, schema, project) {
          } = require('@nx/linter/src/generators/utils/eslint-file');
         updateRelativePathsInConfig(tree, project.root, schema.relativeToRootDestination);
     }
-    catch (_a) {
+    catch {
         devkit_1.output.warn({
             title: `Could not update the eslint config file.`,
             bodyLines: [

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

@@ -14,7 +14,6 @@ let tsModule;
  * @param schema The options provided to the schematic
  */
 function updateImports(tree, schema, project) {
-    var _a, _b, _c, _d, _e;
     if (project.projectType === 'application') {
         // These shouldn't be imported anywhere?
         return;
@@ -29,12 +28,12 @@ function updateImports(tree, schema, project) {
     let secondaryEntryPointImportPaths;
     if (tree.exists(tsConfigPath)) {
         tsConfig = (0, devkit_1.readJson)(tree, tsConfigPath);
-        const sourceRoot = (_a = project.sourceRoot) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(project.root, 'src');
-        mainEntryPointImportPath = Object.keys((_c = (_b = tsConfig.compilerOptions) === null || _b === void 0 ? void 0 : _b.paths) !== null && _c !== void 0 ? _c : {}).find((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(sourceRoot))));
-        secondaryEntryPointImportPaths = Object.keys((_e = (_d = tsConfig.compilerOptions) === null || _d === void 0 ? void 0 : _d.paths) !== null && _e !== void 0 ? _e : {}).filter((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(project.root)) &&
+        const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
+        mainEntryPointImportPath = Object.keys(tsConfig.compilerOptions?.paths ?? {}).find((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(sourceRoot))));
+        secondaryEntryPointImportPaths = Object.keys(tsConfig.compilerOptions?.paths ?? {}).filter((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(project.root)) &&
             !x.startsWith(ensureTrailingSlash(sourceRoot))));
     }
-    mainEntryPointImportPath !== null && mainEntryPointImportPath !== void 0 ? mainEntryPointImportPath : (mainEntryPointImportPath = (0, utils_1.normalizePathSlashes)((0, get_import_path_1.getImportPath)(tree, project.root.slice(libsDir.length).replace(/^\/|\\/, ''))));
+    mainEntryPointImportPath ??= (0, utils_1.normalizePathSlashes)((0, get_import_path_1.getImportPath)(tree, project.root.slice(libsDir.length).replace(/^\/|\\/, '')));
     const projectRefs = [
         {
             from: mainEntryPointImportPath,