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

package/src/migrations/update-16-2-0/replace-e2e-executor.js

@@ -1,32 +1,32 @@
 "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 replaceE2EExecutor(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const executor of ['@nx/plugin:e2e', '@nrwl/nx-plugin:e2e']) {
-            (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (options, project, target, configuration) => {
-                var _a;
-                const projectConfiguration = projects.get(project);
-                const config = Object.assign(Object.assign({}, options), { target: undefined, runInBand: true });
-                if (configuration) {
-                    projectConfiguration.targets[target].configurations[configuration] =
-                        config;
-                }
-                else {
-                    projectConfiguration.targets[target].dependsOn = [
-                        ...((_a = projectConfiguration.targets[target].dependsOn) !== null && _a !== void 0 ? _a : []),
-                        options.target,
-                    ];
-                    projectConfiguration.targets[target].executor = '@nx/jest:jest';
-                    projectConfiguration.targets[target].options = config;
-                }
-                (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfiguration);
-            });
-        }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function replaceE2EExecutor(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const executor of ['@nx/plugin:e2e', '@nrwl/nx-plugin:e2e']) {
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (options, project, target, configuration) => {
+            const projectConfiguration = projects.get(project);
+            const config = {
+                ...options,
+                target: undefined,
+                runInBand: true,
+            };
+            if (configuration) {
+                projectConfiguration.targets[target].configurations[configuration] =
+                    config;
+            }
+            else {
+                projectConfiguration.targets[target].dependsOn = [
+                    ...(projectConfiguration.targets[target].dependsOn ?? []),
+                    options.target,
+                ];
+                projectConfiguration.targets[target].executor = '@nx/jest:jest';
+                projectConfiguration.targets[target].options = config;
+            }
+            (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfiguration);
+        });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = replaceE2EExecutor;

package/src/utils/has-generator.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 function hasGenerator(tree, projectName, generatorName) {
-    var _a, _b, _c, _d;
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     const packageJson = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(project.root, 'package.json'));
     if (!packageJson.generators && !packageJson.schematics) {
         return false;
     }
-    const generatorsPath = (0, devkit_1.joinPathFragments)(project.root, (_a = packageJson.generators) !== null && _a !== void 0 ? _a : packageJson.schematics);
+    const generatorsPath = (0, devkit_1.joinPathFragments)(project.root, packageJson.generators ?? packageJson.schematics);
     const generatorsJson = (0, devkit_1.readJson)(tree, generatorsPath);
-    return (((_c = (_b = generatorsJson.generators) === null || _b === void 0 ? void 0 : _b[generatorName]) !== null && _c !== void 0 ? _c : (_d = generatorsJson.schematics) === null || _d === void 0 ? void 0 : _d[generatorName]) !== undefined);
+    return ((generatorsJson.generators?.[generatorName] ??
+        generatorsJson.schematics?.[generatorName]) !== undefined);
 }
 exports.hasGenerator = hasGenerator;

package/src/utils/testing-utils/async-commands.js

@@ -15,10 +15,9 @@ function runCommandAsync(command, opts = {
     silenceError: false,
 }) {
     return new Promise((resolve, reject) => {
-        var _a;
         (0, child_process_1.exec)(command, {
-            cwd: (_a = opts.cwd) !== null && _a !== void 0 ? _a : (0, paths_1.tmpProjPath)(),
-            env: Object.assign(Object.assign({}, process.env), opts.env),
+            cwd: opts.cwd ?? (0, paths_1.tmpProjPath)(),
+            env: { ...process.env, ...opts.env },
         }, (err, stdout, stderr) => {
             if (!opts.silenceError && err) {
                 reject(err);

package/src/utils/testing-utils/commands.js

@@ -16,10 +16,9 @@ function runNxCommand(command, opts = {
     silenceError: false,
 }) {
     function _runNxCommand(c) {
-        var _a;
         const execSyncOptions = {
-            cwd: (_a = opts.cwd) !== null && _a !== void 0 ? _a : (0, paths_1.tmpProjPath)(),
-            env: Object.assign(Object.assign({}, process.env), opts.env),
+            cwd: opts.cwd ?? (0, paths_1.tmpProjPath)(),
+            env: { ...process.env, ...opts.env },
         };
         if ((0, utils_1.fileExists)((0, paths_1.tmpProjPath)('package.json'))) {
             const pmc = (0, devkit_1.getPackageManagerCommand)();
@@ -49,12 +48,11 @@ function runNxCommand(command, opts = {
 }
 exports.runNxCommand = runNxCommand;
 function runCommand(command, opts) {
-    var _a;
     try {
         return (0, child_process_1.execSync)(command, {
-            cwd: (_a = opts.cwd) !== null && _a !== void 0 ? _a : (0, paths_1.tmpProjPath)(),
+            cwd: opts.cwd ?? (0, paths_1.tmpProjPath)(),
             stdio: ['pipe', 'pipe', 'pipe'],
-            env: Object.assign(Object.assign({}, process.env), opts === null || opts === void 0 ? void 0 : opts.env),
+            env: { ...process.env, ...opts?.env },
         }).toString();
     }
     catch (e) {

package/src/utils/testing-utils/nx-project.js

@@ -10,7 +10,10 @@ const paths_1 = require("./paths");
 const utils_1 = require("./utils");
 function runNxNewCommand(args, silent) {
     const localTmpDir = (0, path_1.dirname)((0, paths_1.tmpProjPath)());
-    return (0, child_process_1.execSync)(`node ${require.resolve('nx')} new proj --nx-workspace-root=${localTmpDir} --no-interactive --skip-install --collection=@nx/workspace --npmScope=proj --preset=empty ${args || ''}`, Object.assign({ cwd: localTmpDir }, (silent && false ? { stdio: ['ignore', 'ignore', 'ignore'] } : {})));
+    return (0, child_process_1.execSync)(`node ${require.resolve('nx')} new proj --nx-workspace-root=${localTmpDir} --no-interactive --skip-install --collection=@nx/workspace --npmScope=proj --preset=empty ${args || ''}`, {
+        cwd: localTmpDir,
+        ...(silent && false ? { stdio: ['ignore', 'ignore', 'ignore'] } : {}),
+    });
 }
 function patchPackageJsonForPlugin(npmPackageName, distPath) {
     const path = (0, paths_1.tmpProjPath)('package.json');
@@ -35,7 +38,10 @@ exports.uniq = uniq;
  */
 function runPackageManagerInstall(silent = true) {
     const pmc = (0, devkit_2.getPackageManagerCommand)();
-    const install = (0, child_process_1.execSync)(pmc.install, Object.assign({ cwd: (0, paths_1.tmpProjPath)() }, (silent ? { stdio: ['ignore', 'ignore', 'ignore'] } : {})));
+    const install = (0, child_process_1.execSync)(pmc.install, {
+        cwd: (0, paths_1.tmpProjPath)(),
+        ...(silent ? { stdio: ['ignore', 'ignore', 'ignore'] } : {}),
+    });
     return install ? install.toString() : '';
 }
 exports.runPackageManagerInstall = runPackageManagerInstall;