@nx/node 16.8.0-beta.4 → 16.8.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "16.8.0-beta.4",
+  "version": "16.8.0-beta.5",
   "private": false,
   "description": "The Node Plugin for Nx contains generators to manage Node applications within an Nx workspace.",
   "repository": {
@@ -30,17 +30,17 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/node": "16.8.0-beta.4",
-    "@nx/devkit": "16.8.0-beta.4",
-    "@nx/jest": "16.8.0-beta.4",
-    "@nx/js": "16.8.0-beta.4",
-    "@nx/linter": "16.8.0-beta.4",
-    "@nx/workspace": "16.8.0-beta.4",
+    "@nrwl/node": "16.8.0-beta.5",
+    "@nx/devkit": "16.8.0-beta.5",
+    "@nx/jest": "16.8.0-beta.5",
+    "@nx/js": "16.8.0-beta.5",
+    "@nx/linter": "16.8.0-beta.5",
+    "@nx/workspace": "16.8.0-beta.5",
     "tslib": "^2.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "c9aad2dc8c2b34531cf61549bff872e68c481e4e"
+  "gitHead": "ad2d1e8a55b2d1b358bb5e7483343d9757ff2c53"
 }

package/src/generators/application/application.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationSchematic = exports.applicationGeneratorInternal = exports.applicationGenerator = exports.addLintingToApplication = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const jest_1 = require("@nx/jest");
@@ -31,7 +30,9 @@ function getWebpackBuildConfig(project, options) {
         },
         configurations: {
             development: {},
-            production: Object.assign({}, (options.docker && { generateLockfile: true })),
+            production: {
+                ...(options.docker && { generateLockfile: true }),
+            },
         },
     };
 }
@@ -58,11 +59,14 @@ function getEsBuildConfig(project, options) {
         },
         configurations: {
             development: {},
-            production: Object.assign(Object.assign({}, (options.docker && { generateLockfile: true })), { esbuildOptions: {
+            production: {
+                ...(options.docker && { generateLockfile: true }),
+                esbuildOptions: {
                     sourcemap: false,
                     // Generate CJS files as .js so imports can be './foo' rather than './foo.cjs'.
                     outExtension: { '.js': '.js' },
-                } }),
+                },
+            },
         },
     };
 }
@@ -99,12 +103,26 @@ function addProject(tree, options) {
     (0, devkit_1.addProjectConfiguration)(tree, options.name, project, options.standaloneConfig);
 }
 function addAppFiles(tree, options) {
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/common'), options.appProjectRoot, Object.assign(Object.assign({}, options), { tmpl: '', name: options.name, root: options.appProjectRoot, offset: (0, devkit_1.offsetFromRoot)(options.appProjectRoot), rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot) }));
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/common'), options.appProjectRoot, {
+        ...options,
+        tmpl: '',
+        name: options.name,
+        root: options.appProjectRoot,
+        offset: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
+        rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot),
+    });
     if (options.bundler !== 'webpack') {
         tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js'));
     }
     if (options.framework && options.framework !== 'none') {
-        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, `./files/${options.framework}`), options.appProjectRoot, Object.assign(Object.assign({}, options), { tmpl: '', name: options.name, root: options.appProjectRoot, offset: (0, devkit_1.offsetFromRoot)(options.appProjectRoot), rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot) }));
+        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, `./files/${options.framework}`), options.appProjectRoot, {
+            ...options,
+            tmpl: '',
+            name: options.name,
+            root: options.appProjectRoot,
+            offset: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
+            rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot),
+        });
     }
     if (options.js) {
         (0, devkit_1.toJS)(tree);
@@ -117,7 +135,10 @@ function addProxy(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.frontendProject);
     if (projectConfig.targets && projectConfig.targets.serve) {
         const pathToProxyFile = `${projectConfig.root}/proxy.conf.json`;
-        projectConfig.targets.serve.options = Object.assign(Object.assign({}, projectConfig.targets.serve.options), { proxyConfig: pathToProxyFile });
+        projectConfig.targets.serve.options = {
+            ...projectConfig.targets.serve.options,
+            proxyConfig: pathToProxyFile,
+        };
         if (!tree.exists(pathToProxyFile)) {
             tree.write(pathToProxyFile, JSON.stringify({
                 '/api': {
@@ -129,33 +150,34 @@ function addProxy(tree, options) {
         else {
             //add new entry to existing config
             const proxyFileContent = tree.read(pathToProxyFile).toString();
-            const proxyModified = Object.assign(Object.assign({}, JSON.parse(proxyFileContent)), { [`/${options.name}-api`]: {
+            const proxyModified = {
+                ...JSON.parse(proxyFileContent),
+                [`/${options.name}-api`]: {
                     target: `http://localhost:${options.port}`,
                     secure: false,
-                } });
+                },
+            };
             tree.write(pathToProxyFile, JSON.stringify(proxyModified, null, 2));
         }
         (0, devkit_1.updateProjectConfiguration)(tree, options.frontendProject, projectConfig);
     }
 }
-function addLintingToApplication(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const lintTask = yield (0, linter_1.lintProjectGenerator)(tree, {
-            linter: options.linter,
-            project: options.name,
-            tsConfigPaths: [
-                (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-            ],
-            eslintFilePatterns: [
-                (0, lint_project_1.mapLintPattern)(options.appProjectRoot, options.js ? 'js' : 'ts', options.rootProject),
-            ],
-            unitTestRunner: options.unitTestRunner,
-            skipFormat: true,
-            setParserOptionsProject: options.setParserOptionsProject,
-            rootProject: options.rootProject,
-        });
-        return lintTask;
+async function addLintingToApplication(tree, options) {
+    const lintTask = await (0, linter_1.lintProjectGenerator)(tree, {
+        linter: options.linter,
+        project: options.name,
+        tsConfigPaths: [
+            (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
+        ],
+        eslintFilePatterns: [
+            (0, lint_project_1.mapLintPattern)(options.appProjectRoot, options.js ? 'js' : 'ts', options.rootProject),
+        ],
+        unitTestRunner: options.unitTestRunner,
+        skipFormat: true,
+        setParserOptionsProject: options.setParserOptionsProject,
+        rootProject: options.rootProject,
     });
+    return lintTask;
 }
 exports.addLintingToApplication = addLintingToApplication;
 function addProjectDependencies(tree, options) {
@@ -191,95 +213,146 @@ function addProjectDependencies(tree, options) {
         },
         fastify: {},
     };
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, Object.assign({}, frameworkDependencies[options.framework]), Object.assign(Object.assign({}, frameworkDevDependencies[options.framework]), bundlers[options.bundler]));
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {
+        ...frameworkDependencies[options.framework],
+    }, {
+        ...frameworkDevDependencies[options.framework],
+        ...bundlers[options.bundler],
+    });
 }
 function updateTsConfigOptions(tree, options) {
     (0, devkit_1.updateJson)(tree, `${options.appProjectRoot}/tsconfig.json`, (json) => {
         if (options.rootProject) {
-            return Object.assign(Object.assign({ compilerOptions: Object.assign(Object.assign(Object.assign({}, js_1.tsConfigBaseOptions), json.compilerOptions), { esModuleInterop: true }) }, json), { extends: undefined, exclude: ['node_modules', 'tmp'] });
+            return {
+                compilerOptions: {
+                    ...js_1.tsConfigBaseOptions,
+                    ...json.compilerOptions,
+                    esModuleInterop: true,
+                },
+                ...json,
+                extends: undefined,
+                exclude: ['node_modules', 'tmp'],
+            };
         }
         else {
-            return Object.assign(Object.assign({}, json), { compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { esModuleInterop: true }) });
+            return {
+                ...json,
+                compilerOptions: {
+                    ...json.compilerOptions,
+                    esModuleInterop: true,
+                },
+            };
         }
     });
 }
-function applicationGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield applicationGeneratorInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function applicationGenerator(tree, schema) {
+    return await applicationGeneratorInternal(tree, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.applicationGenerator = applicationGenerator;
-function applicationGeneratorInternal(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield normalizeOptions(tree, schema);
-        const tasks = [];
-        if (options.framework === 'nest') {
-            const { applicationGenerator } = (0, devkit_1.ensurePackage)('@nx/nest', versions_2.nxVersion);
-            return yield applicationGenerator(tree, Object.assign(Object.assign({}, options), { skipFormat: true }));
-        }
-        const initTask = yield (0, init_1.initGenerator)(tree, Object.assign(Object.assign({}, schema), { skipFormat: true }));
-        tasks.push(initTask);
-        const installTask = addProjectDependencies(tree, options);
-        tasks.push(installTask);
-        addAppFiles(tree, options);
-        addProject(tree, options);
-        updateTsConfigOptions(tree, options);
-        if (options.linter === linter_1.Linter.EsLint) {
-            const lintTask = yield addLintingToApplication(tree, options);
-            tasks.push(lintTask);
-        }
-        if (options.unitTestRunner === 'jest') {
-            const jestTask = yield (0, jest_1.configurationGenerator)(tree, Object.assign(Object.assign({}, options), { project: options.name, setupFile: 'none', skipSerializers: true, supportTsx: options.js, testEnvironment: 'node', compiler: options.swcJest ? 'swc' : 'tsc', skipFormat: true }));
-            tasks.push(jestTask);
-        }
-        else {
-            // No need for default spec file if unit testing is not setup.
-            tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/app/app.spec.ts'));
-        }
-        if (options.e2eTestRunner === 'jest') {
-            const e2eTask = yield (0, e2e_project_1.e2eProjectGenerator)(tree, Object.assign(Object.assign({}, options), { projectType: options.framework === 'none' ? 'cli' : 'server', name: options.rootProject ? 'e2e' : `${options.name}-e2e`, directory: options.rootProject ? 'e2e' : `${options.appProjectRoot}-e2e`, projectNameAndRootFormat: 'as-provided', project: options.name, port: options.port, isNest: options.isNest, skipFormat: true }));
-            tasks.push(e2eTask);
-        }
-        if (options.js) {
-            (0, devkit_1.updateTsConfigsToJs)(tree, { projectRoot: options.appProjectRoot });
-        }
-        if (options.frontendProject) {
-            addProxy(tree, options);
-        }
-        if (options.docker) {
-            const dockerTask = yield (0, setup_docker_1.setupDockerGenerator)(tree, Object.assign(Object.assign({}, options), { project: options.name, skipFormat: true }));
-            tasks.push(dockerTask);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function applicationGeneratorInternal(tree, schema) {
+    const options = await normalizeOptions(tree, schema);
+    const tasks = [];
+    if (options.framework === 'nest') {
+        const { applicationGenerator } = (0, devkit_1.ensurePackage)('@nx/nest', versions_2.nxVersion);
+        return await applicationGenerator(tree, { ...options, skipFormat: true });
+    }
+    const initTask = await (0, init_1.initGenerator)(tree, {
+        ...schema,
+        skipFormat: true,
     });
+    tasks.push(initTask);
+    const installTask = addProjectDependencies(tree, options);
+    tasks.push(installTask);
+    addAppFiles(tree, options);
+    addProject(tree, options);
+    updateTsConfigOptions(tree, options);
+    if (options.linter === linter_1.Linter.EsLint) {
+        const lintTask = await addLintingToApplication(tree, options);
+        tasks.push(lintTask);
+    }
+    if (options.unitTestRunner === 'jest') {
+        const jestTask = await (0, jest_1.configurationGenerator)(tree, {
+            ...options,
+            project: options.name,
+            setupFile: 'none',
+            skipSerializers: true,
+            supportTsx: options.js,
+            testEnvironment: 'node',
+            compiler: options.swcJest ? 'swc' : 'tsc',
+            skipFormat: true,
+        });
+        tasks.push(jestTask);
+    }
+    else {
+        // No need for default spec file if unit testing is not setup.
+        tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/app/app.spec.ts'));
+    }
+    if (options.e2eTestRunner === 'jest') {
+        const e2eTask = await (0, e2e_project_1.e2eProjectGenerator)(tree, {
+            ...options,
+            projectType: options.framework === 'none' ? 'cli' : 'server',
+            name: options.rootProject ? 'e2e' : `${options.name}-e2e`,
+            directory: options.rootProject ? 'e2e' : `${options.appProjectRoot}-e2e`,
+            projectNameAndRootFormat: 'as-provided',
+            project: options.name,
+            port: options.port,
+            isNest: options.isNest,
+            skipFormat: true,
+        });
+        tasks.push(e2eTask);
+    }
+    if (options.js) {
+        (0, devkit_1.updateTsConfigsToJs)(tree, { projectRoot: options.appProjectRoot });
+    }
+    if (options.frontendProject) {
+        addProxy(tree, options);
+    }
+    if (options.docker) {
+        const dockerTask = await (0, setup_docker_1.setupDockerGenerator)(tree, {
+            ...options,
+            project: options.name,
+            skipFormat: true,
+        });
+        tasks.push(dockerTask);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
-function normalizeOptions(host, options) {
-    var _a, _b, _c, _d, _e, _f;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-            name: options.name,
-            projectType: 'application',
-            directory: options.directory,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
-            rootProject: options.rootProject,
-            callingGenerator: '@nx/node:application',
-        });
-        options.rootProject = appProjectRoot === '.';
-        options.projectNameAndRootFormat = projectNameAndRootFormat;
-        options.bundler = (_a = options.bundler) !== null && _a !== void 0 ? _a : 'esbuild';
-        options.e2eTestRunner = (_b = options.e2eTestRunner) !== null && _b !== void 0 ? _b : 'jest';
-        const parsedTags = options.tags
-            ? options.tags.split(',').map((s) => s.trim())
-            : [];
-        return Object.assign(Object.assign({}, options), { name: appProjectName, frontendProject: options.frontendProject
-                ? (0, devkit_1.names)(options.frontendProject).fileName
-                : undefined, appProjectRoot,
-            parsedTags, linter: (_c = options.linter) !== null && _c !== void 0 ? _c : linter_1.Linter.EsLint, unitTestRunner: (_d = options.unitTestRunner) !== null && _d !== void 0 ? _d : 'jest', rootProject: (_e = options.rootProject) !== null && _e !== void 0 ? _e : false, port: (_f = options.port) !== null && _f !== void 0 ? _f : 3000 });
+async function normalizeOptions(host, options) {
+    const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+        name: options.name,
+        projectType: 'application',
+        directory: options.directory,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
+        rootProject: options.rootProject,
+        callingGenerator: '@nx/node:application',
     });
+    options.rootProject = appProjectRoot === '.';
+    options.projectNameAndRootFormat = projectNameAndRootFormat;
+    options.bundler = options.bundler ?? 'esbuild';
+    options.e2eTestRunner = options.e2eTestRunner ?? 'jest';
+    const parsedTags = options.tags
+        ? options.tags.split(',').map((s) => s.trim())
+        : [];
+    return {
+        ...options,
+        name: appProjectName,
+        frontendProject: options.frontendProject
+            ? (0, devkit_1.names)(options.frontendProject).fileName
+            : undefined,
+        appProjectRoot,
+        parsedTags,
+        linter: options.linter ?? linter_1.Linter.EsLint,
+        unitTestRunner: options.unitTestRunner ?? 'jest',
+        rootProject: options.rootProject ?? false,
+        port: options.port ?? 3000,
+    };
 }
 exports.default = applicationGenerator;
 exports.applicationSchematic = (0, devkit_1.convertNxGenerator)(applicationGenerator);

package/src/generators/e2e-project/e2e-project.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.e2eProjectSchematic = exports.e2eProjectGeneratorInternal = exports.e2eProjectGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const linter_1 = require("@nx/linter");
@@ -9,90 +8,106 @@ const global_eslint_config_1 = require("@nx/linter/src/generators/init/global-es
 const path = require("path");
 const versions_1 = require("../../utils/versions");
 const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
-function e2eProjectGenerator(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield e2eProjectGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, options));
+async function e2eProjectGenerator(host, options) {
+    return await e2eProjectGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...options,
     });
 }
 exports.e2eProjectGenerator = e2eProjectGenerator;
-function e2eProjectGeneratorInternal(host, _options) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const options = yield normalizeOptions(host, _options);
-        const appProject = (0, devkit_1.readProjectConfiguration)(host, options.project);
-        (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
-            root: options.e2eProjectRoot,
-            implicitDependencies: [options.project],
-            targets: {
-                e2e: {
-                    executor: '@nx/jest:jest',
-                    outputs: ['{workspaceRoot}/coverage/{e2eProjectRoot}'],
-                    options: {
-                        jestConfig: `${options.e2eProjectRoot}/jest.config.ts`,
-                        passWithNoTests: true,
-                    },
+async function e2eProjectGeneratorInternal(host, _options) {
+    const tasks = [];
+    const options = await normalizeOptions(host, _options);
+    const appProject = (0, devkit_1.readProjectConfiguration)(host, options.project);
+    (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
+        root: options.e2eProjectRoot,
+        implicitDependencies: [options.project],
+        targets: {
+            e2e: {
+                executor: '@nx/jest:jest',
+                outputs: ['{workspaceRoot}/coverage/{e2eProjectRoot}'],
+                options: {
+                    jestConfig: `${options.e2eProjectRoot}/jest.config.ts`,
+                    passWithNoTests: true,
                 },
             },
+        },
+    });
+    if (options.projectType === 'server') {
+        (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/server/common'), options.e2eProjectRoot, {
+            ...options,
+            ...(0, devkit_1.names)(options.rootProject ? 'server' : options.project),
+            offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
+            tmpl: '',
         });
-        if (options.projectType === 'server') {
-            (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/server/common'), options.e2eProjectRoot, Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.rootProject ? 'server' : options.project)), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot), tmpl: '' }));
-            if (options.isNest) {
-                (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/server/nest'), options.e2eProjectRoot, Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.rootProject ? 'server' : options.project)), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot), tmpl: '' }));
-            }
-        }
-        else if (options.projectType === 'cli') {
-            const mainFile = (_b = (_a = appProject.targets.build) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.outputPath;
-            (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/cli'), options.e2eProjectRoot, Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.rootProject ? 'cli' : options.project)), { mainFile, offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot), tmpl: '' }));
-        }
-        // axios is more than likely used in the application code, so install it as a regular dependency.
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, { axios: versions_1.axiosVersion }, {});
-        tasks.push(installTask);
-        if (options.linter === linter_1.Linter.EsLint) {
-            const linterTask = yield (0, linter_1.lintProjectGenerator)(host, {
-                project: options.e2eProjectName,
-                linter: linter_1.Linter.EsLint,
-                skipFormat: true,
-                tsConfigPaths: [
-                    (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'tsconfig.json'),
-                ],
-                eslintFilePatterns: [`${options.e2eProjectRoot}/**/*.{js,ts}`],
-                setParserOptionsProject: false,
-                skipPackageJson: false,
-                rootProject: options.rootProject,
+        if (options.isNest) {
+            (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/server/nest'), options.e2eProjectRoot, {
+                ...options,
+                ...(0, devkit_1.names)(options.rootProject ? 'server' : options.project),
+                offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
+                tmpl: '',
             });
-            tasks.push(linterTask);
-            if (options.rootProject && (0, eslint_file_1.isEslintConfigSupported)(host)) {
-                (0, eslint_file_1.addPluginsToLintConfig)(host, options.e2eProjectRoot, '@nx');
-                (0, eslint_file_1.replaceOverridesInLintConfig)(host, options.e2eProjectRoot, [
-                    global_eslint_config_1.typeScriptOverride,
-                    global_eslint_config_1.javaScriptOverride,
-                ]);
-            }
         }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
+    }
+    else if (options.projectType === 'cli') {
+        const mainFile = appProject.targets.build?.options?.outputPath;
+        (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/cli'), options.e2eProjectRoot, {
+            ...options,
+            ...(0, devkit_1.names)(options.rootProject ? 'cli' : options.project),
+            mainFile,
+            offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
+            tmpl: '',
+        });
+    }
+    // axios is more than likely used in the application code, so install it as a regular dependency.
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, { axios: versions_1.axiosVersion }, {});
+    tasks.push(installTask);
+    if (options.linter === linter_1.Linter.EsLint) {
+        const linterTask = await (0, linter_1.lintProjectGenerator)(host, {
+            project: options.e2eProjectName,
+            linter: linter_1.Linter.EsLint,
+            skipFormat: true,
+            tsConfigPaths: [
+                (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'tsconfig.json'),
+            ],
+            eslintFilePatterns: [`${options.e2eProjectRoot}/**/*.{js,ts}`],
+            setParserOptionsProject: false,
+            skipPackageJson: false,
+            rootProject: options.rootProject,
+        });
+        tasks.push(linterTask);
+        if (options.rootProject && (0, eslint_file_1.isEslintConfigSupported)(host)) {
+            (0, eslint_file_1.addPluginsToLintConfig)(host, options.e2eProjectRoot, '@nx');
+            (0, eslint_file_1.replaceOverridesInLintConfig)(host, options.e2eProjectRoot, [
+                global_eslint_config_1.typeScriptOverride,
+                global_eslint_config_1.javaScriptOverride,
+            ]);
         }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.e2eProjectGeneratorInternal = e2eProjectGeneratorInternal;
-function normalizeOptions(tree, options) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectName: e2eProjectName, projectRoot: e2eProjectRoot } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
-            name: (_a = options.name) !== null && _a !== void 0 ? _a : `${options.project}-e2e`,
-            projectType: 'library',
-            directory: options.rootProject ? 'e2e' : options.directory,
-            projectNameAndRootFormat: options.rootProject
-                ? 'as-provided'
-                : options.projectNameAndRootFormat,
-            // this is an internal generator, don't save defaults
-            callingGenerator: null,
-        });
-        return Object.assign(Object.assign({}, options), { e2eProjectRoot,
-            e2eProjectName, port: (_b = options.port) !== null && _b !== void 0 ? _b : 3000, rootProject: !!options.rootProject });
+async function normalizeOptions(tree, options) {
+    const { projectName: e2eProjectName, projectRoot: e2eProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+        name: options.name ?? `${options.project}-e2e`,
+        projectType: 'library',
+        directory: options.rootProject ? 'e2e' : options.directory,
+        projectNameAndRootFormat: options.rootProject
+            ? 'as-provided'
+            : options.projectNameAndRootFormat,
+        // this is an internal generator, don't save defaults
+        callingGenerator: null,
     });
+    return {
+        ...options,
+        e2eProjectRoot,
+        e2eProjectName,
+        port: options.port ?? 3000,
+        rootProject: !!options.rootProject,
+    };
 }
 exports.default = e2eProjectGenerator;
 exports.e2eProjectSchematic = (0, devkit_1.convertNxGenerator)(e2eProjectGenerator);

package/src/generators/init/init.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initSchematic = exports.initGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const jest_1 = require("@nx/jest");
 const js_1 = require("@nx/js");
@@ -13,23 +12,27 @@ function updateDependencies(tree) {
     }, { '@nx/node': versions_1.nxVersion, '@types/node': versions_1.typesNodeVersion });
 }
 function normalizeOptions(schema) {
-    var _a;
-    return Object.assign(Object.assign({}, schema), { unitTestRunner: (_a = schema.unitTestRunner) !== null && _a !== void 0 ? _a : 'jest' });
+    return {
+        ...schema,
+        unitTestRunner: schema.unitTestRunner ?? 'jest',
+    };
 }
-function initGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(schema);
-        const tasks = [];
-        tasks.push(yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, schema), { tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', skipFormat: true })));
-        if (options.unitTestRunner === 'jest') {
-            tasks.push(yield (0, jest_1.jestInitGenerator)(tree, Object.assign(Object.assign({}, schema), { testEnvironment: 'node' })));
-        }
-        tasks.push(updateDependencies(tree));
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+async function initGenerator(tree, schema) {
+    const options = normalizeOptions(schema);
+    const tasks = [];
+    tasks.push(await (0, js_1.initGenerator)(tree, {
+        ...schema,
+        tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
+        skipFormat: true,
+    }));
+    if (options.unitTestRunner === 'jest') {
+        tasks.push(await (0, jest_1.jestInitGenerator)(tree, { ...schema, testEnvironment: 'node' }));
+    }
+    tasks.push(updateDependencies(tree));
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.initGenerator = initGenerator;
 exports.default = initGenerator;

package/src/generators/library/library.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.librarySchematic = exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const js_1 = require("@nx/js");
@@ -9,63 +8,74 @@ const add_swc_config_1 = require("@nx/js/src/utils/swc/add-swc-config");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
 const path_1 = require("path");
 const init_1 = require("../init/init");
-function libraryGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield libraryGeneratorInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function libraryGenerator(tree, schema) {
+    return await libraryGeneratorInternal(tree, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.libraryGenerator = libraryGenerator;
-function libraryGeneratorInternal(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield normalizeOptions(tree, schema);
-        const tasks = [
-            yield (0, init_1.initGenerator)(tree, Object.assign(Object.assign({}, options), { skipFormat: true })),
-        ];
-        if (options.publishable === true && !schema.importPath) {
-            throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
-        }
-        const libraryInstall = yield (0, js_1.libraryGenerator)(tree, Object.assign(Object.assign({}, schema), { bundler: schema.buildable ? 'tsc' : 'none', includeBabelRc: schema.babelJest, importPath: options.importPath, testEnvironment: 'node', skipFormat: true, setParserOptionsProject: options.setParserOptionsProject }));
-        tasks.push(libraryInstall);
-        createFiles(tree, options);
-        if (options.js) {
-            (0, devkit_1.updateTsConfigsToJs)(tree, options);
-        }
-        updateProject(tree, options);
-        if (!schema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function libraryGeneratorInternal(tree, schema) {
+    const options = await normalizeOptions(tree, schema);
+    const tasks = [
+        await (0, init_1.initGenerator)(tree, {
+            ...options,
+            skipFormat: true,
+        }),
+    ];
+    if (options.publishable === true && !schema.importPath) {
+        throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
+    }
+    const libraryInstall = await (0, js_1.libraryGenerator)(tree, {
+        ...schema,
+        bundler: schema.buildable ? 'tsc' : 'none',
+        includeBabelRc: schema.babelJest,
+        importPath: options.importPath,
+        testEnvironment: 'node',
+        skipFormat: true,
+        setParserOptionsProject: options.setParserOptionsProject,
     });
+    tasks.push(libraryInstall);
+    createFiles(tree, options);
+    if (options.js) {
+        (0, devkit_1.updateTsConfigsToJs)(tree, options);
+    }
+    updateProject(tree, options);
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 exports.default = libraryGenerator;
 exports.librarySchematic = (0, devkit_1.convertNxGenerator)(libraryGenerator);
-function normalizeOptions(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectName, names: projectNames, projectRoot, importPath, projectNameAndRootFormat, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
-            name: options.name,
-            projectType: 'library',
-            directory: options.directory,
-            importPath: options.importPath,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
-            callingGenerator: '@nx/node:library',
-        });
-        options.projectNameAndRootFormat = projectNameAndRootFormat;
-        const fileName = getCaseAwareFileName({
-            fileName: options.simpleModuleName
-                ? projectNames.projectSimpleName
-                : projectNames.projectFileName,
-            pascalCaseFiles: options.pascalCaseFiles,
-        });
-        const parsedTags = options.tags
-            ? options.tags.split(',').map((s) => s.trim())
-            : [];
-        return Object.assign(Object.assign({}, options), { fileName,
-            projectName,
-            projectRoot,
-            parsedTags,
-            importPath });
+async function normalizeOptions(tree, options) {
+    const { projectName, names: projectNames, projectRoot, importPath, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+        name: options.name,
+        projectType: 'library',
+        directory: options.directory,
+        importPath: options.importPath,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
+        callingGenerator: '@nx/node:library',
     });
+    options.projectNameAndRootFormat = projectNameAndRootFormat;
+    const fileName = getCaseAwareFileName({
+        fileName: options.simpleModuleName
+            ? projectNames.projectSimpleName
+            : projectNames.projectFileName,
+        pascalCaseFiles: options.pascalCaseFiles,
+    });
+    const parsedTags = options.tags
+        ? options.tags.split(',').map((s) => s.trim())
+        : [];
+    return {
+        ...options,
+        fileName,
+        projectName,
+        projectRoot,
+        parsedTags,
+        importPath,
+    };
 }
 function getCaseAwareFileName(options) {
     const normalized = (0, devkit_1.names)(options.fileName);
@@ -73,9 +83,14 @@ function getCaseAwareFileName(options) {
 }
 function createFiles(tree, options) {
     const { className, name, propertyName } = (0, devkit_1.names)(options.fileName);
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/lib'), options.projectRoot, Object.assign(Object.assign({}, options), { className,
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/lib'), options.projectRoot, {
+        ...options,
+        className,
         name,
-        propertyName, tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot) }));
+        propertyName,
+        tmpl: '',
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
+    });
     if (options.unitTestRunner === 'none') {
         tree.delete((0, path_1.join)(options.projectRoot, `./src/lib/${options.fileName}.spec.ts`));
     }

package/src/generators/setup-docker/setup-docker.js

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupDockerSchematic = exports.setupDockerGenerator = exports.updateProjectConfig = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 function normalizeOptions(tree, setupOptions) {
-    var _a, _b, _c;
-    return Object.assign(Object.assign({}, setupOptions), { project: (_a = setupOptions.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject, targetName: (_b = setupOptions.targetName) !== null && _b !== void 0 ? _b : 'docker-build', buildTarget: (_c = setupOptions.buildTarget) !== null && _c !== void 0 ? _c : 'build' });
+    return {
+        ...setupOptions,
+        project: setupOptions.project ?? (0, devkit_1.readNxJson)(tree).defaultProject,
+        targetName: setupOptions.targetName ?? 'docker-build',
+        buildTarget: setupOptions.buildTarget ?? 'build',
+    };
 }
 function addDocker(tree, options) {
-    var _a;
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (!project || !options.targetName) {
         return;
@@ -18,7 +20,7 @@ function addDocker(tree, options) {
         devkit_1.logger.info(`Skipping setup since a Dockerfile already exists inside ${project.root}`);
     }
     else {
-        const outputPath = (_a = project.targets[`${options.buildTarget}`]) === null || _a === void 0 ? void 0 : _a.options.outputPath;
+        const outputPath = project.targets[`${options.buildTarget}`]?.options.outputPath;
         (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), project.root, {
             tmpl: '',
             app: project.sourceRoot,
@@ -36,18 +38,16 @@ function updateProjectConfig(tree, options) {
     (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
 }
 exports.updateProjectConfig = updateProjectConfig;
-function setupDockerGenerator(tree, setupOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const options = normalizeOptions(tree, setupOptions);
-        // Should check if the node project exists
-        addDocker(tree, options);
-        updateProjectConfig(tree, options);
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+async function setupDockerGenerator(tree, setupOptions) {
+    const tasks = [];
+    const options = normalizeOptions(tree, setupOptions);
+    // Should check if the node project exists
+    addDocker(tree, options);
+    updateProjectConfig(tree, options);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.setupDockerGenerator = setupDockerGenerator;
 exports.default = setupDockerGenerator;

package/src/migrations/update-13-0-0/remove-deprecated-options-13-0-0.js

@@ -1,30 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function update(host) {
-    var _a, _b, _c, _d, _e;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(host);
-        for (const [name, config] of projects.entries()) {
-            if (config.targets.build.executor !== '@nrwl/node:build')
-                return;
-            let updated = false;
-            if (typeof ((_c = (_b = (_a = config.targets.build) === null || _a === void 0 ? void 0 : _a.configurations) === null || _b === void 0 ? void 0 : _b.production) === null || _c === void 0 ? void 0 : _c['showCircularDependencies']) !== 'undefined') {
-                delete config.targets.build.configurations.production['showCircularDependencies'];
-                updated = true;
-            }
-            if (typeof ((_e = (_d = config.targets.build) === null || _d === void 0 ? void 0 : _d.options) === null || _e === void 0 ? void 0 : _e['showCircularDependencies']) !==
-                'undefined') {
-                delete config.targets.build.options['showCircularDependencies'];
-                updated = true;
-            }
-            if (updated) {
-                (0, devkit_1.updateProjectConfiguration)(host, name, config);
-                devkit_1.logger.info(`NX Removed legacy build option from "${name}": showCircularDependencies`);
-            }
+async function update(host) {
+    const projects = (0, devkit_1.getProjects)(host);
+    for (const [name, config] of projects.entries()) {
+        if (config.targets.build.executor !== '@nrwl/node:build')
+            return;
+        let updated = false;
+        if (typeof config.targets.build?.configurations?.production?.['showCircularDependencies'] !== 'undefined') {
+            delete config.targets.build.configurations.production['showCircularDependencies'];
+            updated = true;
         }
-        yield (0, devkit_1.formatFiles)(host);
-    });
+        if (typeof config.targets.build?.options?.['showCircularDependencies'] !==
+            'undefined') {
+            delete config.targets.build.options['showCircularDependencies'];
+            updated = true;
+        }
+        if (updated) {
+            (0, devkit_1.updateProjectConfiguration)(host, name, config);
+            devkit_1.logger.info(`NX Removed legacy build option from "${name}": showCircularDependencies`);
+        }
+    }
+    await (0, devkit_1.formatFiles)(host);
 }
 exports.default = update;

package/src/migrations/update-13-0-0/remove-webpack-5-packages-13-0-0.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const packages = [
     'webpack',
@@ -15,18 +14,15 @@ const packages = [
     'react-refresh',
     '@pmmmwh/react-refresh-webpack-plugin',
 ];
-function update(tree) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
-        let task = undefined;
-        // Undo the install by `nx g @nrwl/web:webpack5` in Nx 12.
-        if (((_a = packageJson.devDependencies['webpack']) === null || _a === void 0 ? void 0 : _a.match(/^([\^~])?5\./)) &&
-            packages.every((p) => packageJson.devDependencies[p])) {
-            task = (0, devkit_1.removeDependenciesFromPackageJson)(tree, [], packages);
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return task;
-    });
+async function update(tree) {
+    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
+    let task = undefined;
+    // Undo the install by `nx g @nrwl/web:webpack5` in Nx 12.
+    if (packageJson.devDependencies['webpack']?.match(/^([\^~])?5\./) &&
+        packages.every((p) => packageJson.devDependencies[p])) {
+        task = (0, devkit_1.removeDependenciesFromPackageJson)(tree, [], packages);
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return task;
 }
 exports.default = update;

package/src/migrations/update-13-8-5/rename-build-to-webpack.js

@@ -1,16 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-function update(host) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, executor_options_utils_1.forEachExecutorOptions)(host, '@nrwl/node:build', (_, projectName, targetName) => {
-            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, projectName);
-            projectConfiguration.targets[targetName].executor = '@nrwl/node:webpack';
-            (0, devkit_1.updateProjectConfiguration)(host, projectName, projectConfiguration);
-        });
-        yield (0, devkit_1.formatFiles)(host);
+async function update(host) {
+    (0, executor_options_utils_1.forEachExecutorOptions)(host, '@nrwl/node:build', (_, projectName, targetName) => {
+        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, projectName);
+        projectConfiguration.targets[targetName].executor = '@nrwl/node:webpack';
+        (0, devkit_1.updateProjectConfiguration)(host, projectName, projectConfiguration);
     });
+    await (0, devkit_1.formatFiles)(host);
 }
 exports.default = update;

package/src/migrations/update-13-8-5/rename-execute-to-node.js

@@ -1,16 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/node:execute', (_, projectName, targetName) => {
-            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            projectConfiguration.targets[targetName].executor = '@nrwl/node:node';
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+async function update(tree) {
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/node:execute', (_, projectName, targetName) => {
+        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        projectConfiguration.targets[targetName].executor = '@nrwl/node:node';
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;

package/src/migrations/update-13-8-5/update-package-to-tsc.js

@@ -1,38 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const versions_1 = require("@nx/workspace/src/utils/versions");
-function update(host) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let installNeeded = false;
-        (0, executor_options_utils_1.forEachExecutorOptions)(host, '@nrwl/node:package', (_, projectName, targetName) => {
-            var _a, _b;
-            installNeeded = true;
-            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, projectName);
-            projectConfiguration.targets[targetName].executor = '@nrwl/js:tsc';
-            const transformers = (_a = projectConfiguration.targets[targetName].options) === null || _a === void 0 ? void 0 : _a.tsPlugins;
-            if (transformers) {
-                delete projectConfiguration.targets[targetName].options.tsPlugins;
-                projectConfiguration.targets[targetName].options.transformers =
-                    transformers;
-            }
-            if ((_b = projectConfiguration.targets[targetName].options) === null || _b === void 0 ? void 0 : _b.srcRootForCompilationRoot) {
-                projectConfiguration.targets[targetName].options.rootDir =
-                    projectConfiguration.targets[targetName].options.srcRootForCompilationRoot;
-                delete projectConfiguration.targets[targetName].options
-                    .srcRootForCompilationRoot;
-            }
-            (0, devkit_1.updateProjectConfiguration)(host, projectName, projectConfiguration);
-        });
-        const task = installNeeded
-            ? (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-                '@nrwl/js': versions_1.nxVersion,
-            })
-            : undefined;
-        yield (0, devkit_1.formatFiles)(host);
-        return task;
+async function update(host) {
+    let installNeeded = false;
+    (0, executor_options_utils_1.forEachExecutorOptions)(host, '@nrwl/node:package', (_, projectName, targetName) => {
+        installNeeded = true;
+        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, projectName);
+        projectConfiguration.targets[targetName].executor = '@nrwl/js:tsc';
+        const transformers = projectConfiguration.targets[targetName].options?.tsPlugins;
+        if (transformers) {
+            delete projectConfiguration.targets[targetName].options.tsPlugins;
+            projectConfiguration.targets[targetName].options.transformers =
+                transformers;
+        }
+        if (projectConfiguration.targets[targetName].options
+            ?.srcRootForCompilationRoot) {
+            projectConfiguration.targets[targetName].options.rootDir =
+                projectConfiguration.targets[targetName].options.srcRootForCompilationRoot;
+            delete projectConfiguration.targets[targetName].options
+                .srcRootForCompilationRoot;
+        }
+        (0, devkit_1.updateProjectConfiguration)(host, projectName, projectConfiguration);
     });
+    const task = installNeeded
+        ? (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
+            '@nrwl/js': versions_1.nxVersion,
+        })
+        : undefined;
+    await (0, devkit_1.formatFiles)(host);
+    return task;
 }
 exports.default = update;

package/src/migrations/update-14-7-6/update-webpack-executor.js

@@ -1,18 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/node:webpack', (options, projectName, targetName) => {
-            const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            projectConfig.targets[targetName].executor = '@nrwl/webpack:webpack';
-            projectConfig.targets[targetName].options.compiler = 'tsc';
-            projectConfig.targets[targetName].options.target = 'node';
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+async function update(tree) {
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/node:webpack', (options, projectName, targetName) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        projectConfig.targets[targetName].executor = '@nrwl/webpack:webpack';
+        projectConfig.targets[targetName].options.compiler = 'tsc';
+        projectConfig.targets[targetName].options.target = 'node';
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;

package/src/migrations/update-16-0-0/update-webpack-executor.js

@@ -1,20 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const migrateProject = (options, projectName, targetName) => {
-            const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            projectConfig.targets[targetName].executor = '@nx/webpack:webpack';
-            projectConfig.targets[targetName].options.compiler = 'tsc';
-            projectConfig.targets[targetName].options.target = 'node';
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-        };
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/node:webpack', migrateProject);
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/node:webpack', migrateProject);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function update(tree) {
+    const migrateProject = (options, projectName, targetName) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        projectConfig.targets[targetName].executor = '@nx/webpack:webpack';
+        projectConfig.targets[targetName].options.compiler = 'tsc';
+        projectConfig.targets[targetName].options.target = 'node';
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+    };
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/node:webpack', migrateProject);
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/node:webpack', migrateProject);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-function replacePackage(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/node', '@nx/node');
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function replacePackage(tree) {
+    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/node', '@nx/node');
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = replacePackage;

package/src/migrations/update-16-3-1/update-webpack-executor.js

@@ -1,20 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const migrateProject = (options, projectName, targetName) => {
-            const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            projectConfig.targets[targetName].executor = '@nx/webpack:webpack';
-            projectConfig.targets[targetName].options.compiler = 'tsc';
-            projectConfig.targets[targetName].options.target = 'node';
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-        };
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/node:webpack', migrateProject);
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/node:webpack', migrateProject);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function update(tree) {
+    const migrateProject = (options, projectName, targetName) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        projectConfig.targets[targetName].executor = '@nx/webpack:webpack';
+        projectConfig.targets[targetName].options.compiler = 'tsc';
+        projectConfig.targets[targetName].options.target = 'node';
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+    };
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/node:webpack', migrateProject);
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/node:webpack', migrateProject);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;

package/src/migrations/update-16-4-0/replace-node-executor.js

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const migrateProject = (_options, projectName, targetName) => {
-            const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            projectConfig.targets[targetName].executor = '@nx/js:node';
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-        };
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/node:node', migrateProject);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function update(tree) {
+    const migrateProject = (_options, projectName, targetName) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        projectConfig.targets[targetName].executor = '@nx/js:node';
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+    };
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/node:node', migrateProject);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;