diff --git a/.eslintrc.json b/.eslintrc.json index 330c32caa22..2a5df60724b 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -310,25 +310,7 @@ "vs/workbench/api/~", "vs/workbench/services/*/~", "vs/workbench/{contrib,contrib/welcome}/*/~", - "vs/server/~", - { "when": "test", "pattern": "vs/server/**" } // TODO@layers - ] - }, - { - "target": "src/vs/server/**", - "layer": "node", - "restrictions": [ - "vs/base/~", - "vs/base/parts/*/~", - "vs/platform/*/~", - "vs/workbench/~", - "vs/workbench/api/~", - "vs/workbench/services/*/~", - "vs/workbench/{contrib,contrib/welcome}/*/~", - "vs/server/**", - "@vscode/*", - "@parcel/*", - "*" // node modules + "vs/server/~" ] }, { diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js index a58753e7d80..5fd64e1799e 100644 --- a/build/gulpfile.reh.js +++ b/build/gulpfile.reh.js @@ -71,7 +71,7 @@ const serverResources = [ 'out-build/vs/platform/files/**/*.md', // Uri transformer - 'out-build/vs/server/uriTransformer.js', + 'out-build/vs/server/node/uriTransformer.js', // Process monitor 'out-build/vs/base/node/cpuUsage.sh', @@ -91,15 +91,15 @@ const serverWithWebResources = [ const serverEntryPoints = [ { - name: 'vs/server/remoteExtensionHostAgent', + name: 'vs/server/node/remoteExtensionHostAgent', exclude: ['vs/css', 'vs/nls'] }, { - name: 'vs/server/remoteCli', + name: 'vs/server/node/remoteCli', exclude: ['vs/css', 'vs/nls'] }, { - name: 'vs/server/remoteExtensionHostProcess', + name: 'vs/server/node/remoteExtensionHostProcess', exclude: ['vs/css', 'vs/nls'] }, { diff --git a/src/server-cli.js b/src/server-cli.js index 86cc7f8a6f8..ab5306c3a85 100644 --- a/src/server-cli.js +++ b/src/server-cli.js @@ -18,4 +18,4 @@ if (process.env['VSCODE_DEV']) { } else { delete process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']; } -require('./bootstrap-amd').load('vs/server/remoteCli'); +require('./bootstrap-amd').load('vs/server/node/remoteCli'); diff --git a/src/server-main.js b/src/server-main.js index 0d68cec47d1..75a484f9deb 100644 --- a/src/server-main.js +++ b/src/server-main.js @@ -43,7 +43,7 @@ async function start() { } /** - * @typedef { import('./vs/server/remoteExtensionHostAgentServer').IServerAPI } IServerAPI + * @typedef { import('./vs/server/node/remoteExtensionHostAgentServer').IServerAPI } IServerAPI */ /** @type {IServerAPI | null} */ let _remoteExtensionHostAgentServer = null; @@ -247,7 +247,7 @@ async function findFreePort(host, start, end) { return undefined; } -/** @returns { Promise } */ +/** @returns { Promise } */ function loadCode() { return new Promise((resolve, reject) => { const path = require('path'); @@ -260,7 +260,7 @@ function loadCode() { } 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/node/remoteExtensionHostAgent', resolve, reject); }); } diff --git a/src/vs/server/connectionToken.ts b/src/vs/server/node/connectionToken.ts similarity index 97% rename from src/vs/server/connectionToken.ts rename to src/vs/server/node/connectionToken.ts index c2ded4499ca..ce0cb3a0090 100644 --- a/src/vs/server/connectionToken.ts +++ b/src/vs/server/node/connectionToken.ts @@ -5,7 +5,7 @@ import * as fs from 'fs'; import { generateUuid } from 'vs/base/common/uuid'; -import { ServerParsedArgs } from 'vs/server/serverEnvironmentService'; +import { ServerParsedArgs } from 'vs/server/node/serverEnvironmentService'; const connectionTokenRegex = /^[0-9A-Za-z-]+$/; diff --git a/src/vs/server/extensionHostConnection.ts b/src/vs/server/node/extensionHostConnection.ts similarity index 97% rename from src/vs/server/extensionHostConnection.ts rename to src/vs/server/node/extensionHostConnection.ts index 864c1fba3db..d78b20dfaf1 100644 --- a/src/vs/server/extensionHostConnection.ts +++ b/src/vs/server/node/extensionHostConnection.ts @@ -5,8 +5,8 @@ import * as cp from 'child_process'; import * as net from 'net'; -import { getNLSConfiguration } from 'vs/server/remoteLanguagePacks'; -import { uriTransformerPath } from 'vs/server/remoteUriTransformer'; +import { getNLSConfiguration } from 'vs/server/node/remoteLanguagePacks'; +import { uriTransformerPath } from 'vs/server/node/remoteUriTransformer'; import { FileAccess } from 'vs/base/common/network'; import { join, delimiter } from 'vs/base/common/path'; import { VSBuffer } from 'vs/base/common/buffer'; @@ -17,7 +17,7 @@ import { getResolvedShellEnv } from 'vs/platform/environment/node/shellEnv'; import { ILogService } from 'vs/platform/log/common/log'; import { IRemoteExtensionHostStartParams } from 'vs/platform/remote/common/remoteAgentConnection'; import { IExtHostReadyMessage, IExtHostSocketMessage, IExtHostReduceGraceTimeMessage } from 'vs/workbench/services/extensions/common/extensionHostProtocol'; -import { IServerEnvironmentService } from 'vs/server/serverEnvironmentService'; +import { IServerEnvironmentService } from 'vs/server/node/serverEnvironmentService'; import { IProcessEnvironment, isWindows } from 'vs/base/common/platform'; import { logRemoteEntry } from 'vs/workbench/services/extensions/common/remoteConsoleUtil'; import { removeDangerousEnvVariables } from 'vs/base/node/processes'; @@ -48,7 +48,7 @@ export async function buildUserEnvironment(startParamsEnv: { [key: string]: stri ...userShellEnv, ...{ VSCODE_LOG_NATIVE: String(isDebug), - VSCODE_AMD_ENTRYPOINT: 'vs/server/remoteExtensionHostProcess', + VSCODE_AMD_ENTRYPOINT: 'vs/server/node/remoteExtensionHostProcess', VSCODE_PIPE_LOGGING: 'true', VSCODE_VERBOSE_LOGGING: 'true', VSCODE_EXTHOST_WILL_SEND_SOCKET: 'true', diff --git a/src/vs/server/remoteAgentEnvironmentImpl.ts b/src/vs/server/node/remoteAgentEnvironmentImpl.ts similarity index 98% rename from src/vs/server/remoteAgentEnvironmentImpl.ts rename to src/vs/server/node/remoteAgentEnvironmentImpl.ts index b5e0da7af1f..9f842bfd971 100644 --- a/src/vs/server/remoteAgentEnvironmentImpl.ts +++ b/src/vs/server/node/remoteAgentEnvironmentImpl.ts @@ -7,17 +7,17 @@ import { Event } from 'vs/base/common/event'; import * as platform from 'vs/base/common/platform'; import * as performance from 'vs/base/common/performance'; import { URI } from 'vs/base/common/uri'; -import { createRemoteURITransformer } from 'vs/server/remoteUriTransformer'; +import { createRemoteURITransformer } from 'vs/server/node/remoteUriTransformer'; import { IRemoteAgentEnvironmentDTO, IGetEnvironmentDataArguments, IScanExtensionsArguments, IScanSingleExtensionArguments } from 'vs/workbench/services/remote/common/remoteAgentEnvironmentChannel'; import * as nls from 'vs/nls'; import { FileAccess, Schemas } from 'vs/base/common/network'; -import { IServerEnvironmentService } from 'vs/server/serverEnvironmentService'; +import { IServerEnvironmentService } from 'vs/server/node/serverEnvironmentService'; import { ExtensionScanner, ExtensionScannerInput, IExtensionResolver, IExtensionReference } from 'vs/workbench/services/extensions/node/extensionPoints'; import { IServerChannel } from 'vs/base/parts/ipc/common/ipc'; import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions'; import { transformOutgoingURIs } from 'vs/base/common/uriIpc'; import { ILogService } from 'vs/platform/log/common/log'; -import { getNLSConfiguration, InternalNLSConfiguration } from 'vs/server/remoteLanguagePacks'; +import { getNLSConfiguration, InternalNLSConfiguration } from 'vs/server/node/remoteLanguagePacks'; import { ContextKeyExpr, ContextKeyDefinedExpr, ContextKeyNotExpr, ContextKeyEqualsExpr, ContextKeyNotEqualsExpr, ContextKeyRegexExpr, IContextKeyExprMapper, ContextKeyExpression, ContextKeyInExpr, ContextKeyGreaterExpr, ContextKeyGreaterEqualsExpr, ContextKeySmallerExpr, ContextKeySmallerEqualsExpr } from 'vs/platform/contextkey/common/contextkey'; import { listProcesses } from 'vs/base/node/ps'; import { getMachineInfo, collectWorkspaceStats } from 'vs/platform/diagnostics/node/diagnosticsService'; diff --git a/src/vs/server/remoteCli.ts b/src/vs/server/node/remoteCli.ts similarity index 100% rename from src/vs/server/remoteCli.ts rename to src/vs/server/node/remoteCli.ts diff --git a/src/vs/server/remoteExtensionHostAgent.ts b/src/vs/server/node/remoteExtensionHostAgent.ts similarity index 93% rename from src/vs/server/remoteExtensionHostAgent.ts rename to src/vs/server/node/remoteExtensionHostAgent.ts index c4ded8d28fc..2555835789e 100644 --- a/src/vs/server/remoteExtensionHostAgent.ts +++ b/src/vs/server/node/remoteExtensionHostAgent.ts @@ -7,12 +7,12 @@ import * as os from 'os'; import * as fs from 'fs'; import * as net from 'net'; import { FileAccess } from 'vs/base/common/network'; -import { run as runCli } from 'vs/server/remoteExtensionHostAgentCli'; -import { createServer as doCreateServer, IServerAPI } from 'vs/server/remoteExtensionHostAgentServer'; +import { run as runCli } from 'vs/server/node/remoteExtensionHostAgentCli'; +import { createServer as doCreateServer, IServerAPI } from 'vs/server/node/remoteExtensionHostAgentServer'; import { parseArgs, ErrorReporter } from 'vs/platform/environment/node/argv'; import { join, dirname } from 'vs/base/common/path'; import { performance } from 'perf_hooks'; -import { serverOptions } from 'vs/server/serverEnvironmentService'; +import { serverOptions } from 'vs/server/node/serverEnvironmentService'; import product from 'vs/platform/product/common/product'; import * as perf from 'vs/base/common/performance'; diff --git a/src/vs/server/remoteExtensionHostAgentCli.ts b/src/vs/server/node/remoteExtensionHostAgentCli.ts similarity index 99% rename from src/vs/server/remoteExtensionHostAgentCli.ts rename to src/vs/server/node/remoteExtensionHostAgentCli.ts index 32518573300..c86ca327bdd 100644 --- a/src/vs/server/remoteExtensionHostAgentCli.ts +++ b/src/vs/server/node/remoteExtensionHostAgentCli.ts @@ -26,7 +26,7 @@ import { IFileService } from 'vs/platform/files/common/files'; import { IProductService } from 'vs/platform/product/common/productService'; import { SpdLogLogger } from 'vs/platform/log/node/spdlogLog'; import { RemoteExtensionLogFileName } from 'vs/workbench/services/remote/common/remoteAgentService'; -import { IServerEnvironmentService, ServerEnvironmentService, ServerParsedArgs } from 'vs/server/serverEnvironmentService'; +import { IServerEnvironmentService, ServerEnvironmentService, ServerParsedArgs } from 'vs/server/node/serverEnvironmentService'; import { ExtensionManagementCLIService } from 'vs/platform/extensionManagement/common/extensionManagementCLIService'; import { ILocalizationsService } from 'vs/platform/localizations/common/localizations'; import { LocalizationsService } from 'vs/platform/localizations/node/localizations'; diff --git a/src/vs/server/remoteExtensionHostAgentServer.ts b/src/vs/server/node/remoteExtensionHostAgentServer.ts similarity index 98% rename from src/vs/server/remoteExtensionHostAgentServer.ts rename to src/vs/server/node/remoteExtensionHostAgentServer.ts index 85e6f7882ae..d8c42871474 100644 --- a/src/vs/server/remoteExtensionHostAgentServer.ts +++ b/src/vs/server/node/remoteExtensionHostAgentServer.ts @@ -20,9 +20,9 @@ import * as platform from 'vs/base/common/platform'; import { PersistentProtocol, ProtocolConstants } from 'vs/base/parts/ipc/common/ipc.net'; import { NodeSocket, WebSocketNodeSocket } from 'vs/base/parts/ipc/node/ipc.net'; import { ConnectionType, ConnectionTypeRequest, ErrorMessage, HandshakeMessage, IRemoteExtensionHostStartParams, ITunnelConnectionStartParams, SignRequest } from 'vs/platform/remote/common/remoteAgentConnection'; -import { ExtensionHostConnection } from 'vs/server/extensionHostConnection'; -import { ManagementConnection } from 'vs/server/remoteExtensionManagement'; -import { createRemoteURITransformer } from 'vs/server/remoteUriTransformer'; +import { ExtensionHostConnection } from 'vs/server/node/extensionHostConnection'; +import { ManagementConnection } from 'vs/server/node/remoteExtensionManagement'; +import { createRemoteURITransformer } from 'vs/server/node/remoteUriTransformer'; import { ILogService, LogLevel, AbstractLogger, DEFAULT_LOG_LEVEL, MultiplexLogService, getLogLevel, LogService } from 'vs/platform/log/common/log'; import { FileAccess, Schemas } from 'vs/base/common/network'; import product from 'vs/platform/product/common/product'; @@ -54,8 +54,8 @@ import { IProductService } from 'vs/platform/product/common/productService'; import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment'; import { IPCServer, ClientConnectionEvent, IMessagePassingProtocol, StaticRouter, ProxyChannel } from 'vs/base/parts/ipc/common/ipc'; import { Emitter, Event } from 'vs/base/common/event'; -import { RemoteAgentEnvironmentChannel } from 'vs/server/remoteAgentEnvironmentImpl'; -import { RemoteAgentFileSystemProviderChannel } from 'vs/server/remoteFileSystemProviderServer'; +import { RemoteAgentEnvironmentChannel } from 'vs/server/node/remoteAgentEnvironmentImpl'; +import { RemoteAgentFileSystemProviderChannel } from 'vs/server/node/remoteFileSystemProviderServer'; import { REMOTE_FILE_SYSTEM_CHANNEL_NAME } from 'vs/workbench/services/remote/common/remoteFileSystemProviderClient'; import { RequestChannel } from 'vs/platform/request/common/requestIpc'; import { ExtensionManagementChannel } from 'vs/platform/extensionManagement/common/extensionManagementIpc'; @@ -63,28 +63,28 @@ import ErrorTelemetry from 'vs/platform/telemetry/node/errorTelemetry'; import { ExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/common/extensionHostDebugIpc'; import { LogLevelChannel } from 'vs/platform/log/common/logIpc'; import { IURITransformer } from 'vs/base/common/uriIpc'; -import { WebClientServer, serveError, serveFile } from 'vs/server/webClientServer'; +import { WebClientServer, serveError, serveFile } from 'vs/server/node/webClientServer'; import { URI } from 'vs/base/common/uri'; import { isEqualOrParent } from 'vs/base/common/extpath'; -import { IServerEnvironmentService, ServerEnvironmentService, ServerParsedArgs } from 'vs/server/serverEnvironmentService'; +import { IServerEnvironmentService, ServerEnvironmentService, ServerParsedArgs } from 'vs/server/node/serverEnvironmentService'; import { basename, dirname, join } from 'vs/base/common/path'; import { REMOTE_TERMINAL_CHANNEL_NAME } from 'vs/workbench/contrib/terminal/common/remoteTerminalChannel'; -import { RemoteTerminalChannel } from 'vs/server/remoteTerminalChannel'; +import { RemoteTerminalChannel } from 'vs/server/node/remoteTerminalChannel'; import { LoaderStats } from 'vs/base/common/amd'; import { RemoteExtensionLogFileName } from 'vs/workbench/services/remote/common/remoteAgentService'; import { ExtensionManagementCLIService } from 'vs/platform/extensionManagement/common/extensionManagementCLIService'; import { SpdLogLogger } from 'vs/platform/log/node/spdlogLog'; import { IPtyService, TerminalSettingId } from 'vs/platform/terminal/common/terminal'; import { PtyHostService } from 'vs/platform/terminal/node/ptyHostService'; -import { IRemoteTelemetryService, RemoteNullTelemetryService, RemoteTelemetryService } from 'vs/server/remoteTelemetryService'; +import { IRemoteTelemetryService, RemoteNullTelemetryService, RemoteTelemetryService } from 'vs/server/node/remoteTelemetryService'; import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'; import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService'; import { ICredentialsService } from 'vs/platform/credentials/common/credentials'; import { CredentialsMainService } from 'vs/platform/credentials/node/credentialsMainService'; import { IEncryptionService } from 'vs/workbench/services/encryption/common/encryptionService'; import { EncryptionMainService } from 'vs/platform/encryption/node/encryptionMainService'; -import { RemoteTelemetryChannel } from 'vs/server/remoteTelemetryChannel'; -import { parseConnectionToken, ServerConnectionTokenParseError } from 'vs/server/connectionToken'; +import { RemoteTelemetryChannel } from 'vs/server/node/remoteTelemetryChannel'; +import { parseConnectionToken, ServerConnectionTokenParseError } from 'vs/server/node/connectionToken'; const SHUTDOWN_TIMEOUT = 5 * 60 * 1000; diff --git a/src/vs/server/remoteExtensionHostProcess.ts b/src/vs/server/node/remoteExtensionHostProcess.ts similarity index 100% rename from src/vs/server/remoteExtensionHostProcess.ts rename to src/vs/server/node/remoteExtensionHostProcess.ts diff --git a/src/vs/server/remoteExtensionManagement.ts b/src/vs/server/node/remoteExtensionManagement.ts similarity index 100% rename from src/vs/server/remoteExtensionManagement.ts rename to src/vs/server/node/remoteExtensionManagement.ts diff --git a/src/vs/server/remoteFileSystemProviderServer.ts b/src/vs/server/node/remoteFileSystemProviderServer.ts similarity index 95% rename from src/vs/server/remoteFileSystemProviderServer.ts rename to src/vs/server/node/remoteFileSystemProviderServer.ts index 33c21243523..f5eef0d138f 100644 --- a/src/vs/server/remoteFileSystemProviderServer.ts +++ b/src/vs/server/node/remoteFileSystemProviderServer.ts @@ -8,11 +8,11 @@ import { URI, UriComponents } from 'vs/base/common/uri'; import { IURITransformer } from 'vs/base/common/uriIpc'; import { IFileChange } from 'vs/platform/files/common/files'; import { ILogService } from 'vs/platform/log/common/log'; -import { createRemoteURITransformer } from 'vs/server/remoteUriTransformer'; +import { createRemoteURITransformer } from 'vs/server/node/remoteUriTransformer'; import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment'; import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider'; import { posix, delimiter } from 'vs/base/common/path'; -import { IServerEnvironmentService } from 'vs/server/serverEnvironmentService'; +import { IServerEnvironmentService } from 'vs/server/node/serverEnvironmentService'; import { AbstractDiskFileSystemProviderChannel, AbstractSessionFileWatcher, ISessionFileWatcher } from 'vs/platform/files/node/diskFileSystemProviderServer'; import { IRecursiveWatcherOptions } from 'vs/platform/files/common/watcher'; diff --git a/src/vs/server/remoteLanguagePacks.ts b/src/vs/server/node/remoteLanguagePacks.ts similarity index 100% rename from src/vs/server/remoteLanguagePacks.ts rename to src/vs/server/node/remoteLanguagePacks.ts diff --git a/src/vs/server/remoteTelemetryChannel.ts b/src/vs/server/node/remoteTelemetryChannel.ts similarity index 96% rename from src/vs/server/remoteTelemetryChannel.ts rename to src/vs/server/node/remoteTelemetryChannel.ts index 65c36eac43f..cb5afdaf20d 100644 --- a/src/vs/server/remoteTelemetryChannel.ts +++ b/src/vs/server/node/remoteTelemetryChannel.ts @@ -8,7 +8,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { IServerChannel } from 'vs/base/parts/ipc/common/ipc'; import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry'; import { ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils'; -import { IRemoteTelemetryService } from 'vs/server/remoteTelemetryService'; +import { IRemoteTelemetryService } from 'vs/server/node/remoteTelemetryService'; export class RemoteTelemetryChannel extends Disposable implements IServerChannel { constructor( diff --git a/src/vs/server/remoteTelemetryService.ts b/src/vs/server/node/remoteTelemetryService.ts similarity index 100% rename from src/vs/server/remoteTelemetryService.ts rename to src/vs/server/node/remoteTelemetryService.ts diff --git a/src/vs/server/remoteTerminalChannel.ts b/src/vs/server/node/remoteTerminalChannel.ts similarity index 98% rename from src/vs/server/remoteTerminalChannel.ts rename to src/vs/server/node/remoteTerminalChannel.ts index 66b8b435641..14ab5bb2647 100644 --- a/src/vs/server/remoteTerminalChannel.ts +++ b/src/vs/server/node/remoteTerminalChannel.ts @@ -18,7 +18,7 @@ import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAg import { IPtyService, IShellLaunchConfig, ITerminalProfile } from 'vs/platform/terminal/common/terminal'; import { IGetTerminalLayoutInfoArgs, ISetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess'; import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace'; -import { createRemoteURITransformer } from 'vs/server/remoteUriTransformer'; +import { createRemoteURITransformer } from 'vs/server/node/remoteUriTransformer'; import { CLIServerBase, ICommandsExecuter } from 'vs/workbench/api/node/extHostCLIServer'; import { IEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariable'; import { MergedEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariableCollection'; @@ -26,8 +26,8 @@ import { deserializeEnvironmentVariableCollection } from 'vs/workbench/contrib/t import { ICreateTerminalProcessArguments, ICreateTerminalProcessResult, IWorkspaceFolderData } from 'vs/workbench/contrib/terminal/common/remoteTerminalChannel'; import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment'; import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver'; -import { buildUserEnvironment } from 'vs/server/extensionHostConnection'; -import { IServerEnvironmentService } from 'vs/server/serverEnvironmentService'; +import { buildUserEnvironment } from 'vs/server/node/extensionHostConnection'; +import { IServerEnvironmentService } from 'vs/server/node/serverEnvironmentService'; import { IProductService } from 'vs/platform/product/common/productService'; class CustomVariableResolver extends AbstractVariableResolverService { diff --git a/src/vs/server/remoteUriTransformer.ts b/src/vs/server/node/remoteUriTransformer.ts similarity index 95% rename from src/vs/server/remoteUriTransformer.ts rename to src/vs/server/node/remoteUriTransformer.ts index 9fa8a624de9..42e0230602c 100644 --- a/src/vs/server/remoteUriTransformer.ts +++ b/src/vs/server/node/remoteUriTransformer.ts @@ -6,7 +6,7 @@ import { URITransformer, IURITransformer, IRawURITransformer } from 'vs/base/common/uriIpc'; import { FileAccess } from 'vs/base/common/network'; -export const uriTransformerPath = FileAccess.asFileUri('vs/server/uriTransformer.js', require).fsPath; +export const uriTransformerPath = FileAccess.asFileUri('vs/server/node/uriTransformer.js', require).fsPath; export function createRemoteURITransformer(remoteAuthority: string): IURITransformer { const rawURITransformerFactory = require.__$__nodeRequire(uriTransformerPath); diff --git a/src/vs/server/serverEnvironmentService.ts b/src/vs/server/node/serverEnvironmentService.ts similarity index 100% rename from src/vs/server/serverEnvironmentService.ts rename to src/vs/server/node/serverEnvironmentService.ts diff --git a/src/vs/server/uriTransformer.js b/src/vs/server/node/uriTransformer.js similarity index 88% rename from src/vs/server/uriTransformer.js rename to src/vs/server/node/uriTransformer.js index 852ca4a002f..ea707d627cd 100644 --- a/src/vs/server/uriTransformer.js +++ b/src/vs/server/node/uriTransformer.js @@ -14,9 +14,9 @@ * | file | vscode-local | * -------------------------------- * ``` - * @typedef { import('../base/common/uriIpc').IRawURITransformer } IRawURITransformer - * @typedef { import('../base/common/uriIpc').UriParts } UriParts - * @typedef { import('../base/common/uri').UriComponents } UriComponents + * @typedef { import('../../base/common/uriIpc').IRawURITransformer } IRawURITransformer + * @typedef { import('../../base/common/uriIpc').UriParts } UriParts + * @typedef { import('../../base/common/uri').UriComponents } UriComponents * @param {string} remoteAuthority * @returns {IRawURITransformer} */ diff --git a/src/vs/server/webClientServer.ts b/src/vs/server/node/webClientServer.ts similarity index 99% rename from src/vs/server/webClientServer.ts rename to src/vs/server/node/webClientServer.ts index 5b4cb8e82e5..259d0b0373c 100644 --- a/src/vs/server/webClientServer.ts +++ b/src/vs/server/node/webClientServer.ts @@ -13,7 +13,7 @@ import { isEqualOrParent } from 'vs/base/common/extpath'; import { getMediaMime } from 'vs/base/common/mime'; import { isLinux } from 'vs/base/common/platform'; import { ILogService } from 'vs/platform/log/common/log'; -import { IServerEnvironmentService } from 'vs/server/serverEnvironmentService'; +import { IServerEnvironmentService } from 'vs/server/node/serverEnvironmentService'; import { extname, dirname, join, normalize } from 'vs/base/common/path'; import { FileAccess } from 'vs/base/common/network'; import { generateUuid } from 'vs/base/common/uuid'; diff --git a/src/vs/server/test/node/serverConnectionToken.test.ts b/src/vs/server/test/node/serverConnectionToken.test.ts index f05b290e80b..33623b59878 100644 --- a/src/vs/server/test/node/serverConnectionToken.test.ts +++ b/src/vs/server/test/node/serverConnectionToken.test.ts @@ -7,8 +7,8 @@ import * as assert from 'assert'; import * as os from 'os'; import * as path from 'path'; import { getRandomTestPath } from 'vs/base/test/node/testUtils'; -import { parseConnectionToken, ServerConnectionToken, ServerConnectionTokenParseError } from 'vs/server/connectionToken'; -import { ServerParsedArgs } from 'vs/server/serverEnvironmentService'; +import { parseConnectionToken, ServerConnectionToken, ServerConnectionTokenParseError } from 'vs/server/node/connectionToken'; +import { ServerParsedArgs } from 'vs/server/node/serverEnvironmentService'; import { Promises } from 'vs/base/node/pfs'; suite('parseServerConnectionToken', () => { diff --git a/src/vs/workbench/api/test/node/extHostTunnelService.test.ts b/src/vs/workbench/api/test/node/extHostTunnelService.test.ts index a29d12b6cb9..697b03d7bca 100644 --- a/src/vs/workbench/api/test/node/extHostTunnelService.test.ts +++ b/src/vs/workbench/api/test/node/extHostTunnelService.test.ts @@ -121,7 +121,7 @@ const processes: { pid: number, cwd: string, cmd: string }[] = [ { pid: 2504, 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/bootstrap-fork--type=extensionHost--uriTransformerPath=/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/vs/server/uriTransformer.js--useHostProxy=', + cmd: '/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/node/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/bootstrap-fork--type=extensionHost--uriTransformerPath=/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/vs/server/node/uriTransformer.js--useHostProxy=', }, { pid: 2515, @@ -205,7 +205,7 @@ const processes: { pid: number, cwd: string, cmd: string }[] = [ { pid: 4496, cwd: '/mnt/c/Users/alros/AppData/Local/Programs/Microsoft VS Code Insiders', - cmd: '/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/node--inspect-brk=0.0.0.0:6899/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/bootstrap-fork--type=extensionHost--uriTransformerPath=/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/vs/server/uriTransformer.js--useHostProxy=' + cmd: '/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/node--inspect-brk=0.0.0.0:6899/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/bootstrap-fork--type=extensionHost--uriTransformerPath=/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/vs/server/node/uriTransformer.js--useHostProxy=' }, { pid: 4507,