nx 22.6.0 → 22.6.1
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/bin/nx.js +13 -8
- package/package.json +11 -12
- package/src/adapter/ngcli-adapter.d.ts +8 -5
- package/src/adapter/ngcli-adapter.d.ts.map +1 -1
- package/src/adapter/ngcli-adapter.js +29 -15
- package/src/ai/clone-ai-config-repo.d.ts.map +1 -1
- package/src/ai/clone-ai-config-repo.js +2 -0
- package/src/command-line/add/add.js +1 -1
- package/src/command-line/examples.d.ts +7 -0
- package/src/command-line/examples.d.ts.map +1 -1
- package/src/command-line/examples.js +29 -1
- package/src/command-line/exec/exec.js +3 -3
- package/src/command-line/format/format.js +3 -3
- package/src/command-line/generate/generate.d.ts.map +1 -1
- package/src/command-line/generate/generate.js +1 -1
- package/src/command-line/graph/graph.js +1 -1
- package/src/command-line/init/command-object.js +1 -21
- package/src/command-line/init/configure-plugins.js +1 -1
- package/src/command-line/init/implementation/angular/integrated-workspace.js +1 -1
- package/src/command-line/init/implementation/angular/legacy-angular-versions.js +2 -2
- package/src/command-line/init/implementation/deduce-default-base.js +5 -5
- package/src/command-line/init/implementation/dot-nx/add-nx-scripts.js +2 -2
- package/src/command-line/init/implementation/dot-nx/nxw.js +1 -1
- package/src/command-line/init/implementation/utils.d.ts +1 -2
- package/src/command-line/init/implementation/utils.d.ts.map +1 -1
- package/src/command-line/init/implementation/utils.js +1 -15
- package/src/command-line/init/init-v1.d.ts +0 -3
- package/src/command-line/init/init-v1.d.ts.map +1 -1
- package/src/command-line/init/init-v1.js +1 -27
- package/src/command-line/init/init-v2.d.ts +0 -1
- package/src/command-line/init/init-v2.d.ts.map +1 -1
- package/src/command-line/init/init-v2.js +7 -35
- package/src/command-line/mcp/mcp.d.ts.map +1 -1
- package/src/command-line/mcp/mcp.js +2 -0
- package/src/command-line/migrate/migrate-ui-api.d.ts.map +1 -1
- package/src/command-line/migrate/migrate-ui-api.js +13 -0
- package/src/command-line/migrate/migrate.d.ts.map +1 -1
- package/src/command-line/migrate/migrate.js +16 -14
- package/src/command-line/migrate/run-migration-process.js +2 -0
- package/src/command-line/nx-cloud/connect/view-logs.js +1 -1
- package/src/command-line/nx-commands.js +65 -65
- package/src/command-line/release/config/version-plans.js +1 -1
- package/src/command-line/release/utils/exec-command.js +1 -1
- package/src/command-line/release/utils/launch-editor.js +2 -2
- package/src/command-line/release/utils/remote-release-clients/github.d.ts.map +1 -1
- package/src/command-line/release/utils/remote-release-clients/github.js +2 -1
- package/src/command-line/release/utils/remote-release-clients/gitlab.d.ts.map +1 -1
- package/src/command-line/release/utils/remote-release-clients/gitlab.js +1 -0
- package/src/command-line/release/version/release-group-processor.d.ts.map +1 -1
- package/src/command-line/release/version/release-group-processor.js +2 -4
- package/src/command-line/release/version.js +1 -1
- package/src/command-line/run/run.d.ts.map +1 -1
- package/src/command-line/run/run.js +2 -2
- package/src/command-line/watch/watch.js +1 -1
- package/src/core/graph/main.js +1 -1
- package/src/daemon/client/client.d.ts +1 -1
- package/src/daemon/client/client.d.ts.map +1 -1
- package/src/daemon/client/client.js +3 -2
- package/src/daemon/client/generate-help-output.js +1 -1
- package/src/daemon/server/handle-configure-ai-agents.js +11 -4
- package/src/daemon/server/handle-hash-tasks.d.ts +1 -0
- package/src/daemon/server/handle-hash-tasks.d.ts.map +1 -1
- package/src/daemon/server/handle-hash-tasks.js +1 -1
- package/src/daemon/server/shutdown-utils.js +1 -1
- package/src/executors/run-commands/run-commands.impl.d.ts.map +1 -1
- package/src/executors/run-commands/run-commands.impl.js +60 -7
- package/src/executors/run-commands/running-tasks.d.ts.map +1 -1
- package/src/executors/run-commands/running-tasks.js +1 -5
- package/src/executors/run-script/run-script.impl.js +1 -1
- package/src/hasher/native-task-hasher-impl.d.ts +2 -2
- package/src/hasher/native-task-hasher-impl.d.ts.map +1 -1
- package/src/hasher/native-task-hasher-impl.js +6 -6
- package/src/hasher/task-hasher.d.ts +4 -4
- package/src/hasher/task-hasher.d.ts.map +1 -1
- package/src/hasher/task-hasher.js +9 -6
- package/src/native/nx.wasm32-wasi.debug.wasm +0 -0
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js +1 -1
- package/src/plugins/js/lock-file/bun-parser.js +1 -1
- package/src/plugins/js/lock-file/lock-file.d.ts.map +1 -1
- package/src/plugins/js/lock-file/lock-file.js +3 -1
- package/src/project-graph/file-utils.d.ts.map +1 -1
- package/src/project-graph/file-utils.js +4 -2
- package/src/tasks-runner/cache.js +1 -1
- package/src/tasks-runner/task-orchestrator.d.ts +4 -2
- package/src/tasks-runner/task-orchestrator.d.ts.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +59 -32
- package/src/utils/ab-testing.js +1 -1
- package/src/utils/analytics-prompt.d.ts.map +1 -1
- package/src/utils/analytics-prompt.js +2 -0
- package/src/utils/child-process.d.ts.map +1 -1
- package/src/utils/child-process.js +1 -2
- package/src/utils/command-line-utils.js +3 -3
- package/src/utils/default-base.js +1 -1
- package/src/utils/git-utils.d.ts.map +1 -1
- package/src/utils/git-utils.index-filter.js +2 -2
- package/src/utils/git-utils.js +6 -5
- package/src/utils/git-utils.tree-filter.js +1 -1
- package/src/utils/machine-id-cache.d.ts.map +1 -1
- package/src/utils/machine-id-cache.js +72 -2
- package/src/utils/package-manager.d.ts.map +1 -1
- package/src/utils/package-manager.js +8 -13
- package/src/utils/require-nx-key.js +1 -1
- package/src/utils/serialize-overrides-into-command-line.d.ts.map +1 -1
- package/src/utils/serialize-overrides-into-command-line.js +3 -4
- package/src/utils/shell-quoting.d.ts +11 -0
- package/src/utils/shell-quoting.d.ts.map +1 -0
- package/src/utils/shell-quoting.js +41 -0
- package/src/command-line/init/implementation/react/add-craco-commands-to-package-scripts.d.ts +0 -2
- package/src/command-line/init/implementation/react/add-craco-commands-to-package-scripts.d.ts.map +0 -1
- package/src/command-line/init/implementation/react/add-craco-commands-to-package-scripts.js +0 -21
- package/src/command-line/init/implementation/react/add-vite-commands-to-package-scripts.d.ts +0 -2
- package/src/command-line/init/implementation/react/add-vite-commands-to-package-scripts.d.ts.map +0 -1
- package/src/command-line/init/implementation/react/add-vite-commands-to-package-scripts.js +0 -20
- package/src/command-line/init/implementation/react/check-for-custom-webpack-setup.d.ts +0 -2
- package/src/command-line/init/implementation/react/check-for-custom-webpack-setup.d.ts.map +0 -1
- package/src/command-line/init/implementation/react/check-for-custom-webpack-setup.js +0 -17
- package/src/command-line/init/implementation/react/check-for-uncommitted-changes.d.ts +0 -2
- package/src/command-line/init/implementation/react/check-for-uncommitted-changes.d.ts.map +0 -1
- package/src/command-line/init/implementation/react/check-for-uncommitted-changes.js +0 -20
- package/src/command-line/init/implementation/react/clean-up-files.d.ts +0 -2
- package/src/command-line/init/implementation/react/clean-up-files.d.ts.map +0 -1
- package/src/command-line/init/implementation/react/clean-up-files.js +0 -30
- package/src/command-line/init/implementation/react/index.d.ts +0 -5
- package/src/command-line/init/implementation/react/index.d.ts.map +0 -1
- package/src/command-line/init/implementation/react/index.js +0 -77
- package/src/command-line/init/implementation/react/read-name-from-package-json.d.ts +0 -2
- package/src/command-line/init/implementation/react/read-name-from-package-json.d.ts.map +0 -1
- package/src/command-line/init/implementation/react/read-name-from-package-json.js +0 -16
- package/src/command-line/init/implementation/react/rename-js-to-jsx.d.ts +0 -2
- package/src/command-line/init/implementation/react/rename-js-to-jsx.d.ts.map +0 -1
- package/src/command-line/init/implementation/react/rename-js-to-jsx.js +0 -22
- package/src/command-line/init/implementation/react/tsconfig-setup.d.ts +0 -2
- package/src/command-line/init/implementation/react/tsconfig-setup.d.ts.map +0 -1
- package/src/command-line/init/implementation/react/tsconfig-setup.js +0 -108
- package/src/command-line/init/implementation/react/write-vite-config.d.ts +0 -2
- package/src/command-line/init/implementation/react/write-vite-config.d.ts.map +0 -1
- package/src/command-line/init/implementation/react/write-vite-config.js +0 -53
- package/src/command-line/init/implementation/react/write-vite-index-html.d.ts +0 -2
- package/src/command-line/init/implementation/react/write-vite-index-html.d.ts.map +0 -1
- package/src/command-line/init/implementation/react/write-vite-index-html.js +0 -24
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/init/implementation/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/init/implementation/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAO9D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,sBAAsB,EACvB,MAAM,gCAAgC,CAAC;AASxC,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,kBAAkB,EAAE,MAAM,EAAE,EAC5B,mBAAmB,EAAE,MAAM,EAAE,EAC7B,aAAa,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,QA0C1C;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC7B,mBAAmB,CA+GrB;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,kBAAkB,CAAC,EAAE,MAAM,EAAE,QAY9B;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,QAuB3C;AAED,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,sBAAmD,QAOzD;AAED,wBAAsB,SAAS,CAC7B,kBAAkB,EACd,SAAS,GACT,iBAAiB,GACjB,kBAAkB,GAClB,cAAc,GACd,kBAAkB,GAClB,mBAAmB,iBAMxB;AAED,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAAE,GACnB,IAAI,CAiBN;AAED,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,GAAG,EAAE,sBAAsB,QAqB5B;AAED,wBAAgB,0BAA0B,CAAC,eAAe,EAAE,MAAM,QAQjE;AAED,wBAAgB,iBAAiB,CAAC,EAChC,aAAa,EACb,WAAW,GACZ,EAAE;IACD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,IAAI,CAUP;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,WAAW,WAgBlD"}
|
|
@@ -11,7 +11,6 @@ exports.markRootPackageJsonAsNxProjectLegacy = markRootPackageJsonAsNxProjectLeg
|
|
|
11
11
|
exports.markPackageJsonAsNxProject = markPackageJsonAsNxProject;
|
|
12
12
|
exports.printFinalMessage = printFinalMessage;
|
|
13
13
|
exports.isMonorepo = isMonorepo;
|
|
14
|
-
exports.isCRA = isCRA;
|
|
15
14
|
const child_process_1 = require("child_process");
|
|
16
15
|
const path_1 = require("path");
|
|
17
16
|
const fileutils_1 = require("../../../utils/fileutils");
|
|
@@ -194,7 +193,7 @@ function runInstall(repoRoot, pmc = (0, package_manager_1.getPackageManagerComma
|
|
|
194
193
|
(0, child_process_1.execSync)(pmc.install, {
|
|
195
194
|
stdio: [0, 1, 2],
|
|
196
195
|
cwd: repoRoot,
|
|
197
|
-
windowsHide:
|
|
196
|
+
windowsHide: true,
|
|
198
197
|
});
|
|
199
198
|
}
|
|
200
199
|
async function initCloud(installationSource) {
|
|
@@ -271,16 +270,3 @@ function isMonorepo(packageJson) {
|
|
|
271
270
|
return true;
|
|
272
271
|
return false;
|
|
273
272
|
}
|
|
274
|
-
function isCRA(packageJson) {
|
|
275
|
-
const combinedDependencies = {
|
|
276
|
-
...packageJson.dependencies,
|
|
277
|
-
...packageJson.devDependencies,
|
|
278
|
-
};
|
|
279
|
-
return (
|
|
280
|
-
// Required dependencies for CRA projects
|
|
281
|
-
combinedDependencies['react'] &&
|
|
282
|
-
combinedDependencies['react-dom'] &&
|
|
283
|
-
combinedDependencies['react-scripts'] &&
|
|
284
|
-
(0, fileutils_1.directoryExists)('src') &&
|
|
285
|
-
(0, fileutils_1.directoryExists)('public'));
|
|
286
|
-
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-v1.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/init-v1.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,QAAQ;IACvB,
|
|
1
|
+
{"version":3,"file":"init-v1.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/init-v1.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,QAAQ;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,QAAQ,iBAiElD"}
|
|
@@ -10,7 +10,6 @@ const add_nx_to_nest_1 = require("./implementation/add-nx-to-nest");
|
|
|
10
10
|
const add_nx_to_npm_repo_1 = require("./implementation/add-nx-to-npm-repo");
|
|
11
11
|
const angular_1 = require("./implementation/angular");
|
|
12
12
|
const add_nx_scripts_1 = require("./implementation/dot-nx/add-nx-scripts");
|
|
13
|
-
const react_1 = require("./implementation/react");
|
|
14
13
|
const child_process_2 = require("../../utils/child-process");
|
|
15
14
|
const fileutils_1 = require("../../utils/fileutils");
|
|
16
15
|
const versions_1 = require("../../utils/versions");
|
|
@@ -34,15 +33,6 @@ async function initHandler(options) {
|
|
|
34
33
|
});
|
|
35
34
|
return;
|
|
36
35
|
}
|
|
37
|
-
else if (isCRA(packageJson)) {
|
|
38
|
-
await (0, react_1.addNxToCraRepo)(options);
|
|
39
|
-
(0, utils_1.printFinalMessage)({
|
|
40
|
-
learnMoreLink: options.integrated
|
|
41
|
-
? 'https://nx.dev/getting-started/tutorials/react-monorepo-tutorial'
|
|
42
|
-
: 'https://nx.dev/getting-started/tutorials/react-standalone-tutorial',
|
|
43
|
-
});
|
|
44
|
-
return;
|
|
45
|
-
}
|
|
46
36
|
else if (isNestCLI(packageJson)) {
|
|
47
37
|
await (0, add_nx_to_nest_1.addNxToNest)(options, packageJson);
|
|
48
38
|
(0, utils_1.printFinalMessage)({
|
|
@@ -87,27 +77,11 @@ async function initHandler(options) {
|
|
|
87
77
|
else {
|
|
88
78
|
(0, child_process_1.execSync)(`npx --yes create-nx-workspace@${version} ${args}`, {
|
|
89
79
|
stdio: [0, 1, 2],
|
|
90
|
-
windowsHide:
|
|
80
|
+
windowsHide: true,
|
|
91
81
|
});
|
|
92
82
|
}
|
|
93
83
|
}
|
|
94
84
|
}
|
|
95
|
-
function isCRA(packageJson) {
|
|
96
|
-
const combinedDependencies = {
|
|
97
|
-
...packageJson.dependencies,
|
|
98
|
-
...packageJson.devDependencies,
|
|
99
|
-
};
|
|
100
|
-
return (
|
|
101
|
-
// Required dependencies for CRA projects
|
|
102
|
-
combinedDependencies['react'] &&
|
|
103
|
-
combinedDependencies['react-dom'] &&
|
|
104
|
-
combinedDependencies['react-scripts'] &&
|
|
105
|
-
// // Don't convert customized CRA projects
|
|
106
|
-
!combinedDependencies['react-app-rewired'] &&
|
|
107
|
-
!combinedDependencies['@craco/craco'] &&
|
|
108
|
-
(0, fileutils_1.directoryExists)('src') &&
|
|
109
|
-
(0, fileutils_1.directoryExists)('public'));
|
|
110
|
-
}
|
|
111
85
|
function isNestCLI(packageJson) {
|
|
112
86
|
const combinedDependencies = {
|
|
113
87
|
...packageJson.dependencies,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-v2.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/init-v2.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAc,MAAM,sBAAsB,CAAC;AAIvE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"init-v2.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/init-v2.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAc,MAAM,sBAAsB,CAAC;AAIvE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAwBvD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAavC,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,QAAQ,EACjB,KAAK,UAAQ,GACZ,OAAO,CAAC,IAAI,CAAC,CA2Bf;AA+RD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CA0BtD;AAkDD,wBAAsB,aAAa,CACjC,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,WAAW,GAAG,IAAI,EAC/B,WAAW,EAAE,OAAO,EACpB,iBAAiB,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC,CAsKD"}
|
|
@@ -24,7 +24,6 @@ const add_nx_to_turborepo_1 = require("./implementation/add-nx-to-turborepo");
|
|
|
24
24
|
const angular_1 = require("./implementation/angular");
|
|
25
25
|
const add_nx_scripts_1 = require("./implementation/dot-nx/add-nx-scripts");
|
|
26
26
|
const utils_1 = require("./implementation/utils");
|
|
27
|
-
const react_1 = require("./implementation/react");
|
|
28
27
|
const provenance_1 = require("../../utils/provenance");
|
|
29
28
|
const devkit_internals_1 = require("../../devkit-internals");
|
|
30
29
|
const native_1 = require("../../native");
|
|
@@ -105,10 +104,9 @@ async function initHandlerImpl(options) {
|
|
|
105
104
|
: (0, fileutils_1.readJsonFile)('package.json');
|
|
106
105
|
const _isTurborepo = (0, fs_1.existsSync)('turbo.json');
|
|
107
106
|
const _isMonorepo = _isNonJs ? false : (0, utils_1.isMonorepo)(packageJson);
|
|
108
|
-
const _isCRA = _isNonJs ? false : (0, utils_1.isCRA)(packageJson);
|
|
109
107
|
// AI mode defaults to minimum setup, humans can choose
|
|
110
108
|
let guided = !aiMode; // Default to minimum (false) for AI, guided (true) for humans
|
|
111
|
-
if (options.interactive && !(_isTurborepo ||
|
|
109
|
+
if (options.interactive && !(_isTurborepo || _isNonJs)) {
|
|
112
110
|
const setupType = await (0, enquirer_1.prompt)([
|
|
113
111
|
{
|
|
114
112
|
type: 'select',
|
|
@@ -138,20 +136,7 @@ async function initHandlerImpl(options) {
|
|
|
138
136
|
return;
|
|
139
137
|
}
|
|
140
138
|
const pmc = (0, package_manager_1.getPackageManagerCommand)();
|
|
141
|
-
if (
|
|
142
|
-
if (aiMode) {
|
|
143
|
-
(0, ai_output_1.logProgress)('detecting', 'Detected Create React App project');
|
|
144
|
-
}
|
|
145
|
-
await (0, react_1.addNxToCraRepo)({
|
|
146
|
-
addE2e: false,
|
|
147
|
-
force: options.force,
|
|
148
|
-
vite: true,
|
|
149
|
-
integrated: false,
|
|
150
|
-
interactive: options.interactive,
|
|
151
|
-
nxCloud: false,
|
|
152
|
-
});
|
|
153
|
-
}
|
|
154
|
-
else if (_isMonorepo) {
|
|
139
|
+
if (_isMonorepo) {
|
|
155
140
|
if (aiMode) {
|
|
156
141
|
(0, ai_output_1.logProgress)('detecting', 'Detected monorepo project');
|
|
157
142
|
}
|
|
@@ -199,15 +184,8 @@ async function initHandlerImpl(options) {
|
|
|
199
184
|
else {
|
|
200
185
|
// Need to detect plugins for 'all' or to return needs_input
|
|
201
186
|
(0, ai_output_1.logProgress)('detecting', 'Checking for recommended plugins...');
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
detectedPluginNames = ['@nx/vite'];
|
|
205
|
-
}
|
|
206
|
-
else {
|
|
207
|
-
const { plugins: detected } = await detectPlugins(nxJson, packageJson, false // non-interactive
|
|
208
|
-
);
|
|
209
|
-
detectedPluginNames = detected;
|
|
210
|
-
}
|
|
187
|
+
const { plugins: detectedPluginNames } = await detectPlugins(nxJson, packageJson, false // non-interactive
|
|
188
|
+
);
|
|
211
189
|
if (parsedPlugins === 'all') {
|
|
212
190
|
// Install all detected plugins
|
|
213
191
|
pluginsToInstall = detectedPluginNames;
|
|
@@ -243,15 +221,9 @@ async function initHandlerImpl(options) {
|
|
|
243
221
|
else if (guided) {
|
|
244
222
|
// Non-AI guided mode: existing behavior with interactive prompts
|
|
245
223
|
output_1.output.log({ title: '🧐 Checking dependencies' });
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
}
|
|
250
|
-
else {
|
|
251
|
-
const { plugins: _plugins, updatePackageScripts: _updatePackageScripts } = await detectPlugins(nxJson, packageJson, options.interactive);
|
|
252
|
-
pluginsToInstall = _plugins;
|
|
253
|
-
updatePackageScripts = _updatePackageScripts;
|
|
254
|
-
}
|
|
224
|
+
const { plugins: _plugins, updatePackageScripts: _updatePackageScripts } = await detectPlugins(nxJson, packageJson, options.interactive);
|
|
225
|
+
pluginsToInstall = _plugins;
|
|
226
|
+
updatePackageScripts = _updatePackageScripts;
|
|
255
227
|
if (pluginsToInstall.length > 0) {
|
|
256
228
|
output_1.output.log({ title: '📦 Installing Nx' });
|
|
257
229
|
(0, configure_plugins_1.installPluginPackages)(repoRoot, pmc, pluginsToInstall);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/mcp/mcp.ts"],"names":[],"mappings":"AAOA,wBAAsB,UAAU,CAAC,IAAI,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/mcp/mcp.ts"],"names":[],"mappings":"AAOA,wBAAsB,UAAU,CAAC,IAAI,EAAE,GAAG,iBA6BzC;AAED,wBAAsB,QAAQ,kBA0B7B"}
|
|
@@ -29,6 +29,7 @@ async function mcpHandler(args) {
|
|
|
29
29
|
(0, child_process_1.spawnSync)(executable, execArgs, {
|
|
30
30
|
stdio: 'inherit',
|
|
31
31
|
cwd: workspace_root_1.workspaceRoot,
|
|
32
|
+
windowsHide: true,
|
|
32
33
|
});
|
|
33
34
|
}
|
|
34
35
|
async function showHelp() {
|
|
@@ -53,6 +54,7 @@ async function showHelp() {
|
|
|
53
54
|
const helpOutput = (0, child_process_1.spawnSync)(executable, execArgs, {
|
|
54
55
|
cwd: workspace_root_1.workspaceRoot,
|
|
55
56
|
encoding: 'utf-8',
|
|
57
|
+
windowsHide: true,
|
|
56
58
|
});
|
|
57
59
|
console.log(helpOutput.stdout?.toString().replaceAll('nx-mcp', 'nx mcp'));
|
|
58
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-ui-api.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/migrate/migrate-ui-api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAUxD,MAAM,MAAM,sBAAsB,GAAG;IACnC,mBAAmB,CAAC,EAAE,MAAM,CAC1B,MAAM,EACN,mBAAmB,GAAG,eAAe,GAAG,gBAAgB,GAAG,gBAAgB,CAC5E,CAAC;IACF,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,aAAa,CAAC,EAAE;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,wBAAgB,8BAA8B,CAC5C,aAAa,EAAE,MAAM,EACrB,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"migrate-ui-api.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/migrate/migrate-ui-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,10 +27,12 @@ function recordInitialMigrationMetadata(workspacePath, versionToMigrateTo) {
|
|
|
27
27
|
const gitRef = (0, child_process_1.execSync)('git rev-parse HEAD', {
|
|
28
28
|
cwd: workspacePath,
|
|
29
29
|
encoding: 'utf-8',
|
|
30
|
+
windowsHide: true,
|
|
30
31
|
}).trim();
|
|
31
32
|
const gitSubject = (0, child_process_1.execSync)('git log -1 --pretty=%s', {
|
|
32
33
|
cwd: workspacePath,
|
|
33
34
|
encoding: 'utf-8',
|
|
35
|
+
windowsHide: true,
|
|
34
36
|
}).trim();
|
|
35
37
|
parsedMigrationsJson['nx-console'] = {
|
|
36
38
|
initialGitRef: {
|
|
@@ -51,19 +53,23 @@ function finishMigrationProcess(workspacePath, squashCommits, commitMessage) {
|
|
|
51
53
|
(0, child_process_1.execSync)('git add .', {
|
|
52
54
|
cwd: workspacePath,
|
|
53
55
|
encoding: 'utf-8',
|
|
56
|
+
windowsHide: true,
|
|
54
57
|
});
|
|
55
58
|
(0, child_process_1.execSync)(`git commit -m "${commitMessage}" --no-verify`, {
|
|
56
59
|
cwd: workspacePath,
|
|
57
60
|
encoding: 'utf-8',
|
|
61
|
+
windowsHide: true,
|
|
58
62
|
});
|
|
59
63
|
if (squashCommits && initialGitRef) {
|
|
60
64
|
(0, child_process_1.execSync)(`git reset --soft ${initialGitRef.ref}`, {
|
|
61
65
|
cwd: workspacePath,
|
|
62
66
|
encoding: 'utf-8',
|
|
67
|
+
windowsHide: true,
|
|
63
68
|
});
|
|
64
69
|
(0, child_process_1.execSync)(`git commit -m "${commitMessage}" --no-verify`, {
|
|
65
70
|
cwd: workspacePath,
|
|
66
71
|
encoding: 'utf-8',
|
|
72
|
+
windowsHide: true,
|
|
67
73
|
});
|
|
68
74
|
}
|
|
69
75
|
}
|
|
@@ -76,6 +82,7 @@ async function runSingleMigration(workspacePath, migration, configuration) {
|
|
|
76
82
|
const gitRefBefore = (0, child_process_1.execSync)('git rev-parse HEAD', {
|
|
77
83
|
cwd: workspacePath,
|
|
78
84
|
encoding: 'utf-8',
|
|
85
|
+
windowsHide: true,
|
|
79
86
|
}).trim();
|
|
80
87
|
// Run migration in a separate process so it can be cancelled
|
|
81
88
|
const runMigrationProcessPath = require.resolve('./run-migration-process.js');
|
|
@@ -91,6 +98,7 @@ async function runSingleMigration(workspacePath, migration, configuration) {
|
|
|
91
98
|
], {
|
|
92
99
|
cwd: workspacePath,
|
|
93
100
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
101
|
+
windowsHide: true,
|
|
94
102
|
});
|
|
95
103
|
// Track the process for cancellation
|
|
96
104
|
currentMigrationProcess = migrationProcess;
|
|
@@ -134,6 +142,7 @@ async function runSingleMigration(workspacePath, migration, configuration) {
|
|
|
134
142
|
(0, child_process_1.execSync)('git add migrations.json', {
|
|
135
143
|
cwd: workspacePath,
|
|
136
144
|
encoding: 'utf-8',
|
|
145
|
+
windowsHide: true,
|
|
137
146
|
});
|
|
138
147
|
}
|
|
139
148
|
catch (e) {
|
|
@@ -142,11 +151,13 @@ async function runSingleMigration(workspacePath, migration, configuration) {
|
|
|
142
151
|
(0, child_process_1.execSync)('git commit --amend --no-verify --no-edit', {
|
|
143
152
|
cwd: workspacePath,
|
|
144
153
|
encoding: 'utf-8',
|
|
154
|
+
windowsHide: true,
|
|
145
155
|
});
|
|
146
156
|
// The revision changes after the amend, so we need to update it
|
|
147
157
|
const amendedGitRef = (0, child_process_1.execSync)('git rev-parse HEAD', {
|
|
148
158
|
cwd: workspacePath,
|
|
149
159
|
encoding: 'utf-8',
|
|
160
|
+
windowsHide: true,
|
|
150
161
|
}).trim();
|
|
151
162
|
modifyMigrationsJsonMetadata(workspacePath, updateRefForSuccessfulMigration(migration.id, amendedGitRef));
|
|
152
163
|
}
|
|
@@ -172,6 +183,7 @@ async function runSingleMigration(workspacePath, migration, configuration) {
|
|
|
172
183
|
(0, child_process_1.execSync)('git add migrations.json', {
|
|
173
184
|
cwd: workspacePath,
|
|
174
185
|
encoding: 'utf-8',
|
|
186
|
+
windowsHide: true,
|
|
175
187
|
});
|
|
176
188
|
}
|
|
177
189
|
catch (e) {
|
|
@@ -303,6 +315,7 @@ function undoMigration(workspacePath, id) {
|
|
|
303
315
|
(0, child_process_1.execSync)(`git reset --hard ${existing.ref}^`, {
|
|
304
316
|
cwd: workspacePath,
|
|
305
317
|
encoding: 'utf-8',
|
|
318
|
+
windowsHide: true,
|
|
306
319
|
});
|
|
307
320
|
migrationsJsonMetadata.completedMigrations[id] = {
|
|
308
321
|
type: 'skipped',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/migrate/migrate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/migrate/migrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const pc = require("picocolors");
|
|
|
14
14
|
const child_process_1 = require("child_process");
|
|
15
15
|
const enquirer_1 = require("enquirer");
|
|
16
16
|
const path_1 = require("path");
|
|
17
|
+
const path_2 = require("../../utils/path");
|
|
17
18
|
const semver_1 = require("semver");
|
|
18
19
|
const node_url_1 = require("node:url");
|
|
19
20
|
const util_1 = require("util");
|
|
@@ -590,7 +591,8 @@ function createFetcher() {
|
|
|
590
591
|
setCache(packageName, resolvedVersion);
|
|
591
592
|
return getPackageMigrationsUsingRegistry(packageName, resolvedVersion);
|
|
592
593
|
})
|
|
593
|
-
.catch(() => {
|
|
594
|
+
.catch((e) => {
|
|
595
|
+
logger_1.logger.verbose(`Failed to get migrations from registry for ${packageName}@${packageVersion}: ${e.message}. Falling back to install.`);
|
|
594
596
|
logger_1.logger.info(`Fetching ${packageName}@${packageVersion}`);
|
|
595
597
|
return getPackageMigrationsUsingInstall(packageName, packageVersion);
|
|
596
598
|
});
|
|
@@ -663,7 +665,7 @@ async function downloadPackageMigrationsFromRegistry(packageName, packageVersion
|
|
|
663
665
|
let result;
|
|
664
666
|
try {
|
|
665
667
|
const { tarballPath } = await (0, package_manager_1.packageRegistryPack)(dir, packageName, packageVersion);
|
|
666
|
-
const migrations = await (0, fileutils_1.extractFileFromTarball)((0, path_1.join)(dir, tarballPath), (0,
|
|
668
|
+
const migrations = await (0, fileutils_1.extractFileFromTarball)((0, path_1.join)(dir, tarballPath), (0, path_2.joinPathFragments)('package', migrationsFilePath), (0, path_1.join)(dir, migrationsFilePath)).then((path) => (0, fileutils_1.readJsonFile)(path));
|
|
667
669
|
result = { ...migrations, packageGroup, version: packageVersion };
|
|
668
670
|
}
|
|
669
671
|
catch {
|
|
@@ -684,6 +686,10 @@ async function getPackageMigrationsUsingInstall(packageName, packageVersion) {
|
|
|
684
686
|
const pmc = (0, package_manager_1.getPackageManagerCommand)((0, package_manager_1.detectPackageManager)(dir), dir);
|
|
685
687
|
await execAsync(`${pmc.add} ${packageName}@${packageVersion}`, {
|
|
686
688
|
cwd: dir,
|
|
689
|
+
env: {
|
|
690
|
+
...process.env,
|
|
691
|
+
npm_config_legacy_peer_deps: 'true',
|
|
692
|
+
},
|
|
687
693
|
});
|
|
688
694
|
const { migrations: migrationsFilePath, packageGroup, packageJson, } = readPackageMigrationConfig(packageName, dir);
|
|
689
695
|
let migrations = undefined;
|
|
@@ -693,11 +699,7 @@ async function getPackageMigrationsUsingInstall(packageName, packageVersion) {
|
|
|
693
699
|
result = { ...migrations, packageGroup, version: packageJson.version };
|
|
694
700
|
}
|
|
695
701
|
catch (e) {
|
|
696
|
-
|
|
697
|
-
title: `Failed to fetch migrations for ${packageName}@${packageVersion}`,
|
|
698
|
-
bodyLines: [e.message],
|
|
699
|
-
});
|
|
700
|
-
return {};
|
|
702
|
+
throw new Error(`Failed to fetch migrations for ${packageName}@${packageVersion}: ${e.message}`);
|
|
701
703
|
}
|
|
702
704
|
finally {
|
|
703
705
|
await cleanup();
|
|
@@ -977,7 +979,7 @@ function runInstall(nxWorkspaceRoot) {
|
|
|
977
979
|
});
|
|
978
980
|
(0, child_process_1.execSync)(installCommand, {
|
|
979
981
|
stdio: [0, 1, 2],
|
|
980
|
-
windowsHide:
|
|
982
|
+
windowsHide: true,
|
|
981
983
|
cwd: nxWorkspaceRoot ?? process.cwd(),
|
|
982
984
|
});
|
|
983
985
|
}
|
|
@@ -1057,8 +1059,8 @@ async function runNxOrAngularMigration(root, migration, isVerbose, shouldCreateC
|
|
|
1057
1059
|
}
|
|
1058
1060
|
else {
|
|
1059
1061
|
const ngCliAdapter = await getNgCompatLayer();
|
|
1060
|
-
const
|
|
1061
|
-
|
|
1062
|
+
const migrationProjectGraph = await (0, project_graph_1.createProjectGraphAsync)();
|
|
1063
|
+
const { madeChanges, loggingQueue } = await ngCliAdapter.runMigration(root, migration.package, migration.name, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(migrationProjectGraph).projects, isVerbose, migrationProjectGraph);
|
|
1062
1064
|
logger_1.logger.info(`Ran ${migration.name} from ${migration.package}`);
|
|
1063
1065
|
logger_1.logger.info(` ${migration.description}\n`);
|
|
1064
1066
|
if (!madeChanges) {
|
|
@@ -1202,7 +1204,7 @@ async function runMigration() {
|
|
|
1202
1204
|
}
|
|
1203
1205
|
(0, child_process_1.execSync)(`${p} _migrate ${process.argv.slice(3).join(' ')}`, {
|
|
1204
1206
|
stdio: ['inherit', 'inherit', 'inherit'],
|
|
1205
|
-
windowsHide:
|
|
1207
|
+
windowsHide: true,
|
|
1206
1208
|
});
|
|
1207
1209
|
}
|
|
1208
1210
|
}
|
|
@@ -1266,21 +1268,21 @@ async function nxCliPath(nxWorkspaceRoot) {
|
|
|
1266
1268
|
(0, child_process_1.execSync)(pmc.preInstall, {
|
|
1267
1269
|
cwd: tmpDir,
|
|
1268
1270
|
stdio,
|
|
1269
|
-
windowsHide:
|
|
1271
|
+
windowsHide: true,
|
|
1270
1272
|
});
|
|
1271
1273
|
// if it's berry ensure we set the node_linker to node-modules
|
|
1272
1274
|
if (packageManager === 'yarn' && pmc.ciInstall.includes('immutable')) {
|
|
1273
1275
|
(0, child_process_1.execSync)('yarn config set nodeLinker node-modules', {
|
|
1274
1276
|
cwd: tmpDir,
|
|
1275
1277
|
stdio,
|
|
1276
|
-
windowsHide:
|
|
1278
|
+
windowsHide: true,
|
|
1277
1279
|
});
|
|
1278
1280
|
}
|
|
1279
1281
|
}
|
|
1280
1282
|
(0, child_process_1.execSync)(`${pmc.install} ${pmc.ignoreScriptsFlag ?? ''}`, {
|
|
1281
1283
|
cwd: tmpDir,
|
|
1282
1284
|
stdio,
|
|
1283
|
-
windowsHide:
|
|
1285
|
+
windowsHide: true,
|
|
1284
1286
|
});
|
|
1285
1287
|
// Set NODE_PATH so that these modules can be used for module resolution
|
|
1286
1288
|
addToNodePath((0, path_1.join)(tmpDir, 'node_modules'));
|
|
@@ -30,6 +30,7 @@ async function runMigrationProcess() {
|
|
|
30
30
|
const gitRefBefore = execSync('git rev-parse HEAD', {
|
|
31
31
|
cwd: workspacePath,
|
|
32
32
|
encoding: 'utf-8',
|
|
33
|
+
windowsHide: true,
|
|
33
34
|
}).trim();
|
|
34
35
|
|
|
35
36
|
const { changes: fileChanges, nextSteps } = await runNxOrAngularMigration(
|
|
@@ -45,6 +46,7 @@ async function runMigrationProcess() {
|
|
|
45
46
|
const gitRefAfter = execSync('git rev-parse HEAD', {
|
|
46
47
|
cwd: workspacePath,
|
|
47
48
|
encoding: 'utf-8',
|
|
49
|
+
windowsHide: true,
|
|
48
50
|
}).trim();
|
|
49
51
|
|
|
50
52
|
// Report success
|
|
@@ -41,7 +41,7 @@ async function viewLogs() {
|
|
|
41
41
|
const pmc = (0, package_manager_1.getPackageManagerCommand)();
|
|
42
42
|
(0, child_process_1.execSync)(`${pmc.exec} nx-cloud upload-and-show-run-details`, {
|
|
43
43
|
stdio: [0, 1, 2],
|
|
44
|
-
windowsHide:
|
|
44
|
+
windowsHide: true,
|
|
45
45
|
});
|
|
46
46
|
if (!cloudUsed) {
|
|
47
47
|
output_1.output.note({
|