nx 21.4.0-canary.20250725-0359f0d → 21.4.0-canary.20250726-64897b7
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/.eslintrc.json +2 -0
- package/bin/nx.js +6 -6
- package/package.json +12 -11
- package/schemas/nx-schema.json +77 -0
- package/src/command-line/nx-cloud/connect/command-object.d.ts.map +1 -1
- package/src/command-line/nx-cloud/connect/command-object.js +2 -1
- package/src/command-line/nx-cloud/connect/connect-to-nx-cloud.d.ts +1 -0
- package/src/command-line/nx-cloud/connect/connect-to-nx-cloud.d.ts.map +1 -1
- package/src/command-line/nx-cloud/connect/connect-to-nx-cloud.js +12 -0
- package/src/command-line/release/changelog.d.ts.map +1 -1
- package/src/command-line/release/changelog.js +6 -2
- package/src/command-line/release/command-object.d.ts +1 -0
- package/src/command-line/release/command-object.d.ts.map +1 -1
- package/src/command-line/release/command-object.js +4 -0
- package/src/command-line/release/config/config.d.ts +10 -3
- package/src/command-line/release/config/config.d.ts.map +1 -1
- package/src/command-line/release/config/config.js +103 -0
- package/src/command-line/release/config/filter-release-groups.d.ts +5 -1
- package/src/command-line/release/config/filter-release-groups.d.ts.map +1 -1
- package/src/command-line/release/release.d.ts.map +1 -1
- package/src/command-line/release/release.js +6 -1
- package/src/command-line/release/utils/shared.d.ts +9 -0
- package/src/command-line/release/utils/shared.d.ts.map +1 -1
- package/src/command-line/release/utils/shared.js +25 -4
- package/src/command-line/release/version/project-logger.d.ts.map +1 -1
- package/src/command-line/release/version/project-logger.js +1 -0
- package/src/command-line/release/version/release-group-processor.d.ts +6 -1
- package/src/command-line/release/version/release-group-processor.d.ts.map +1 -1
- package/src/command-line/release/version/release-group-processor.js +73 -3
- package/src/command-line/release/version/version-actions.d.ts +21 -0
- package/src/command-line/release/version/version-actions.d.ts.map +1 -1
- package/src/command-line/release/version/version-actions.js +32 -1
- package/src/command-line/release/version.d.ts.map +1 -1
- package/src/command-line/release/version.js +42 -11
- package/src/command-line/sync/sync.d.ts.map +1 -1
- package/src/command-line/sync/sync.js +8 -2
- package/src/config/nx-json.d.ts +58 -0
- package/src/config/nx-json.d.ts.map +1 -1
- package/src/config/workspace-json-project-json.d.ts +2 -1
- package/src/config/workspace-json-project-json.d.ts.map +1 -1
- package/src/core/graph/main.js +1 -1
- package/src/daemon/server/handle-get-sync-generator-changes.d.ts.map +1 -1
- package/src/daemon/server/handle-get-sync-generator-changes.js +1 -0
- package/src/native/index.d.ts +1 -0
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/plugins/js/lock-file/pnpm-parser.js +2 -1
- package/src/project-graph/utils/normalize-project-nodes.d.ts +5 -5
- package/src/project-graph/utils/normalize-project-nodes.d.ts.map +1 -1
- package/src/project-graph/utils/normalize-project-nodes.js +35 -6
- package/src/tasks-runner/life-cycle.d.ts +2 -0
- package/src/tasks-runner/life-cycle.d.ts.map +1 -1
- package/src/tasks-runner/life-cycle.js +7 -0
- package/src/tasks-runner/task-orchestrator.d.ts.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +5 -0
- package/src/tasks-runner/tasks-schedule.d.ts +1 -0
- package/src/tasks-runner/tasks-schedule.d.ts.map +1 -1
- package/src/tasks-runner/tasks-schedule.js +3 -0
- package/src/utils/git-utils.d.ts +1 -0
- package/src/utils/git-utils.d.ts.map +1 -1
- package/src/utils/git-utils.js +11 -4
- package/src/utils/sync-generators.d.ts +3 -1
- package/src/utils/sync-generators.d.ts.map +1 -1
- package/src/utils/sync-generators.js +7 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"handle-get-sync-generator-changes.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/handle-get-sync-generator-changes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAG9C,wBAAsB,6BAA6B,CACjD,UAAU,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,aAAa,CAAC,
|
1
|
+
{"version":3,"file":"handle-get-sync-generator-changes.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/handle-get-sync-generator-changes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAG9C,wBAAsB,6BAA6B,CACjD,UAAU,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,aAAa,CAAC,CAmBxB"}
|
@@ -11,6 +11,7 @@ async function handleGetSyncGeneratorChanges(generators) {
|
|
11
11
|
generatorName: change.generatorName,
|
12
12
|
changes: change.changes.map((c) => ({ ...c, content: null })),
|
13
13
|
outOfSyncMessage: change.outOfSyncMessage,
|
14
|
+
outOfSyncDetails: change.outOfSyncDetails,
|
14
15
|
});
|
15
16
|
return {
|
16
17
|
response: JSON.stringify(result),
|
package/src/native/index.d.ts
CHANGED
@@ -22,6 +22,7 @@ export declare class AppLifeCycle {
|
|
22
22
|
setTaskStatus(taskId: string, status: TaskStatus): void
|
23
23
|
registerForcedShutdownCallback(forcedShutdownCallback: () => any): void
|
24
24
|
__setCloudMessage(message: string): Promise<void>
|
25
|
+
setEstimatedTaskTimings(timings: Record<string, number>): void
|
25
26
|
}
|
26
27
|
|
27
28
|
export declare class ChildProcess {
|
Binary file
|
@@ -422,7 +422,8 @@ function mapRootSnapshot(packageJson, rootImporters, packages, graph, lockfileVe
|
|
422
422
|
const version = packageJson[depType][packageName];
|
423
423
|
if (workspaceModules.has(packageName)) {
|
424
424
|
for (const [importerPath, importerSnapshot] of Object.entries(rootImporters)) {
|
425
|
-
const workspaceDep = importerSnapshot.dependencies
|
425
|
+
const workspaceDep = importerSnapshot.dependencies &&
|
426
|
+
importerSnapshot.dependencies[packageName];
|
426
427
|
if (workspaceDep) {
|
427
428
|
const workspaceDepImporterPath = workspaceDep.replace('link:', '');
|
428
429
|
const importerKeyForPackage = (0, path_1.join)(importerPath, workspaceDepImporterPath);
|
@@ -1,7 +1,7 @@
|
|
1
|
-
import { ProjectGraphProjectNode } from '../../config/project-graph';
|
2
|
-
import {
|
3
|
-
import {
|
4
|
-
import {
|
5
|
-
export declare function normalizeProjectNodes({ projects }: CreateDependenciesContext, builder: ProjectGraphBuilder): Promise<void>;
|
1
|
+
import type { ProjectGraphProjectNode } from '../../config/project-graph';
|
2
|
+
import type { ProjectConfiguration } from '../../config/workspace-json-project-json';
|
3
|
+
import type { CreateDependenciesContext } from '../plugins';
|
4
|
+
import type { ProjectGraphBuilder } from '../project-graph-builder';
|
5
|
+
export declare function normalizeProjectNodes({ projects, workspaceRoot }: CreateDependenciesContext, builder: ProjectGraphBuilder): Promise<void>;
|
6
6
|
export declare function normalizeImplicitDependencies(source: string, implicitDependencies: ProjectConfiguration['implicitDependencies'], projects: Record<string, ProjectGraphProjectNode>): string[];
|
7
7
|
//# sourceMappingURL=normalize-project-nodes.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"normalize-project-nodes.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/utils/normalize-project-nodes.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"normalize-project-nodes.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/utils/normalize-project-nodes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAIrF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,wBAAsB,qBAAqB,CACzC,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,yBAAyB,EACtD,OAAO,EAAE,mBAAmB,iBAqE7B;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,EACd,oBAAoB,EAAE,oBAAoB,CAAC,sBAAsB,CAAC,EAClE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,YAuClD"}
|
@@ -2,8 +2,11 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.normalizeProjectNodes = normalizeProjectNodes;
|
4
4
|
exports.normalizeImplicitDependencies = normalizeImplicitDependencies;
|
5
|
+
const node_fs_1 = require("node:fs");
|
6
|
+
const node_path_1 = require("node:path");
|
7
|
+
const fileutils_1 = require("../../utils/fileutils");
|
5
8
|
const find_matching_projects_1 = require("../../utils/find-matching-projects");
|
6
|
-
async function normalizeProjectNodes({ projects }, builder) {
|
9
|
+
async function normalizeProjectNodes({ projects, workspaceRoot }, builder) {
|
7
10
|
// Sorting projects by name to make sure that the order of projects in the graph is deterministic.
|
8
11
|
// This is important to ensure that expanded properties referencing projects (e.g. implicit dependencies)
|
9
12
|
// are also deterministic, and thus don't cause the calculated project configuration hash to shift.
|
@@ -26,11 +29,7 @@ async function normalizeProjectNodes({ projects }, builder) {
|
|
26
29
|
p.implicitDependencies = normalizeImplicitDependencies(key, p.implicitDependencies, partialProjectGraphNodes);
|
27
30
|
p.targets ??= {};
|
28
31
|
// TODO: remove in v16
|
29
|
-
const projectType = p.projectType
|
30
|
-
? key.endsWith('-e2e') || key === 'e2e'
|
31
|
-
? 'e2e'
|
32
|
-
: 'app'
|
33
|
-
: 'lib';
|
32
|
+
const projectType = getProjectType(key, p.projectType, workspaceRoot, p.root);
|
34
33
|
const tags = p.tags || [];
|
35
34
|
toAdd.push({
|
36
35
|
name: key,
|
@@ -86,3 +85,33 @@ function normalizeImplicitDependencies(source, implicitDependencies, projects) {
|
|
86
85
|
// detected by createDependencies.
|
87
86
|
return deps.concat(alwaysIgnoredDeps.map((x) => '!' + x));
|
88
87
|
}
|
88
|
+
function getProjectType(projectName, projectType, workspaceRoot, projectRoot) {
|
89
|
+
if (projectType) {
|
90
|
+
if (projectType === 'library') {
|
91
|
+
return 'lib';
|
92
|
+
}
|
93
|
+
if (projectName.endsWith('-e2e') || projectName === 'e2e') {
|
94
|
+
return 'e2e';
|
95
|
+
}
|
96
|
+
return 'app';
|
97
|
+
}
|
98
|
+
if ((0, node_fs_1.existsSync)((0, node_path_1.join)(workspaceRoot, projectRoot, 'tsconfig.lib.json'))) {
|
99
|
+
return 'lib';
|
100
|
+
}
|
101
|
+
if ((0, node_fs_1.existsSync)((0, node_path_1.join)(workspaceRoot, projectRoot, 'tsconfig.app.json'))) {
|
102
|
+
return 'app';
|
103
|
+
}
|
104
|
+
// If it doesn't have any common library entry points, assume it is an application
|
105
|
+
const packageJsonPath = (0, node_path_1.join)(workspaceRoot, projectRoot, 'package.json');
|
106
|
+
try {
|
107
|
+
const packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
|
108
|
+
if (!packageJson.exports &&
|
109
|
+
!packageJson.main &&
|
110
|
+
!packageJson.module &&
|
111
|
+
!packageJson.bin) {
|
112
|
+
return 'app';
|
113
|
+
}
|
114
|
+
}
|
115
|
+
catch { }
|
116
|
+
return 'lib';
|
117
|
+
}
|
@@ -41,6 +41,7 @@ export interface LifeCycle {
|
|
41
41
|
appendTaskOutput?(taskId: string, output: string, isPtyTask: boolean): void;
|
42
42
|
setTaskStatus?(taskId: string, status: NativeTaskStatus): void;
|
43
43
|
registerForcedShutdownCallback?(callback: () => void): void;
|
44
|
+
setEstimatedTaskTimings?(timings: Record<string, number>): void;
|
44
45
|
}
|
45
46
|
export declare class CompositeLifeCycle implements LifeCycle {
|
46
47
|
private readonly lifeCycles;
|
@@ -58,5 +59,6 @@ export declare class CompositeLifeCycle implements LifeCycle {
|
|
58
59
|
appendTaskOutput(taskId: string, output: string, isPtyTask: boolean): void;
|
59
60
|
setTaskStatus(taskId: string, status: NativeTaskStatus): void;
|
60
61
|
registerForcedShutdownCallback(callback: () => void): void;
|
62
|
+
setEstimatedTaskTimings(timings: Record<string, number>): void;
|
61
63
|
}
|
62
64
|
//# sourceMappingURL=life-cycle.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"life-cycle.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/life-cycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE3E,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAErD,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB;AAUD,MAAM,WAAW,SAAS;IACxB,YAAY,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvD,UAAU,CAAC,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpC,YAAY,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhD;;;;OAIG;IACH,SAAS,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAE7B;;;;OAIG;IACH,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAEzC,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExE,QAAQ,CAAC,CACP,WAAW,EAAE,UAAU,EAAE,EACzB,QAAQ,EAAE,YAAY,GACrB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExB,uBAAuB,CAAC,CACtB,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,MAAM,GACb,IAAI,CAAC;IAER,mBAAmB,CAAC,CAClB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,cAAc,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAC1C,IAAI,CAAC;IAER,kCAAkC,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAE1D,gBAAgB,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IAE5E,aAAa,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAE/D,8BAA8B,CAAC,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;
|
1
|
+
{"version":3,"file":"life-cycle.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/life-cycle.ts"],"names":[],"mappings":"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"}
|
@@ -102,5 +102,12 @@ class CompositeLifeCycle {
|
|
102
102
|
}
|
103
103
|
}
|
104
104
|
}
|
105
|
+
setEstimatedTaskTimings(timings) {
|
106
|
+
for (let l of this.lifeCycles) {
|
107
|
+
if (l.setEstimatedTaskTimings) {
|
108
|
+
l.setEstimatedTaskTimings(timings);
|
109
|
+
}
|
110
|
+
}
|
111
|
+
}
|
105
112
|
}
|
106
113
|
exports.CompositeLifeCycle = CompositeLifeCycle;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"task-orchestrator.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAQnD,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAMrD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAGnE,OAAO,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAC;AAGxD,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAM3D,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAiB,MAAM,kBAAkB,CAAC;AAUxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE,qBAAa,gBAAgB;IA6CzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAtDtC,OAAO,CAAC,WAAW,CAAwC;IAC3D,OAAO,CAAC,KAAK,CAA2C;IACxD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,uBAAuB,CAG7B;IAEF,OAAO,CAAC,mBAAmB,CAElB;IACT,OAAO,CAAC,aAAa,CAInB;IAGF,OAAO,CAAC,QAAQ,CAGd;IACF,OAAO,CAAC,eAAe,CAAwC;IAE/D,OAAO,CAAC,mBAAmB,CAAkD;IAE7E,OAAO,CAAC,cAAc,CAAiD;IACvE,OAAO,CAAC,gBAAgB,CAAmC;IAE3D,OAAO,CAAC,cAAc,CAEf;IACP,OAAO,CAAC,eAAe,CAAkB;IAEzC,OAAO,CAAC,MAAM,CAAM;IAEpB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,sBAAsB,CAAkC;IAChE,OAAO,CAAC,uBAAuB,CAAkC;gBAK9C,MAAM,EAAE,UAAU,EAClB,iBAAiB,EAAE,MAAM,GAAG,SAAS,EACrC,eAAe,EAAE,IAAI,EAAE,EACvB,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,GAAG,yBAAyB,EAC3C,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,MAAM,EACnB,mBAAmB,GAAE,SAAqB;IAGvD,IAAI;
|
1
|
+
{"version":3,"file":"task-orchestrator.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAQnD,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAMrD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAGnE,OAAO,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAC;AAGxD,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAM3D,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAiB,MAAM,kBAAkB,CAAC;AAUxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE,qBAAa,gBAAgB;IA6CzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAtDtC,OAAO,CAAC,WAAW,CAAwC;IAC3D,OAAO,CAAC,KAAK,CAA2C;IACxD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,uBAAuB,CAG7B;IAEF,OAAO,CAAC,mBAAmB,CAElB;IACT,OAAO,CAAC,aAAa,CAInB;IAGF,OAAO,CAAC,QAAQ,CAGd;IACF,OAAO,CAAC,eAAe,CAAwC;IAE/D,OAAO,CAAC,mBAAmB,CAAkD;IAE7E,OAAO,CAAC,cAAc,CAAiD;IACvE,OAAO,CAAC,gBAAgB,CAAmC;IAE3D,OAAO,CAAC,cAAc,CAEf;IACP,OAAO,CAAC,eAAe,CAAkB;IAEzC,OAAO,CAAC,MAAM,CAAM;IAEpB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,sBAAsB,CAAkC;IAChE,OAAO,CAAC,uBAAuB,CAAkC;gBAK9C,MAAM,EAAE,UAAU,EAClB,iBAAiB,EAAE,MAAM,GAAG,SAAS,EACrC,eAAe,EAAE,IAAI,EAAE,EACvB,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,GAAG,yBAAyB,EAC3C,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,MAAM,EACnB,mBAAmB,GAAE,SAAqB;IAGvD,IAAI;IAiBJ,GAAG;;;IA4CF,SAAS;YAIF,wCAAwC;IA2CtD,OAAO,CAAC,YAAY;YAUN,WAAW;YAoBX,qBAAqB;IAkB5B,wBAAwB;YAajB,kBAAkB;YAUlB,iBAAiB;IAuClB,wBAAwB,CACnC,cAAc,EAAE,OAAO,EACvB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,UAAU,EAAE,CAAC;YAmEV,QAAQ;IA6ChB,uBAAuB,CAC3B,cAAc,EAAE,OAAO,EACvB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,UAAU,CAAC;YAkER,OAAO;YAiKP,sBAAsB;IA2C9B,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM;YAkHvC,WAAW;YAQX,YAAY;YAmFZ,kCAAkC;IAQhD,OAAO,CAAC,QAAQ;YA0CF,iBAAiB;IAiB/B,OAAO,CAAC,qBAAqB;IAO7B,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,SAAS;YAIH,0BAA0B;YAQ1B,iBAAiB;YAQjB,OAAO;IA0BrB,OAAO,CAAC,8BAA8B;CAwBvC;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,GAAG,yBAAyB,EAC3C,SAAS,EAAE,SAAS,UAqBrB"}
|
@@ -66,6 +66,11 @@ class TaskOrchestrator {
|
|
66
66
|
}),
|
67
67
|
'init' in this.cache ? this.cache.init() : null,
|
68
68
|
]);
|
69
|
+
// Pass estimated timings to TUI after TasksSchedule is initialized
|
70
|
+
if (this.tuiEnabled) {
|
71
|
+
const estimatedTimings = this.tasksSchedule.getEstimatedTaskTimings();
|
72
|
+
this.options.lifeCycle.setEstimatedTaskTimings(estimatedTimings);
|
73
|
+
}
|
69
74
|
}
|
70
75
|
async run() {
|
71
76
|
await this.init();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"tasks-schedule.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/tasks-schedule.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAKvD,MAAM,WAAW,KAAK;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,qBAAa,aAAa;IAetB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhB1B,OAAO,CAAC,qBAAqB,CAAkB;IAC/C,OAAO,CAAC,eAAe,CAAwC;IAC/D,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,WAAW,CAAwC;IAE3D,OAAO,CAAC,gBAAgB,CAAe;IACvC,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,8BAA8B,CAAqB;IAC3D,OAAO,CAAC,oBAAoB,CAA8B;IAC1D,OAAO,CAAC,mBAAmB,CAA8B;gBAGtC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,yBAAyB;IAGxC,IAAI;IAkBJ,iBAAiB;IAMvB,QAAQ;IASR,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE;IAW1B,oBAAoB;;;;IAOpB,QAAQ;IAQR,SAAS,IAAI,KAAK;IAMlB,kBAAkB,IAAI,IAAI,EAAE;YAUrB,aAAa;YAWb,YAAY;YAkDZ,eAAe;IAY7B,OAAO,CAAC,aAAa;YAUP,qBAAqB;IAoDnC,OAAO,CAAC,uBAAuB;IAc/B,OAAO,CAAC,cAAc;
|
1
|
+
{"version":3,"file":"tasks-schedule.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/tasks-schedule.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAKvD,MAAM,WAAW,KAAK;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,qBAAa,aAAa;IAetB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhB1B,OAAO,CAAC,qBAAqB,CAAkB;IAC/C,OAAO,CAAC,eAAe,CAAwC;IAC/D,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,WAAW,CAAwC;IAE3D,OAAO,CAAC,gBAAgB,CAAe;IACvC,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,8BAA8B,CAAqB;IAC3D,OAAO,CAAC,oBAAoB,CAA8B;IAC1D,OAAO,CAAC,mBAAmB,CAA8B;gBAGtC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,yBAAyB;IAGxC,IAAI;IAkBJ,iBAAiB;IAMvB,QAAQ;IASR,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE;IAW1B,oBAAoB;;;;IAOpB,QAAQ;IAQR,SAAS,IAAI,KAAK;IAMlB,kBAAkB,IAAI,IAAI,EAAE;YAUrB,aAAa;YAWb,YAAY;YAkDZ,eAAe;IAY7B,OAAO,CAAC,aAAa;YAUP,qBAAqB;IAoDnC,OAAO,CAAC,uBAAuB;IAc/B,OAAO,CAAC,cAAc;IAiCf,uBAAuB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAGzD"}
|
package/src/utils/git-utils.d.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"git-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/git-utils.ts"],"names":[],"mappings":"AAeA,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,EAAE,UAAU,EAAE,KAAK,EAAE,GAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAE1D,0BAaF;AAED,qBAAa,aAAa;IAEZ,OAAO,CAAC,SAAS;IADtB,IAAI,SAAuC;gBAC9B,SAAS,EAAE,MAAM;IAErC,cAAc,CAAC,GAAG,EAAE,MAAM;IASpB,qBAAqB;IAKrB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAMjD,QAAQ;IAIR,YAAY;IAYZ,WAAW,CAAC,IAAI,EAAE,MAAM;IAUxB,KAAK,CAAC,GAAG,EAAE,MAAM;IAIjB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAKpD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAIlC,QAAQ,CACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;QACJ,GAAG,EAAE,OAAO,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KACd;IASG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAMtC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAIpC,MAAM,CAAC,OAAO,EAAE,MAAM;IAGtB,WAAW;IAIX,eAAe,CAAC,IAAI,EAAE,MAAM;IAI5B,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAItC,sBAAsB;IAWtB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAkB9C,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAkC1E,OAAO,CAAC,SAAS;IAWjB,OAAO,CAAC,SAAS;IAQjB,OAAO,CAAC,QAAQ;CAYjB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,IAAI,
|
1
|
+
{"version":3,"file":"git-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/git-utils.ts"],"names":[],"mappings":"AAeA,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,EAAE,UAAU,EAAE,KAAK,EAAE,GAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAE1D,0BAaF;AAED,qBAAa,aAAa;IAEZ,OAAO,CAAC,SAAS;IADtB,IAAI,SAAuC;gBAC9B,SAAS,EAAE,MAAM;IAErC,cAAc,CAAC,GAAG,EAAE,MAAM;IASpB,qBAAqB;IAKrB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAMjD,QAAQ;IAIR,YAAY;IAYZ,WAAW,CAAC,IAAI,EAAE,MAAM;IAUxB,KAAK,CAAC,GAAG,EAAE,MAAM;IAIjB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAKpD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAIlC,QAAQ,CACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;QACJ,GAAG,EAAE,OAAO,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KACd;IASG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAMtC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAIpC,MAAM,CAAC,OAAO,EAAE,MAAM;IAGtB,WAAW;IAIX,eAAe,CAAC,IAAI,EAAE,MAAM;IAI5B,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAItC,sBAAsB;IAWtB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAkB9C,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAkC1E,OAAO,CAAC,SAAS;IAWjB,OAAO,CAAC,SAAS;IAQjB,OAAO,CAAC,QAAQ;CAYjB;AAED,wBAAgB,YAAY,WAQ3B;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAYnD;AAED,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,IAAI,CAyBf;AAeD,wBAAgB,aAAa,CAC3B,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,MAAM,GACjB,MAAM,GAAG,IAAI,CA2Bf;AAED,wBAAgB,kBAAkB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAWpE"}
|
package/src/utils/git-utils.js
CHANGED
@@ -2,6 +2,7 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.GitRepository = void 0;
|
4
4
|
exports.cloneFromUpstream = cloneFromUpstream;
|
5
|
+
exports.getGitRemote = getGitRemote;
|
5
6
|
exports.getGithubSlugOrNull = getGithubSlugOrNull;
|
6
7
|
exports.extractUserAndRepoFromGitHubUrl = extractUserAndRepoFromGitHubUrl;
|
7
8
|
exports.commitChanges = commitChanges;
|
@@ -170,15 +171,21 @@ class GitRepository {
|
|
170
171
|
}
|
171
172
|
}
|
172
173
|
exports.GitRepository = GitRepository;
|
174
|
+
function getGitRemote() {
|
175
|
+
const res = (0, child_process_1.execSync)('git remote -v', {
|
176
|
+
stdio: 'pipe',
|
177
|
+
windowsHide: false,
|
178
|
+
})
|
179
|
+
.toString()
|
180
|
+
.trim();
|
181
|
+
return res;
|
182
|
+
}
|
173
183
|
/**
|
174
184
|
* This is currently duplicated in Nx Console. Please let @MaxKless know if you make changes here.
|
175
185
|
*/
|
176
186
|
function getGithubSlugOrNull() {
|
177
187
|
try {
|
178
|
-
const gitRemote = (
|
179
|
-
stdio: 'pipe',
|
180
|
-
windowsHide: false,
|
181
|
-
}).toString();
|
188
|
+
const gitRemote = getGitRemote();
|
182
189
|
// If there are no remotes, we default to github
|
183
190
|
if (!gitRemote || gitRemote.length === 0) {
|
184
191
|
return 'github';
|
@@ -7,6 +7,7 @@ import { type FileChange, type Tree } from '../generators/tree';
|
|
7
7
|
export type SyncGeneratorResult = void | {
|
8
8
|
callback?: GeneratorCallback;
|
9
9
|
outOfSyncMessage?: string;
|
10
|
+
outOfSyncDetails?: string[];
|
10
11
|
};
|
11
12
|
export type SyncGenerator = (tree: Tree) => SyncGeneratorResult | Promise<SyncGeneratorResult>;
|
12
13
|
export type SyncGeneratorRunSuccessResult = {
|
@@ -14,6 +15,7 @@ export type SyncGeneratorRunSuccessResult = {
|
|
14
15
|
changes: FileChange[];
|
15
16
|
callback?: GeneratorCallback;
|
16
17
|
outOfSyncMessage?: string;
|
18
|
+
outOfSyncDetails?: string[];
|
17
19
|
};
|
18
20
|
type SerializableSimpleError = {
|
19
21
|
message: string;
|
@@ -53,7 +55,7 @@ export declare function runSyncGenerator(tree: Tree, generatorSpecifier: string,
|
|
53
55
|
export declare function collectEnabledTaskSyncGeneratorsFromProjectGraph(projectGraph: ProjectGraph, nxJson: NxJsonConfiguration): Set<string>;
|
54
56
|
export declare function collectEnabledTaskSyncGeneratorsFromTaskGraph(taskGraph: TaskGraph, projectGraph: ProjectGraph, nxJson: NxJsonConfiguration): Set<string>;
|
55
57
|
export declare function collectRegisteredGlobalSyncGenerators(nxJson?: NxJsonConfiguration<string[] | "*">): Set<string>;
|
56
|
-
export declare function getSyncGeneratorSuccessResultsMessageLines(results: SyncGeneratorRunResult[]): string[];
|
58
|
+
export declare function getSyncGeneratorSuccessResultsMessageLines(results: SyncGeneratorRunResult[], logOutOfSyncDetails?: boolean): string[];
|
57
59
|
export declare function getFailedSyncGeneratorsFixMessageLines(results: SyncGeneratorRunResult[], verbose: boolean, globalGeneratorSet?: Set<string>): string[];
|
58
60
|
export declare function getFlushFailureMessageLines(result: FlushSyncGeneratorChangesFailure, verbose: boolean, globalGeneratorSet?: Set<string>): string[];
|
59
61
|
export declare function processSyncGeneratorResultErrors(results: SyncGeneratorRunResult[]): {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"sync-generators.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/sync-generators.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAc,KAAK,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAGlF,OAAO,EAGL,KAAK,UAAU,EACf,KAAK,IAAI,EACV,MAAM,oBAAoB,CAAC;AAS5B,MAAM,MAAM,mBAAmB,GAAG,IAAI,GAAG;IACvC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;
|
1
|
+
{"version":3,"file":"sync-generators.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/sync-generators.ts"],"names":[],"mappings":"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"}
|
@@ -71,9 +71,11 @@ async function runSyncGenerator(tree, generatorSpecifier, projects) {
|
|
71
71
|
const result = await implementation(tree);
|
72
72
|
let callback;
|
73
73
|
let outOfSyncMessage;
|
74
|
+
let outOfSyncDetails;
|
74
75
|
if (result && typeof result === 'object') {
|
75
76
|
callback = result.callback;
|
76
77
|
outOfSyncMessage = result.outOfSyncMessage;
|
78
|
+
outOfSyncDetails = result.outOfSyncDetails;
|
77
79
|
}
|
78
80
|
perf_hooks_1.performance.mark(`run-sync-generator:${generatorSpecifier}:end`);
|
79
81
|
perf_hooks_1.performance.measure(`run-sync-generator:${generatorSpecifier}`, `run-sync-generator:${generatorSpecifier}:start`, `run-sync-generator:${generatorSpecifier}:end`);
|
@@ -82,6 +84,7 @@ async function runSyncGenerator(tree, generatorSpecifier, projects) {
|
|
82
84
|
generatorName: generatorSpecifier,
|
83
85
|
callback,
|
84
86
|
outOfSyncMessage,
|
87
|
+
outOfSyncDetails,
|
85
88
|
};
|
86
89
|
}
|
87
90
|
catch (e) {
|
@@ -139,13 +142,16 @@ function collectRegisteredGlobalSyncGenerators(nxJson = (0, nx_json_1.readNxJson
|
|
139
142
|
}
|
140
143
|
return globalSyncGenerators;
|
141
144
|
}
|
142
|
-
function getSyncGeneratorSuccessResultsMessageLines(results) {
|
145
|
+
function getSyncGeneratorSuccessResultsMessageLines(results, logOutOfSyncDetails = false) {
|
143
146
|
const messageLines = [];
|
144
147
|
for (const result of results) {
|
145
148
|
if ('error' in result) {
|
146
149
|
continue;
|
147
150
|
}
|
148
151
|
messageLines.push(`[${chalk.bold(result.generatorName)}]: ${result.outOfSyncMessage ?? `Some files are out of sync.`}`);
|
152
|
+
if (logOutOfSyncDetails && result.outOfSyncDetails?.length) {
|
153
|
+
messageLines.push(...result.outOfSyncDetails);
|
154
|
+
}
|
149
155
|
}
|
150
156
|
return messageLines;
|
151
157
|
}
|