From 30f7e6590a37ef76ac53df665b54dade9aeece7d Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 3 Feb 2020 14:57:14 +0100
Subject: Remove recent improvements to the build script

tslib as a dev dependency and commonjs modules are definitely *wrong*
in the ideal world, **but** in the real world that's the only
combination that works. See

https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0/topic/Problems.20with.20TypeScript.20build
---
 editors/code/package-lock.json | 15 ++++++++-------
 editors/code/package.json      |  8 ++++----
 editors/code/tsconfig.json     |  6 ++----
 3 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'editors/code')

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 4096255ac..712153c34 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -51,13 +51,13 @@
             }
         },
         "@rollup/plugin-typescript": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-3.0.0.tgz",
-            "integrity": "sha512-O6915Ril3+Q0B4P898PULAcPFZfPuatEB/4nox7bnK48ekGrmamMYhMB5tOqWjihEWrw4oz/NL+c+/kS3Fk95g==",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-2.1.0.tgz",
+            "integrity": "sha512-7lXKGY06aofrceVez/YnN2axttFdHSqlUBpCJ6ebzDfxwLDKMgSV5lD4ykBcdgE7aK3egxuLkD/HKyRB5L8Log==",
             "dev": true,
             "requires": {
-                "@rollup/pluginutils": "^3.0.1",
-                "resolve": "^1.14.1"
+                "@rollup/pluginutils": "^3.0.0",
+                "resolve": "^1.13.1"
             }
         },
         "@rollup/pluginutils": {
@@ -749,7 +749,8 @@
         "tslib": {
             "version": "1.10.0",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-            "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+            "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+            "dev": true
         },
         "tslint": {
             "version": "5.20.1",
@@ -895,7 +896,7 @@
         "vscode-languageclient": {
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.0.tgz",
-            "integrity": "sha1-7mfAt4GMQs4CgVctBcia38xPWjg=",
+            "integrity": "sha512-Tcp0VoOaa0YzxL4nEfK9tsmcy76Eo8jNLvFQZwh2c8oMm02luL8uGYPLQNAiZ3XGgegfcwiQFZMqbW7DNV0vxA==",
             "requires": {
                 "semver": "^6.3.0",
                 "vscode-languageserver-protocol": "^3.15.2"
diff --git a/editors/code/package.json b/editors/code/package.json
index e733ee2b4..06aa747fe 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -26,20 +26,20 @@
     "dependencies": {
         "jsonc-parser": "^2.1.0",
         "seedrandom": "^3.0.5",
-        "vscode-languageclient": "^6.1.0",
-        "tslib": "^1.10.0"
+        "vscode-languageclient": "^6.1.0"
     },
     "devDependencies": {
         "@rollup/plugin-commonjs": "^11.0.1",
         "@rollup/plugin-node-resolve": "^6.1.0",
-        "@rollup/plugin-typescript": "^3.0.0",
+        "@rollup/plugin-typescript": "^2.0.0",
         "@types/node": "^12.12.25",
         "@types/seedrandom": "^2.4.28",
         "@types/vscode": "^1.41.0",
         "rollup": "^1.30.1",
+        "tslib": "^1.10.0",
         "tslint": "^5.20.1",
-        "typescript": "^3.7.5",
         "typescript-formatter": "^7.2.2",
+        "typescript": "^3.7.5",
         "vsce": "^1.71.0"
     },
     "activationEvents": [
diff --git a/editors/code/tsconfig.json b/editors/code/tsconfig.json
index 42130c5e1..d74169c29 100644
--- a/editors/code/tsconfig.json
+++ b/editors/code/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "compilerOptions": {
-        "moduleResolution": "node",
-        "module": "es2015",
+        "module": "commonjs",
         "target": "es2018",
         "outDir": "out",
         "lib": [
@@ -15,8 +14,7 @@
         "noImplicitReturns": true,
         "noFallthroughCasesInSwitch": true,
         "newLine": "LF",
-        "esModuleInterop": true,
-        "importHelpers": true
+        "esModuleInterop": true
     },
     "exclude": [
         "node_modules"
-- 
cgit v1.2.3