From 9be21f963ead526b380465c8de9ee766b24ecfa6 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Thu, 8 Mar 2018 16:48:54 +0100
Subject: [PATCH] Always compile to esm

---
 .gitignore            | 1 -
 package.json          | 2 +-
 scripts/release.js    | 4 ++--
 src/tsconfig.esm.json | 8 --------
 src/tsconfig.json     | 2 +-
 5 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 src/tsconfig.esm.json

diff --git a/.gitignore b/.gitignore
index 9eb41956..d9ef910d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 /node_modules/
 /out/
-/out-esm/
 /release/
diff --git a/package.json b/package.json
index e7b8cae9..a33de421 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "1.3.2",
   "description": "JSON plugin for the Monaco Editor",
   "scripts": {
-    "compile": "node ./scripts/rmdir.js ./out && tsc -p ./src && tsc -p ./src/tsconfig.esm.json",
+    "compile": "node ./scripts/rmdir.js ./out && tsc -p ./src",
     "watch": "tsc -p ./src --watch",
     "prepublish": "node ./scripts/rmdir.js ./release && npm run compile && node ./scripts/release.js && webpack --config webpack.dev.config.js && webpack --config webpack.min.config.js && node ./scripts/copy.js ./src/monaco.d.ts ./release/min/monaco.d.ts",
     "install-service-next": "npm install vscode-json-languageservice@next -f -D && npm install vscode-languageserver-types@next -f -D",
diff --git a/scripts/release.js b/scripts/release.js
index 96258055..20de3a79 100644
--- a/scripts/release.js
+++ b/scripts/release.js
@@ -6,7 +6,7 @@ var path = require("path");
 var REPO_ROOT = path.join(__dirname, '../');
 process({
     repoRoot: REPO_ROOT,
-    esmSource: 'out-esm',
+    esmSource: 'out',
     esmDestination: 'release/esm',
     entryPoints: [
         'monaco.contribution.js',
@@ -14,7 +14,7 @@ process({
         'json.worker.js'
     ],
     resolveAlias: {
-        'vscode-nls': path.join(REPO_ROOT, "out-esm/fillers/vscode-nls.js")
+        'vscode-nls': path.join(REPO_ROOT, "out/fillers/vscode-nls.js")
     },
     resolveSkip: [
         'monaco-editor-core'
diff --git a/src/tsconfig.esm.json b/src/tsconfig.esm.json
deleted file mode 100644
index 83a72eee..00000000
--- a/src/tsconfig.esm.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "es6",
-    "moduleResolution": "node",
-    "outDir": "../out-esm",
-    "target": "es5"
-  }
-}
\ No newline at end of file
diff --git a/src/tsconfig.json b/src/tsconfig.json
index 6bd5e44b..a00c7267 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "module": "umd",
+    "module": "es6",
     "moduleResolution": "node",
     "outDir": "../out",
     "target": "es5"