瀏覽代碼

Always compile to esm

Alex Dima 7 年之前
父節點
當前提交
9be21f963e
共有 5 個文件被更改,包括 4 次插入13 次删除
  1. 0 1
      .gitignore
  2. 1 1
      package.json
  3. 2 2
      scripts/release.js
  4. 0 8
      src/tsconfig.esm.json
  5. 1 1
      src/tsconfig.json

+ 0 - 1
.gitignore

@@ -1,4 +1,3 @@
 /node_modules/
 /out/
-/out-esm/
 /release/

+ 1 - 1
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",

+ 2 - 2
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'

+ 0 - 8
src/tsconfig.esm.json

@@ -1,8 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "es6",
-    "moduleResolution": "node",
-    "outDir": "../out-esm",
-    "target": "es5"
-  }
-}

+ 1 - 1
src/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "module": "umd",
+    "module": "es6",
     "moduleResolution": "node",
     "outDir": "../out",
     "target": "es5"