refactor: external TS of worker (#127)

vuejs · Jul 5, 2023 · f9ed9cb · f9ed9cb
1 parent 4301d86
commit f9ed9cb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/empty.js b/empty.js
diff --git 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,28 +13,22 @@ 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',
       'vue/server-renderer',
     ],
   },
   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
@@ -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,14 @@ export default defineConfig({
   ],
   resolve: {
     alias: {
-      typescript: path.resolve(__dirname, './empty.js'),
       path: 'path-browserify',
     },
   },
+  build: {
+    commonjsOptions: {
+      ignore: ['typescript'],
+    },
+  },
   worker: {
     format: 'es',
     plugins: [