nx 21.7.0-canary.20250930-e144408 → 21.7.0
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.
Potentially problematic release.
This version of nx might be problematic. Click here for more details.
- package/README.md +1 -1
- package/bin/nx.js +0 -1
- package/generators.json +0 -6
- package/package.json +12 -12
- package/schemas/nx-schema.json +1 -15
- package/src/adapter/ngcli-adapter.d.ts.map +1 -1
- package/src/adapter/ngcli-adapter.js +8 -21
- package/src/command-line/format/format.js +1 -5
- package/src/command-line/graph/graph.d.ts.map +1 -1
- package/src/command-line/graph/graph.js +14 -37
- package/src/command-line/init/command-object.js +0 -6
- package/src/command-line/init/init-v2.d.ts +0 -2
- package/src/command-line/init/init-v2.d.ts.map +1 -1
- package/src/command-line/init/init-v2.js +0 -20
- package/src/command-line/migrate/command-object.js +1 -1
- package/src/command-line/migrate/migrate.d.ts +2 -3
- package/src/command-line/migrate/migrate.d.ts.map +1 -1
- package/src/command-line/migrate/migrate.js +7 -37
- package/src/command-line/nx-cloud/fix-ci/command-object.d.ts.map +1 -1
- package/src/command-line/nx-cloud/fix-ci/command-object.js +1 -4
- package/src/command-line/nx-cloud/login/command-object.d.ts.map +1 -1
- package/src/command-line/nx-cloud/login/command-object.js +1 -4
- package/src/command-line/nx-cloud/logout/command-object.d.ts.map +1 -1
- package/src/command-line/nx-cloud/logout/command-object.js +1 -4
- package/src/command-line/nx-cloud/record/command-object.d.ts.map +1 -1
- package/src/command-line/nx-cloud/record/command-object.js +1 -4
- package/src/command-line/nx-cloud/start-ci-run/command-object.d.ts.map +1 -1
- package/src/command-line/nx-cloud/start-ci-run/command-object.js +1 -4
- package/src/command-line/nx-commands.d.ts.map +1 -1
- package/src/command-line/nx-commands.js +15 -17
- package/src/command-line/release/config/config.d.ts.map +1 -1
- package/src/command-line/release/config/config.js +0 -3
- package/src/command-line/release/publish.d.ts.map +1 -1
- package/src/command-line/release/publish.js +0 -8
- package/src/command-line/release/version/release-group-processor.d.ts +2 -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 +50 -13
- package/src/command-line/run/run-one.d.ts.map +1 -1
- package/src/command-line/run/run-one.js +9 -9
- package/src/config/misc-interfaces.d.ts +0 -1
- package/src/config/misc-interfaces.d.ts.map +1 -1
- package/src/config/nx-json.d.ts +0 -9
- package/src/config/nx-json.d.ts.map +1 -1
- package/src/config/workspace-json-project-json.d.ts +1 -7
- package/src/config/workspace-json-project-json.d.ts.map +1 -1
- package/src/core/graph/index.html +2 -4
- 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.map +1 -1
- package/src/daemon/client/client.js +5 -8
- package/src/daemon/server/server.js +1 -1
- package/src/daemon/server/shutdown-utils.d.ts.map +1 -1
- package/src/daemon/server/shutdown-utils.js +2 -6
- package/src/devkit-internals.d.ts +1 -1
- package/src/devkit-internals.d.ts.map +1 -1
- package/src/devkit-internals.js +1 -2
- package/src/executors/run-script/run-script.impl.d.ts.map +1 -1
- package/src/executors/run-script/run-script.impl.js +8 -33
- package/src/hasher/hash-task.js +1 -1
- package/src/native/index.d.ts +0 -15
- package/src/native/native-bindings.js +0 -4
- package/src/native/nx.wasi.cjs +45 -53
- 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 +4 -5
- package/src/plugins/js/lock-file/npm-parser.d.ts.map +1 -1
- package/src/plugins/js/lock-file/npm-parser.js +1 -4
- package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.js +7 -7
- package/src/plugins/js/project-graph/build-dependencies/target-project-locator.d.ts +1 -1
- package/src/plugins/js/project-graph/build-dependencies/target-project-locator.d.ts.map +1 -1
- package/src/plugins/js/project-graph/build-dependencies/target-project-locator.js +2 -33
- package/src/plugins/js/versions.d.ts +1 -1
- package/src/plugins/js/versions.js +1 -1
- package/src/plugins/package-json/create-nodes.d.ts.map +1 -1
- package/src/plugins/package-json/create-nodes.js +3 -2
- package/src/project-graph/build-project-graph.d.ts.map +1 -1
- package/src/project-graph/build-project-graph.js +21 -28
- package/src/project-graph/nx-deps-cache.d.ts +3 -4
- package/src/project-graph/nx-deps-cache.d.ts.map +1 -1
- package/src/project-graph/nx-deps-cache.js +2 -7
- package/src/project-graph/plugins/loaded-nx-plugin.d.ts.map +1 -1
- package/src/project-graph/plugins/public-api.d.ts +0 -4
- package/src/project-graph/plugins/public-api.d.ts.map +1 -1
- package/src/project-graph/utils/project-configuration-utils.d.ts.map +1 -1
- package/src/project-graph/utils/project-configuration-utils.js +6 -5
- package/src/tasks-runner/create-task-graph.d.ts.map +1 -1
- package/src/tasks-runner/create-task-graph.js +3 -17
- package/src/tasks-runner/fork.js +5 -31
- package/src/tasks-runner/life-cycle.d.ts.map +1 -1
- package/src/tasks-runner/life-cycles/task-history-life-cycle.d.ts.map +1 -1
- package/src/tasks-runner/life-cycles/task-history-life-cycle.js +4 -3
- package/src/tasks-runner/run-command.d.ts.map +1 -1
- package/src/tasks-runner/run-command.js +9 -19
- package/src/tasks-runner/task-orchestrator.d.ts.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +5 -8
- package/src/tasks-runner/utils.d.ts.map +1 -1
- package/src/tasks-runner/utils.js +1 -3
- package/src/utils/nx-console-prompt.d.ts.map +1 -1
- package/src/utils/nx-console-prompt.js +0 -8
- package/src/utils/package-json.d.ts +0 -4
- package/src/utils/package-json.d.ts.map +1 -1
- package/src/utils/package-json.js +1 -52
- package/src/utils/package-manager.d.ts +1 -6
- package/src/utils/package-manager.d.ts.map +1 -1
- package/src/utils/package-manager.js +4 -15
- package/src/utils/split-target.d.ts.map +1 -1
- package/src/utils/split-target.js +6 -46
- package/src/utils/task-history.js +1 -1
- package/telemetry.js +198 -0
- package/src/ai/constants.d.ts +0 -15
- package/src/ai/constants.d.ts.map +0 -1
- package/src/ai/constants.js +0 -53
- package/src/ai/set-up-ai-agents/get-agent-rules.d.ts +0 -2
- package/src/ai/set-up-ai-agents/get-agent-rules.d.ts.map +0 -1
- package/src/ai/set-up-ai-agents/get-agent-rules.js +0 -26
- package/src/ai/set-up-ai-agents/schema.d.ts +0 -9
- package/src/ai/set-up-ai-agents/schema.json +0 -34
- package/src/ai/set-up-ai-agents/set-up-ai-agents.d.ts +0 -11
- package/src/ai/set-up-ai-agents/set-up-ai-agents.d.ts.map +0 -1
- package/src/ai/set-up-ai-agents/set-up-ai-agents.js +0 -213
- package/src/ai/utils.d.ts +0 -20
- package/src/ai/utils.d.ts.map +0 -1
- package/src/ai/utils.js +0 -187
- package/src/command-line/configure-ai-agents/command-object.d.ts +0 -9
- package/src/command-line/configure-ai-agents/command-object.d.ts.map +0 -1
- package/src/command-line/configure-ai-agents/command-object.js +0 -32
- package/src/command-line/configure-ai-agents/configure-ai-agents.d.ts +0 -4
- package/src/command-line/configure-ai-agents/configure-ai-agents.d.ts.map +0 -1
- package/src/command-line/configure-ai-agents/configure-ai-agents.js +0 -231
- package/src/command-line/init/ai-agent-prompts.d.ts +0 -3
- package/src/command-line/init/ai-agent-prompts.d.ts.map +0 -1
- package/src/command-line/init/ai-agent-prompts.js +0 -28
- package/src/utils/provenance.d.ts +0 -48
- package/src/utils/provenance.d.ts.map +0 -1
- package/src/utils/provenance.js +0 -84
package/src/native/nx.wasi.cjs
CHANGED
@@ -90,55 +90,51 @@ function __napi_rs_initialize_modules(__napiInstance) {
|
|
90
90
|
__napiInstance.exports['__napi_register__get_transformable_outputs_5']?.()
|
91
91
|
__napiInstance.exports['__napi_register__hash_array_6']?.()
|
92
92
|
__napiInstance.exports['__napi_register__hash_file_7']?.()
|
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['
|
106
|
-
__napiInstance.exports['
|
107
|
-
__napiInstance.exports['
|
108
|
-
__napiInstance.exports['
|
109
|
-
__napiInstance.exports['
|
110
|
-
__napiInstance.exports['
|
111
|
-
__napiInstance.exports['
|
112
|
-
__napiInstance.exports['
|
113
|
-
__napiInstance.exports['
|
114
|
-
__napiInstance.exports['
|
115
|
-
__napiInstance.exports['
|
116
|
-
__napiInstance.exports['
|
117
|
-
__napiInstance.exports['
|
118
|
-
__napiInstance.exports['
|
119
|
-
__napiInstance.exports['
|
120
|
-
__napiInstance.exports['
|
121
|
-
__napiInstance.exports['
|
122
|
-
__napiInstance.exports['
|
123
|
-
__napiInstance.exports['
|
124
|
-
__napiInstance.exports['
|
125
|
-
__napiInstance.exports['
|
126
|
-
__napiInstance.exports['
|
127
|
-
__napiInstance.exports['
|
128
|
-
__napiInstance.exports['
|
129
|
-
__napiInstance.exports['
|
130
|
-
__napiInstance.exports['
|
131
|
-
__napiInstance.exports['
|
132
|
-
__napiInstance.exports['
|
133
|
-
__napiInstance.exports['
|
134
|
-
__napiInstance.exports['
|
135
|
-
__napiInstance.exports['
|
136
|
-
__napiInstance.exports['
|
137
|
-
__napiInstance.exports['
|
138
|
-
__napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_74']?.()
|
139
|
-
__napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_75']?.()
|
140
|
-
__napiInstance.exports['__napi_register__FileMap_struct_76']?.()
|
141
|
-
__napiInstance.exports['__napi_register____test_only_transfer_file_map_77']?.()
|
93
|
+
__napiInstance.exports['__napi_register__can_install_nx_console_8']?.()
|
94
|
+
__napiInstance.exports['__napi_register__install_nx_console_9']?.()
|
95
|
+
__napiInstance.exports['__napi_register__NxConsolePreferences_struct_10']?.()
|
96
|
+
__napiInstance.exports['__napi_register__NxConsolePreferences_impl_14']?.()
|
97
|
+
__napiInstance.exports['__napi_register__log_debug_15']?.()
|
98
|
+
__napiInstance.exports['__napi_register__IS_WASM_16']?.()
|
99
|
+
__napiInstance.exports['__napi_register__get_binary_target_17']?.()
|
100
|
+
__napiInstance.exports['__napi_register__ImportResult_struct_18']?.()
|
101
|
+
__napiInstance.exports['__napi_register__find_imports_19']?.()
|
102
|
+
__napiInstance.exports['__napi_register__transfer_project_graph_20']?.()
|
103
|
+
__napiInstance.exports['__napi_register__ExternalNode_struct_21']?.()
|
104
|
+
__napiInstance.exports['__napi_register__Target_struct_22']?.()
|
105
|
+
__napiInstance.exports['__napi_register__Project_struct_23']?.()
|
106
|
+
__napiInstance.exports['__napi_register__ProjectGraph_struct_24']?.()
|
107
|
+
__napiInstance.exports['__napi_register__HashPlanInspector_struct_25']?.()
|
108
|
+
__napiInstance.exports['__napi_register__HashPlanInspector_impl_28']?.()
|
109
|
+
__napiInstance.exports['__napi_register__HashPlanner_struct_29']?.()
|
110
|
+
__napiInstance.exports['__napi_register__HashPlanner_impl_33']?.()
|
111
|
+
__napiInstance.exports['__napi_register__HashDetails_struct_34']?.()
|
112
|
+
__napiInstance.exports['__napi_register__HasherOptions_struct_35']?.()
|
113
|
+
__napiInstance.exports['__napi_register__TaskHasher_struct_36']?.()
|
114
|
+
__napiInstance.exports['__napi_register__TaskHasher_impl_39']?.()
|
115
|
+
__napiInstance.exports['__napi_register__Task_struct_40']?.()
|
116
|
+
__napiInstance.exports['__napi_register__TaskTarget_struct_41']?.()
|
117
|
+
__napiInstance.exports['__napi_register__TaskResult_struct_42']?.()
|
118
|
+
__napiInstance.exports['__napi_register__TaskGraph_struct_43']?.()
|
119
|
+
__napiInstance.exports['__napi_register__FileData_struct_44']?.()
|
120
|
+
__napiInstance.exports['__napi_register__InputsInput_struct_45']?.()
|
121
|
+
__napiInstance.exports['__napi_register__FileSetInput_struct_46']?.()
|
122
|
+
__napiInstance.exports['__napi_register__RuntimeInput_struct_47']?.()
|
123
|
+
__napiInstance.exports['__napi_register__EnvironmentInput_struct_48']?.()
|
124
|
+
__napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_49']?.()
|
125
|
+
__napiInstance.exports['__napi_register__DepsOutputsInput_struct_50']?.()
|
126
|
+
__napiInstance.exports['__napi_register__NxJson_struct_51']?.()
|
127
|
+
__napiInstance.exports['__napi_register__is_ai_agent_52']?.()
|
128
|
+
__napiInstance.exports['__napi_register__FileLock_struct_53']?.()
|
129
|
+
__napiInstance.exports['__napi_register__FileLock_impl_55']?.()
|
130
|
+
__napiInstance.exports['__napi_register__WorkspaceContext_struct_56']?.()
|
131
|
+
__napiInstance.exports['__napi_register__WorkspaceContext_impl_67']?.()
|
132
|
+
__napiInstance.exports['__napi_register__WorkspaceErrors_68']?.()
|
133
|
+
__napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_69']?.()
|
134
|
+
__napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_70']?.()
|
135
|
+
__napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_71']?.()
|
136
|
+
__napiInstance.exports['__napi_register__FileMap_struct_72']?.()
|
137
|
+
__napiInstance.exports['__napi_register____test_only_transfer_file_map_73']?.()
|
142
138
|
}
|
143
139
|
module.exports.FileLock = __napiModule.exports.FileLock
|
144
140
|
module.exports.HashPlanInspector = __napiModule.exports.HashPlanInspector
|
@@ -148,7 +144,6 @@ module.exports.NxConsolePreferences = __napiModule.exports.NxConsolePreferences
|
|
148
144
|
module.exports.TaskHasher = __napiModule.exports.TaskHasher
|
149
145
|
module.exports.WorkspaceContext = __napiModule.exports.WorkspaceContext
|
150
146
|
module.exports.canInstallNxConsole = __napiModule.exports.canInstallNxConsole
|
151
|
-
module.exports.canInstallNxConsoleForEditor = __napiModule.exports.canInstallNxConsoleForEditor
|
152
147
|
module.exports.copy = __napiModule.exports.copy
|
153
148
|
module.exports.expandOutputs = __napiModule.exports.expandOutputs
|
154
149
|
module.exports.findImports = __napiModule.exports.findImports
|
@@ -158,13 +153,10 @@ module.exports.getTransformableOutputs = __napiModule.exports.getTransformableOu
|
|
158
153
|
module.exports.hashArray = __napiModule.exports.hashArray
|
159
154
|
module.exports.hashFile = __napiModule.exports.hashFile
|
160
155
|
module.exports.installNxConsole = __napiModule.exports.installNxConsole
|
161
|
-
module.exports.installNxConsoleForEditor = __napiModule.exports.installNxConsoleForEditor
|
162
156
|
module.exports.IS_WASM = __napiModule.exports.IS_WASM
|
163
157
|
module.exports.isAiAgent = __napiModule.exports.isAiAgent
|
164
|
-
module.exports.isEditorInstalled = __napiModule.exports.isEditorInstalled
|
165
158
|
module.exports.logDebug = __napiModule.exports.logDebug
|
166
159
|
module.exports.remove = __napiModule.exports.remove
|
167
|
-
module.exports.SupportedEditor = __napiModule.exports.SupportedEditor
|
168
160
|
module.exports.testOnlyTransferFileMap = __napiModule.exports.testOnlyTransferFileMap
|
169
161
|
module.exports.transferProjectGraph = __napiModule.exports.transferProjectGraph
|
170
162
|
module.exports.validateOutputs = __napiModule.exports.validateOutputs
|
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;AAwF9D,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,11 +23,10 @@ function printCloudConnectionDisabledMessage() {
|
|
23
23
|
],
|
24
24
|
});
|
25
25
|
}
|
26
|
-
function getRootPackageName(tree
|
26
|
+
function getRootPackageName(tree) {
|
27
27
|
let packageJson;
|
28
28
|
try {
|
29
|
-
|
30
|
-
packageJson = (0, json_1.readJson)(tree, packageJsonPath);
|
29
|
+
packageJson = (0, json_1.readJson)(tree, 'package.json');
|
31
30
|
}
|
32
31
|
catch (e) { }
|
33
32
|
return packageJson?.name ?? 'my-workspace';
|
@@ -125,11 +124,11 @@ async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)
|
|
125
124
|
schema.installationSource === 'nx-console'))
|
126
125
|
return null;
|
127
126
|
try {
|
128
|
-
responseFromCreateNxCloudWorkspaceV2 = await createNxCloudWorkspaceV2(getRootPackageName(tree
|
127
|
+
responseFromCreateNxCloudWorkspaceV2 = await createNxCloudWorkspaceV2(getRootPackageName(tree), schema.installationSource, getNxInitDate());
|
129
128
|
}
|
130
129
|
catch (e) {
|
131
130
|
if (e.response?.status === 404) {
|
132
|
-
responseFromCreateNxCloudWorkspaceV1 = await createNxCloudWorkspaceV1(getRootPackageName(tree
|
131
|
+
responseFromCreateNxCloudWorkspaceV1 = await createNxCloudWorkspaceV1(getRootPackageName(tree), schema.installationSource, getNxInitDate());
|
133
132
|
}
|
134
133
|
else {
|
135
134
|
throw e;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"npm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/npm-parser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EAEzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA6D3E,wBAAgB,mBAAmB,CACjC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,4CASrB;AAED,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAQ/B;
|
1
|
+
{"version":3,"file":"npm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/npm-parser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EAEzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA6D3E,wBAAgB,mBAAmB,CACjC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,4CASrB;AAED,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAQ/B;AAoSD,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,GACjC,MAAM,CA8BR"}
|
@@ -44,10 +44,7 @@ function getNodes(data, keyMap) {
|
|
44
44
|
}
|
45
45
|
const packageName = path.split('node_modules/').pop();
|
46
46
|
const version = findV3Version(snapshot, packageName);
|
47
|
-
|
48
|
-
if (version) {
|
49
|
-
createNode(packageName, version, path, nodes, keyMap, snapshot);
|
50
|
-
}
|
47
|
+
createNode(packageName, version, path, nodes, keyMap, snapshot);
|
51
48
|
});
|
52
49
|
}
|
53
50
|
else {
|
package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.js
CHANGED
@@ -22,31 +22,31 @@ function isPackageJsonAtProjectRoot(nodes, fileName) {
|
|
22
22
|
return (fileName.endsWith('package.json') &&
|
23
23
|
nodes.find((projectNode) => (0, path_1.joinPathFragments)(projectNode.root, 'package.json') === fileName));
|
24
24
|
}
|
25
|
-
function processPackageJson(sourceProject,
|
25
|
+
function processPackageJson(sourceProject, fileName, ctx, targetProjectLocator, collectedDeps) {
|
26
26
|
try {
|
27
|
-
const deps = readDeps((0, json_1.parseJson)((0, file_utils_1.defaultFileRead)(
|
28
|
-
for (const
|
29
|
-
const localProject = targetProjectLocator.findDependencyInWorkspaceProjects(
|
27
|
+
const deps = readDeps((0, json_1.parseJson)((0, file_utils_1.defaultFileRead)(fileName)));
|
28
|
+
for (const d of Object.keys(deps)) {
|
29
|
+
const localProject = targetProjectLocator.findDependencyInWorkspaceProjects(d);
|
30
30
|
if (localProject) {
|
31
31
|
// package.json refers to another project in the monorepo
|
32
32
|
const dependency = {
|
33
33
|
source: sourceProject,
|
34
34
|
target: localProject,
|
35
|
-
sourceFile:
|
35
|
+
sourceFile: fileName,
|
36
36
|
type: project_graph_1.DependencyType.static,
|
37
37
|
};
|
38
38
|
(0, project_graph_builder_1.validateDependency)(dependency, ctx);
|
39
39
|
collectedDeps.push(dependency);
|
40
40
|
continue;
|
41
41
|
}
|
42
|
-
const externalNodeName = targetProjectLocator.findNpmProjectFromImport(
|
42
|
+
const externalNodeName = targetProjectLocator.findNpmProjectFromImport(d, fileName);
|
43
43
|
if (!externalNodeName) {
|
44
44
|
continue;
|
45
45
|
}
|
46
46
|
const dependency = {
|
47
47
|
source: sourceProject,
|
48
48
|
target: externalNodeName,
|
49
|
-
sourceFile:
|
49
|
+
sourceFile: fileName,
|
50
50
|
type: project_graph_1.DependencyType.static,
|
51
51
|
};
|
52
52
|
(0, project_graph_builder_1.validateDependency)(dependency, ctx);
|
@@ -47,7 +47,7 @@ export declare class TargetProjectLocator {
|
|
47
47
|
findPaths(normalizedImportExpr: string): string[] | undefined;
|
48
48
|
findMatchingPaths(importExpr: string): [pattern: string | PathPattern, paths: string[]] | undefined;
|
49
49
|
findImportInWorkspaceProjects(importPath: string): string | null;
|
50
|
-
findDependencyInWorkspaceProjects(
|
50
|
+
findDependencyInWorkspaceProjects(dep: string): string | null;
|
51
51
|
private isPatternMatch;
|
52
52
|
private parsePaths;
|
53
53
|
private resolveImportWithTypescript;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"target-project-locator.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/target-project-locator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,kCAAkC,CAAC;AAmB1C;;;;GAIG;AACH,KAAK,kBAAkB,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;AAErD,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAaF,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAGjE;AAED,qBAAa,oBAAoB;IAc7B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAI9B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAlBrC,OAAO,CAAC,mBAAmB,CAAyC;IACpE,OAAO,CAAC,WAAW,CAAkD;IACrE,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,KAAK,CAAgD;IAC7D,OAAO,CAAC,kBAAkB,CAA6B;IACvD,OAAO,CAAC,yBAAyB,CAAoC;IACrE,OAAO,CAAC,gBAAgB,CAItB;gBAGiB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAC9C,aAAa,GAAE,MAAM,CACpC,MAAM,EACN,wBAAwB,CACpB,EACW,kBAAkB,GAAE,kBAA8C;IA2BrF;;;;;;OAMG;IACH,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAsEnE;;;;;;OAMG;IACH,wBAAwB,CACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI;IAoEhB;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS;IAmB7D,iBAAiB,CACf,UAAU,EAAE,MAAM,GACjB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS;IA6B/D,6BAA6B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAehE,iCAAiC,
|
1
|
+
{"version":3,"file":"target-project-locator.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/target-project-locator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,kCAAkC,CAAC;AAmB1C;;;;GAIG;AACH,KAAK,kBAAkB,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;AAErD,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAaF,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAGjE;AAED,qBAAa,oBAAoB;IAc7B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAI9B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAlBrC,OAAO,CAAC,mBAAmB,CAAyC;IACpE,OAAO,CAAC,WAAW,CAAkD;IACrE,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,KAAK,CAAgD;IAC7D,OAAO,CAAC,kBAAkB,CAA6B;IACvD,OAAO,CAAC,yBAAyB,CAAoC;IACrE,OAAO,CAAC,gBAAgB,CAItB;gBAGiB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAC9C,aAAa,GAAE,MAAM,CACpC,MAAM,EACN,wBAAwB,CACpB,EACW,kBAAkB,GAAE,kBAA8C;IA2BrF;;;;;;OAMG;IACH,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAsEnE;;;;;;OAMG;IACH,wBAAwB,CACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI;IAoEhB;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS;IAmB7D,iBAAiB,CACf,UAAU,EAAE,MAAM,GACjB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS;IA6B/D,6BAA6B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAehE,iCAAiC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAM7D,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,UAAU;IAuBlB,OAAO,CAAC,2BAA2B;IAgDnC,OAAO,CAAC,wBAAwB;IAYhC,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,eAAe;IAkBvB,OAAO,CAAC,wBAAwB;IAKhC;;;;;;;;;OASG;IACH,OAAO,CAAC,eAAe;CAyCxB"}
|
@@ -223,40 +223,9 @@ class TargetProjectLocator {
|
|
223
223
|
const project = (0, packages_1.matchImportToWildcardEntryPointsToProjectMap)(this.packagesMetadata.wildcardEntryPointsToProjectMap, importPath);
|
224
224
|
return project?.name;
|
225
225
|
}
|
226
|
-
findDependencyInWorkspaceProjects(
|
226
|
+
findDependencyInWorkspaceProjects(dep) {
|
227
227
|
this.packagesMetadata ??= (0, packages_1.getWorkspacePackagesMetadata)(this.nodes);
|
228
|
-
|
229
|
-
const maybeDepMetadata = maybeDep?.data.metadata.js;
|
230
|
-
if (!maybeDepMetadata?.isInPackageManagerWorkspaces) {
|
231
|
-
return null;
|
232
|
-
}
|
233
|
-
const workspaceRegex = /^workspace:/;
|
234
|
-
const hasWorkspaceProtocol = workspaceRegex.test(packageVersion);
|
235
|
-
const normalizedRange = packageVersion.replace(workspaceRegex, '');
|
236
|
-
/**
|
237
|
-
* Regex is needed to test for workspace: protocol because following options are all valid:
|
238
|
-
* - workspace:*
|
239
|
-
* - workspace:^
|
240
|
-
* - workspace:~
|
241
|
-
* - workspace:foo@*
|
242
|
-
*/
|
243
|
-
if (hasWorkspaceProtocol || normalizedRange === '*') {
|
244
|
-
return maybeDep?.name;
|
245
|
-
}
|
246
|
-
if (normalizedRange.startsWith('file:')) {
|
247
|
-
const targetPath = maybeDep?.data.root;
|
248
|
-
const normalizedPath = normalizedRange.replace('file:', '');
|
249
|
-
const resolvedPath = (0, node_path_1.join)((0, node_path_1.dirname)(packageJsonPath), normalizedPath);
|
250
|
-
if (targetPath === resolvedPath) {
|
251
|
-
return maybeDep?.name;
|
252
|
-
}
|
253
|
-
}
|
254
|
-
if ((0, semver_1.satisfies)(maybeDepMetadata.packageVersion, normalizedRange, {
|
255
|
-
includePrerelease: true,
|
256
|
-
})) {
|
257
|
-
return maybeDep?.name;
|
258
|
-
}
|
259
|
-
return null;
|
228
|
+
return this.packagesMetadata.packageToProjectMap[dep]?.name;
|
260
229
|
}
|
261
230
|
isPatternMatch({ prefix, suffix }, candidate) {
|
262
231
|
return (candidate.length >= prefix.length + suffix.length &&
|
@@ -1,2 +1,2 @@
|
|
1
|
-
export declare const typescriptVersion = "~5.
|
1
|
+
export declare const typescriptVersion = "~5.8.2";
|
2
2
|
//# sourceMappingURL=versions.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"create-nodes.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/plugins/package-json/create-nodes.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAc,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAMrF,OAAO,EAEL,WAAW,EAGZ,MAAM,0BAA0B,CAAC;
|
1
|
+
{"version":3,"file":"create-nodes.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/plugins/package-json/create-nodes.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAc,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAMrF,OAAO,EAEL,WAAW,EAGZ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAEL,aAAa,EACd,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EACL,6BAA6B,EAE9B,MAAM,+BAA+B,CAAC;AAEvC,eAAO,MAAM,aAAa,EAAE,aA8C3B,CAAC;AAoBF,wBAAgB,iCAAiC,CAC/C,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,IAqBvB,GAAG,MAAM,aAYlB;AAED,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,6BAA6B,EACpC,4BAA4B,EAAE,OAAO;;;;EAsCtC;AAED,wBAAgB,wCAAwC,CACtD,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,mBAAmB,EAC3B,4BAA4B,EAAE,OAAO,GACpC,oBAAoB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CA8DzC;AAED;;GAEG;AACH,wBAAgB,2CAA2C,CACzD,IAAI,EAAE,MAAM,EAEZ,QAAQ,GAAE,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,CAER,EACtC,QAAQ,GAAE,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,CAER,EACtC,MAAM,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAA0C,GACnE,MAAM,EAAE,CA+CV"}
|
@@ -16,7 +16,6 @@ const logger_1 = require("../../utils/logger");
|
|
16
16
|
const output_1 = require("../../utils/output");
|
17
17
|
const package_json_1 = require("../../utils/package-json");
|
18
18
|
const path_1 = require("../../utils/path");
|
19
|
-
const versions_1 = require("../../utils/versions");
|
20
19
|
const plugins_1 = require("../../project-graph/plugins");
|
21
20
|
const path_2 = require("path");
|
22
21
|
const file_hasher_1 = require("../../hasher/file-hasher");
|
@@ -90,7 +89,9 @@ function createNodeFromPackageJson(pkgJsonPath, workspaceRoot, cache, isInPackag
|
|
90
89
|
...json,
|
91
90
|
root: projectRoot,
|
92
91
|
isInPackageManagerWorkspaces,
|
93
|
-
|
92
|
+
// change this to bust the cache when making changes that result in different
|
93
|
+
// results for the same hash
|
94
|
+
bust: 1,
|
94
95
|
});
|
95
96
|
const cached = cache[hash];
|
96
97
|
if (cached) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"build-project-graph.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/build-project-graph.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAIL,YAAY,EAEb,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAEL,qBAAqB,EAEtB,MAAM,WAAW,CAAC;AAEnB,OAAO,EACL,OAAO,EACP,YAAY,EACZ,wBAAwB,EACzB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAI7E,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAEL,mBAAmB,EAKpB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,uBAAuB,EAExB,MAAM,qCAAqC,CAAC;
|
1
|
+
{"version":3,"file":"build-project-graph.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/build-project-graph.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAIL,YAAY,EAEb,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAEL,qBAAqB,EAEtB,MAAM,WAAW,CAAC;AAEnB,OAAO,EACL,OAAO,EACP,YAAY,EACZ,wBAAwB,EACzB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAI7E,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAEL,mBAAmB,EAKpB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,uBAAuB,EAExB,MAAM,qCAAqC,CAAC;AAO7C,wBAAgB,UAAU,IAAI;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,QAAQ,EAAE,CAAC;IAC9B,cAAc,EAAE,yBAAyB,GAAG,IAAI,CAAC;CAClD,CAiBA;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,cAAc,EAAE,yBAAyB,QAK1C;AAED,wBAAsB,oCAAoC,CACxD,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EACpD,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,EACvD,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,cAAc,EAAE,yBAAyB,EACzC,YAAY,EAAE,YAAY,GAAG,IAAI,EACjC,OAAO,EAAE,cAAc,EAAE,EACzB,SAAS,EAAE,uBAAuB,GACjC,OAAO,CAAC;IACT,YAAY,EAAE,YAAY,CAAC;IAC3B,mBAAmB,EAAE,YAAY,CAAC;CACnC,CAAC,CA4FD;AA+OD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,cAAc,EAAE,EACzB,OAAO,EAAE,qBAAqB,EAC9B,SAAS,EAAE,uBAAuB,GACjC,OAAO,CAAC;IAAE,KAAK,EAAE,YAAY,CAAC;IAAC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAA;CAAE,CAAC,CAuFlE"}
|
@@ -19,7 +19,6 @@ const fs_1 = require("fs");
|
|
19
19
|
const error_types_1 = require("./error-types");
|
20
20
|
const project_configuration_utils_1 = require("./utils/project-configuration-utils");
|
21
21
|
const delayed_spinner_1 = require("../utils/delayed-spinner");
|
22
|
-
const file_hasher_1 = require("../hasher/file-hasher");
|
23
22
|
let storedFileMap = null;
|
24
23
|
let storedAllWorkspaceFiles = null;
|
25
24
|
let storedRustReferences = null;
|
@@ -69,11 +68,10 @@ async function buildProjectGraphUsingProjectFileMap(projectRootMap, externalNode
|
|
69
68
|
}
|
70
69
|
const packageJsonDeps = readCombinedDeps();
|
71
70
|
const rootTsConfig = readRootTsConfig();
|
72
|
-
const externalNodesHash = hashExternalNodes(externalNodes);
|
73
71
|
let filesToProcess;
|
74
72
|
let cachedFileData;
|
75
73
|
const useCacheData = fileMapCache &&
|
76
|
-
!(0, nx_deps_cache_1.shouldRecomputeWholeGraph)(fileMapCache, packageJsonDeps, projects, nxJson, rootTsConfig
|
74
|
+
!(0, nx_deps_cache_1.shouldRecomputeWholeGraph)(fileMapCache, packageJsonDeps, projects, nxJson, rootTsConfig);
|
77
75
|
if (useCacheData) {
|
78
76
|
const fromCache = (0, nx_deps_cache_1.extractCachedFileData)(fileMap, fileMapCache);
|
79
77
|
filesToProcess = fromCache.filesToProcess;
|
@@ -91,7 +89,7 @@ async function buildProjectGraphUsingProjectFileMap(projectRootMap, externalNode
|
|
91
89
|
try {
|
92
90
|
const context = createContext(projects, nxJson, externalNodes, fileMap, filesToProcess);
|
93
91
|
projectGraph = await buildProjectGraphUsingContext(externalNodes, context, cachedFileData, projectGraphVersion, plugins, sourceMap);
|
94
|
-
projectFileMapCache = (0, nx_deps_cache_1.createProjectFileMapCache)(nxJson, packageJsonDeps, fileMap, rootTsConfig
|
92
|
+
projectFileMapCache = (0, nx_deps_cache_1.createProjectFileMapCache)(nxJson, packageJsonDeps, fileMap, rootTsConfig);
|
95
93
|
}
|
96
94
|
catch (e) {
|
97
95
|
// we need to include the workspace validity errors in the final error
|
@@ -208,7 +206,7 @@ async function updateProjectGraphWithPlugins(context, initProjectGraph, plugins,
|
|
208
206
|
spinner.setMessage(`Creating project graph dependencies with ${inProgressPlugins.size} plugins`);
|
209
207
|
}
|
210
208
|
}
|
211
|
-
spinner = new delayed_spinner_1.DelayedSpinner(`Creating project graph dependencies with ${
|
209
|
+
spinner = new delayed_spinner_1.DelayedSpinner(`Creating project graph dependencies with ${plugins.length} plugins`);
|
212
210
|
await Promise.all(createDependencyPlugins.map(async (plugin) => {
|
213
211
|
perf_hooks_1.performance.mark(`${plugin.name}:createDependencies - start`);
|
214
212
|
inProgressPlugins.add(plugin.name);
|
@@ -281,23 +279,24 @@ async function applyProjectMetadata(graph, plugins, context, sourceMap) {
|
|
281
279
|
spinner.setMessage(`Creating project metadata with ${inProgressPlugins.size} plugins`);
|
282
280
|
}
|
283
281
|
}
|
284
|
-
|
285
|
-
|
286
|
-
|
287
|
-
|
288
|
-
|
289
|
-
|
290
|
-
|
291
|
-
|
292
|
-
|
293
|
-
|
294
|
-
|
295
|
-
|
296
|
-
|
297
|
-
|
298
|
-
|
299
|
-
|
300
|
-
|
282
|
+
spinner = new delayed_spinner_1.DelayedSpinner(`Creating project metadata with ${plugins.length} plugins`);
|
283
|
+
const promises = plugins.map(async (plugin) => {
|
284
|
+
if (plugin.createMetadata) {
|
285
|
+
perf_hooks_1.performance.mark(`${plugin.name}:createMetadata - start`);
|
286
|
+
inProgressPlugins.add(plugin.name);
|
287
|
+
try {
|
288
|
+
const metadata = await plugin.createMetadata(graph, context);
|
289
|
+
results.push({ metadata, pluginName: plugin.name });
|
290
|
+
}
|
291
|
+
catch (e) {
|
292
|
+
errors.push(new error_types_1.CreateMetadataError(e, plugin.name));
|
293
|
+
}
|
294
|
+
finally {
|
295
|
+
inProgressPlugins.delete(plugin.name);
|
296
|
+
updateSpinner();
|
297
|
+
perf_hooks_1.performance.mark(`${plugin.name}:createMetadata - end`);
|
298
|
+
perf_hooks_1.performance.measure(`${plugin.name}:createMetadata`, `${plugin.name}:createMetadata - start`, `${plugin.name}:createMetadata - end`);
|
299
|
+
}
|
301
300
|
}
|
302
301
|
});
|
303
302
|
await Promise.all(promises);
|
@@ -314,9 +313,3 @@ async function applyProjectMetadata(graph, plugins, context, sourceMap) {
|
|
314
313
|
perf_hooks_1.performance.measure(`createMetadata`, `createMetadata:start`, `createMetadata:end`);
|
315
314
|
return { errors, graph };
|
316
315
|
}
|
317
|
-
function hashExternalNodes(externalNodes) {
|
318
|
-
return (0, file_hasher_1.hashObject)(Object.entries(externalNodes).reduce((acc, [name, node]) => {
|
319
|
-
acc[name] = node.data.version;
|
320
|
-
return acc;
|
321
|
-
}, {}));
|
322
|
-
}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import { NxJsonConfiguration } from '../config/nx-json';
|
2
|
-
import
|
2
|
+
import { FileData, FileMap, ProjectGraph } from '../config/project-graph';
|
3
3
|
import { ProjectConfiguration } from '../config/workspace-json-project-json';
|
4
4
|
import { ConfigurationSourceMaps } from './utils/project-configuration-utils';
|
5
5
|
import { ProjectGraphErrorTypes } from './error-types';
|
@@ -10,7 +10,6 @@ export interface FileMapCache {
|
|
10
10
|
nxJsonPlugins: PluginData[];
|
11
11
|
pluginsConfig?: any;
|
12
12
|
fileMap: FileMap;
|
13
|
-
externalNodesHash?: string;
|
14
13
|
}
|
15
14
|
export declare const nxProjectGraph: string;
|
16
15
|
export declare const nxFileMap: string;
|
@@ -25,7 +24,7 @@ export declare function createProjectFileMapCache(nxJson: NxJsonConfiguration<'*
|
|
25
24
|
[p: string]: any;
|
26
25
|
};
|
27
26
|
};
|
28
|
-
}
|
27
|
+
}): FileMapCache;
|
29
28
|
export declare function writeCache(cache: FileMapCache, projectGraph: ProjectGraph, sourceMaps: ConfigurationSourceMaps, errors: ProjectGraphErrorTypes[]): void;
|
30
29
|
export declare function shouldRecomputeWholeGraph(cache: FileMapCache, packageJsonDeps: Record<string, string>, projects: Record<string, ProjectConfiguration>, nxJson: NxJsonConfiguration, tsConfig: {
|
31
30
|
compilerOptions: {
|
@@ -33,7 +32,7 @@ export declare function shouldRecomputeWholeGraph(cache: FileMapCache, packageJs
|
|
33
32
|
[k: string]: any;
|
34
33
|
};
|
35
34
|
};
|
36
|
-
}
|
35
|
+
}): boolean;
|
37
36
|
export type CachedFileData = {
|
38
37
|
nonProjectFiles: Record<string, FileData>;
|
39
38
|
projectFileMap: {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"nx-deps-cache.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/nx-deps-cache.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,
|
1
|
+
{"version":3,"file":"nx-deps-cache.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/nx-deps-cache.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAuB,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EACL,QAAQ,EACR,OAAO,EAEP,YAAY,EACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAU7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAEL,sBAAsB,EAEvB,MAAM,eAAe,CAAC;AAIvB,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClC,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,eAAO,MAAM,cAAc,QAG1B,CAAC;AACF,eAAO,MAAM,SAAS,QAAgD,CAAC;AAEvE,eAAO,MAAM,YAAY,QAAmD,CAAC;AAE7E,wBAAgB,oBAAoB,IAAI,IAAI,CAoB3C;AAED,wBAAgB,gBAAgB,IAAI,IAAI,GAAG,YAAY,CAmBtD;AAED,wBAAgB,qBAAqB,CACnC,iBAAiB,CAAC,EAAE,MAAM,GACzB,IAAI,GAAG,YAAY,CA8DrB;AAED,wBAAgB,mBAAmB,IAAI,IAAI,GAAG,uBAAuB,CAuBpE;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,mBAAmB,CAAC,GAAG,GAAG,MAAM,EAAE,CAAC,EAC3C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE;IAAE,eAAe,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE;YAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,gBAajE;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,YAAY,EACnB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,uBAAuB,EACnC,MAAM,EAAE,sBAAsB,EAAE,GAC/B,IAAI,CA+DN;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC9C,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,EAAE;IAAE,eAAe,EAAE;QAAE,KAAK,EAAE;YAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,GAC7D,OAAO,CA+CT;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC1C,cAAc,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;KAAE,CAAC;CACjE,CAAC;AAOF,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,CAAC,EAAE,YAAY,GACd;IACD,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,cAAc,CAAC;CAChC,CAkCA;AAqDD,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC"}
|
@@ -118,7 +118,7 @@ function readSourceMapsCache() {
|
|
118
118
|
perf_hooks_1.performance.measure('read cache', 'read source-maps:start', 'read source-maps:end');
|
119
119
|
return data ?? null;
|
120
120
|
}
|
121
|
-
function createProjectFileMapCache(nxJson, packageJsonDeps, fileMap, tsConfig
|
121
|
+
function createProjectFileMapCache(nxJson, packageJsonDeps, fileMap, tsConfig) {
|
122
122
|
const nxJsonPlugins = getNxJsonPluginsData(nxJson, packageJsonDeps);
|
123
123
|
const newValue = {
|
124
124
|
version: '6.0',
|
@@ -128,7 +128,6 @@ function createProjectFileMapCache(nxJson, packageJsonDeps, fileMap, tsConfig, e
|
|
128
128
|
nxJsonPlugins,
|
129
129
|
pluginsConfig: nxJson?.pluginsConfig,
|
130
130
|
fileMap,
|
131
|
-
externalNodesHash,
|
132
131
|
};
|
133
132
|
return newValue;
|
134
133
|
}
|
@@ -183,7 +182,7 @@ function writeCache(cache, projectGraph, sourceMaps, errors) {
|
|
183
182
|
perf_hooks_1.performance.mark('write cache:end');
|
184
183
|
perf_hooks_1.performance.measure('write cache', 'write cache:start', 'write cache:end');
|
185
184
|
}
|
186
|
-
function shouldRecomputeWholeGraph(cache, packageJsonDeps, projects, nxJson, tsConfig
|
185
|
+
function shouldRecomputeWholeGraph(cache, packageJsonDeps, projects, nxJson, tsConfig) {
|
187
186
|
if (cache.version !== '6.0') {
|
188
187
|
return true;
|
189
188
|
}
|
@@ -216,10 +215,6 @@ function shouldRecomputeWholeGraph(cache, packageJsonDeps, projects, nxJson, tsC
|
|
216
215
|
JSON.stringify(cache.pluginsConfig)) {
|
217
216
|
return true;
|
218
217
|
}
|
219
|
-
// Check if external nodes have changed
|
220
|
-
if (externalNodesHash !== cache.externalNodesHash) {
|
221
|
-
return true;
|
222
|
-
}
|
223
218
|
return false;
|
224
219
|
}
|
225
220
|
/*
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"loaded-nx-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/loaded-nx-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,
|
1
|
+
{"version":3,"file":"loaded-nx-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/loaded-nx-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAc,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAK5E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,KAAK,EACV,yBAAyB,EACzB,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,yBAAyB,EACzB,wBAAwB,EACxB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AAKtB,qBAAa,cAAc;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE;QACrB,WAAW,EAAE,MAAM;QAGnB,EAAE,EAAE,CACF,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,oBAAoB,KAC1B,OAAO,CACV,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAC1E;KACF,CAAC;IACF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAC5B,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAAC;IAC1C,QAAQ,CAAC,cAAc,CAAC,EAAE,CACxB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,qBAAqB,KAC3B,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/B,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAC3B,OAAO,EAAE,wBAAwB,KAC9B,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAChC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAC5B,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnB,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;gBAEhB,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,mBAAmB;CAsFtE"}
|
@@ -133,19 +133,15 @@ export type NxPluginV2<TOptions = unknown> = {
|
|
133
133
|
postTasksExecution?: PostTasksExecution<TOptions>;
|
134
134
|
};
|
135
135
|
export type PreTasksExecutionContext = {
|
136
|
-
readonly id: string;
|
137
136
|
readonly workspaceRoot: string;
|
138
137
|
readonly nxJsonConfiguration: NxJsonConfiguration;
|
139
138
|
readonly argv: string[];
|
140
139
|
};
|
141
140
|
export type PostTasksExecutionContext = {
|
142
|
-
readonly id: string;
|
143
141
|
readonly workspaceRoot: string;
|
144
142
|
readonly nxJsonConfiguration: NxJsonConfiguration;
|
145
143
|
readonly taskResults: TaskResults;
|
146
144
|
readonly argv: string[];
|
147
|
-
readonly startTime: number;
|
148
|
-
readonly endTime: number;
|
149
145
|
};
|
150
146
|
export type PreTasksExecution<TOptions = unknown> = (options: TOptions | undefined, context: PreTasksExecutionContext) => void | Promise<void>;
|
151
147
|
export type PostTasksExecution<TOptions = unknown> = (options: TOptions | undefined, context: PostTasksExecutionContext) => void | Promise<void>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"public-api.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/public-api.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"public-api.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/public-api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,OAAO,EACP,YAAY,EACZ,wBAAwB,EACzB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAErF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAEjE;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,oBAAoB;IAC9D;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAClD,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC;AAED;;;GAGG;AACH,MAAM,MAAM,mBAAmB,CAAC,CAAC,GAAG,OAAO,IAAI,CAC7C,wBAAwB,EAAE,MAAM,EAChC,OAAO,EAAE,CAAC,GAAG,SAAS,EACtB,OAAO,EAAE,kBAAkB,KACxB,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAEpD,MAAM,MAAM,mBAAmB,GAAG,KAAK,CACrC,SAAS,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAC/D,CAAC;AAEF,MAAM,MAAM,qBAAqB,CAAC,CAAC,GAAG,OAAO,IAAI,CAC/C,yBAAyB,EAAE,SAAS,MAAM,EAAE,EAC5C,OAAO,EAAE,CAAC,GAAG,SAAS,EACtB,OAAO,EAAE,oBAAoB,KAC1B,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAExD,MAAM,MAAM,QAAQ,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAE9E,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC;IAElE;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;CAC1D;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,OAAO,IAAI,SAAS;IAC9C,kBAAkB,EAAE,MAAM;IAC1B,mBAAmB,EAAE,mBAAmB,CAAC,CAAC,CAAC;CAC5C,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,GAAG,OAAO,IAAI,SAAS;IAChD,kBAAkB,EAAE,MAAM;IAC1B,mBAAmB,EAAE,qBAAqB,CAAC,CAAC,CAAC;CAC9C,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC;;OAEG;IACH,QAAQ,CAAC,aAAa,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC;IAEtD;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAExD;;OAEG;IACH,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAElD;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IAEjC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC;AAED;;;GAGG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,GAAG,OAAO,IAAI,CAC5C,OAAO,EAAE,CAAC,GAAG,SAAS,EACtB,OAAO,EAAE,yBAAyB,KAC/B,yBAAyB,EAAE,GAAG,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAAC;AAExE,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAClD,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,MAAM,CACnC,MAAM,EACN,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,CACvC,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,OAAO,IAAI,CACxC,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,CAAC,GAAG,SAAS,EACtB,OAAO,EAAE,qBAAqB,KAC3B,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,UAAU,CAAC,QAAQ,GAAG,OAAO,IAAI;IAC3C,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAEpC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IAExC;;OAEG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAElD;;OAEG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IAE1C;;OAEG;IACH,iBAAiB,CAAC,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAEhD;;OAEG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAClD,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AACF,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAClD,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAAC,QAAQ,GAAG,OAAO,IAAI,CAClD,OAAO,EAAE,QAAQ,GAAG,SAAS,EAC7B,OAAO,EAAE,wBAAwB,KAC9B,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAC1B,MAAM,MAAM,kBAAkB,CAAC,QAAQ,GAAG,OAAO,IAAI,CACnD,OAAO,EAAE,QAAQ,GAAG,SAAS,EAC7B,OAAO,EAAE,yBAAyB,KAC/B,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAC1B;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,UAAU,CAAC"}
|
@@ -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,7 +26,6 @@ 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;
|
30
29
|
if (configurationSourceMaps && !configurationSourceMaps[project.root]) {
|
31
30
|
configurationSourceMaps[project.root] = {};
|
32
31
|
}
|
@@ -258,13 +257,15 @@ plugins) {
|
|
258
257
|
spinner.setMessage(`Creating project graph nodes with ${inProgressPlugins.size} plugins`);
|
259
258
|
}
|
260
259
|
}
|
261
|
-
|
262
|
-
spinner = new delayed_spinner_1.DelayedSpinner(`Creating project graph nodes with ${createNodesPlugins.length} plugins`);
|
260
|
+
spinner = new delayed_spinner_1.DelayedSpinner(`Creating project graph nodes with ${plugins.length} plugins`);
|
263
261
|
const results = [];
|
264
262
|
const errors = [];
|
265
263
|
// We iterate over plugins first - this ensures that plugins specified first take precedence.
|
266
|
-
for (const [index, { index: pluginIndex, createNodes: createNodesTuple, include, exclude, name: pluginName, },] of
|
267
|
-
const [pattern, createNodes] = createNodesTuple;
|
264
|
+
for (const [index, { index: pluginIndex, createNodes: createNodesTuple, include, exclude, name: pluginName, },] of plugins.entries()) {
|
265
|
+
const [pattern, createNodes] = createNodesTuple ?? [];
|
266
|
+
if (!pattern) {
|
267
|
+
continue;
|
268
|
+
}
|
268
269
|
const matchingConfigFiles = findMatchingConfigFiles(projectFiles[index], pattern, include, exclude);
|
269
270
|
inProgressPlugins.add(pluginName);
|
270
271
|
let r = createNodes(matchingConfigFiles, {
|