Use vscode-file:// instead of file://

src/bootstrap-window.js

@@ -89,14 +89,9 @@
 
 		window.document.documentElement.setAttribute('lang', locale);
 
-		// do not advertise AMD to avoid confusing UMD modules loaded with nodejs (TODO@sandbox non-sandboxed only)
-		if (!sandbox) {
-			window['define'] = undefined;
-		}
-
 		// replace the patched electron fs with the original node fs for all AMD code (TODO@sandbox non-sandboxed only)
 		if (!sandbox) {
-			require.define('fs', ['original-fs'], function (originalFS) { return originalFS; });
+			require.define('fs', [], function () { return require.__$__nodeRequire('original-fs'); });
 		}
 
 		window['MonacoEnvironment'] = {};
@@ -105,6 +100,7 @@
 			baseUrl: `${uriFromPath(configuration.appRoot)}/out`,
 			'vs/nls': nlsConfig,
 			amdModulesPattern: /^vs\//,
+			preferScriptTags: true
 		};
 
 		// cached data config
@@ -247,7 +243,7 @@
 		if (safeProcess.platform === 'win32' && pathName.startsWith('//')) { // specially handle Windows UNC paths
 			uri = encodeURI(`file:${pathName}`);
 		} else {
-			uri = encodeURI(`file://${pathName}`);
+			uri = encodeURI(`vscode-file://app${pathName}`);
 		}
 
 		return uri.replace(/#/g, '%23');

src/main.js

@@ -124,6 +124,15 @@ protocol.registerSchemesAsPrivileged([
 			corsEnabled: true,
 		}
 	},
+	{
+		scheme: 'vscode-file',
+		privileges: {
+			secure: true,
+			standard: true,
+			supportFetchAPI: true,
+			corsEnabled: true
+		}
+	}
 ]);
 
 // Global app listeners

src/vs/base/browser/dom.ts

@@ -1235,6 +1235,9 @@ export function asDomUri(uri: URI): URI {
 	if (Schemas.vscodeRemote === uri.scheme) {
 		return RemoteAuthorities.rewrite(uri);
 	}
+	if (platform.isNative && Schemas.file === uri.scheme) {
+		return uri.with({ authority: Schemas.vscodeFileAuthority, scheme: Schemas.vscodeFileResource });
+	}
 	return uri;
 }
 

src/vs/base/common/network.ts

@@ -78,6 +78,12 @@ export namespace Schemas {
 	 * Scheme used for extension pages
 	 */
 	export const extension = 'extension';
+
+	/**
+	 * Scheme used to load top level resources for the app
+	 */
+	export const vscodeFileResource = 'vscode-file';
+	export const vscodeFileAuthority = 'app';
 }
 
 class RemoteAuthoritiesImpl {
@@ -129,3 +135,12 @@ class RemoteAuthoritiesImpl {
 }
 
 export const RemoteAuthorities = new RemoteAuthoritiesImpl();
+
+export function toCodeFileUri(path: string, query?: string, skipEncoding?: boolean): string {
+	const url = require.toUrl(path);
+	return URI.parse(url).with({
+		scheme: Schemas.vscodeFileResource,
+		authority: Schemas.vscodeFileAuthority,
+		query: query
+	}).toString(skipEncoding);
+}

src/vs/code/electron-main/app.ts

@@ -34,6 +34,7 @@ import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProper
 import { getDelayedChannel, StaticRouter, createChannelReceiver } from 'vs/base/parts/ipc/common/ipc';
 import product from 'vs/platform/product/common/product';
 import { ProxyAuthHandler } from 'vs/code/electron-main/auth';
+import { FileProtocolHandler } from 'vs/code/electron-main/protocol';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IWindowsMainService, ICodeWindow } from 'vs/platform/windows/electron-main/windows';
 import { ActiveWindowManager } from 'vs/platform/windows/electron-main/windowTracker';
@@ -355,6 +356,9 @@ export class CodeApplication extends Disposable {
 			this.logService.error(error);
 		}
 
+		// Setup Protocol Handler
+		this._register(new FileProtocolHandler(this.environmentService));
+
 		// Create Electron IPC Server
 		const electronIpcServer = new ElectronIPCServer();
 

src/vs/code/electron-main/auth.ts

@@ -7,6 +7,7 @@ import { localize } from 'vs/nls';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Event } from 'vs/base/common/event';
 import { URI } from 'vs/base/common/uri';
+import { toCodeFileUri } from 'vs/base/common/network';
 import { BrowserWindow, BrowserWindowConstructorOptions, app, AuthInfo, WebContents, Event as ElectronEvent } from 'electron';
 
 type LoginEvent = {
@@ -76,7 +77,7 @@ export class ProxyAuthHandler extends Disposable {
 		}
 
 		const win = new BrowserWindow(opts);
-		const url = require.toUrl('vs/code/electron-sandbox/proxy/auth.html');
+		const fileUrl = toCodeFileUri('vs/code/electron-sandbox/proxy/auth.html');
 		const proxyUrl = `${authInfo.host}:${authInfo.port}`;
 		const title = localize('authRequire', "Proxy Authentication Required");
 		const message = localize('proxyauth', "The proxy {0} requires authentication.", proxyUrl);
@@ -97,6 +98,6 @@ export class ProxyAuthHandler extends Disposable {
 				win.close();
 			}
 		});
-		win.loadURL(url);
+		win.loadURL(fileUrl);
 	}
 }

src/vs/code/electron-main/protocol.ts

@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
+import { Schemas } from 'vs/base/common/network';
+import { URI } from 'vs/base/common/uri';
+import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
+import { session } from 'electron';
+
+export class FileProtocolHandler extends Disposable {
+
+	constructor(
+		@IEnvironmentService private readonly environmentService: INativeEnvironmentService
+	) {
+		super();
+
+		const { defaultSession } = session;
+
+		const resourceHandler = this.handleResourceRequest.bind(this);
+		defaultSession.protocol.registerFileProtocol(Schemas.vscodeFileResource, resourceHandler);
+
+		this._register(toDisposable(() => {
+			defaultSession.protocol.unregisterProtocol(Schemas.vscodeFileResource);
+		}));
+	}
+
+	private async handleResourceRequest(
+		request: Electron.Request,
+		callback: any) {
+		const uri = URI.parse(request.url);
+		const appRoot = this.environmentService.appRoot;
+		const extensionsPath = this.environmentService.extensionsPath;
+		if (uri.path.startsWith(appRoot) ||
+			(extensionsPath && uri.path.startsWith(extensionsPath))) {
+			return callback({
+				path: decodeURIComponent(uri.path)
+			});
+		}
+		console.error(`vscode-file: Refused to load resource ${uri.path}`);
+		callback({ error: -3 /* ABORTED */ });
+	}
+}

src/vs/code/electron-main/sharedProcess.ts

@@ -14,6 +14,7 @@ import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifec
 import { IThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
 import { toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { Event } from 'vs/base/common/event';
+import { toCodeFileUri } from 'vs/base/common/network';
 
 export class SharedProcess implements ISharedProcess {
 
@@ -60,8 +61,10 @@ export class SharedProcess implements ISharedProcess {
 			windowId: this.window.id
 		};
 
-		const url = `${require.toUrl('vs/code/electron-browser/sharedProcess/sharedProcess.html')}?config=${encodeURIComponent(JSON.stringify(config))}`;
-		this.window.loadURL(url);
+		const fileUrl = toCodeFileUri(
+			'vs/code/electron-browser/sharedProcess/sharedProcess.html',
+			`config=${encodeURIComponent(JSON.stringify(config))}`, true);
+		this.window.loadURL(fileUrl);
 
 		// Prevent the window from dying
 		const onClose = (e: ElectronEvent) => {

src/vs/code/electron-main/window.ts

@@ -34,6 +34,7 @@ import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
 import { IStorageMainService } from 'vs/platform/storage/node/storageMainService';
 import { IFileService } from 'vs/platform/files/common/files';
+import { toCodeFileUri } from 'vs/base/common/network';
 import { ColorScheme } from 'vs/platform/theme/common/theme';
 
 export interface IWindowCreationOptions {
@@ -835,7 +836,11 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 			workbench = 'vs/code/electron-browser/workbench/workbench.html';
 		}
 
-		return `${require.toUrl(workbench)}?config=${encodeURIComponent(JSON.stringify(config))}`;
+		const fileUrl = toCodeFileUri(
+			workbench,
+			`config=${encodeURIComponent(JSON.stringify(config))}`, true);
+
+		return fileUrl;
 	}
 
 	private doGetPreloadUrl(): string {

src/vs/editor/test/browser/services/decorationRenderOptions.test.ts

@@ -149,25 +149,33 @@ suite('Decoration Render Options', () => {
 		assert(readStyleSheet(styleSheet).indexOf(`{background:url('data:image/svg+xml;base64,PHN2ZyB4b+') center center no-repeat;}`) > 0);
 		s.removeDecorationType('example');
 
+		function assertBackground(url1: string, url2: string) {
+			const actual = readStyleSheet(styleSheet);
+			assert(
+				actual.indexOf(`{background:url('${url1}') center center no-repeat;}`) > 0
+				|| actual.indexOf(`{background:url('${url2}') center center no-repeat;}`) > 0
+			);
+		}
+
 		if (platform.isWindows) {
 			// windows file path (used as string)
 			s.registerDecorationType('example', { gutterIconPath: URI.file('c:\\files\\miles\\more.png') });
-			assert(readStyleSheet(styleSheet).indexOf(`{background:url('file:///c:/files/miles/more.png') center center no-repeat;}`) > 0);
+			assertBackground('file:///c:/files/miles/more.png', 'vscode-file://app/c:/files/miles/more.png');
 			s.removeDecorationType('example');
 
 			// single quote must always be escaped/encoded
 			s.registerDecorationType('example', { gutterIconPath: URI.file('c:\\files\\foo\\b\'ar.png') });
-			assert(readStyleSheet(styleSheet).indexOf(`{background:url('file:///c:/files/foo/b%27ar.png') center center no-repeat;}`) > 0);
+			assertBackground('file:///c:/files/foo/b%27ar.png', 'vscode-file://app/c:/files/foo/b%27ar.png');
 			s.removeDecorationType('example');
 		} else {
 			// unix file path (used as string)
 			s.registerDecorationType('example', { gutterIconPath: URI.file('/Users/foo/bar.png') });
-			assert(readStyleSheet(styleSheet).indexOf(`{background:url('file:///Users/foo/bar.png') center center no-repeat;}`) > 0);
+			assertBackground('file:///Users/foo/bar.png', 'vscode-file://app/Users/foo/bar.png');
 			s.removeDecorationType('example');
 
 			// single quote must always be escaped/encoded
 			s.registerDecorationType('example', { gutterIconPath: URI.file('/Users/foo/b\'ar.png') });
-			assert(readStyleSheet(styleSheet).indexOf(`{background:url('file:///Users/foo/b%27ar.png') center center no-repeat;}`) > 0);
+			assertBackground('file:///Users/foo/b%27ar.png', 'vscode-file://app/Users/foo/b%27ar.png');
 			s.removeDecorationType('example');
 		}
 

src/vs/platform/issue/electron-main/issueMainService.ts

@@ -21,6 +21,7 @@ import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogs';
 import { URI } from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { zoomLevelToZoomFactor } from 'vs/platform/windows/common/windows';
+import { toCodeFileUri } from 'vs/base/common/network';
 
 const DEFAULT_BACKGROUND_COLOR = '#1E1E1E';
 
@@ -449,5 +450,8 @@ function toLauchUrl<T>(pathToHtml: string, windowConfiguration: T): string {
 		}
 	}
 
-	return `${require.toUrl(pathToHtml)}?config=${encodeURIComponent(JSON.stringify(config))}`;
+	const fileUrl = toCodeFileUri(
+		pathToHtml,
+		`config=${encodeURIComponent(JSON.stringify(config))}`, true);
+	return fileUrl;
 }

src/vs/workbench/contrib/extensions/test/electron-browser/extensionsWorkbenchService.test.ts

@@ -223,8 +223,8 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 		assert.equal('1.1.0', actual.version);
 		assert.equal('1.1.0', actual.latestVersion);
 		assert.equal('localDescription1', actual.description);
-		assert.equal('file:///localPath1/localIcon1', actual.iconUrl);
-		assert.equal('file:///localPath1/localIcon1', actual.iconUrlFallback);
+		assert.ok(actual.iconUrl === 'file:///localPath1/localIcon1' || actual.iconUrl === 'vscode-file://app/localPath1/localIcon1');
+		assert.ok(actual.iconUrlFallback === 'file:///localPath1/localIcon1' || actual.iconUrlFallback === 'vscode-file://app/localPath1/localIcon1');
 		assert.equal(null, actual.licenseUrl);
 		assert.equal(ExtensionState.Installed, actual.state);
 		assert.equal(null, actual.installCount);