nx 20.0.0-beta.7 → 20.0.0-beta.8

package/bin/init-local.js

@@ -5,7 +5,6 @@ exports.rewriteTargetsAndProjects = rewriteTargetsAndProjects;
 const perf_hooks_1 = require("perf_hooks");
 const nx_commands_1 = require("../src/command-line/nx-commands");
 const strip_indents_1 = require("../src/utils/strip-indents");
-const Mod = require("module");
 /**
  * Nx is being run inside a workspace.
  *
@@ -15,7 +14,6 @@ function initLocal(workspace) {
     process.env.NX_CLI_SET = 'true';
     try {
         perf_hooks_1.performance.mark('init-local');
-        monkeyPatchRequire();
         if (workspace.type !== 'nx' && shouldDelegateToAngularCLI()) {
             console.warn((0, strip_indents_1.stripIndents) `Using Nx to run Angular CLI commands is deprecated and will be removed in a future version.
         To run Angular CLI commands, use \`ng\`.`);
@@ -144,40 +142,3 @@ To update the cache configuration, you can directly update the relevant options
         }
     }
 }
-// TODO(v17): Remove this once the @nrwl/* packages are not
-function monkeyPatchRequire() {
-    const originalRequire = Mod.prototype.require;
-    Mod.prototype.require = function (...args) {
-        const modulePath = args[0];
-        if (!modulePath.startsWith('@nrwl/')) {
-            return originalRequire.apply(this, args);
-        }
-        else {
-            try {
-                // Try the original require
-                return originalRequire.apply(this, args);
-            }
-            catch (e) {
-                if (e.code !== 'MODULE_NOT_FOUND') {
-                    throw e;
-                }
-                try {
-                    // Retry the require with the @nx package
-                    return originalRequire.apply(this, args.map((value, i) => {
-                        if (i !== 0) {
-                            return value;
-                        }
-                        else {
-                            return value.replace('@nrwl/', '@nx/');
-                        }
-                    }));
-                }
-                catch {
-                    // Throw the original error
-                    throw e;
-                }
-            }
-        }
-        // do some side-effect of your own
-    };
-}

package/bin/nx.js

@@ -127,19 +127,9 @@ function resolveNx(workspace) {
     }
     catch { }
     // check for root install
-    try {
-        return require.resolve('nx/bin/nx.js', {
-            paths: [workspace ? workspace.dir : globalsRoot],
-        });
-    }
-    catch {
-        // TODO(v17): Remove this
-        // fallback for old CLI install setup
-        // nx-ignore-next-line
-        return require.resolve('@nrwl/cli/bin/nx.js', {
-            paths: [workspace ? workspace.dir : globalsRoot],
-        });
-    }
+    return require.resolve('nx/bin/nx.js', {
+        paths: [workspace ? workspace.dir : globalsRoot],
+    });
 }
 function handleMissingLocalInstallation() {
     output_1.output.error({

package/migrations.json

@@ -52,6 +52,11 @@
       "description": "Set project name in nx.json explicitly",
       "implementation": "./src/migrations/update-19-2-4/set-project-name",
       "x-repair-skip": true
+    },
+    "move-use-daemon-process": {
+      "version": "20.0.0-beta.7",
+      "description": "Migration for v20.0.0-beta.7",
+      "implementation": "./src/migrations/update-20-0-0/move-use-daemon-process"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.0.0-beta.7",
+  "version": "20.0.0-beta.8",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -80,16 +80,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "20.0.0-beta.7",
-    "@nx/nx-darwin-arm64": "20.0.0-beta.7",
-    "@nx/nx-linux-x64-gnu": "20.0.0-beta.7",
-    "@nx/nx-linux-x64-musl": "20.0.0-beta.7",
-    "@nx/nx-win32-x64-msvc": "20.0.0-beta.7",
-    "@nx/nx-linux-arm64-gnu": "20.0.0-beta.7",
-    "@nx/nx-linux-arm64-musl": "20.0.0-beta.7",
-    "@nx/nx-linux-arm-gnueabihf": "20.0.0-beta.7",
-    "@nx/nx-win32-arm64-msvc": "20.0.0-beta.7",
-    "@nx/nx-freebsd-x64": "20.0.0-beta.7"
+    "@nx/nx-darwin-x64": "20.0.0-beta.8",
+    "@nx/nx-darwin-arm64": "20.0.0-beta.8",
+    "@nx/nx-linux-x64-gnu": "20.0.0-beta.8",
+    "@nx/nx-linux-x64-musl": "20.0.0-beta.8",
+    "@nx/nx-win32-x64-msvc": "20.0.0-beta.8",
+    "@nx/nx-linux-arm64-gnu": "20.0.0-beta.8",
+    "@nx/nx-linux-arm64-musl": "20.0.0-beta.8",
+    "@nx/nx-linux-arm-gnueabihf": "20.0.0-beta.8",
+    "@nx/nx-win32-arm64-msvc": "20.0.0-beta.8",
+    "@nx/nx-freebsd-x64": "20.0.0-beta.8"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/adapter/compat.d.ts

@@ -1,2 +1,2 @@
 export declare const allowedProjectExtensions: readonly ["tags", "implicitDependencies", "configFilePath", "$schema", "generators", "namedInputs", "name", "files", "root", "sourceRoot", "projectType", "release", "includedScripts", "metadata"];
-export declare const allowedWorkspaceExtensions: readonly ["implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud", "sync", "enableDbCache"];
+export declare const allowedWorkspaceExtensions: readonly ["implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud", "sync", "useLegacyCache"];

package/src/adapter/compat.js

@@ -63,7 +63,7 @@ exports.allowedWorkspaceExtensions = [
     'useInferencePlugins',
     'neverConnectToCloud',
     'sync',
-    'enableDbCache',
+    'useLegacyCache',
 ];
 if (!patched) {
     Module.prototype.require = function () {

package/src/command-line/affected/affected.js

@@ -12,7 +12,6 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const project_graph_utils_1 = require("../../utils/project-graph-utils");
 const affected_project_graph_1 = require("../../project-graph/affected/affected-project-graph");
 const configuration_1 = require("../../config/configuration");
-const workspace_configuration_check_1 = require("../../utils/workspace-configuration-check");
 const find_matching_projects_1 = require("../../utils/find-matching-projects");
 const graph_1 = require("../graph/graph");
 const all_file_data_1 = require("../../utils/all-file-data");
@@ -22,7 +21,6 @@ async function affected(command, args, extraTargetDependencies = {}, extraOption
 }) {
     perf_hooks_1.performance.mark('code-loading:end');
     perf_hooks_1.performance.measure('code-loading', 'init-local', 'code-loading:end');
-    (0, workspace_configuration_check_1.workspaceConfigurationCheck)();
     const nxJson = (0, configuration_1.readNxJson)();
     const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', {
         printWarnings: command !== 'print-affected' && !args.plain && args.graph !== 'stdout',

package/src/command-line/release/utils/git.js

@@ -16,7 +16,7 @@ exports.getFirstGitCommit = getFirstGitCommit;
  * https://github.com/unjs/changelogen
  */
 const utils_1 = require("../../../tasks-runner/utils");
-const app_root_1 = require("../../../utils/app-root");
+const workspace_root_1 = require("../../../utils/workspace-root");
 const exec_command_1 = require("./exec-command");
 function escapeRegExp(string) {
     return string.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&');
@@ -118,7 +118,7 @@ async function getChangedTrackedFiles(cwd) {
 async function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, cwd, }) {
     logFn = logFn || console.log;
     // Default to running git add related commands from the workspace root
-    cwd = cwd || app_root_1.workspaceRoot;
+    cwd = cwd || workspace_root_1.workspaceRoot;
     let ignoredFiles = [];
     let filesToAdd = [];
     for (const f of changedFiles ?? []) {

package/src/command-line/run/run-one.js

@@ -11,7 +11,6 @@ const split_target_1 = require("../../utils/split-target");
 const output_1 = require("../../utils/output");
 const configuration_1 = require("../../config/configuration");
 const calculate_default_project_name_1 = require("../../config/calculate-default-project-name");
-const workspace_configuration_check_1 = require("../../utils/workspace-configuration-check");
 const graph_1 = require("../graph/graph");
 async function runOne(cwd, args, extraTargetDependencies = {}, extraOptions = {
     excludeTaskDependencies: args.excludeTaskDependencies,
@@ -19,7 +18,6 @@ async function runOne(cwd, args, extraTargetDependencies = {}, extraOptions = {
 }) {
     perf_hooks_1.performance.mark('code-loading:end');
     perf_hooks_1.performance.measure('code-loading', 'init-local', 'code-loading:end');
-    (0, workspace_configuration_check_1.workspaceConfigurationCheck)();
     const nxJson = (0, configuration_1.readNxJson)();
     const projectGraph = await (0, project_graph_1.createProjectGraphAsync)();
     const opts = parseRunOneOptions(cwd, args, projectGraph, nxJson);

package/src/command-line/run/run.js

@@ -100,7 +100,6 @@ async function runExecutorInternal({ project, target, configuration }, overrides
             target: targetConfig,
             projectsConfigurations,
             nxJsonConfiguration,
-            workspace: { ...projectsConfigurations, ...nxJsonConfiguration },
             projectName: project,
             targetName: target,
             configurationName: configuration,

package/src/command-line/run-many/run-many.js

@@ -4,7 +4,6 @@ exports.runMany = runMany;
 exports.projectsToRun = projectsToRun;
 const run_command_1 = require("../../tasks-runner/run-command");
 const command_line_utils_1 = require("../../utils/command-line-utils");
-const command_line_utils_2 = require("../../utils/command-line-utils");
 const project_graph_utils_1 = require("../../utils/project-graph-utils");
 const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
 const perf_hooks_1 = require("perf_hooks");
@@ -12,7 +11,6 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const configuration_1 = require("../../config/configuration");
 const output_1 = require("../../utils/output");
 const find_matching_projects_1 = require("../../utils/find-matching-projects");
-const workspace_configuration_check_1 = require("../../utils/workspace-configuration-check");
 const graph_1 = require("../graph/graph");
 async function runMany(args, extraTargetDependencies = {}, extraOptions = {
     excludeTaskDependencies: args.excludeTaskDependencies,
@@ -20,9 +18,8 @@ async function runMany(args, extraTargetDependencies = {}, extraOptions = {
 }) {
     perf_hooks_1.performance.mark('code-loading:end');
     perf_hooks_1.performance.measure('code-loading', 'init-local', 'code-loading:end');
-    (0, workspace_configuration_check_1.workspaceConfigurationCheck)();
     const nxJson = (0, configuration_1.readNxJson)();
-    const { nxArgs, overrides } = (0, command_line_utils_2.splitArgsIntoNxArgsAndOverrides)(args, 'run-many', { printWarnings: args.graph !== 'stdout' }, nxJson);
+    const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'run-many', { printWarnings: args.graph !== 'stdout' }, nxJson);
     if (nxArgs.verbose) {
         process.env.NX_VERBOSE_LOGGING = 'true';
     }

package/src/config/misc-interfaces.d.ts

@@ -173,16 +173,12 @@ export interface ExecutorContext {
     target?: TargetConfiguration;
     /**
      * Projects config
-     *
-     * @todo(vsavkin): mark this as required for v17
      */
-    projectsConfigurations?: ProjectsConfigurations;
+    projectsConfigurations: ProjectsConfigurations;
     /**
      * The contents of nx.json.
-     *
-     * @todo(vsavkin): mark this as required for v17
      */
-    nxJsonConfiguration?: NxJsonConfiguration;
+    nxJsonConfiguration: NxJsonConfiguration;
     /**
      * The current working directory
      */
@@ -194,19 +190,11 @@ export interface ExecutorContext {
     /**
      * A snapshot of the project graph as
      * it existed when the Nx command was kicked off
-     *
-     * @todo(vsavkin) mark this required for v17
      */
-    projectGraph?: ProjectGraph;
+    projectGraph: ProjectGraph;
     /**
      * A snapshot of the task graph as
      * it existed when the Nx command was kicked off
      */
     taskGraph?: TaskGraph;
-    /**
-     * Deprecated. Use projectsConfigurations or nxJsonConfiguration
-     * The full workspace configuration
-     * @todo(vsavkin): remove after v17
-     */
-    workspace?: ProjectsConfigurations & NxJsonConfiguration;
 }

package/src/config/nx-json.d.ts

@@ -464,9 +464,9 @@ export interface NxJsonConfiguration<T = '*' | string[]> {
      */
     sync?: NxSyncConfiguration;
     /**
-     * Enable the new experimental db based cache
+     * Use the legacy file system cache instead of the db cache
      */
-    enableDbCache?: boolean;
+    useLegacyCache?: boolean;
 }
 export type PluginConfiguration = string | ExpandedPluginConfiguration;
 export type ExpandedPluginConfiguration<T = unknown> = {

package/src/config/project-graph.d.ts

@@ -61,8 +61,6 @@ export declare enum DependencyType {
      */
     implicit = "implicit"
 }
-/** @deprecated this type will be removed in v16. Use {@link ProjectGraphProjectNode} or {@link ProjectGraphExternalNode} instead */
-export type ProjectGraphNode = ProjectGraphProjectNode | ProjectGraphExternalNode;
 /**
  * A node describing a project in a workspace
  */