From 196f3556606e4e389940ba4f61dec2ffa3cbab19 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Sat, 27 Aug 2016 11:21:32 +0200
Subject: [PATCH] No need for worker proxying in website

---
 gulpfile.js                               | 2 +-
 website/index.html                        | 5 -----
 website/monarch.html                      | 5 -----
 website/playground.html                   | 5 -----
 website/playground/playground-runner.html | 6 ------
 website/worker-loader-proxy.js            | 4 ----
 6 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 website/worker-loader-proxy.js

diff --git a/gulpfile.js b/gulpfile.js
index 208c99ef..bbee6bb3 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -343,7 +343,7 @@ gulp.task('website', ['clean-website', 'playground-samples'], function() {
 	return (
 		gulp.src('website/**/*', { dot: true })
 		.pipe(es.through(function(data) {
-			if (!data.contents || !/\.(js|html)$/.test(data.path)) {
+			if (!data.contents || !/\.(html)$/.test(data.path)) {
 				return this.emit('data', data);
 			}
 
diff --git a/website/index.html b/website/index.html
index 52ea332f..015db922 100644
--- a/website/index.html
+++ b/website/index.html
@@ -142,11 +142,6 @@
 
 	<script type="text/javascript" src="../release/min/vs/loader.js"></script>
 	<script type="text/javascript">
-		window.MonacoEnvironment = {
-			getWorkerUrl: function(workerId, label) {
-				return 'worker-loader-proxy.js';
-			}
-		};
 		require.config({
 			paths: {
 				vs: '../release/min/vs'
diff --git a/website/monarch.html b/website/monarch.html
index ce21c333..232b4a84 100644
--- a/website/monarch.html
+++ b/website/monarch.html
@@ -4297,11 +4297,6 @@ return {
 
 	<script type="text/javascript" src="../release/min/vs/loader.js"></script>
 	<script type="text/javascript">
-		window.MonacoEnvironment = {
-			getWorkerUrl: function(workerId, label) {
-				return 'worker-loader-proxy.js';
-			}
-		};
 		require.config({
 			paths: {
 				vs: "../release/min/vs"
diff --git a/website/playground.html b/website/playground.html
index 98acfb77..d6d00bce 100644
--- a/website/playground.html
+++ b/website/playground.html
@@ -67,11 +67,6 @@
 
 	<script type="text/javascript" src="../release/min/vs/loader.js"></script>
 	<script type="text/javascript">
-		window.MonacoEnvironment = {
-			getWorkerUrl: function(workerId, label) {
-				return 'worker-loader-proxy.js';
-			}
-		};
 		require.config({
 			paths: {
 				vs: "../release/min/vs"
diff --git a/website/playground/playground-runner.html b/website/playground/playground-runner.html
index 546ad7b7..2f3200d0 100644
--- a/website/playground/playground-runner.html
+++ b/website/playground/playground-runner.html
@@ -22,12 +22,6 @@
 			};
 		};
 
-		window.MonacoEnvironment = {
-			getWorkerUrl: function(workerId, label) {
-				return '../worker-loader-proxy.js';
-			}
-		};
-
 		require.config({
 			paths: {
 				vs: "../../release/min/vs"
diff --git a/website/worker-loader-proxy.js b/website/worker-loader-proxy.js
deleted file mode 100644
index b6a1d53a..00000000
--- a/website/worker-loader-proxy.js
+++ /dev/null
@@ -1,4 +0,0 @@
-self.MonacoEnvironment = {
-	baseUrl: '../release/min/'
-};
-importScripts('../release/min/vs/base/worker/workerMain.js');
\ No newline at end of file