wip: update

Author: sapphi-red

packages/vite/src/client/client.ts

@@ -1,4 +1,3 @@
-/// <reference types="rolldown/experimental/runtime-types" />
 import type { ErrorPayload, HotPayload } from '#types/hmrPayload'
 import type { ViteHotContext } from '#types/hot'
 import { HMRClient, HMRContext } from '../shared/hmr'
@@ -618,24 +617,19 @@ export function injectQuery(url: string, queryToInject: string): string {
 
 export { ErrorOverlay }
 
+// TODO: proper types
+declare let DevRuntime: { new (socket: any): any } | undefined
+
 if (isFullBundleMode && typeof DevRuntime !== 'undefined') {
   class ViteDevRuntime extends DevRuntime {
-    override createModuleHotContext(moduleId: string) {
+    createModuleHotContext(moduleId: string) {
       const ctx = createHotContext(moduleId)
-      // @ts-expect-error TODO: support CSS
-      ctx._internal = {
-        updateStyle,
-        removeStyle,
-      }
-      // @ts-expect-error TODO: support this function (used by plugin-react)
-      ctx.getExports = async () =>
-        // @ts-expect-error __rolldown_runtime__ / ctx.ownerPath
-        __rolldown_runtime__.loadExports(ctx.ownerPath)
+      // @ts-expect-error TODO: support CSS properly
+      ctx._internal = { updateStyle, removeStyle }
       return ctx
     }
 
-    override applyUpdates(_boundaries: string[]): void {
-      // TODO: how should this be handled?
+    applyUpdates(_boundaries: string[]): void {
       // noop, handled in the HMR client
     }
   }

packages/vite/src/node/plugins/clientInjections.ts

@@ -138,7 +138,7 @@ export async function getHmrImplementation(
   const replacer = await createClientConfigValueReplacer(config)
   return (
     replacer(content)
-      // the rolldown runtime shouldn't be importer a module
+      // the rolldown runtime cannot import a module
       .replace(/import\s*['"]@vite\/env['"]/, '')
   )
 }

packages/vite/src/node/plugins/define.ts

@@ -221,7 +221,6 @@ export async function replaceDefine(
   })
 
   if (result.errors.length > 0) {
-    // TODO: better error message
     throw new AggregateError(result.errors, 'oxc transform error')
   }
 

packages/vite/src/node/server/environments/fullBundleEnvironment.ts

@@ -247,7 +247,6 @@ export class FullBundleDevEnvironment extends DevEnvironment {
         )
       }
 
-      // TODO: need to check if this is enough
       this.handleHmrOutput(client, [m.path], update, {
         firstInvalidatedBy: m.firstInvalidatedBy,
       })
@@ -286,10 +285,6 @@ export class FullBundleDevEnvironment extends DevEnvironment {
         output.assetFileNames = 'assets/[name]-[hash][extname]'
         output.minify = false
         output.sourcemap = true
-        // output.advancedChunks ||= {}
-        // output.advancedChunks.groups = [
-        //   { name: 'chunk', maxSize: 1024 * 1024 },
-        // ]
       }
     } else {
       rolldownOptions.output ??= {}
@@ -298,12 +293,7 @@ export class FullBundleDevEnvironment extends DevEnvironment {
       rolldownOptions.output.assetFileNames = 'assets/[name]-[hash][extname]'
       rolldownOptions.output.minify = false
       rolldownOptions.output.sourcemap = true
-      // rolldownOptions.output.advancedChunks ||= {}
-      // rolldownOptions.output.advancedChunks.groups = [
-      //   { name: 'chunk', maxSize: 1024 * 1024 },
-      // ]
     }
-    // rolldownOptions.experimental.strictExecutionOrder = true
 
     return rolldownOptions
   }

packages/vite/src/node/server/middlewares/indexHtml.ts

@@ -565,10 +565,26 @@ async function generateFallbackHtml(server: ViteDevServer) {
     ${hmrRuntime.replaceAll('</script>', '<\\/script>')}
   </script>
   <style>
+    :root {
+      --page-bg: #ffffff;
+      --text-color: #1d1d1f;
+      --spinner-track: #f5f5f7;
+      --spinner-accent: #0071e3;
+    }
+    @media (prefers-color-scheme: dark) {
+      :root {
+        --page-bg: #1e1e1e;
+        --text-color: #f5f5f5;
+        --spinner-track: #424242;
+      }
+    }
+
     body {
       margin: 0;
       min-height: 100vh;
       display: flex;
+      background-color: var(--page-bg);
+      color: var(--text-color);
     }
 
     .container {
@@ -582,8 +598,8 @@ async function generateFallbackHtml(server: ViteDevServer) {
       width: 3rem;
       height: 3rem;
       margin: 2rem auto;
-      border: 3px solid #f5f5f7;
-      border-top-color: #0071e3;
+      border: 3px solid var(--spinner-track);
+      border-top-color: var(--spinner-accent);
       border-radius: 50%;
       animation: spin 1s linear infinite;
     }

packages/vite/src/node/server/middlewares/rejectInvalidRequest.ts

@@ -1,6 +1,8 @@
 import type { Connect } from '#dep-types/connect'
 
-// disallows request that contains `#` in the URL
+/**
+ * disallows request that contains `#` in the URL
+ */
 export function rejectInvalidRequestMiddleware(): Connect.NextHandleFunction {
   // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
   return function viteRejectInvalidRequestMiddleware(req, res, next) {