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

package/src/generators/run-commands/run-commands.js

@@ -1,28 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCommandsSchematic = exports.runCommandsGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function runCommandsGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const project = (0, devkit_1.readProjectConfiguration)(host, schema.project);
-        project.targets = project.targets || {};
-        project.targets[schema.name] = {
-            executor: 'nx:run-commands',
-            outputs: schema.outputs
-                ? schema.outputs
-                    .split(',')
-                    .map((s) => (0, devkit_1.joinPathFragments)('{workspaceRoot}', s.trim()))
-                : [],
-            options: {
-                command: schema.command,
-                cwd: schema.cwd,
-                envFile: schema.envFile,
-            },
-        };
-        (0, devkit_1.updateProjectConfiguration)(host, schema.project, project);
-        yield (0, devkit_1.formatFiles)(host);
-    });
+async function runCommandsGenerator(host, schema) {
+    const project = (0, devkit_1.readProjectConfiguration)(host, schema.project);
+    project.targets = project.targets || {};
+    project.targets[schema.name] = {
+        executor: 'nx:run-commands',
+        outputs: schema.outputs
+            ? schema.outputs
+                .split(',')
+                .map((s) => (0, devkit_1.joinPathFragments)('{workspaceRoot}', s.trim()))
+            : [],
+        options: {
+            command: schema.command,
+            cwd: schema.cwd,
+            envFile: schema.envFile,
+        },
+    };
+    (0, devkit_1.updateProjectConfiguration)(host, schema.project, project);
+    await (0, devkit_1.formatFiles)(host);
 }
 exports.runCommandsGenerator = runCommandsGenerator;
 exports.default = runCommandsGenerator;

package/src/generators/utils/get-npm-package-version.js

@@ -16,6 +16,6 @@ function getNpmPackageVersion(packageName, packageVersion) {
         }
     }
     catch (err) { }
-    return packageVersion !== null && packageVersion !== void 0 ? packageVersion : null;
+    return packageVersion ?? null;
 }
 exports.getNpmPackageVersion = getNpmPackageVersion;

package/src/generators/utils/presets.d.ts

@@ -1,6 +1,10 @@
 export declare enum Preset {
     Apps = "apps",
+    /** @deprecated Use Apps instead
+     */
     Empty = "empty",
+    /** @deprecated Use NPM instead
+     */
     Core = "core",
     NPM = "npm",
     TS = "ts",

package/src/generators/utils/presets.js

@@ -4,7 +4,12 @@ exports.Preset = void 0;
 var Preset;
 (function (Preset) {
     Preset["Apps"] = "apps";
+    // TODO(v18): Remove Empty and Core presets
+    /** @deprecated Use Apps instead
+     */
     Preset["Empty"] = "empty";
+    /** @deprecated Use NPM instead
+     */
     Preset["Core"] = "core";
     Preset["NPM"] = "npm";
     Preset["TS"] = "ts";

package/src/generators/workspace-generator/workspace-generator.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function default_1(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const message = (0, devkit_1.stripIndents) `Workspace Generators are no longer supported. Instead,
+async function default_1(host, schema) {
+    const message = (0, devkit_1.stripIndents) `Workspace Generators are no longer supported. Instead,
     Nx now supports executing generators or executors from local plugins. To get 
     started, install @nx/plugin and run \`nx g plugin\`.
 
@@ -12,7 +10,6 @@ function default_1(host, schema) {
     \`nx g generator --project {my-plugin}\` to add a new generator.
     
     For more information, see: https://nx.dev/deprecated/workspace-generators`;
-        throw new Error(message);
-    });
+    throw new Error(message);
 }
 exports.default = default_1;

package/src/migrations/update-12-5-0/add-target-dependencies.js

@@ -1,38 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setTargetDependencies = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const output_1 = require("../../utilities/output");
-function setTargetDependencies(host) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const config = (0, devkit_1.readNxJson)(host);
-        const strictlyOrderedTargets = ((_c = (_b = (_a = config.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.strictlyOrderedTargets) || ['build'];
-        (_f = (_e = (_d = config.tasksRunnerOptions) === null || _d === void 0 ? void 0 : _d['default']) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? true : delete _f.strictlyOrderedTargets;
-        config.targetDependencies = (_g = config.targetDependencies) !== null && _g !== void 0 ? _g : {};
-        const updatedStrictlyOrderedTargets = [];
-        strictlyOrderedTargets.forEach((target) => {
-            if (!config.targetDependencies[target]) {
-                config.targetDependencies[target] = [
-                    { target, projects: 'dependencies' },
-                ];
-                updatedStrictlyOrderedTargets.push(target);
-            }
-        });
-        (0, devkit_1.updateNxJson)(host, config);
-        if (updatedStrictlyOrderedTargets.length > 0) {
-            output_1.output.note({
-                title: 'Target dependencies have been updated in nx.json',
-                bodyLines: [
-                    `Nx has deprecated strictlyOrderedTargets in favour of targetDependencies.`,
-                    `Based on your configuration the migration has configured targetDependencies for the following targets: ${updatedStrictlyOrderedTargets.join(', ')}.`,
-                    `Read more here: https://nx.dev/reference/project-configuration`,
-                ],
-            });
+async function setTargetDependencies(host) {
+    const config = (0, devkit_1.readNxJson)(host);
+    const strictlyOrderedTargets = config.tasksRunnerOptions?.['default']?.options
+        ?.strictlyOrderedTargets || ['build'];
+    delete config.tasksRunnerOptions?.['default']?.options
+        ?.strictlyOrderedTargets;
+    config.targetDependencies = config.targetDependencies ?? {};
+    const updatedStrictlyOrderedTargets = [];
+    strictlyOrderedTargets.forEach((target) => {
+        if (!config.targetDependencies[target]) {
+            config.targetDependencies[target] = [
+                { target, projects: 'dependencies' },
+            ];
+            updatedStrictlyOrderedTargets.push(target);
         }
-        yield (0, devkit_1.formatFiles)(host);
     });
+    (0, devkit_1.updateNxJson)(host, config);
+    if (updatedStrictlyOrderedTargets.length > 0) {
+        output_1.output.note({
+            title: 'Target dependencies have been updated in nx.json',
+            bodyLines: [
+                `Nx has deprecated strictlyOrderedTargets in favour of targetDependencies.`,
+                `Based on your configuration the migration has configured targetDependencies for the following targets: ${updatedStrictlyOrderedTargets.join(', ')}.`,
+                `Read more here: https://nx.dev/reference/project-configuration`,
+            ],
+        });
+    }
+    await (0, devkit_1.formatFiles)(host);
 }
 exports.setTargetDependencies = setTargetDependencies;
 exports.default = setTargetDependencies;

package/src/migrations/update-13-0-0/config-locations/config-locations.js

@@ -1,25 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
-        // updateProjectConfiguration automatically saves the project opts into workspace/project.json
-        if (nxJson.projects) {
-            Object.entries(nxJson.projects).forEach(([p, nxJsonConfiguration]) => {
-                var _a, _b;
-                const configuration = (0, devkit_1.readProjectConfiguration)(tree, p);
-                (_a = configuration.tags) !== null && _a !== void 0 ? _a : (configuration.tags = nxJsonConfiguration.tags);
-                (_b = configuration.implicitDependencies) !== null && _b !== void 0 ? _b : (configuration.implicitDependencies = nxJsonConfiguration.implicitDependencies);
-                (0, devkit_1.updateProjectConfiguration)(tree, p, configuration);
-            });
-            delete nxJson.projects;
-        }
-        (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
-        movePropertiesAreInNewLocations(tree); // move config options to new spots.
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function update(tree) {
+    const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
+    // updateProjectConfiguration automatically saves the project opts into workspace/project.json
+    if (nxJson.projects) {
+        Object.entries(nxJson.projects).forEach(([p, nxJsonConfiguration]) => {
+            const configuration = (0, devkit_1.readProjectConfiguration)(tree, p);
+            configuration.tags ??= nxJsonConfiguration.tags;
+            configuration.implicitDependencies ??=
+                nxJsonConfiguration.implicitDependencies;
+            (0, devkit_1.updateProjectConfiguration)(tree, p, configuration);
+        });
+        delete nxJson.projects;
+    }
+    (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
+    movePropertiesAreInNewLocations(tree); // move config options to new spots.
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;
 /**

package/src/migrations/update-13-0-0/set-default-base-if-not-set.js

@@ -1,29 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setDefaultBaseIfNotSet = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const output_1 = require("../../utilities/output");
-function setDefaultBaseIfNotSet(host) {
-    var _a, _b, _c;
-    var _d;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const config = (0, devkit_1.readNxJson)(host);
-        if (!((_a = config.affected) === null || _a === void 0 ? void 0 : _a.defaultBase)) {
-            (_b = config.affected) !== null && _b !== void 0 ? _b : (config.affected = {});
-            (_c = (_d = config.affected).defaultBase) !== null && _c !== void 0 ? _c : (_d.defaultBase = 'master');
-            output_1.output.note({
-                title: 'Default Base has been set in nx.json',
-                bodyLines: [
-                    `Nx is moving to "main" as the default branch.`,
-                    `To avoid your current defaults changing, defaultBase has been set to "master" in nx.json`,
-                    `Read more here: https://nx.dev/using-nx/affected`,
-                ],
-            });
-        }
-        (0, devkit_1.updateNxJson)(host, config);
-        yield (0, devkit_1.formatFiles)(host);
-    });
+async function setDefaultBaseIfNotSet(host) {
+    const config = (0, devkit_1.readNxJson)(host);
+    if (!config.affected?.defaultBase) {
+        config.affected ??= {};
+        config.affected.defaultBase ??= 'master';
+        output_1.output.note({
+            title: 'Default Base has been set in nx.json',
+            bodyLines: [
+                `Nx is moving to "main" as the default branch.`,
+                `To avoid your current defaults changing, defaultBase has been set to "master" in nx.json`,
+                `Read more here: https://nx.dev/using-nx/affected`,
+            ],
+        });
+    }
+    (0, devkit_1.updateNxJson)(host, config);
+    await (0, devkit_1.formatFiles)(host);
 }
 exports.setDefaultBaseIfNotSet = setDefaultBaseIfNotSet;
 exports.default = setDefaultBaseIfNotSet;

package/src/migrations/update-13-10-0/update-decorate-cli.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDecorateAngularCLI = void 0;
 function updateDecorateAngularCLI(host) {
-    var _a;
-    const decorate = (_a = host.read('decorate-angular-cli.js')) === null || _a === void 0 ? void 0 : _a.toString();
+    const decorate = host.read('decorate-angular-cli.js')?.toString();
     if (decorate) {
         host.write('decorate-angular-cli.js', decorate.replace('@nrwl/cli/lib/decorate-cli', 'nx/src/adapter/decorate-cli'));
         host.write('decorate-angular-cli.js', decorate.replace('nx/src/cli/decorate-cli', 'nx/src/adapter/decorate-cli'));

package/src/migrations/update-13-10-0/update-tasks-runner.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTasksRunner = void 0;
 const devkit_1 = require("@nx/devkit");
 function updateTasksRunner(host) {
-    var _a;
     const config = (0, devkit_1.readNxJson)(host);
-    if (((_a = config === null || config === void 0 ? void 0 : config.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) &&
-        (config === null || config === void 0 ? void 0 : config.tasksRunnerOptions['default'].runner) ==
+    if (config?.tasksRunnerOptions?.['default'] &&
+        config?.tasksRunnerOptions['default'].runner ==
             '@nrwl/workspace/tasks-runners/default') {
         config.tasksRunnerOptions['default'].runner = 'nx/tasks-runners/default';
     }

package/src/migrations/update-13-2-0/set-parallel-default.js

@@ -1,26 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setParallelDefault = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function setParallelDefault(host) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const config = (0, devkit_1.readNxJson)(host);
-        const defaultTaskRunnerOptions = (_b = (_a = config.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options;
-        if (defaultTaskRunnerOptions) {
-            if (defaultTaskRunnerOptions.parallel) {
-                defaultTaskRunnerOptions.parallel =
-                    defaultTaskRunnerOptions.maxParallel || 3;
-                delete defaultTaskRunnerOptions.maxParallel;
-            }
-            else {
-                defaultTaskRunnerOptions.parallel = 1;
-            }
-            (0, devkit_1.updateNxJson)(host, config);
+async function setParallelDefault(host) {
+    const config = (0, devkit_1.readNxJson)(host);
+    const defaultTaskRunnerOptions = config.tasksRunnerOptions?.['default']?.options;
+    if (defaultTaskRunnerOptions) {
+        if (defaultTaskRunnerOptions.parallel) {
+            defaultTaskRunnerOptions.parallel =
+                defaultTaskRunnerOptions.maxParallel || 3;
+            delete defaultTaskRunnerOptions.maxParallel;
         }
-        yield (0, devkit_1.formatFiles)(host);
-    });
+        else {
+            defaultTaskRunnerOptions.parallel = 1;
+        }
+        (0, devkit_1.updateNxJson)(host, config);
+    }
+    await (0, devkit_1.formatFiles)(host);
 }
 exports.setParallelDefault = setParallelDefault;
 exports.default = setParallelDefault;

package/src/migrations/update-13-3-0/update-tsc-executor-location.js

@@ -1,30 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTscExecutorLocation = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
-function updateTscExecutorLocation(host) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(host);
-        let used = false;
-        for (const [project, projectConfig] of projects.entries()) {
-            for (const [target, targetConfig] of Object.entries(projectConfig.targets || {})) {
-                if (targetConfig.executor === '@nrwl/workspace:tsc') {
-                    projectConfig.targets[target].executor = '@nrwl/js:tsc';
-                    (0, devkit_1.updateProjectConfiguration)(host, project, projectConfig);
-                    used = true;
-                }
+async function updateTscExecutorLocation(host) {
+    const projects = (0, devkit_1.getProjects)(host);
+    let used = false;
+    for (const [project, projectConfig] of projects.entries()) {
+        for (const [target, targetConfig] of Object.entries(projectConfig.targets || {})) {
+            if (targetConfig.executor === '@nrwl/workspace:tsc') {
+                projectConfig.targets[target].executor = '@nrwl/js:tsc';
+                (0, devkit_1.updateProjectConfiguration)(host, project, projectConfig);
+                used = true;
             }
         }
-        if (used) {
-            (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-                '@nrwl/js': versions_1.nxVersion,
-            });
-        }
-        yield (0, devkit_1.formatFiles)(host);
-        return () => (0, devkit_1.installPackagesTask)(host);
-    });
+    }
+    if (used) {
+        (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
+            '@nrwl/js': versions_1.nxVersion,
+        });
+    }
+    await (0, devkit_1.formatFiles)(host);
+    return () => (0, devkit_1.installPackagesTask)(host);
 }
 exports.updateTscExecutorLocation = updateTscExecutorLocation;
 exports.default = updateTscExecutorLocation;

package/src/migrations/update-13-6-0/remove-old-task-runner-options.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeOldTaskRunnerOptions = void 0;
 const devkit_1 = require("@nx/devkit");
 function removeOldTaskRunnerOptions(host) {
-    var _a, _b;
     const nxJson = (0, devkit_1.readNxJson)(host);
-    const options = (_b = (_a = nxJson.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options;
+    const options = nxJson.tasksRunnerOptions?.['default']?.options;
     if (options) {
         delete options.scan;
         delete options.analytics;

package/src/migrations/update-13-9-0/replace-tao-with-nx.js

@@ -4,11 +4,10 @@ exports.replaceTaoWithNx = void 0;
 const devkit_1 = require("@nx/devkit");
 function replaceTaoWithNx(host) {
     (0, devkit_1.updateJson)(host, 'package.json', (json) => {
-        var _a, _b;
-        if ((_a = json.dependencies) === null || _a === void 0 ? void 0 : _a['@nrwl/workspace']) {
+        if (json.dependencies?.['@nrwl/workspace']) {
             json.dependencies['nx'] = json.dependencies['@nrwl/workspace'];
         }
-        else if ((_b = json.devDependencies) === null || _b === void 0 ? void 0 : _b['@nrwl/workspace']) {
+        else if (json.devDependencies?.['@nrwl/workspace']) {
             json.devDependencies['nx'] = json.devDependencies['@nrwl/workspace'];
         }
         removeTao(json.dependencies);

package/src/migrations/update-13-9-0/update-decorate-cli.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDecorateAngularCLI = void 0;
 function updateDecorateAngularCLI(host) {
-    var _a;
-    const decorate = (_a = host.read('decorate-angular-cli.js')) === null || _a === void 0 ? void 0 : _a.toString();
+    const decorate = host.read('decorate-angular-cli.js')?.toString();
     if (decorate) {
         host.write('decorate-angular-cli.js', decorate.replace('@nrwl/cli/lib/decorate-cli', 'nx/src/cli/decorate-cli'));
     }

package/src/migrations/update-14-0-0/change-npm-script-executor.js

@@ -1,19 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.changeNpmScriptExecutor = void 0;
-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 changeNpmScriptExecutor(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/workspace:run-script', (currentValue, project, target) => {
-            const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
-            const targetConfig = projectConfig.targets[target];
-            targetConfig.executor = 'nx:run-script';
-            (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfig);
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+async function changeNpmScriptExecutor(tree) {
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/workspace:run-script', (currentValue, project, target) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
+        const targetConfig = projectConfig.targets[target];
+        targetConfig.executor = 'nx:run-script';
+        (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfig);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.changeNpmScriptExecutor = changeNpmScriptExecutor;
 exports.default = changeNpmScriptExecutor;

package/src/migrations/update-14-0-0/change-nx-json-presets.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.changeNxJsonPresets = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function changeNxJsonPresets(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        const replacements = {
-            '@nrwl/workspace/presets/npm.json': 'nx/presets/npm.json',
-            '@nrwl/workspace/presets/core.json': 'nx/presets/core.json',
-        };
-        if (nxJson.extends && replacements[nxJson.extends]) {
-            (0, devkit_1.updateNxJson)(tree, Object.assign(Object.assign({}, nxJson), { extends: replacements[nxJson.extends] }));
-        }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function changeNxJsonPresets(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const replacements = {
+        '@nrwl/workspace/presets/npm.json': 'nx/presets/npm.json',
+        '@nrwl/workspace/presets/core.json': 'nx/presets/core.json',
+    };
+    if (nxJson.extends && replacements[nxJson.extends]) {
+        (0, devkit_1.updateNxJson)(tree, {
+            ...nxJson,
+            extends: replacements[nxJson.extends],
+        });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.changeNxJsonPresets = changeNxJsonPresets;
 exports.default = changeNxJsonPresets;

package/src/migrations/update-14-2-0/enable-source-analysis.js

@@ -1,27 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enableSourceAnalysis = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function enableSourceAnalysis(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, devkit_1.updateJson)(tree, 'nx.json', (config) => {
-            var _a;
-            if (config.extends === 'nx/presets/core.json' ||
-                config.extends === 'nx/presets/npm.json') {
-                const explicitlyDisabled = config.pluginsConfig &&
-                    config.pluginsConfig['@nrwl/js'] &&
-                    config.pluginsConfig['@nrwl/js'].analyzeSourceFiles === false;
-                if (!explicitlyDisabled) {
-                    config.pluginsConfig || (config.pluginsConfig = {});
-                    (_a = config.pluginsConfig)['@nrwl/js'] || (_a['@nrwl/js'] = {});
-                    config.pluginsConfig['@nrwl/js'].analyzeSourceFiles = true;
-                }
+async function enableSourceAnalysis(tree) {
+    (0, devkit_1.updateJson)(tree, 'nx.json', (config) => {
+        if (config.extends === 'nx/presets/core.json' ||
+            config.extends === 'nx/presets/npm.json') {
+            const explicitlyDisabled = config.pluginsConfig &&
+                config.pluginsConfig['@nrwl/js'] &&
+                config.pluginsConfig['@nrwl/js'].analyzeSourceFiles === false;
+            if (!explicitlyDisabled) {
+                config.pluginsConfig ||= {};
+                config.pluginsConfig['@nrwl/js'] ||= {};
+                config.pluginsConfig['@nrwl/js'].analyzeSourceFiles = true;
             }
-            return config;
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+        }
+        return config;
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.enableSourceAnalysis = enableSourceAnalysis;
 exports.default = enableSourceAnalysis;

package/src/migrations/update-14-8-0/change-run-commands-executor.js

@@ -1,19 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.changeRunCommandsExecutor = void 0;
-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 changeRunCommandsExecutor(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/workspace:run-commands', (currentValue, project, target) => {
-            const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
-            const targetConfig = projectConfig.targets[target];
-            targetConfig.executor = 'nx:run-commands';
-            (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfig);
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+async function changeRunCommandsExecutor(tree) {
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/workspace:run-commands', (currentValue, project, target) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
+        const targetConfig = projectConfig.targets[target];
+        targetConfig.executor = 'nx:run-commands';
+        (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfig);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.changeRunCommandsExecutor = changeRunCommandsExecutor;
 exports.default = changeRunCommandsExecutor;

package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.js

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.splitConfigurationIntoProjectJsonFiles = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const convert_to_nx_project_1 = require("../../generators/convert-to-nx-project/convert-to-nx-project");
-function splitConfigurationIntoProjectJsonFiles(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, convert_to_nx_project_1.default)(tree, { all: true });
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function splitConfigurationIntoProjectJsonFiles(tree) {
+    await (0, convert_to_nx_project_1.default)(tree, { all: true });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.splitConfigurationIntoProjectJsonFiles = splitConfigurationIntoProjectJsonFiles;
 exports.default = splitConfigurationIntoProjectJsonFiles;

package/src/migrations/update-16-0-0/fix-invalid-babelrc.js

@@ -5,18 +5,17 @@ function update(tree) {
     const projects = (0, devkit_1.getProjects)(tree);
     const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
     // In case user installed as prod dep.
-    const deps = Object.assign(Object.assign({}, packageJson.dependencies), packageJson.devDependencies);
+    const deps = { ...packageJson.dependencies, ...packageJson.devDependencies };
     // If web package is installed, skip update.
     if (deps['@nrwl/web'] || deps['@nx/web']) {
         return;
     }
     projects.forEach((config, name) => {
-        var _a;
         const babelRcPath = (0, devkit_1.joinPathFragments)(config.root, '.babelrc');
         if (!tree.exists(babelRcPath))
             return;
         const babelRc = (0, devkit_1.readJson)(tree, babelRcPath);
-        const nrwlWebBabelPresetIdx = (_a = babelRc.presets) === null || _a === void 0 ? void 0 : _a.findIndex((p) => 
+        const nrwlWebBabelPresetIdx = babelRc.presets?.findIndex((p) => 
         // Babel preset could be specified as a string or a tuple with options.
         // Account for rescope migration running before or after this one.
         Array.isArray(p)