nx 14.8.7 → 14.8.8
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/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
## [14.8.
|
|
6
|
+
## [14.8.8](https://github.com/nrwl/nx/compare/14.8.7...14.8.8) (2023-03-14)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package nx
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "14.8.
|
|
3
|
+
"version": "14.8.8",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
|
|
6
6
|
"repository": {
|
|
@@ -32,8 +32,8 @@
|
|
|
32
32
|
},
|
|
33
33
|
"homepage": "https://nx.dev",
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@nrwl/cli": "14.8.
|
|
36
|
-
"@nrwl/tao": "14.8.
|
|
35
|
+
"@nrwl/cli": "14.8.8",
|
|
36
|
+
"@nrwl/tao": "14.8.8",
|
|
37
37
|
"@parcel/watcher": "2.0.4",
|
|
38
38
|
"@yarnpkg/lockfile": "^1.1.0",
|
|
39
39
|
"@yarnpkg/parsers": "^3.0.0-rc.18",
|
|
@@ -120,5 +120,5 @@
|
|
|
120
120
|
},
|
|
121
121
|
"main": "./bin/nx.js",
|
|
122
122
|
"types": "./bin/nx.d.ts",
|
|
123
|
-
"gitHead": "
|
|
123
|
+
"gitHead": "26f7cfdf15ae9c7f90a79789d744b71612951ae4"
|
|
124
124
|
}
|
|
@@ -213,6 +213,9 @@ function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings:
|
|
|
213
213
|
});
|
|
214
214
|
}
|
|
215
215
|
}
|
|
216
|
+
if (nxArgs.base) {
|
|
217
|
+
nxArgs.base = getMergeBase(nxArgs.base, nxArgs.head);
|
|
218
|
+
}
|
|
216
219
|
}
|
|
217
220
|
if (!nxArgs.skipNxCache) {
|
|
218
221
|
nxArgs.skipNxCache = process.env.NX_SKIP_NX_CACHE === 'true';
|
|
@@ -271,23 +274,31 @@ function getUncommittedFiles() {
|
|
|
271
274
|
function getUntrackedFiles() {
|
|
272
275
|
return parseGitOutput(`git ls-files --others --exclude-standard`);
|
|
273
276
|
}
|
|
274
|
-
function
|
|
275
|
-
let mergeBase;
|
|
277
|
+
function getMergeBase(base, head = 'HEAD') {
|
|
276
278
|
try {
|
|
277
|
-
|
|
279
|
+
return (0, child_process_1.execSync)(`git merge-base "${base}" "${head}"`, {
|
|
278
280
|
maxBuffer: file_utils_1.TEN_MEGABYTES,
|
|
281
|
+
stdio: 'pipe',
|
|
279
282
|
})
|
|
280
283
|
.toString()
|
|
281
284
|
.trim();
|
|
282
285
|
}
|
|
283
286
|
catch (_a) {
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
287
|
+
try {
|
|
288
|
+
return (0, child_process_1.execSync)(`git merge-base --fork-point "${base}" "${head}"`, {
|
|
289
|
+
maxBuffer: file_utils_1.TEN_MEGABYTES,
|
|
290
|
+
stdio: 'pipe',
|
|
291
|
+
})
|
|
292
|
+
.toString()
|
|
293
|
+
.trim();
|
|
294
|
+
}
|
|
295
|
+
catch (_b) {
|
|
296
|
+
return base;
|
|
297
|
+
}
|
|
289
298
|
}
|
|
290
|
-
|
|
299
|
+
}
|
|
300
|
+
function getFilesUsingBaseAndHead(base, head) {
|
|
301
|
+
return parseGitOutput(`git diff --name-only --no-renames --relative "${base}" "${head}"`);
|
|
291
302
|
}
|
|
292
303
|
function parseGitOutput(command) {
|
|
293
304
|
return (0, child_process_1.execSync)(command, { maxBuffer: file_utils_1.TEN_MEGABYTES })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-line-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/command-line-utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"command-line-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/command-line-utils.ts"],"names":[],"mappings":"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"}
|