Move Monaco Build -> monaco-editor-es

vanillawc · Jul 1, 2020 · 9d7eb10 · 9d7eb10
1 parent 84bfc40
commit 9d7eb10
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 85 deletions.
diff --git a/.config/monaco.config.js b/.config/monaco.config.js
diff --git a/index.js b/index.js
diff --git a/index.min.js b/index.min.js
diff --git a/monaco/css.worker.js b/monaco/css.worker.js
diff --git a/monaco/editor.main.js b/monaco/editor.main.js
diff --git a/monaco/editor.worker.js b/monaco/editor.worker.js
diff --git a/monaco/html.worker.js b/monaco/html.worker.js
diff --git a/monaco/json.worker.js b/monaco/json.worker.js
diff --git a/monaco/workers/css.worker.js b/monaco/workers/css.worker.js
diff --git a/monaco/workers/editor.worker.js b/monaco/workers/editor.worker.js
diff --git a/monaco/workers/html.worker.js b/monaco/workers/html.worker.js
diff --git a/monaco/workers/json.worker.js b/monaco/workers/json.worker.js
diff --git a/monaco/ts.worker.js → monaco/workers/ts.worker.js b/monaco/ts.worker.js → monaco/workers/ts.worker.js
diff --git a/package.json b/package.json
@@ -15,31 +15,27 @@
   "scripts": {
     "start": "npx live-server --no-browser --port=5500 --open=dev",
     "lint": "esmtk lint",
-    "build": "npm run build:main && npm run build:min",
+    "build": "npm run build:main && npm run build:min && npm run copy",
     "build:main": "npx rollup --config .config/main.config.js",
     "build:min": "npx rollup --config .config/min.config.js",
-    "build:monaco": "webpack --config .config/monaco.config.js",
+    "copy": "npm run cp:editor && npm run cp:font && npm run cp:workers",
+    "cp:editor": "cp node_modules/monaco-editor-es/editor.main.js monaco/",
+    "cp:font": "cp node_modules/monaco-editor-es/*.ttf monaco/",
+    "cp:workers": "cp -r node_modules/monaco-editor-es/workers/* monaco/workers/",
     "package": "npx rimraf package && npm pack | tail -n 1 | xargs tar -xf",
     "preversion": "npm run lint",
     "postversion": "git push --follow-tags"
   },
   "devDependencies": {
-    "css": "^2.2.4",
-    "css-loader": "^3.5.3",
     "esmtk": "^0.1.1",
-    "file-loader": "^6.0.0",
-    "monaco-editor": "^0.20.0",
-    "rollup-plugin-terser": "^5.2.0",
-    "style-loader": "^1.2.1",
-    "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.11"
+    "monaco-editor-es": "^0.20.0",
+    "rollup-plugin-terser": "^5.2.0"
   },
   "standard": {
     "ignore": [
       "demo/*",
       "dev/*",
-      "monaco/*",
-      "src/monaco/*",
+      "**/monaco/*",
       "index.js"
     ]
   }

diff --git a/src/wc-monaco-editor.js b/src/wc-monaco-editor.js
@@ -1,24 +1,24 @@
 /* eslint no-undef: 0 */
-import '../monaco/editor.main.js'
+import './monaco/editor.main.js'
 
-const monacoDir = new URL('monaco/', import.meta.url)
+const workersDir = new URL('monaco/workers/', import.meta.url)
 
 // eslint-disable-next-line
 self.MonacoEnvironment = {
   getWorkerUrl: function (moduleId, label) {
-    if (label === 'json') {
-      return `${monacoDir}json.worker.js`
+    switch (label) {
+      case 'json':
+        return `${workersDir}json.worker.js`
+      case 'css':
+        return `${workersDir}css.worker.js`
+      case 'html':
+        return `${workersDir}html.worker.js`
+      case 'typescript':
+      case 'javascript':
+        return `${workersDir}ts.worker.js`
+      default:
+        return `${workersDir}editor.worker.js`
     }
-    if (label === 'css') {
-      return `${monacoDir}css.worker.js`
-    }
-    if (label === 'html') {
-      return `${monacoDir}html.worker.js`
-    }
-    if (label === 'typescript' || label === 'javascript') {
-      return `${monacoDir}ts.worker.js`
-    }
-    return `${monacoDir}editor.worker.js`
   }
 }