From 5bae3e2f8a337107346febfc7e88ba6d7bb66d9b Mon Sep 17 00:00:00 2001
From: purocean <purocean@gmail.com>
Date: Sun, 19 Dec 2021 17:04:47 +0800
Subject: [PATCH] refactor: import monaco by esm

---
 src/renderer/components/MonacoEditor.vue | 22 ++++------------------
 vite.config.ts                           |  6 ------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/renderer/components/MonacoEditor.vue b/src/renderer/components/MonacoEditor.vue
index 2ae46ad6..5d5ebfea 100644
--- a/src/renderer/components/MonacoEditor.vue
+++ b/src/renderer/components/MonacoEditor.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts">
-import type * as monaco from 'monaco-editor'
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'
 import { defineComponent, onMounted, ref } from 'vue'
 import { defaultOptions } from '@fe/services/editor'
 import { toUri } from '@fe/services/document'
@@ -20,7 +20,7 @@ export default defineComponent({
     let editor: monaco.editor.IStandaloneCodeEditor | null = null
     const refEditor = ref<HTMLElement | null>(null)
 
-    const getMonaco = () => window.monaco
+    const getMonaco = () => monaco
     const getEditor = () => editor!
     const resize = () => editor && editor.layout()
 
@@ -52,7 +52,7 @@ export default defineComponent({
     function initMonaco () {
       triggerHook('MONACO_BEFORE_INIT', { monaco: getMonaco() })
 
-      editor = getMonaco().editor.create(refEditor.value, defaultOptions)
+      editor = getMonaco().editor.create(refEditor.value!, defaultOptions)
       setModel(toUri(null), '')
 
       setTimeout(() => {
@@ -60,21 +60,7 @@ export default defineComponent({
       }, 500)
     }
 
-    function onGotAmdLoader () {
-      (window as any).require(['vs/editor/editor.main'], initMonaco)
-    }
-
-    onMounted(() => {
-      if (!window.require) {
-        const loaderScript = document.createElement('script')
-        loaderScript.type = 'text/javascript'
-        loaderScript.src = 'vs/loader.js'
-        loaderScript.addEventListener('load', onGotAmdLoader)
-        document.body.appendChild(loaderScript)
-      } else {
-        onGotAmdLoader()
-      }
-    })
+    onMounted(initMonaco)
 
     return {
       refEditor,
diff --git a/vite.config.ts b/vite.config.ts
index 4baebe34..66af52b7 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -3,12 +3,6 @@ import vue from '@vitejs/plugin-vue'
 import path from 'path'
 import fs from 'fs-extra'
 
-// copy vs
-fs.copySync(
-  path.resolve(__dirname, 'node_modules/monaco-editor/min/vs'),
-  path.resolve(__dirname, 'src/renderer/public/vs')
-)
-
 fs.copySync(
   path.resolve(__dirname, 'node_modules/luckysheet/dist'),
   path.resolve(__dirname, 'src/renderer/public/embed')