From fccc14592988e4b2c1ed7821b6b432f1c71b185b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?=
 <sxzz@sxzz.moe>
Date: Thu, 6 Jul 2023 03:23:31 +0800
Subject: [PATCH 1/2] refactor: external TS of worker

---
 empty.js               |  1 -
 vite.config.ts         | 15 ++++-----------
 vite.preview.config.ts | 10 ++++++++--
 3 files changed, 12 insertions(+), 14 deletions(-)
 delete mode 100644 empty.js

diff --git a/empty.js b/empty.js
deleted file mode 100644
index 336ce12b..00000000
--- a/empty.js
+++ /dev/null
@@ -1 +0,0 @@
-export {}
diff --git a/vite.config.ts b/vite.config.ts
index dce02501..2dcb3b6c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,5 +1,4 @@
-import path from 'node:path'
-import { defineConfig, Plugin, UserConfig } from 'vite'
+import { Plugin, mergeConfig } from 'vite'
 import base from './vite.preview.config'
 
 const genStub: Plugin = {
@@ -14,15 +13,15 @@ const genStub: Plugin = {
   },
 }
 
-export default defineConfig({
-  ...base,
-  plugins: [...(base as UserConfig).plugins!, genStub],
+export default mergeConfig(base, {
+  plugins: [genStub],
   optimizeDeps: {
     // avoid late discovered deps
     include: [
       'path-browserify',
       'onigasm',
       'typescript',
+      '@volar/cdn',
       '@vue/language-service',
       'monaco-editor-core/esm/vs/editor/editor.worker',
       '@volar/monaco/worker',
@@ -30,12 +29,6 @@ export default defineConfig({
     ],
   },
   base: './',
-  resolve: {
-    alias: {
-      typescript: path.resolve(__dirname, './empty.js'),
-      path: 'path-browserify',
-    },
-  },
   build: {
     target: 'esnext',
     minify: false,
diff --git a/vite.preview.config.ts b/vite.preview.config.ts
index a42dc65b..a1eae08a 100644
--- a/vite.preview.config.ts
+++ b/vite.preview.config.ts
@@ -1,4 +1,3 @@
-import path from 'node:path'
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import replace from '@rollup/plugin-replace'
@@ -13,10 +12,17 @@ export default defineConfig({
   ],
   resolve: {
     alias: {
-      typescript: path.resolve(__dirname, './empty.js'),
       path: 'path-browserify',
     },
   },
+  build: {
+    rollupOptions: {
+      external: ['typescript'],
+    },
+    commonjsOptions: {
+      ignore: ['typescript'],
+    },
+  },
   worker: {
     format: 'es',
     plugins: [

From 9b91863bd8085ebbeb55a520319c402bc4265b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?=
 <sxzz@sxzz.moe>
Date: Thu, 6 Jul 2023 03:28:24 +0800
Subject: [PATCH 2/2] fix: remove external

---
 vite.preview.config.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/vite.preview.config.ts b/vite.preview.config.ts
index a1eae08a..ad330139 100644
--- a/vite.preview.config.ts
+++ b/vite.preview.config.ts
@@ -16,9 +16,6 @@ export default defineConfig({
     },
   },
   build: {
-    rollupOptions: {
-      external: ['typescript'],
-    },
     commonjsOptions: {
       ignore: ['typescript'],
     },