Comparing version 19.7.0-canary.20240822-d6a0cfb to 19.7.0-canary.20240823-1824267
{ | ||
"name": "nx", | ||
"version": "19.7.0-canary.20240822-d6a0cfb", | ||
"version": "19.7.0-canary.20240823-1824267", | ||
"private": false, | ||
@@ -74,3 +74,3 @@ "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.", | ||
"ora": "5.3.0", | ||
"@nrwl/tao": "19.7.0-canary.20240822-d6a0cfb" | ||
"@nrwl/tao": "19.7.0-canary.20240823-1824267" | ||
}, | ||
@@ -90,12 +90,12 @@ "peerDependencies": { | ||
"optionalDependencies": { | ||
"@nx/nx-darwin-x64": "19.7.0-canary.20240822-d6a0cfb", | ||
"@nx/nx-darwin-arm64": "19.7.0-canary.20240822-d6a0cfb", | ||
"@nx/nx-linux-x64-gnu": "19.7.0-canary.20240822-d6a0cfb", | ||
"@nx/nx-linux-x64-musl": "19.7.0-canary.20240822-d6a0cfb", | ||
"@nx/nx-win32-x64-msvc": "19.7.0-canary.20240822-d6a0cfb", | ||
"@nx/nx-linux-arm64-gnu": "19.7.0-canary.20240822-d6a0cfb", | ||
"@nx/nx-linux-arm64-musl": "19.7.0-canary.20240822-d6a0cfb", | ||
"@nx/nx-linux-arm-gnueabihf": "19.7.0-canary.20240822-d6a0cfb", | ||
"@nx/nx-win32-arm64-msvc": "19.7.0-canary.20240822-d6a0cfb", | ||
"@nx/nx-freebsd-x64": "19.7.0-canary.20240822-d6a0cfb" | ||
"@nx/nx-darwin-x64": "19.7.0-canary.20240823-1824267", | ||
"@nx/nx-darwin-arm64": "19.7.0-canary.20240823-1824267", | ||
"@nx/nx-linux-x64-gnu": "19.7.0-canary.20240823-1824267", | ||
"@nx/nx-linux-x64-musl": "19.7.0-canary.20240823-1824267", | ||
"@nx/nx-win32-x64-msvc": "19.7.0-canary.20240823-1824267", | ||
"@nx/nx-linux-arm64-gnu": "19.7.0-canary.20240823-1824267", | ||
"@nx/nx-linux-arm64-musl": "19.7.0-canary.20240823-1824267", | ||
"@nx/nx-linux-arm-gnueabihf": "19.7.0-canary.20240823-1824267", | ||
"@nx/nx-win32-arm64-msvc": "19.7.0-canary.20240823-1824267", | ||
"@nx/nx-freebsd-x64": "19.7.0-canary.20240823-1824267" | ||
}, | ||
@@ -102,0 +102,0 @@ "nx-migrations": { |
@@ -75,5 +75,7 @@ "use strict"; | ||
// 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)() || | ||
@@ -80,0 +82,0 @@ nxJsonIsNotPresent() || |
@@ -22,2 +22,3 @@ import { ProjectFileMap, ProjectGraph, ProjectGraphProjectNode } from '../../../config/project-graph'; | ||
skipPackageManager?: boolean; | ||
skipOverrides?: boolean; | ||
}, fileMap?: ProjectFileMap): PackageJson; | ||
@@ -24,0 +25,0 @@ export declare function findProjectsNpmDependencies(projectNode: ProjectGraphProjectNode, graph: ProjectGraph, target: string, rootPackageJson: PackageJson, options: { |
@@ -124,2 +124,26 @@ "use strict"; | ||
} | ||
// 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; | ||
@@ -126,0 +150,0 @@ } |
@@ -45,2 +45,5 @@ import { ProjectConfiguration, ProjectMetadata, TargetConfiguration } from '../config/workspace-json-project-json'; | ||
resolutions?: Record<string, string>; | ||
pnpm?: { | ||
overrides?: PackageOverride; | ||
}; | ||
overrides?: PackageOverride; | ||
@@ -47,0 +50,0 @@ bin?: Record<string, string> | string; |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
8418457
51844
+ Added@nrwl/tao@19.7.0-canary.20240823-1824267(transitive)
+ Added@nx/nx-darwin-arm64@19.7.0-canary.20240823-1824267(transitive)
+ Added@nx/nx-darwin-x64@19.7.0-canary.20240823-1824267(transitive)
+ Added@nx/nx-freebsd-x64@19.7.0-canary.20240823-1824267(transitive)
+ Added@nx/nx-linux-arm-gnueabihf@19.7.0-canary.20240823-1824267(transitive)
+ Added@nx/nx-linux-arm64-gnu@19.7.0-canary.20240823-1824267(transitive)
+ Added@nx/nx-linux-arm64-musl@19.7.0-canary.20240823-1824267(transitive)
+ Added@nx/nx-linux-x64-gnu@19.7.0-canary.20240823-1824267(transitive)
+ Added@nx/nx-linux-x64-musl@19.7.0-canary.20240823-1824267(transitive)
+ Added@nx/nx-win32-arm64-msvc@19.7.0-canary.20240823-1824267(transitive)
+ Added@nx/nx-win32-x64-msvc@19.7.0-canary.20240823-1824267(transitive)
- Removed@nrwl/tao@19.7.0-canary.20240822-d6a0cfb(transitive)
- Removed@nx/nx-darwin-arm64@19.7.0-canary.20240822-d6a0cfb(transitive)
- Removed@nx/nx-darwin-x64@19.7.0-canary.20240822-d6a0cfb(transitive)
- Removed@nx/nx-freebsd-x64@19.7.0-canary.20240822-d6a0cfb(transitive)
- Removed@nx/nx-linux-arm-gnueabihf@19.7.0-canary.20240822-d6a0cfb(transitive)
- Removed@nx/nx-linux-arm64-gnu@19.7.0-canary.20240822-d6a0cfb(transitive)
- Removed@nx/nx-linux-arm64-musl@19.7.0-canary.20240822-d6a0cfb(transitive)
- Removed@nx/nx-linux-x64-gnu@19.7.0-canary.20240822-d6a0cfb(transitive)
- Removed@nx/nx-linux-x64-musl@19.7.0-canary.20240822-d6a0cfb(transitive)
- Removed@nx/nx-win32-arm64-msvc@19.7.0-canary.20240822-d6a0cfb(transitive)
- Removed@nx/nx-win32-x64-msvc@19.7.0-canary.20240822-d6a0cfb(transitive)