nx 19.7.0-canary.20240822-d6a0cfb → 19.7.0-canary.20240823-1824267
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +12 -12
- package/src/core/graph/main.js +1 -1
- package/src/daemon/client/client.js +4 -2
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/plugins/js/package-json/create-package-json.d.ts +1 -0
- package/src/plugins/js/package-json/create-package-json.js +24 -0
- package/src/utils/package-json.d.ts +3 -0
|
@@ -72,9 +72,11 @@ class DaemonClient {
|
|
|
72
72
|
// CI=true,env=undefined => no daemon
|
|
73
73
|
// CI=true,env=false => no daemon
|
|
74
74
|
// CI=true,env=true => daemon
|
|
75
|
+
// docker=true,env=undefined => no daemon
|
|
76
|
+
// docker=true,env=false => no daemon
|
|
77
|
+
// docker=true,env=true => daemon
|
|
75
78
|
// WASM => no daemon because file watching does not work
|
|
76
|
-
if (((0, is_ci_1.isCI)() && env !== 'true') ||
|
|
77
|
-
isDocker() ||
|
|
79
|
+
if ((((0, is_ci_1.isCI)() || isDocker()) && env !== 'true') ||
|
|
78
80
|
(0, tmp_dir_1.isDaemonDisabled)() ||
|
|
79
81
|
nxJsonIsNotPresent() ||
|
|
80
82
|
(useDaemonProcessOption === undefined && env === 'false') ||
|
|
Binary file
|
|
@@ -19,6 +19,7 @@ export declare function createPackageJson(projectName: string, graph: ProjectGra
|
|
|
19
19
|
isProduction?: boolean;
|
|
20
20
|
helperDependencies?: string[];
|
|
21
21
|
skipPackageManager?: boolean;
|
|
22
|
+
skipOverrides?: boolean;
|
|
22
23
|
}, fileMap?: ProjectFileMap): PackageJson;
|
|
23
24
|
export declare function findProjectsNpmDependencies(projectNode: ProjectGraphProjectNode, graph: ProjectGraph, target: string, rootPackageJson: PackageJson, options: {
|
|
24
25
|
helperDependencies?: string[];
|
|
@@ -121,6 +121,30 @@ function createPackageJson(projectName, graph, options = {}, fileMap = null) {
|
|
|
121
121
|
}
|
|
122
122
|
packageJson.packageManager = rootPackageJson.packageManager;
|
|
123
123
|
}
|
|
124
|
+
// region Overrides/Resolutions
|
|
125
|
+
// npm
|
|
126
|
+
if (rootPackageJson.overrides && !options.skipOverrides) {
|
|
127
|
+
packageJson.overrides = {
|
|
128
|
+
...rootPackageJson.overrides,
|
|
129
|
+
...packageJson.overrides,
|
|
130
|
+
};
|
|
131
|
+
}
|
|
132
|
+
// pnpm
|
|
133
|
+
if (rootPackageJson.pnpm?.overrides && !options.skipOverrides) {
|
|
134
|
+
packageJson.pnpm ??= {};
|
|
135
|
+
packageJson.pnpm.overrides = {
|
|
136
|
+
...rootPackageJson.pnpm.overrides,
|
|
137
|
+
...packageJson.pnpm.overrides,
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
// yarn
|
|
141
|
+
if (rootPackageJson.resolutions && !options.skipOverrides) {
|
|
142
|
+
packageJson.resolutions = {
|
|
143
|
+
...rootPackageJson.resolutions,
|
|
144
|
+
...packageJson.resolutions,
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
// endregion Overrides/Resolutions
|
|
124
148
|
return packageJson;
|
|
125
149
|
}
|
|
126
150
|
function findProjectsNpmDependencies(projectNode, graph, target, rootPackageJson, options, fileMap) {
|