From 84e25e9b4160672c487a4b1b0aba0aff92e22cf3 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Fri, 12 Nov 2021 14:22:44 +0100
Subject: [PATCH] Fix `esbuild` warnings

---
 monaco-typescript/{scripts => }/importTypescript.js | 11 ++++++++++-
 monaco-typescript/package.json                      |  3 +--
 monaco-typescript/src/lib/typescriptServices.js     | 12 ++++++------
 package.json                                        |  1 +
 4 files changed, 18 insertions(+), 9 deletions(-)
 rename monaco-typescript/{scripts => }/importTypescript.js (94%)

diff --git a/monaco-typescript/scripts/importTypescript.js b/monaco-typescript/importTypescript.js
similarity index 94%
rename from monaco-typescript/scripts/importTypescript.js
rename to monaco-typescript/importTypescript.js
index ec2ecdbb..173735c1 100644
--- a/monaco-typescript/scripts/importTypescript.js
+++ b/monaco-typescript/importTypescript.js
@@ -12,7 +12,7 @@ const generatedNote = `//
 //
 `;
 
-const REPO_ROOT = path.join(__dirname, '../../');
+const REPO_ROOT = path.join(__dirname, '../');
 const TYPESCRIPT_LIB_SOURCE = path.join(REPO_ROOT, 'node_modules/typescript/lib');
 const TYPESCRIPT_LIB_DESTINATION = path.join(REPO_ROOT, 'monaco-typescript/src/lib');
 
@@ -109,6 +109,15 @@ define("vs/language/typescript/lib/typescriptServices", [], function() { return
 		stripSourceMaps(tsServices_amd)
 	);
 
+	// Remove pattern that creates warnings with esbuild
+	// e.g.
+	// > monaco-typescript/src/lib/typescriptServices.js:20:21: warning: Top-level "this" will be replaced with undefined since this file is an ECMAScript module
+	// 20 │ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+	//    ╵                      ~~~~
+	//
+
+	tsServices = tsServices.replace(/\nvar ([^ ]+) = \(this && this\.([^)]+)\) \|\|/gm, '\nvar $1 =')
+
 	const tsServices_esm =
 		generatedNote +
 		tsServices +
diff --git a/monaco-typescript/package.json b/monaco-typescript/package.json
index b468673c..1abe9e70 100644
--- a/monaco-typescript/package.json
+++ b/monaco-typescript/package.json
@@ -1,6 +1,5 @@
 {
 	"scripts": {
-		"watch": "../node_modules/.bin/tsc -p ./src --watch",
-		"import-typescript": "node ./scripts/importTypescript"
+		"watch": "../node_modules/.bin/tsc -p ./src --watch"
 	}
 }
diff --git a/monaco-typescript/src/lib/typescriptServices.js b/monaco-typescript/src/lib/typescriptServices.js
index 3cb005a1..342cc974 100644
--- a/monaco-typescript/src/lib/typescriptServices.js
+++ b/monaco-typescript/src/lib/typescriptServices.js
@@ -17,7 +17,7 @@ and limitations under the License.
 ***************************************************************************** */
 
 "use strict";
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+var __spreadArray = function (to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
             if (!ar) ar = Array.prototype.slice.call(from, 0, i);
@@ -26,7 +26,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-var __assign = (this && this.__assign) || function () {
+var __assign = function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
             s = arguments[i];
@@ -37,11 +37,11 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
+var __makeTemplateObject = function (cooked, raw) {
     if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
     return cooked;
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
+var __generator = function (thisArg, body) {
     var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
     return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
@@ -68,7 +68,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __rest = (this && this.__rest) || function (s, e) {
+var __rest = function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
@@ -79,7 +79,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __extends = (this && this.__extends) || (function () {
+var __extends = (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
diff --git a/package.json b/package.json
index e8f8a698..370d51d3 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
 	"license": "MIT",
 	"scripts": {
 		"simpleserver": "gulp simpleserver",
+		"import-typescript": "node ./monaco-typescript/importTypescript",
 		"release-css": "node ./monaco-css/build",
 		"release-html": "node ./monaco-html/build",
 		"release-json": "node ./monaco-json/build",