nx 21.5.0-canary.20250823-a93e74e → 21.5.0-canary.20250826-af44608
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 +11 -11
- package/src/adapter/ngcli-adapter.d.ts.map +1 -1
- package/src/adapter/ngcli-adapter.js +21 -8
- package/src/command-line/migrate/migrate.d.ts +1 -0
- package/src/command-line/migrate/migrate.d.ts.map +1 -1
- package/src/command-line/migrate/migrate.js +17 -1
- package/src/config/misc-interfaces.d.ts +1 -0
- package/src/config/misc-interfaces.d.ts.map +1 -1
- package/src/core/graph/main.js +1 -1
- package/src/daemon/client/client.d.ts.map +1 -1
- package/src/daemon/client/client.js +2 -1
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.d.ts.map +1 -1
- package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js +5 -4
- package/src/plugins/js/versions.d.ts +1 -1
- package/src/plugins/js/versions.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "21.5.0-canary.
|
|
3
|
+
"version": "21.5.0-canary.20250826-af44608",
|
|
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": {
|
|
@@ -83,16 +83,16 @@
|
|
|
83
83
|
}
|
|
84
84
|
},
|
|
85
85
|
"optionalDependencies": {
|
|
86
|
-
"@nx/nx-darwin-arm64": "21.5.0-canary.
|
|
87
|
-
"@nx/nx-darwin-x64": "21.5.0-canary.
|
|
88
|
-
"@nx/nx-freebsd-x64": "21.5.0-canary.
|
|
89
|
-
"@nx/nx-linux-arm-gnueabihf": "21.5.0-canary.
|
|
90
|
-
"@nx/nx-linux-arm64-gnu": "21.5.0-canary.
|
|
91
|
-
"@nx/nx-linux-arm64-musl": "21.5.0-canary.
|
|
92
|
-
"@nx/nx-linux-x64-gnu": "21.5.0-canary.
|
|
93
|
-
"@nx/nx-linux-x64-musl": "21.5.0-canary.
|
|
94
|
-
"@nx/nx-win32-arm64-msvc": "21.5.0-canary.
|
|
95
|
-
"@nx/nx-win32-x64-msvc": "21.5.0-canary.
|
|
86
|
+
"@nx/nx-darwin-arm64": "21.5.0-canary.20250826-af44608",
|
|
87
|
+
"@nx/nx-darwin-x64": "21.5.0-canary.20250826-af44608",
|
|
88
|
+
"@nx/nx-freebsd-x64": "21.5.0-canary.20250826-af44608",
|
|
89
|
+
"@nx/nx-linux-arm-gnueabihf": "21.5.0-canary.20250826-af44608",
|
|
90
|
+
"@nx/nx-linux-arm64-gnu": "21.5.0-canary.20250826-af44608",
|
|
91
|
+
"@nx/nx-linux-arm64-musl": "21.5.0-canary.20250826-af44608",
|
|
92
|
+
"@nx/nx-linux-x64-gnu": "21.5.0-canary.20250826-af44608",
|
|
93
|
+
"@nx/nx-linux-x64-musl": "21.5.0-canary.20250826-af44608",
|
|
94
|
+
"@nx/nx-win32-arm64-msvc": "21.5.0-canary.20250826-af44608",
|
|
95
|
+
"@nx/nx-win32-x64-msvc": "21.5.0-canary.20250826-af44608"
|
|
96
96
|
},
|
|
97
97
|
"nx-migrations": {
|
|
98
98
|
"migrations": "./migrations.json",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ngcli-adapter.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/ngcli-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EAEP,IAAI,EACJ,YAAY,EAGZ,SAAS,EAEV,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,UAAU,EAAE,MAAM,oDAAoD,CAAC;AAWhF,OAAO,EAAgB,UAAU,EAAW,MAAM,MAAM,CAAC;AAUzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAEzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAU,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAuBlD,OAAO,EAIL,eAAe,EAGf,iBAAiB,EAElB,MAAM,2BAA2B,CAAC;AASnC,wBAAsB,oBAAoB,CACxC,WAAW,EAAE;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,GAAG,CAAC;CACnB,EACD,OAAO,EAAE,eAAe,+DA+GzB;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,GAAG,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;CAChD,EACD,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC,OAAO,2BAA2B,EAAE,aAAa,CAAC,CAAC,CA4CxE;AA2KD,KAAK,2BAA2B,GAAG,oBAAoB,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9E,qBAAa,YAAa,SAAQ,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC;IAC7C,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,MAAM;IAIhC,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,UAAU,CAAC,UAAU,CAAC;IAaxC,SAAS,CAAC,gCAAgC;IA+C1C,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ngcli-adapter.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/ngcli-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -251,7 +251,7 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
|
|
|
251
251
|
read(path) {
|
|
252
252
|
if ((path === 'angular.json' || path === '/angular.json') &&
|
|
253
253
|
(0, angular_json_1.isAngularPluginInstalled)()) {
|
|
254
|
-
return this.readMergedWorkspaceConfiguration().pipe((0, operators_1.map)((r) =>
|
|
254
|
+
return this.readMergedWorkspaceConfiguration().pipe((0, operators_1.map)((r) => stringToArrayBuffer(JSON.stringify((0, angular_json_1.toOldFormat)(r)))));
|
|
255
255
|
}
|
|
256
256
|
else {
|
|
257
257
|
return super.read(path);
|
|
@@ -332,11 +332,11 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
|
|
|
332
332
|
const updatedContent = this.mergeProjectConfiguration(existingConfig.projects[projectName], projects[projectName], projectName);
|
|
333
333
|
if (updatedContent) {
|
|
334
334
|
delete updatedContent.root;
|
|
335
|
-
allObservables.push(super.write(path,
|
|
335
|
+
allObservables.push(super.write(path, stringToArrayBuffer(JSON.stringify(updatedContent, null, 2))));
|
|
336
336
|
}
|
|
337
337
|
}
|
|
338
338
|
else {
|
|
339
|
-
allObservables.push(super.write(path,
|
|
339
|
+
allObservables.push(super.write(path, stringToArrayBuffer(content)));
|
|
340
340
|
}
|
|
341
341
|
},
|
|
342
342
|
}, projectName, projects[projectName]);
|
|
@@ -473,7 +473,7 @@ class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
|
|
|
473
473
|
const projectJsonConfig = (0, angular_json_1.toOldFormat)({ projects });
|
|
474
474
|
return super.readExistingAngularJson().pipe((0, operators_1.map)((angularJson) => {
|
|
475
475
|
if (angularJson) {
|
|
476
|
-
return
|
|
476
|
+
return stringToArrayBuffer(JSON.stringify({
|
|
477
477
|
version: 1,
|
|
478
478
|
projects: {
|
|
479
479
|
...projectJsonConfig.projects,
|
|
@@ -482,14 +482,14 @@ class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
|
|
|
482
482
|
}));
|
|
483
483
|
}
|
|
484
484
|
else {
|
|
485
|
-
return
|
|
485
|
+
return stringToArrayBuffer(JSON.stringify(projectJsonConfig));
|
|
486
486
|
}
|
|
487
487
|
}));
|
|
488
488
|
}
|
|
489
489
|
else {
|
|
490
490
|
const match = findMatchingFileChange(this.host, path);
|
|
491
491
|
if (match) {
|
|
492
|
-
return (0, rxjs_1.of)(Buffer.from(match.content));
|
|
492
|
+
return (0, rxjs_1.of)(bufferToArrayBuffer(Buffer.from(match.content)));
|
|
493
493
|
}
|
|
494
494
|
else {
|
|
495
495
|
return super.read(path);
|
|
@@ -706,11 +706,11 @@ function wrapAngularDevkitSchematic(collectionName, generatorName) {
|
|
|
706
706
|
saveProjectsConfigurationsInWrappedSchematic(host, event.content.toString());
|
|
707
707
|
}
|
|
708
708
|
else {
|
|
709
|
-
host.write(eventPath, event.content);
|
|
709
|
+
host.write(eventPath, toBufferOrString(event.content));
|
|
710
710
|
}
|
|
711
711
|
}
|
|
712
712
|
else if (event.kind === 'create') {
|
|
713
|
-
host.write(eventPath, event.content);
|
|
713
|
+
host.write(eventPath, toBufferOrString(event.content));
|
|
714
714
|
}
|
|
715
715
|
else if (event.kind === 'delete') {
|
|
716
716
|
host.delete(eventPath);
|
|
@@ -946,3 +946,16 @@ function restoreNxTokensInOptions(newOptions, previousOptions, project) {
|
|
|
946
946
|
}
|
|
947
947
|
return result;
|
|
948
948
|
}
|
|
949
|
+
function toBufferOrString(content) {
|
|
950
|
+
if (Buffer.isBuffer(content) || typeof content === 'string') {
|
|
951
|
+
return content;
|
|
952
|
+
}
|
|
953
|
+
// it's an ArrayBuffer
|
|
954
|
+
return Buffer.from(content);
|
|
955
|
+
}
|
|
956
|
+
function stringToArrayBuffer(str) {
|
|
957
|
+
return new TextEncoder().encode(str).buffer;
|
|
958
|
+
}
|
|
959
|
+
function bufferToArrayBuffer(buffer) {
|
|
960
|
+
return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
|
|
961
|
+
}
|
|
@@ -64,6 +64,7 @@ export declare class Migrator {
|
|
|
64
64
|
private shouldApplyPackageUpdate;
|
|
65
65
|
private addPackageUpdate;
|
|
66
66
|
private areRequirementsMet;
|
|
67
|
+
private areIncompatiblePackagesPresent;
|
|
67
68
|
private areMigrationRequirementsMet;
|
|
68
69
|
private isMigrationForHigherVersionThanWhatIsInstalled;
|
|
69
70
|
private wasMigrationSkipped;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/migrate/migrate.ts"],"names":[],"mappings":"AAkBA,OAAO,EACL,cAAc,EAEd,2BAA2B,IAAI,aAAa,EAE7C,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACL,UAAU,EAIX,MAAM,uBAAuB,CAAC;AAW/B,OAAO,EACL,iBAAiB,EAEjB,WAAW,EAGZ,MAAM,0BAA0B,CAAC;AAmClC,MAAM,WAAW,8BAA+B,SAAQ,cAAc;IACpE,YAAY,CAAC,EAAE,iBAAiB,CAAC;CAClC;AAID,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,UAgC/C;AAUD,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,cAAc,CAAC,EAAE,mBAAmB,CAAC,cAAc,CAAC,CAAC;IACrD,0BAA0B,EAAE,CAC1B,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAC/B,MAAM,CAAC;IACZ,KAAK,EAAE,CACL,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAC7C,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAChC,EAAE,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC9B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAiC;IAC9D,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAgD;IAC3F,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA2B;IACjD,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAA0B;IACvE,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAwB;IAC3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAiC;IAC7D,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA8C;IACvF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAqC;IACpE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA8B;IAChE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA+B;IAC7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAC5E,OAAO,CAAC,4BAA4B,CAAqB;gBAE7C,IAAI,EAAE,eAAe;IAW3B,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;;;;;;;;;;;;;YAc5C,iBAAiB;YA8BjB,uBAAuB;
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/migrate/migrate.ts"],"names":[],"mappings":"AAkBA,OAAO,EACL,cAAc,EAEd,2BAA2B,IAAI,aAAa,EAE7C,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACL,UAAU,EAIX,MAAM,uBAAuB,CAAC;AAW/B,OAAO,EACL,iBAAiB,EAEjB,WAAW,EAGZ,MAAM,0BAA0B,CAAC;AAmClC,MAAM,WAAW,8BAA+B,SAAQ,cAAc;IACpE,YAAY,CAAC,EAAE,iBAAiB,CAAC;CAClC;AAID,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,UAgC/C;AAUD,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,cAAc,CAAC,EAAE,mBAAmB,CAAC,cAAc,CAAC,CAAC;IACrD,0BAA0B,EAAE,CAC1B,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAC/B,MAAM,CAAC;IACZ,KAAK,EAAE,CACL,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAC7C,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAChC,EAAE,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC9B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAiC;IAC9D,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAgD;IAC3F,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA2B;IACjD,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAA0B;IACvE,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAwB;IAC3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAiC;IAC7D,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA8C;IACvF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAqC;IACpE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA8B;IAChE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA+B;IAC7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAC5E,OAAO,CAAC,4BAA4B,CAAqB;gBAE7C,IAAI,EAAE,eAAe;IAW3B,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;;;;;;;;;;;;;YAc5C,iBAAiB;YA8BjB,uBAAuB;YAyCvB,+CAA+C;IA+F7D,OAAO,CAAC,wCAAwC;IA+BhD;;;;;;;OAOG;IACH,OAAO,CAAC,qCAAqC;IA0C7C,OAAO,CAAC,wBAAwB;IAuDhC,OAAO,CAAC,wBAAwB;IAgBhC,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,kBAAkB;IAyB1B,OAAO,CAAC,8BAA8B;IAyBtC,OAAO,CAAC,2BAA2B;IAkBnC,OAAO,CAAC,8CAA8C;IAatD,OAAO,CAAC,mBAAmB;YAkBb,uCAAuC;IAiDrD,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,EAAE;IAIV,OAAO,CAAC,EAAE;IAIV,OAAO,CAAC,GAAG;CAGZ;AA+HD,KAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,oBAAoB,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC9B,EAAE,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,eAAe,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,wBAAsB,sBAAsB,CAAC,OAAO,EAAE;IACpD,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB,GAAG,OAAO,CAAC,kBAAkB,GAAG,aAAa,CAAC,CAiC9C;AAmmBD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,EACH,SAAS,EAAE,OAAO,EAClB,mBAAmB,EAAE,OAAO,EAC5B,YAAY,EAAE,MAAM;;iBAPT,MAAM;cACT,MAAM;sBACE,MAAM;iBACX,MAAM;;;GA0DlB;AAiBD,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB,EACD,SAAS,EAAE,OAAO,EAClB,mBAAmB,EAAE,OAAO,EAC5B,YAAY,EAAE,MAAM,EACpB,oBAAoB,CAAC,EAAE,MAAM,IAAI,EACjC,iBAAiB,UAAQ,GACxB,OAAO,CAAC;IAAE,OAAO,EAAE,UAAU,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CA6EzD;AA2HD,wBAAsB,OAAO,CAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC1B,OAAO,EAAE,MAAM,EAAE,mBAmBlB;AAED,wBAAgB,YAAY,SA6B3B;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;;EAWxE;AAED,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,cAAc,EAC1B,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,MAAM,GACX;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAyBpC;AAED,wBAAgB,SAAS,CAAC,eAAe,CAAC,EAAE,MAAM,UAkEjD"}
|
|
@@ -124,6 +124,7 @@ class Migrator {
|
|
|
124
124
|
const filteredUpdates = {};
|
|
125
125
|
for (const [packageUpdateKey, packageUpdate] of Object.entries(packageToCheck.updates)) {
|
|
126
126
|
if (this.areRequirementsMet(packageUpdate.requires) &&
|
|
127
|
+
!this.areIncompatiblePackagesPresent(packageUpdate.incompatibleWith) &&
|
|
127
128
|
(!this.interactive ||
|
|
128
129
|
(await this.runPackageJsonUpdatesConfirmationPrompt(packageUpdate, packageUpdateKey, packageToCheck.package)))) {
|
|
129
130
|
Object.entries(packageUpdate.packages).forEach(([name, update]) => {
|
|
@@ -174,7 +175,8 @@ class Migrator {
|
|
|
174
175
|
return [];
|
|
175
176
|
}
|
|
176
177
|
const shouldCheckUpdates = Object.values(packageJsonUpdates).some((packageJsonUpdate) => (this.interactive && packageJsonUpdate['x-prompt']) ||
|
|
177
|
-
Object.keys(packageJsonUpdate.requires ?? {}).length
|
|
178
|
+
Object.keys(packageJsonUpdate.requires ?? {}).length ||
|
|
179
|
+
Object.keys(packageJsonUpdate.incompatibleWith ?? {}).length);
|
|
178
180
|
if (shouldCheckUpdates) {
|
|
179
181
|
return [{ package: targetPackage, updates: packageJsonUpdates }];
|
|
180
182
|
}
|
|
@@ -294,6 +296,20 @@ class Migrator {
|
|
|
294
296
|
}));
|
|
295
297
|
});
|
|
296
298
|
}
|
|
299
|
+
areIncompatiblePackagesPresent(incompatibleWith) {
|
|
300
|
+
if (!incompatibleWith || !Object.keys(incompatibleWith).length) {
|
|
301
|
+
return false;
|
|
302
|
+
}
|
|
303
|
+
return Object.entries(incompatibleWith).some(([pkgName, versionRange]) => {
|
|
304
|
+
if (this.packageUpdates[pkgName]) {
|
|
305
|
+
return (0, semver_1.satisfies)(cleanSemver(this.packageUpdates[pkgName].version), versionRange, { includePrerelease: true });
|
|
306
|
+
}
|
|
307
|
+
return (this.getPkgVersion(pkgName) &&
|
|
308
|
+
(0, semver_1.satisfies)(this.getPkgVersion(pkgName), versionRange, {
|
|
309
|
+
includePrerelease: true,
|
|
310
|
+
}));
|
|
311
|
+
});
|
|
312
|
+
}
|
|
297
313
|
areMigrationRequirementsMet(packageName, migration) {
|
|
298
314
|
if (!this.excludeAppliedMigrations) {
|
|
299
315
|
return this.areRequirementsMet(migration.requires);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc-interfaces.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/config/misc-interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC/C;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE3D;;GAEG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,GAAG,OAAO,IAAI,CACnC,IAAI,KAAA,EACJ,MAAM,EAAE,CAAC,KACN,IAAI,GAAG,iBAAiB,GAAG,OAAO,CAAC,IAAI,GAAG,iBAAiB,CAAC,CAAC;AAElE,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,QAAQ,CAAC,EAAE,SAAS,GAAG,aAAa,CAAC;IACrC,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC;AAED,MAAM,MAAM,mBAAmB,GAAG,eAAe,GAAG,MAAM,CAAC;AAE3D,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AACD,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,uBAAuB,CAAC;AAElE,MAAM,MAAM,YAAY,GAAG,cAAc,GAAG,iBAAiB,CAAC;AAE9D,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,sBAAsB,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC;IAChD,gBAAgB,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC;CAC3C;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,CAAC,IAAI,EAAE,MAAM,GAAG;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE;YACR,CAAC,WAAW,EAAE,MAAM,GAAG,2BAA2B,CAAC;SACpD,CAAC;QACF,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"misc-interfaces.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/config/misc-interfaces.ts"],"names":[],"mappings":"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"}
|