nx 21.5.0-beta.0 → 21.5.0-beta.2
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/affected/affected.d.ts.map +1 -1
- package/src/command-line/affected/affected.js +2 -0
- package/src/command-line/graph/graph.d.ts +2 -2
- package/src/command-line/graph/graph.d.ts.map +1 -1
- package/src/command-line/graph/graph.js +89 -166
- package/src/command-line/init/implementation/utils.d.ts.map +1 -1
- package/src/command-line/init/implementation/utils.js +9 -2
- package/src/command-line/mcp/mcp.d.ts.map +1 -1
- package/src/command-line/mcp/mcp.js +39 -4
- 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 +20 -2
- package/src/command-line/run-many/run-many.js +1 -1
- package/src/config/misc-interfaces.d.ts +1 -0
- package/src/config/misc-interfaces.d.ts.map +1 -1
- package/src/config/workspace-json-project-json.d.ts +1 -0
- package/src/config/workspace-json-project-json.d.ts.map +1 -1
- package/src/core/graph/main.js +1 -1
- package/src/core/graph/styles.css +1 -1
- package/src/core/graph/styles.js +1 -1
- package/src/daemon/client/client.d.ts +1 -0
- package/src/daemon/client/client.d.ts.map +1 -1
- package/src/daemon/client/client.js +35 -4
- package/src/daemon/server/shutdown-utils.d.ts.map +1 -1
- package/src/daemon/server/shutdown-utils.js +1 -0
- package/src/executors/run-commands/running-tasks.d.ts +1 -0
- package/src/executors/run-commands/running-tasks.d.ts.map +1 -1
- package/src/executors/run-commands/running-tasks.js +40 -14
- package/src/generators/utils/project-configuration.js +7 -2
- package/src/native/nx.wasi-browser.js +39 -42
- 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/src/project-graph/utils/project-configuration-utils.d.ts.map +1 -1
- package/src/project-graph/utils/project-configuration-utils.js +1 -0
- package/src/tasks-runner/task-graph-utils.d.ts.map +1 -1
- package/src/tasks-runner/task-graph-utils.js +27 -4
- package/src/utils/package-manager.d.ts.map +1 -1
- package/src/utils/package-manager.js +12 -1
- package/src/utils/promised-based-queue.d.ts +7 -0
- package/src/utils/promised-based-queue.d.ts.map +1 -1
- package/src/utils/promised-based-queue.js +9 -0
@@ -64,49 +64,46 @@ function __napi_rs_initialize_modules(__napiInstance) {
|
|
64
64
|
__napiInstance.exports['__napi_register__NxConsolePreferences_struct_10']?.()
|
65
65
|
__napiInstance.exports['__napi_register__NxConsolePreferences_impl_14']?.()
|
66
66
|
__napiInstance.exports['__napi_register__log_debug_15']?.()
|
67
|
-
__napiInstance.exports['
|
68
|
-
__napiInstance.exports['
|
69
|
-
__napiInstance.exports['
|
70
|
-
__napiInstance.exports['
|
71
|
-
__napiInstance.exports['
|
72
|
-
__napiInstance.exports['
|
73
|
-
__napiInstance.exports['
|
74
|
-
__napiInstance.exports['
|
75
|
-
__napiInstance.exports['
|
76
|
-
__napiInstance.exports['
|
77
|
-
__napiInstance.exports['
|
78
|
-
__napiInstance.exports['
|
79
|
-
__napiInstance.exports['
|
80
|
-
__napiInstance.exports['
|
81
|
-
__napiInstance.exports['
|
82
|
-
__napiInstance.exports['
|
83
|
-
__napiInstance.exports['
|
84
|
-
__napiInstance.exports['
|
85
|
-
__napiInstance.exports['
|
86
|
-
__napiInstance.exports['
|
87
|
-
__napiInstance.exports['
|
88
|
-
__napiInstance.exports['
|
89
|
-
__napiInstance.exports['
|
90
|
-
__napiInstance.exports['
|
91
|
-
__napiInstance.exports['
|
92
|
-
__napiInstance.exports['
|
93
|
-
__napiInstance.exports['
|
94
|
-
__napiInstance.exports['
|
95
|
-
__napiInstance.exports['
|
96
|
-
__napiInstance.exports['
|
97
|
-
__napiInstance.exports['
|
98
|
-
__napiInstance.exports['
|
99
|
-
__napiInstance.exports['
|
100
|
-
__napiInstance.exports['
|
101
|
-
__napiInstance.exports['
|
102
|
-
__napiInstance.exports['
|
103
|
-
__napiInstance.exports['
|
104
|
-
__napiInstance.exports['
|
105
|
-
__napiInstance.exports['__napi_register__FileMap_struct_72']?.()
|
106
|
-
__napiInstance.exports['__napi_register____test_only_transfer_file_map_73']?.()
|
67
|
+
__napiInstance.exports['__napi_register__log_error_16']?.()
|
68
|
+
__napiInstance.exports['__napi_register__IS_WASM_17']?.()
|
69
|
+
__napiInstance.exports['__napi_register__get_binary_target_18']?.()
|
70
|
+
__napiInstance.exports['__napi_register__ImportResult_struct_19']?.()
|
71
|
+
__napiInstance.exports['__napi_register__find_imports_20']?.()
|
72
|
+
__napiInstance.exports['__napi_register__transfer_project_graph_21']?.()
|
73
|
+
__napiInstance.exports['__napi_register__ExternalNode_struct_22']?.()
|
74
|
+
__napiInstance.exports['__napi_register__Target_struct_23']?.()
|
75
|
+
__napiInstance.exports['__napi_register__Project_struct_24']?.()
|
76
|
+
__napiInstance.exports['__napi_register__ProjectGraph_struct_25']?.()
|
77
|
+
__napiInstance.exports['__napi_register__HashPlanner_struct_26']?.()
|
78
|
+
__napiInstance.exports['__napi_register__HashPlanner_impl_30']?.()
|
79
|
+
__napiInstance.exports['__napi_register__HashDetails_struct_31']?.()
|
80
|
+
__napiInstance.exports['__napi_register__HasherOptions_struct_32']?.()
|
81
|
+
__napiInstance.exports['__napi_register__TaskHasher_struct_33']?.()
|
82
|
+
__napiInstance.exports['__napi_register__TaskHasher_impl_36']?.()
|
83
|
+
__napiInstance.exports['__napi_register__Task_struct_37']?.()
|
84
|
+
__napiInstance.exports['__napi_register__TaskTarget_struct_38']?.()
|
85
|
+
__napiInstance.exports['__napi_register__TaskResult_struct_39']?.()
|
86
|
+
__napiInstance.exports['__napi_register__TaskGraph_struct_40']?.()
|
87
|
+
__napiInstance.exports['__napi_register__FileData_struct_41']?.()
|
88
|
+
__napiInstance.exports['__napi_register__InputsInput_struct_42']?.()
|
89
|
+
__napiInstance.exports['__napi_register__FileSetInput_struct_43']?.()
|
90
|
+
__napiInstance.exports['__napi_register__RuntimeInput_struct_44']?.()
|
91
|
+
__napiInstance.exports['__napi_register__EnvironmentInput_struct_45']?.()
|
92
|
+
__napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_46']?.()
|
93
|
+
__napiInstance.exports['__napi_register__DepsOutputsInput_struct_47']?.()
|
94
|
+
__napiInstance.exports['__napi_register__NxJson_struct_48']?.()
|
95
|
+
__napiInstance.exports['__napi_register__FileLock_struct_49']?.()
|
96
|
+
__napiInstance.exports['__napi_register__FileLock_impl_51']?.()
|
97
|
+
__napiInstance.exports['__napi_register__WorkspaceContext_struct_52']?.()
|
98
|
+
__napiInstance.exports['__napi_register__WorkspaceContext_impl_63']?.()
|
99
|
+
__napiInstance.exports['__napi_register__WorkspaceErrors_64']?.()
|
100
|
+
__napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_65']?.()
|
101
|
+
__napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_66']?.()
|
102
|
+
__napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_67']?.()
|
103
|
+
__napiInstance.exports['__napi_register__FileMap_struct_68']?.()
|
104
|
+
__napiInstance.exports['__napi_register____test_only_transfer_file_map_69']?.()
|
107
105
|
}
|
108
106
|
export const FileLock = __napiModule.exports.FileLock
|
109
|
-
export const HashPlanInspector = __napiModule.exports.HashPlanInspector
|
110
107
|
export const HashPlanner = __napiModule.exports.HashPlanner
|
111
108
|
export const ImportResult = __napiModule.exports.ImportResult
|
112
109
|
export const NxConsolePreferences = __napiModule.exports.NxConsolePreferences
|
@@ -123,8 +120,8 @@ export const hashArray = __napiModule.exports.hashArray
|
|
123
120
|
export const hashFile = __napiModule.exports.hashFile
|
124
121
|
export const installNxConsole = __napiModule.exports.installNxConsole
|
125
122
|
export const IS_WASM = __napiModule.exports.IS_WASM
|
126
|
-
export const isAiAgent = __napiModule.exports.isAiAgent
|
127
123
|
export const logDebug = __napiModule.exports.logDebug
|
124
|
+
export const logError = __napiModule.exports.logError
|
128
125
|
export const remove = __napiModule.exports.remove
|
129
126
|
export const testOnlyTransferFileMap = __napiModule.exports.testOnlyTransferFileMap
|
130
127
|
export const transferProjectGraph = __napiModule.exports.transferProjectGraph
|
Binary file
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"connect-to-nx-cloud.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;
|
1
|
+
{"version":3,"file":"connect-to-nx-cloud.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAyF9D,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,kBAAkB,EAAE,MAAM,mBAgB3B;AAED,MAAM,WAAW,uBAAuB;IACtC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAgDD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,uBAAuB,EAC/B,MAAM,sCAAmB,GACxB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA6ExB;AAED,iBAAe,yBAAyB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,iBAGjC;AAED,eAAe,yBAAyB,CAAC"}
|
@@ -23,10 +23,11 @@ function printCloudConnectionDisabledMessage() {
|
|
23
23
|
],
|
24
24
|
});
|
25
25
|
}
|
26
|
-
function getRootPackageName(tree) {
|
26
|
+
function getRootPackageName(tree, directory) {
|
27
27
|
let packageJson;
|
28
28
|
try {
|
29
|
-
|
29
|
+
const packageJsonPath = (0, path_1.join)(directory, 'package.json');
|
30
|
+
packageJson = (0, json_1.readJson)(tree, packageJsonPath);
|
30
31
|
}
|
31
32
|
catch (e) { }
|
32
33
|
return packageJson?.name ?? 'my-workspace';
|
@@ -124,11 +125,11 @@ async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)
|
|
124
125
|
schema.installationSource === 'nx-console'))
|
125
126
|
return null;
|
126
127
|
try {
|
127
|
-
responseFromCreateNxCloudWorkspaceV2 = await createNxCloudWorkspaceV2(getRootPackageName(tree), schema.installationSource, getNxInitDate());
|
128
|
+
responseFromCreateNxCloudWorkspaceV2 = await createNxCloudWorkspaceV2(getRootPackageName(tree, schema.directory), schema.installationSource, getNxInitDate());
|
128
129
|
}
|
129
130
|
catch (e) {
|
130
131
|
if (e.response?.status === 404) {
|
131
|
-
responseFromCreateNxCloudWorkspaceV1 = await createNxCloudWorkspaceV1(getRootPackageName(tree), schema.installationSource, getNxInitDate());
|
132
|
+
responseFromCreateNxCloudWorkspaceV1 = await createNxCloudWorkspaceV1(getRootPackageName(tree, schema.directory), schema.installationSource, getNxInitDate());
|
132
133
|
}
|
133
134
|
else {
|
134
135
|
throw e;
|
@@ -1,2 +1,2 @@
|
|
1
|
-
export declare const typescriptVersion = "~5.
|
1
|
+
export declare const typescriptVersion = "~5.9.2";
|
2
2
|
//# sourceMappingURL=versions.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"project-configuration-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/utils/project-configuration-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,cAAc,EACf,MAAM,0CAA0C,CAAC;AASlD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAwB7D,MAAM,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AACtE,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAC1C,MAAM,EACN,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAClC,CAAC;AAEF,wBAAgB,oCAAoC,CAClD,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EACpD,OAAO,EAAE,oBAAoB,EAC7B,uBAAuB,CAAC,EAAE,uBAAuB,EACjD,iBAAiB,CAAC,EAAE,iBAAiB,EAGrC,uBAAuB,CAAC,EAAE,OAAO,GAChC,IAAI,
|
1
|
+
{"version":3,"file":"project-configuration-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/utils/project-configuration-utils.ts"],"names":[],"mappings":"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"}
|
@@ -26,6 +26,7 @@ function mergeProjectConfigurationIntoRootMap(projectRootMap, project, configura
|
|
26
26
|
// This function is used when reading project configuration
|
27
27
|
// in generators, where we don't want to do this.
|
28
28
|
skipTargetNormalization) {
|
29
|
+
project.root = project.root === '' ? '.' : project.root;
|
29
30
|
if (configurationSourceMaps && !configurationSourceMaps[project.root]) {
|
30
31
|
configurationSourceMaps[project.root] = {};
|
31
32
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"task-graph-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-graph-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAQ,SAAS,EAAE,MAAM,sBAAsB,CAAC;AA0BvD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE;IAC/B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACvC,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACnD,GAAG,MAAM,EAAE,GAAG,IAAI,CAYlB;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE;IAChC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACvC,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACnD,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAerB;AA2BD,wBAAgB,WAAW,CAAC,KAAK,EAAE;IACjC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACxC,GAAG,IAAI,CAWP;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,QAyC3B;AAED,wBAAgB,2CAA2C,CACzD,SAAS,EAAE,SAAS,
|
1
|
+
{"version":3,"file":"task-graph-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-graph-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAQ,SAAS,EAAE,MAAM,sBAAsB,CAAC;AA0BvD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE;IAC/B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACvC,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACnD,GAAG,MAAM,EAAE,GAAG,IAAI,CAYlB;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE;IAChC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACvC,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACnD,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAerB;AA2BD,wBAAgB,WAAW,CAAC,KAAK,EAAE;IACjC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACxC,GAAG,IAAI,CAWP;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,QAyC3B;AAED,wBAAgB,2CAA2C,CACzD,SAAS,EAAE,SAAS,QAgCrB;AAwCD,wBAAgB,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,CAU9D"}
|
@@ -117,15 +117,24 @@ function validateNoAtomizedTasks(taskGraph, projectGraph) {
|
|
117
117
|
process.exit(1);
|
118
118
|
}
|
119
119
|
function assertTaskGraphDoesNotContainInvalidTargets(taskGraph) {
|
120
|
-
const
|
120
|
+
const nonParallelTasksThatDependOnContinuousTasks = [];
|
121
|
+
const nonParallelContinuousTasksThatAreDependedOn = [];
|
121
122
|
for (const task of Object.values(taskGraph.tasks)) {
|
122
123
|
if (task.parallelism === false &&
|
123
124
|
taskGraph.continuousDependencies[task.id].length > 0) {
|
124
|
-
|
125
|
+
nonParallelTasksThatDependOnContinuousTasks.push(task);
|
125
126
|
}
|
127
|
+
for (const dependency of taskGraph.continuousDependencies[task.id]) {
|
128
|
+
if (taskGraph.tasks[dependency].parallelism === false) {
|
129
|
+
nonParallelContinuousTasksThatAreDependedOn.push(taskGraph.tasks[dependency]);
|
130
|
+
}
|
131
|
+
}
|
132
|
+
}
|
133
|
+
if (nonParallelTasksThatDependOnContinuousTasks.length > 0) {
|
134
|
+
throw new NonParallelTaskDependsOnContinuousTasksError(nonParallelTasksThatDependOnContinuousTasks, taskGraph);
|
126
135
|
}
|
127
|
-
if (
|
128
|
-
throw new
|
136
|
+
if (nonParallelContinuousTasksThatAreDependedOn.length > 0) {
|
137
|
+
throw new DependingOnNonParallelContinuousTaskError(nonParallelContinuousTasksThatAreDependedOn, taskGraph);
|
129
138
|
}
|
130
139
|
}
|
131
140
|
class NonParallelTaskDependsOnContinuousTasksError extends Error {
|
@@ -139,6 +148,20 @@ class NonParallelTaskDependsOnContinuousTasksError extends Error {
|
|
139
148
|
this.name = 'NonParallelTaskDependsOnContinuousTasksError';
|
140
149
|
}
|
141
150
|
}
|
151
|
+
class DependingOnNonParallelContinuousTaskError extends Error {
|
152
|
+
constructor(invalidTasks, taskGraph) {
|
153
|
+
let message = 'The following continuous tasks do not support parallelism but are depended on:';
|
154
|
+
for (const task of invalidTasks) {
|
155
|
+
const dependents = Object.keys(taskGraph.continuousDependencies).filter((parentTaskId) => taskGraph.continuousDependencies[parentTaskId].includes(task.id));
|
156
|
+
message += `\n - ${task.id} <- ${dependents.join(', ')}`;
|
157
|
+
}
|
158
|
+
message +=
|
159
|
+
'\nParallelism must be enabled for a continuous task if it is depended on, as the tasks that depend on it will run in parallel with it.';
|
160
|
+
super(message);
|
161
|
+
this.invalidTasks = invalidTasks;
|
162
|
+
this.name = 'DependingOnNonParallelContinuousTaskError';
|
163
|
+
}
|
164
|
+
}
|
142
165
|
function getLeafTasks(taskGraph) {
|
143
166
|
const reversed = reverseTaskGraph(taskGraph);
|
144
167
|
const leafTasks = new Set();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.ts"],"names":[],"mappings":"AA+BA,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;AAE7D,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAE/C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,CACP,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,MAAM,EACzB,GAAG,EAAE,MAAM,KACR,MAAM,CAAC;CACb;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,GAAE,MAAW,GAAG,cAAc,CAYrE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,cAAc,GAAE,cAAuC,EACvD,IAAI,GAAE,MAAsB,GAC3B,OAAO,
|
1
|
+
{"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.ts"],"names":[],"mappings":"AA+BA,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;AAE7D,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAE/C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,CACP,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,MAAM,EACzB,GAAG,EAAE,MAAM,KACR,MAAM,CAAC;CACb;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,GAAE,MAAW,GAAG,cAAc,CAYrE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,cAAc,GAAE,cAAuC,EACvD,IAAI,GAAE,MAAsB,GAC3B,OAAO,CAmBT;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CACtC,cAAc,GAAE,cAAuC,EACvD,IAAI,GAAE,MAAsB,GAC3B,sBAAsB,CA4HxB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,cAAc,GAAE,cAAuC,EACvD,GAAG,SAAgB,GAClB,MAAM,CAwBR;AAED,wBAAgB,mCAAmC,CACjD,uBAAuB,EAAE,MAAM,EAC/B,wBAAwB,EAAE,MAAM,GAAG,SAAS,GAC3C,IAAI,GAAG,MAAM,CAkBf;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,MAAM,EACZ,SAAS,GAAE,MAAsB,GAChC,MAAM,GAAG,IAAI,CAUf;AAED;;;;;;;;;GASG;AACH,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAkBzE;AAED;;;;;;;;;GASG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAOtE;AAED,wBAAgB,oCAAoC,CAClD,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,QAuCpB;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB;;;EAoBrC;AAED;;;GAGG;AACH,wBAAsB,kCAAkC,CACtD,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CA8BjB;AAED;;;;GAIG;AACH,wBAAsB,sCAAsC,CAC1D,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,CAoBjB;AAED,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,CAsBlC;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,cAAc,GAAE,cAAuC,EACvD,IAAI,GAAE,MAAsB,GAC3B,MAAM,EAAE,CAoBV;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,cAAuC,EACvD,UAAU,GAAE,MAAM,EAAyC,EAC3D,IAAI,GAAE,MAAsB,GAC3B,IAAI,CAiEN"}
|
@@ -52,7 +52,18 @@ function detectPackageManager(dir = '') {
|
|
52
52
|
*/
|
53
53
|
function isWorkspacesEnabled(packageManager = detectPackageManager(), root = workspace_root_1.workspaceRoot) {
|
54
54
|
if (packageManager === 'pnpm') {
|
55
|
-
|
55
|
+
if (!(0, fs_1.existsSync)((0, path_1.join)(root, 'pnpm-workspace.yaml'))) {
|
56
|
+
return false;
|
57
|
+
}
|
58
|
+
try {
|
59
|
+
const content = (0, fs_1.readFileSync)((0, path_1.join)(root, 'pnpm-workspace.yaml'), 'utf-8');
|
60
|
+
const { load } = require('@zkochan/js-yaml');
|
61
|
+
const { packages } = load(content) ?? {};
|
62
|
+
return packages !== undefined;
|
63
|
+
}
|
64
|
+
catch {
|
65
|
+
return false;
|
66
|
+
}
|
56
67
|
}
|
57
68
|
// yarn and npm both use the same 'workspaces' property in package.json
|
58
69
|
const packageJson = (0, file_utils_1.readPackageJson)(root);
|
@@ -3,5 +3,12 @@ export declare class PromisedBasedQueue {
|
|
3
3
|
private promise;
|
4
4
|
sendToQueue(fn: () => Promise<any>): Promise<any>;
|
5
5
|
isEmpty(): boolean;
|
6
|
+
/**
|
7
|
+
* Used to decrement the internal counter representing the number of active promises in the queue.
|
8
|
+
* This is useful for retrying a failed daemon message, as we want to be able to shut the daemon down
|
9
|
+
* without marking the promise that represents the failed message as settled. To do so, we store
|
10
|
+
* the promise in a separate variable and only resolve or reject it later.
|
11
|
+
*/
|
12
|
+
decrementQueueCounter(): void;
|
6
13
|
}
|
7
14
|
//# sourceMappingURL=promised-based-queue.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"promised-based-queue.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/promised-based-queue.ts"],"names":[],"mappings":"AAAA,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,OAAO,CAAyB;IAExC,WAAW,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IA8BjD,OAAO;
|
1
|
+
{"version":3,"file":"promised-based-queue.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/promised-based-queue.ts"],"names":[],"mappings":"AAAA,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,OAAO,CAAyB;IAExC,WAAW,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IA8BjD,OAAO;IAIP;;;;;OAKG;IACH,qBAAqB;CAGtB"}
|
@@ -39,5 +39,14 @@ class PromisedBasedQueue {
|
|
39
39
|
isEmpty() {
|
40
40
|
return this.counter === 0;
|
41
41
|
}
|
42
|
+
/**
|
43
|
+
* Used to decrement the internal counter representing the number of active promises in the queue.
|
44
|
+
* This is useful for retrying a failed daemon message, as we want to be able to shut the daemon down
|
45
|
+
* without marking the promise that represents the failed message as settled. To do so, we store
|
46
|
+
* the promise in a separate variable and only resolve or reject it later.
|
47
|
+
*/
|
48
|
+
decrementQueueCounter() {
|
49
|
+
this.counter--;
|
50
|
+
}
|
42
51
|
}
|
43
52
|
exports.PromisedBasedQueue = PromisedBasedQueue;
|