Clean vite setup

bluwy · Oct 24, 2024 · 5ae869f · 5ae869f
1 parent 01dcd18
commit 5ae869f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 28 deletions.
diff --git a/site/src/pages/Package.svelte b/site/src/pages/Package.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { onDestroy } from 'svelte'
   import githubLogo from '../assets/github.svg'
   import gitlabLogo from '../assets/gitlab.svg'
   import gitLogo from '../assets/git.svg'
@@ -26,6 +27,12 @@
   let error = $state('')
   let status = $state('')
 
+  onDestroy(() => {
+    if (worker) {
+      worker.terminate()
+    }
+  })
+
   function createWorker() {
     const worker = new Worker(new URL('../utils/worker.js', import.meta.url), {
       type: 'module'

diff --git a/site/vite.config.js b/site/vite.config.js
@@ -11,13 +11,10 @@ export default defineConfig({
     // TODO: Fix this in Vite
     entries: ['**/*.html', './src/utils/worker.js']
   },
-  plugins: [
-    spaFallbackWithDot(),
-    serveAnalysisJson(),
-    unocss(),
-    svelte(),
-    markdown()
-  ],
+  plugins: [serveAnalysisJson(), unocss(), svelte(), markdown()],
+  esbuild: {
+    legalComments: 'none'
+  },
   build: {
     rollupOptions: {
       input: {
@@ -28,27 +25,6 @@ export default defineConfig({
   }
 })
 
-/**
- * Vite doesn't handle fallback html with dot (.), see https://github.com/vitejs/vite/issues/2415
- * TODO: Review the PR in Vite
- * @returns {import('vite').Plugin}
- */
-function spaFallbackWithDot() {
-  return {
-    name: 'spa-fallback-with-dot',
-    configureServer(server) {
-      return () => {
-        server.middlewares.use((req, res, next) => {
-          if (req.url.includes('.') && !req.url.endsWith('.html')) {
-            req.url = '/index.html'
-          }
-          next()
-        })
-      }
-    }
-  }
-}
-
 const analysisJsonUrl = new URL(
   '../analysis/cache/_results.json',
   import.meta.url