@opensumi/ide-core-node 2.22.10 → 2.23.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.
- package/lib/bootstrap/app.d.ts.map +1 -1
- package/lib/bootstrap/app.js +1 -0
- package/lib/bootstrap/app.js.map +1 -1
- package/lib/bootstrap/shell-path.js +1 -1
- package/lib/bootstrap/shell-path.js.map +1 -1
- package/package.json +4 -4
- package/src/bootstrap/app.ts +2 -2
- package/src/bootstrap/shell-path.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/bootstrap/app.ts"],"names":[],"mappings":";;;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AAItB,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/bootstrap/app.ts"],"names":[],"mappings":";;;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AAItB,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAE,oBAAoB,EAAyD,MAAM,2BAA2B,CAAC;AAIxH,OAAO,EAAsD,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAErG,OAAO,EAAa,UAAU,EAAE,cAAc,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAI3G,qBAAa,SAAU,YAAW,UAAU;IAuB9B,OAAO,CAAC,IAAI;IAtBxB,OAAO,CAAC,SAAS,CAAW;IAE5B,OAAO,CAAC,MAAM,CAAiB;IAE/B,OAAO,CAAC,MAAM,CAAwD;IAEtE,OAAO,CAAC,gBAAgB,CAAqB;IAE7C,OAAO,CAAC,gBAAgB,CAAe;IAEvC,GAAG,EAAE,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC;IAE9E,SAAS,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,qBAAqB,CAAC,CAAC;IAE7E;;;;;;;OAOG;gBACiB,IAAI,EAAE,cAAc;IA6CxC,IAAI,QAAQ,aAEX;IAED;;OAEG;IACI,iBAAiB,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,EAAE;IAW7E,OAAO,KAAK,aAAa,GAExB;IAED,OAAO,CAAC,gBAAgB;YAWV,sBAAsB;YAYtB,iBAAiB;IAYzB,KAAK,CACT,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,EAC/C,cAAc,CAAC,EAAE,CAAC,aAAa,EAAE,gBAAgB,KAAK,IAAI;YA8B9C,MAAM;IAYpB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA6B1B;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;CAyB1B"}
|
package/lib/bootstrap/app.js
CHANGED
package/lib/bootstrap/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/bootstrap/app.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AACxB,0DAA0B;AAC1B,sDAAsB;AACtB,oDAAoB;AACpB,wDAAwB;AAIxB,qCAAwC;AAExC,+
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/bootstrap/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ async function createUpdateShellPathPromise() {
|
|
|
43
43
|
try {
|
|
44
44
|
shellPath = await new Promise((resolve, reject) => {
|
|
45
45
|
const buf = [];
|
|
46
|
-
const proc = (0, child_process_1.spawn)('/bin/bash', ['-ilc', 'echo -n "_SHELL_ENV_DELIMITER_"; env; echo -n "_SHELL_ENV_DELIMITER_"; exit;'], {
|
|
46
|
+
const proc = (0, child_process_1.spawn)(process.env.SHELL || '/bin/bash', ['-ilc', 'echo -n "_SHELL_ENV_DELIMITER_"; env; echo -n "_SHELL_ENV_DELIMITER_"; exit;'], {
|
|
47
47
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
48
48
|
detached: true, // 在有些场景 zsh 会卡住， detached 后正常
|
|
49
49
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-path.js","sourceRoot":"","sources":["../../src/bootstrap/shell-path.ts"],"names":[],"mappings":";;;AAAA,iDAAsC;AAEtC,+DAAiE;AAEjE,sBAAsB;AACtB,MAAM,sBAAsB,GAAG,CAAC,GAAG,IAAI,CAAC;AAExC,kBAAkB;AAClB,oDAAoD;AACpD,MAAM,aAAa,GAAG,EAAE,GAAG,IAAI,CAAC;AAEhC,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;AACjC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;AAC5C,IAAI,QAAmC,CAAC;AAExC,UAAU;AACV,IAAI,UAAU,GAAG,KAAK,CAAC;AAEvB,sBAAsB;AACtB,kBAAkB;AAClB,IAAI,CAAC,UAAU,EAAE;IACf,eAAe,EAAE,CAAC;CACnB;AAED,SAAS,QAAQ,CAAC,GAAW;IAC3B,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,GAAG,GAA8B,EAAE,CAAC;IAC1C,MAAM,KAAK,GAAG,IAAA,2BAAS,EAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACzD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC7B;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,KAAK,UAAU,4BAA4B;IACzC,IAAI,GAAW,CAAC;IAChB,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;QAC5B,IAAI,GAAG,EAAE;YACP,IAAI;gBACF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACnB;YAAC,OAAO,KAAK,EAAE;gBACd,SAAS;aACV;SACF;IACH,CAAC,EAAE,aAAa,CAAC,CAAC;IAElB,IAAI;QACF,SAAS,GAAG,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAChD,MAAM,GAAG,GAAa,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,IAAA,qBAAK,EAChB,WAAW,
|
|
1
|
+
{"version":3,"file":"shell-path.js","sourceRoot":"","sources":["../../src/bootstrap/shell-path.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-core-node",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.23.0",
|
|
4
4
|
"description": "@opensumi/ide-core-node",
|
|
5
5
|
"files": [
|
|
6
6
|
"lib",
|
|
@@ -18,12 +18,12 @@
|
|
|
18
18
|
"url": "git@github.com:opensumi/core.git"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@opensumi/ide-connection": "2.
|
|
22
|
-
"@opensumi/ide-core-common": "2.
|
|
21
|
+
"@opensumi/ide-connection": "2.23.0",
|
|
22
|
+
"@opensumi/ide-core-common": "2.23.0",
|
|
23
23
|
"keytar": "^7.7.0"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@opensumi/ide-dev-tool": "1.3.1"
|
|
27
27
|
},
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "5d8e4fcf717531446c838d142f7601699fd50d0f"
|
|
29
29
|
}
|
package/src/bootstrap/app.ts
CHANGED
|
@@ -8,7 +8,7 @@ import Koa from 'koa';
|
|
|
8
8
|
|
|
9
9
|
import { Injector } from '@opensumi/di';
|
|
10
10
|
import { WebSocketHandler } from '@opensumi/ide-connection/lib/node';
|
|
11
|
-
import { ContributionProvider, createContributionProvider, isWindows } from '@opensumi/ide-core-common';
|
|
11
|
+
import { ContributionProvider, createContributionProvider, getDebugLogger, isWindows } from '@opensumi/ide-core-common';
|
|
12
12
|
import { ILogServiceManager, ILogService, SupportLogNamespace, StoragePaths } from '@opensumi/ide-core-common';
|
|
13
13
|
import { DEFAULT_TRS_REGISTRY } from '@opensumi/ide-core-common/lib/const';
|
|
14
14
|
|
|
@@ -23,7 +23,7 @@ export class ServerApp implements IServerApp {
|
|
|
23
23
|
|
|
24
24
|
private config: IServerAppOpts;
|
|
25
25
|
|
|
26
|
-
private logger: ILogService;
|
|
26
|
+
private logger: Pick<ILogService, 'log' | 'error'> = getDebugLogger();
|
|
27
27
|
|
|
28
28
|
private webSocketHandler: WebSocketHandler[];
|
|
29
29
|
|
|
@@ -49,7 +49,7 @@ async function createUpdateShellPathPromise(): Promise<void> {
|
|
|
49
49
|
shellPath = await new Promise((resolve, reject) => {
|
|
50
50
|
const buf: Buffer[] = [];
|
|
51
51
|
const proc = spawn(
|
|
52
|
-
'/bin/bash',
|
|
52
|
+
process.env.SHELL || '/bin/bash',
|
|
53
53
|
['-ilc', 'echo -n "_SHELL_ENV_DELIMITER_"; env; echo -n "_SHELL_ENV_DELIMITER_"; exit;'],
|
|
54
54
|
{
|
|
55
55
|
stdio: ['ignore', 'pipe', 'pipe'],
|