nx 19.7.0-canary.20240822-d6a0cfb → 19.7.0-canary.20240823-1824267

package/src/daemon/client/client.js

@@ -72,9 +72,11 @@ class DaemonClient {
             // CI=true,env=undefined => no daemon
             // CI=true,env=false => no daemon
             // CI=true,env=true => daemon
+            // docker=true,env=undefined => no daemon
+            // docker=true,env=false => no daemon
+            // docker=true,env=true => daemon
             // WASM => no daemon because file watching does not work
-            if (((0, is_ci_1.isCI)() && env !== 'true') ||
-                isDocker() ||
+            if ((((0, is_ci_1.isCI)() || isDocker()) && env !== 'true') ||
                 (0, tmp_dir_1.isDaemonDisabled)() ||
                 nxJsonIsNotPresent() ||
                 (useDaemonProcessOption === undefined && env === 'false') ||

package/src/plugins/js/package-json/create-package-json.d.ts

@@ -19,6 +19,7 @@ export declare function createPackageJson(projectName: string, graph: ProjectGra
     isProduction?: boolean;
     helperDependencies?: string[];
     skipPackageManager?: boolean;
+    skipOverrides?: boolean;
 }, fileMap?: ProjectFileMap): PackageJson;
 export declare function findProjectsNpmDependencies(projectNode: ProjectGraphProjectNode, graph: ProjectGraph, target: string, rootPackageJson: PackageJson, options: {
     helperDependencies?: string[];

package/src/plugins/js/package-json/create-package-json.js

@@ -121,6 +121,30 @@ function createPackageJson(projectName, graph, options = {}, fileMap = null) {
         }
         packageJson.packageManager = rootPackageJson.packageManager;
     }
+    // region Overrides/Resolutions
+    // npm
+    if (rootPackageJson.overrides && !options.skipOverrides) {
+        packageJson.overrides = {
+            ...rootPackageJson.overrides,
+            ...packageJson.overrides,
+        };
+    }
+    // pnpm
+    if (rootPackageJson.pnpm?.overrides && !options.skipOverrides) {
+        packageJson.pnpm ??= {};
+        packageJson.pnpm.overrides = {
+            ...rootPackageJson.pnpm.overrides,
+            ...packageJson.pnpm.overrides,
+        };
+    }
+    // yarn
+    if (rootPackageJson.resolutions && !options.skipOverrides) {
+        packageJson.resolutions = {
+            ...rootPackageJson.resolutions,
+            ...packageJson.resolutions,
+        };
+    }
+    // endregion Overrides/Resolutions
     return packageJson;
 }
 function findProjectsNpmDependencies(projectNode, graph, target, rootPackageJson, options, fileMap) {

package/src/utils/package-json.d.ts

@@ -42,6 +42,9 @@ export interface PackageJson {
         optional: boolean;
     }>;
     resolutions?: Record<string, string>;
+    pnpm?: {
+        overrides?: PackageOverride;
+    };
     overrides?: PackageOverride;
     bin?: Record<string, string> | string;
     workspaces?: string[] | {