@theia/remote-wsl 1.68.0-next.7 → 1.68.0-next.79
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/lib/electron-browser/wsl-connection-contribution.js +5 -8
- package/lib/electron-browser/wsl-connection-contribution.js.map +1 -1
- package/lib/electron-node/remote-wsl-connection.d.ts +0 -4
- package/lib/electron-node/remote-wsl-connection.d.ts.map +1 -1
- package/lib/electron-node/remote-wsl-connection.js +4 -6
- package/lib/electron-node/remote-wsl-connection.js.map +1 -1
- package/package.json +5 -5
|
@@ -76,9 +76,8 @@ let WslConnectionContribution = class WslConnectionContribution extends remote_r
|
|
|
76
76
|
});
|
|
77
77
|
registry.registerCommand(RemoteWslCommands.OPEN_CURRENT_FOLDER_IN_WSL, {
|
|
78
78
|
execute: () => this.getOrSelectWslDistribution().then(distribution => {
|
|
79
|
-
var _a;
|
|
80
79
|
if (distribution) {
|
|
81
|
-
const workspacePath =
|
|
80
|
+
const workspacePath = this.workspaceService.workspace?.resource.path.fsPath();
|
|
82
81
|
if (workspacePath) {
|
|
83
82
|
this.connectToWSL(distribution, this.toWSLMountPath(workspacePath));
|
|
84
83
|
}
|
|
@@ -88,11 +87,10 @@ let WslConnectionContribution = class WslConnectionContribution extends remote_r
|
|
|
88
87
|
});
|
|
89
88
|
}
|
|
90
89
|
async connectToWSL(distribution, workspace, preserveWindow = true) {
|
|
91
|
-
var _a, _b;
|
|
92
90
|
const connectionResult = await this.connectionProvider.connectToWsl({
|
|
93
91
|
nodeDownloadTemplate: this.remotePreferences['remote.nodeDownloadTemplate'],
|
|
94
92
|
distribution: distribution.name,
|
|
95
|
-
workspacePath:
|
|
93
|
+
workspacePath: this.workspaceService.workspace?.resource.path?.fsPath()
|
|
96
94
|
});
|
|
97
95
|
if (workspace) {
|
|
98
96
|
this.workspaceServer.setMostRecentlyUsedWorkspace(`${wsl_workspaces_1.WSL_WORKSPACE_SCHEME}:${workspace}?distro=${distribution.name}`);
|
|
@@ -100,7 +98,6 @@ let WslConnectionContribution = class WslConnectionContribution extends remote_r
|
|
|
100
98
|
this.openRemote(connectionResult.port.toString(), !preserveWindow, workspace);
|
|
101
99
|
}
|
|
102
100
|
async getOrSelectWslDistribution() {
|
|
103
|
-
var _a;
|
|
104
101
|
const distributions = await this.connectionProvider.getWslDistributions();
|
|
105
102
|
if (distributions.length === 0) {
|
|
106
103
|
this.messageService.error(core_1.nls.localize('theia/remote/wsl/noWslDistroFound', 'No WSL distributions found. Please install a WSL distribution first.'));
|
|
@@ -109,14 +106,14 @@ let WslConnectionContribution = class WslConnectionContribution extends remote_r
|
|
|
109
106
|
if (distributions.length === 1) {
|
|
110
107
|
return distributions[0];
|
|
111
108
|
}
|
|
112
|
-
return (
|
|
109
|
+
return (await this.quickInputService.pick(distributions.map(dist => ({
|
|
113
110
|
type: 'item',
|
|
114
111
|
label: dist.name,
|
|
115
112
|
description: dist.default ? core_1.nls.localizeByDefault('Default') : dist.version,
|
|
116
113
|
distribution: dist,
|
|
117
114
|
})), {
|
|
118
115
|
title: core_1.nls.localize('theia/remote/wsl/selectWSLDistro', 'Select a WSL distribution')
|
|
119
|
-
}))
|
|
116
|
+
}))?.distribution;
|
|
120
117
|
}
|
|
121
118
|
canHandle(uri) {
|
|
122
119
|
return uri.scheme === wsl_workspaces_1.WSL_WORKSPACE_SCHEME; // WSL doesn't use a special URI scheme
|
|
@@ -130,7 +127,7 @@ let WslConnectionContribution = class WslConnectionContribution extends remote_r
|
|
|
130
127
|
if (!distro) {
|
|
131
128
|
throw new Error(`Invalid WSL workspace URI. Distribution ${distroName} not found.`);
|
|
132
129
|
}
|
|
133
|
-
this.connectToWSL(distro, workspacePath, options
|
|
130
|
+
this.connectToWSL(distro, workspacePath, options?.preserveWindow);
|
|
134
131
|
}
|
|
135
132
|
throw new Error('Invalid WSL workspace URI. No distrubution specified.');
|
|
136
133
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wsl-connection-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/wsl-connection-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAkE;AAClE,kHAAqI;AACrI,sGAAiG;AACjG,sCAA8F;AAC9F,sFAAoI;AACpI,wDAA8D;AAC9D,sGAAiH;AACjH,sEAAyE;AACzE,6FAAyF;AAEzF,IAAiB,iBAAiB,CAkBjC;AAlBD,WAAiB,iBAAiB;IACjB,gCAAc,GAAG,cAAO,CAAC,kBAAkB,CAAC;QACrD,EAAE,EAAE,2BAA2B;QAC/B,KAAK,EAAE,gBAAgB;QACvB,QAAQ,EAAE,KAAK;KAClB,EAAE,+BAA+B,CAAC,CAAC;IAEvB,4CAA0B,GAAG,cAAO,CAAC,kBAAkB,CAAC;QACjE,EAAE,EAAE,uCAAuC;QAC3C,KAAK,EAAE,gCAAgC;QACvC,QAAQ,EAAE,KAAK;KAClB,EAAE,0CAA0C,CAAC,CAAC;IAElC,4CAA0B,GAAG,cAAO,CAAC,kBAAkB,CAAC;QACjE,EAAE,EAAE,uCAAuC;QAC3C,KAAK,EAAE,sBAAsB;QAC7B,QAAQ,EAAE,KAAK;KAClB,EAAE,8BAA8B,CAAC,CAAC;AACvC,CAAC,EAlBgB,iBAAiB,iCAAjB,iBAAiB,QAkBjC;AAGM,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,iEAAkC;IAwB7E,sBAAsB,CAAC,QAAwB;QAC3C,IAAI,CAAC,gBAAS,EAAE,CAAC;YACb,+CAA+C;YAC/C,OAAO;QACX,CAAC;QACD,QAAQ,CAAC,eAAe,CAAC,iBAAiB,CAAC,cAAc,EAAE;YACvD,OAAO,EAAE,GAAG,EAAE;gBACV,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;oBAC/D,MAAM,aAAa,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAC/D,IAAI,aAAa,EAAE,CAAC;wBAChB,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;oBACrC,CAAC;yBAAM,CAAC;wBACJ,IAAI,CAAC,0BAA0B,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;4BAClD,IAAI,YAAY,EAAE,CAAC;gCACf,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;4BACpC,CAAC;wBACL,CAAC,CAAC,CAAC;oBACP,CAAC;gBACL,CAAC,CAAC,CAAC;YACP,CAAC;SACJ,CAAC,CAAC;QAEH,QAAQ,CAAC,eAAe,CAAC,iBAAiB,CAAC,0BAA0B,EAAE;YACnE,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;gBACjE,IAAI,YAAY,EAAE,CAAC;oBACf,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;gBACpC,CAAC;YACL,CAAC,CAAC;SACL,CAAC,CAAC;QAEH,QAAQ,CAAC,eAAe,CAAC,iBAAiB,CAAC,0BAA0B,EAAE;YACnE,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE
|
|
1
|
+
{"version":3,"file":"wsl-connection-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/wsl-connection-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
|
-
/// <reference types="node" />
|
|
4
|
-
/// <reference types="node" />
|
|
5
1
|
import { Emitter, Event } from '@theia/core';
|
|
6
2
|
import { RemoteConnection, RemoteExecOptions, RemoteExecResult, RemoteExecTester } from '@theia/remote/lib/electron-node/remote-types';
|
|
7
3
|
import { Socket } from 'net';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-wsl-connection.d.ts","sourceRoot":"","sources":["../../src/electron-node/remote-wsl-connection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"remote-wsl-connection.d.ts","sourceRoot":"","sources":["../../src/electron-node/remote-wsl-connection.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AACvI,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAK7B,MAAM,WAAW,0BAA0B;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,mBAAoB,YAAW,gBAAgB;IACxD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IAErB,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,SAAS,CAAC,QAAQ,CAAC,sBAAsB,gBAAuB;IAChE,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,CAAqC;gBAErD,OAAO,EAAE,0BAA0B;IAOzC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAe1F,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAmD3H,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BjG,OAAO,IAAI,IAAI;IAIf,WAAW,IAAI,IAAI;CAGtB"}
|
|
@@ -39,11 +39,10 @@ class RemoteWslConnection {
|
|
|
39
39
|
});
|
|
40
40
|
}
|
|
41
41
|
async exec(cmd, args, options) {
|
|
42
|
-
var _a;
|
|
43
42
|
const deferred = new promise_util_1.Deferred();
|
|
44
|
-
const fullCommand = `wsl -d ${this.distribution} ${cmd} ${
|
|
43
|
+
const fullCommand = `wsl -d ${this.distribution} ${cmd} ${args?.join(' ') ?? ''}`;
|
|
45
44
|
try {
|
|
46
|
-
(0, child_process_1.exec)(fullCommand, { env: options
|
|
45
|
+
(0, child_process_1.exec)(fullCommand, { env: options?.env }, (error, stdout, stderr) => {
|
|
47
46
|
deferred.resolve({ stdout, stderr });
|
|
48
47
|
});
|
|
49
48
|
}
|
|
@@ -53,7 +52,6 @@ class RemoteWslConnection {
|
|
|
53
52
|
return deferred.promise;
|
|
54
53
|
}
|
|
55
54
|
async execPartial(cmd, tester, args, options) {
|
|
56
|
-
var _a;
|
|
57
55
|
const deferred = new promise_util_1.Deferred();
|
|
58
56
|
try {
|
|
59
57
|
let cdPath = undefined;
|
|
@@ -62,8 +60,8 @@ class RemoteWslConnection {
|
|
|
62
60
|
cdPath = parts[0].replace('cd', '').trim();
|
|
63
61
|
cmd = parts[1];
|
|
64
62
|
}
|
|
65
|
-
const fullCommand = `wsl -d ${this.distribution} ${cdPath ? `--cd ${cdPath} ${cmd}` : cmd} ${
|
|
66
|
-
const process = (0, child_process_1.spawn)(fullCommand, { env: options
|
|
63
|
+
const fullCommand = `wsl -d ${this.distribution} ${cdPath ? `--cd ${cdPath} ${cmd}` : cmd} ${args?.join(' ') ?? ''}`;
|
|
64
|
+
const process = (0, child_process_1.spawn)(fullCommand, { env: options?.env, shell: 'powershell' });
|
|
67
65
|
let stdoutBuffer = '';
|
|
68
66
|
let stderrBuffer = '';
|
|
69
67
|
process.stdout.on('data', (data) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-wsl-connection.js","sourceRoot":"","sources":["../../src/electron-node/remote-wsl-connection.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,sCAA6C;AAE7C,6BAA6B;AAC7B,iDAA4C;AAC5C,sEAA+D;AAC/D,yBAAyB;AASzB,MAAa,mBAAmB;IAO5B,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAKD,YAAY,OAAmC;QAH5B,2BAAsB,GAAG,IAAI,cAAO,EAAQ,CAAC;QAChE,oBAAe,GAAgB,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC;QAG7D,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,IAAY;QACzC,IAAI,YAAM,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE;YACzC,MAAM,CAAC,IAAI,CAAC,IAAI,YAAM,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAW,EAAE,IAAe,EAAE,OAA2B
|
|
1
|
+
{"version":3,"file":"remote-wsl-connection.js","sourceRoot":"","sources":["../../src/electron-node/remote-wsl-connection.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/remote-wsl",
|
|
3
|
-
"version": "1.68.0-next.
|
|
3
|
+
"version": "1.68.0-next.79+c38f18ec72c",
|
|
4
4
|
"description": "Theia - Remote WSL",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.68.0-next.
|
|
7
|
-
"@theia/remote": "1.68.0-next.
|
|
8
|
-
"@theia/workspace": "1.68.0-next.
|
|
6
|
+
"@theia/core": "1.68.0-next.79+c38f18ec72c",
|
|
7
|
+
"@theia/remote": "1.68.0-next.79+c38f18ec72c",
|
|
8
|
+
"@theia/workspace": "1.68.0-next.79+c38f18ec72c",
|
|
9
9
|
"tslib": "^2.6.2"
|
|
10
10
|
},
|
|
11
11
|
"publishConfig": {
|
|
@@ -44,5 +44,5 @@
|
|
|
44
44
|
"nyc": {
|
|
45
45
|
"extends": "../../configs/nyc.json"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "c38f18ec72c0cb454100658a01331bd9fb7bd8cc"
|
|
48
48
|
}
|