From bb97e452f12b544e60d25741d15765adcbc48d0c Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@microsoft.com>
Date: Tue, 9 Jun 2020 10:59:15 -0400
Subject: [PATCH] Fixes #99666 - moves code-web into resources/

---
 .vscode/launch.json                             | 2 +-
 build/gulpfile.hygiene.js                       | 2 +-
 package.json                                    | 2 +-
 {scripts => resources/serverless}/callback.html | 0
 {scripts => resources/serverless}/code-web.js   | 4 ++--
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename {scripts => resources/serverless}/callback.html (100%)
 rename {scripts => resources/serverless}/code-web.js (98%)
 mode change 100755 => 100644

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2a54a65d214a8..ffc76f2c1e3df 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -217,7 +217,7 @@
 			"type": "node",
 			"request": "launch",
 			"name": "VS Code (Web)",
-			"program": "${workspaceFolder}/scripts/code-web.js",
+			"program": "${workspaceFolder}/resources/serverless/code-web.js",
 			"presentation": {
 				"group": "0_vscode",
 				"order": 2
diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js
index 0e2285bad0060..2fbd50c18aae3 100644
--- a/build/gulpfile.hygiene.js
+++ b/build/gulpfile.hygiene.js
@@ -124,7 +124,7 @@ const copyrightFilter = [
 	'!extensions/html-language-features/server/src/modes/typescript/*',
 	'!extensions/*/server/bin/*',
 	'!src/vs/editor/test/node/classification/typescript-test.ts',
-	'!scripts/code-web.js'
+	'!resources/serverless/code-web.js'
 ];
 
 const jsHygieneFilter = [
diff --git a/package.json b/package.json
index dd3cfabc80786..1d8275f657229 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "valid-layers-check": "node build/lib/layersChecker.js",
     "strict-function-types-watch": "tsc --watch -p src/tsconfig.json --noEmit --strictFunctionTypes",
     "update-distro": "node build/npm/update-distro.js",
-    "web": "node scripts/code-web.js",
+    "web": "node resources/serverless/code-web.js",
     "eslint": "eslint -c .eslintrc.json --rulesdir ./build/lib/eslint --ext .ts --ext .js ./src/vs ./extensions"
   },
   "dependencies": {
diff --git a/scripts/callback.html b/resources/serverless/callback.html
similarity index 100%
rename from scripts/callback.html
rename to resources/serverless/callback.html
diff --git a/scripts/code-web.js b/resources/serverless/code-web.js
old mode 100755
new mode 100644
similarity index 98%
rename from scripts/code-web.js
rename to resources/serverless/code-web.js
index e4c28d750be89..23c9f201a3aa5
--- a/scripts/code-web.js
+++ b/resources/serverless/code-web.js
@@ -6,7 +6,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 // @ts-check
-/** @typedef {import('../src/vs/workbench/workbench.web.api').IWorkbenchConstructionOptions} WebConfiguration **/
+/** @typedef {import('../../src/vs/workbench/workbench.web.api').IWorkbenchConstructionOptions} WebConfiguration **/
 
 const http = require('http');
 const url = require('url');
@@ -18,7 +18,7 @@ const opn = require('opn');
 const minimist = require('minimist');
 const webpack = require('webpack');
 
-const APP_ROOT = path.dirname(__dirname);
+const APP_ROOT = path.join(__dirname, '..', '..');
 const EXTENSIONS_ROOT = path.join(APP_ROOT, 'extensions');
 const WEB_MAIN = path.join(APP_ROOT, 'src', 'vs', 'code', 'browser', 'workbench', 'workbench-dev.html');