@mnci/cli 4.0.4 → 4.0.5
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/dist/cli.js +9 -3
- package/dist/cli.js.map +1 -1
- package/package.json +1 -1
package/dist/cli.js
CHANGED
|
@@ -1640,14 +1640,15 @@ function launchConfigurations(workspaceName) {
|
|
|
1640
1640
|
presentation: { group: "mnci", order: index + 1 }
|
|
1641
1641
|
}));
|
|
1642
1642
|
}
|
|
1643
|
-
function vscodeWorkspace(workspaceName, existingTasks, existingLaunch) {
|
|
1643
|
+
function vscodeWorkspace(workspaceName, existingTasks, existingLaunch, existingSettings) {
|
|
1644
1644
|
const userConfigurations = (existingLaunch?.configurations ?? []).filter(
|
|
1645
1645
|
(configuration) => !String(configuration.name ?? "").startsWith(LAUNCH_CONFIG_PREFIX)
|
|
1646
1646
|
);
|
|
1647
|
+
const settings = { ...existingSettings, ...vscodeSettings() };
|
|
1647
1648
|
return JSON.stringify(
|
|
1648
1649
|
{
|
|
1649
1650
|
folders: [{ path: ".", name: workspaceName }],
|
|
1650
|
-
settings
|
|
1651
|
+
settings,
|
|
1651
1652
|
extensions: { recommendations: VSCODE_RECOMMENDED_EXTENSIONS },
|
|
1652
1653
|
tasks: {
|
|
1653
1654
|
version: existingTasks?.version ?? "2.0.0",
|
|
@@ -2323,7 +2324,12 @@ function applyOverlay(workspaceRoot, options, onProgress = () => {
|
|
|
2323
2324
|
const existing = readCodeWorkspace(codeWorkspacePath);
|
|
2324
2325
|
writeFileEnsured(
|
|
2325
2326
|
codeWorkspacePath,
|
|
2326
|
-
vscodeWorkspace(
|
|
2327
|
+
vscodeWorkspace(
|
|
2328
|
+
options.workspaceName,
|
|
2329
|
+
existing?.tasks,
|
|
2330
|
+
existing?.launch,
|
|
2331
|
+
existing?.settings
|
|
2332
|
+
)
|
|
2327
2333
|
);
|
|
2328
2334
|
if (options.workspaceName !== "undefined") {
|
|
2329
2335
|
(0, import_node_fs6.rmSync)((0, import_node_path11.join)(workspaceRoot, "undefined.code-workspace"), { force: true });
|