development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #140997: Move server entry points to src/

Browse source
This commit is contained in:
Alex Dima 2022-01-20 09:31:00 +01:00
parent 12f9c5fc6d
commit 3b5afe84e8
No known key found for this signature in database
GPG key ID: 39563C1504FDD0C9
15 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/gulpfile.reh.js
View file

@ -63,8 +63,8 @@ const serverResources = [
'out-build/vs/base/common/performance.js',
// main entry points
'out-build/vs/server/cli.js',
'out-build/vs/server/main.js',
'out-build/server-cli.js',
'out-build/server-main.js',
// Watcher
'out-build/vs/platform/files/**/*.exe',

2
resources/server/bin-dev/code-server.sh
View file

@ -22,7 +22,7 @@ function code() {
NODE_ENV=development \
VSCODE_DEV=1 \
$NODE "$ROOT/out/vs/server/main.js" "$@"
$NODE "$ROOT/out/server-main.js" "$@"
}
code "$@"

2
resources/server/bin-dev/helpers/browser.sh
View file

@ -14,5 +14,5 @@ PROD_NAME="Code Server - Dev"
VERSION=""
COMMIT=""
EXEC_NAME=""
CLI_SCRIPT="$VSCODE_PATH/out/vs/server/cli.js"
CLI_SCRIPT="$VSCODE_PATH/out/server-cli.js"
node "$CLI_SCRIPT" "$PROD_NAME" "$VERSION" "$COMMIT" "$EXEC_NAME" "--openExternal" "$@"

2
resources/server/bin-dev/remote-cli/code.sh
View file

@ -14,5 +14,5 @@ PROD_NAME="Code Server - Dev"
VERSION=""
COMMIT=""
EXEC_NAME="$(basename "$(test -L "$0" && readlink "$0" || echo "$0")")"
CLI_SCRIPT="$VSCODE_PATH/out/vs/server/cli.js"
CLI_SCRIPT="$VSCODE_PATH/out/server-cli.js"
node "$CLI_SCRIPT" "$PROD_NAME" "$VERSION" "$COMMIT" "$EXEC_NAME" "$@"

2
resources/server/bin/code-server.sh
View file

@ -9,4 +9,4 @@ esac
ROOT=$(dirname "$(dirname "$0")")
"$ROOT/node" ${INSPECT:-} "$ROOT/out/vs/server/main.js" "$@"
"$ROOT/node" ${INSPECT:-} "$ROOT/out/server-main.js" "$@"

2
resources/server/bin/helpers/browser.sh
View file

@ -8,5 +8,5 @@ APP_NAME="@@APPNAME@@"
VERSION="@@VERSION@@"
COMMIT="@@COMMIT@@"
EXEC_NAME="@@APPNAME@@"
CLI_SCRIPT="$ROOT/out/vs/server/cli.js"
CLI_SCRIPT="$ROOT/out/server-cli.js"
"$ROOT/node" "$CLI_SCRIPT" "$APP_NAME" "$VERSION" "$COMMIT" "$EXEC_NAME" "--openExternal" "$@"

2
resources/server/bin/remote-cli/code.sh
View file

@ -8,5 +8,5 @@ APP_NAME="@@APPNAME@@"
VERSION="@@VERSION@@"
COMMIT="@@COMMIT@@"
EXEC_NAME="@@APPNAME@@"
CLI_SCRIPT="$ROOT/out/vs/server/cli.js"
CLI_SCRIPT="$ROOT/out/server-cli.js"
"$ROOT/node" "$CLI_SCRIPT" "$APP_NAME" "$VERSION" "$COMMIT" "$EXEC_NAME" "$@"

2
resources/server/bin/server-old.sh
View file

@ -9,4 +9,4 @@ esac
ROOT="$(dirname "$0")"
"$ROOT/node" ${INSPECT:-} "$ROOT/out/vs/server/main.js" --compatibility=1.63 "$@"
"$ROOT/node" ${INSPECT:-} "$ROOT/out/server-main.js" --compatibility=1.63 "$@"

6
src/vs/server/cli.js → src/server-cli.js
View file

@ -13,9 +13,9 @@ delete process.env['ELECTRON_RUN_AS_NODE'];
if (process.env['VSCODE_DEV']) {
// When running out of sources, we need to load node modules from remote/node_modules,
// which are compiled against nodejs, not electron
process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', '..', '..', 'remote', 'node_modules');
require('../../bootstrap-node').injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
require('./bootstrap-node').injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
} else {
delete process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'];
}
require('../../bootstrap-amd').load('vs/server/remoteCli');
require('./bootstrap-amd').load('vs/server/remoteCli');

14
src/vs/server/main.js → src/server-main.js
View file

@ -5,9 +5,9 @@
// @ts-check
const perf = require('../base/common/performance');
const perf = require('./vs/base/common/performance');
const performance = require('perf_hooks').performance;
const product = require('../../../product.json');
const product = require('../product.json');
const readline = require('readline');
const http = require('http');
@ -43,7 +43,7 @@ async function start() {
}
/**
* @typedef { import('./remoteExtensionHostAgentServer').IServerAPI } IServerAPI
* @typedef { import('./vs/server/remoteExtensionHostAgentServer').IServerAPI } IServerAPI
*/
/** @type {IServerAPI | null} */
let _remoteExtensionHostAgentServer = null;
@ -247,7 +247,7 @@ async function findFreePort(host, start, end) {
return undefined;
}
/** @returns { Promise<typeof import('./remoteExtensionHostAgent')> } */
/** @returns { Promise<typeof import('./vs/server/remoteExtensionHostAgent')> } */
function loadCode() {
return new Promise((resolve, reject) => {
const path = require('path');
@ -255,12 +255,12 @@ function loadCode() {
if (process.env['VSCODE_DEV']) {
// When running out of sources, we need to load node modules from remote/node_modules,
// which are compiled against nodejs, not electron
process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', '..', '..', 'remote', 'node_modules');
require('../../bootstrap-node').injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
require('./bootstrap-node').injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
} else {
delete process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'];
}
require('../../bootstrap-amd').load('vs/server/remoteExtensionHostAgent', resolve, reject);
require('./bootstrap-amd').load('vs/server/remoteExtensionHostAgent', resolve, reject);
});
}

2
src/vs/base/parts/ipc/common/ipc.net.ts
View file

@ -1123,7 +1123,7 @@ export class PersistentProtocol implements IMessagePassingProtocol {
// ? 'renderer'
// : (process.argv.includes('--type=extensionHost')
// ? 'extensionHost'
// : (process.argv.some(item => item.includes('server/main'))
// : (process.argv.some(item => item.includes('server-main'))
// ? 'server'
// : 'unknown'
// )

4
src/vs/server/remoteExtensionHostAgent.ts
View file

@ -55,14 +55,14 @@ args['extensions-dir'] = args['extensions-dir'] || join(REMOTE_DATA_FOLDER, 'ext
});
/**
* invoked by vs/server/main.js
* invoked by server-main.js
*/
export function spawnCli() {
runCli(args, REMOTE_DATA_FOLDER, serverOptions);
}
/**
* invoked by vs/server/main.js
* invoked by server-main.js
*/
export function createServer(address: string | net.AddressInfo | null): Promise<IServerAPI> {
return doCreateServer(address, args, REMOTE_DATA_FOLDER);

8
src/vs/server/remoteExtensionHostAgentServer.ts
View file

@ -987,19 +987,19 @@ function parseConnectionToken(args: ServerParsedArgs): { connectionToken: string
export interface IServerAPI {
/**
* Do not remove!!. Called from vs/server/main.js
* Do not remove!!. Called from server-main.js
*/
handleRequest(req: http.IncomingMessage, res: http.ServerResponse): Promise<void>;
/**
* Do not remove!!. Called from vs/server/main.js
* Do not remove!!. Called from server-main.js
*/
handleUpgrade(req: http.IncomingMessage, socket: net.Socket): void;
/**
* Do not remove!!. Called from vs/server/main.js
* Do not remove!!. Called from server-main.js
*/
handleServerError(err: Error): void;
/**
* Do not remove!!. Called from vs/server/main.js
* Do not remove!!. Called from server-main.js
*/
dispose(): void;
}

2
src/vs/workbench/api/node/extHostTunnelService.ts
View file

@ -107,7 +107,7 @@ export function loadConnectionTable(stdout: string): Record<string, string>[] {
function knownExcludeCmdline(command: string): boolean {
return !!command.match(/.*\.vscode-server-[a-zA-Z]+\/bin.*/)
|| (command.indexOf('out/vs/server/main.js') !== -1)
|| (command.indexOf('out/server-main.js') !== -1)
|| (command.indexOf('_productName=VSCode') !== -1);
}

2
src/vs/workbench/test/node/api/extHostTunnelService.test.ts
View file

@ -185,7 +185,7 @@ const processes: { pid: number, cwd: string, cmd: string }[] = [
{
pid: 314,
cwd: '/mnt/c/Users/alros/AppData/Local/Programs/Microsoft VS Code Insiders',
cmd: '/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/node/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/vs/server/main.js--port=0--use-host-proxy--enable-remote-auto-shutdown--print-ip-address'
cmd: '/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/node/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/server-main.js--port=0--use-host-proxy--enable-remote-auto-shutdown--print-ip-address'
},
{
pid: 3172,