fix: respect server.origin when provided

Author: fi3ework

.changeset/grumpy-pumas-tie.md

@@ -0,0 +1,5 @@
+---
+'vite-plugin-checker': patch
+---
+
+Should respect `server.origin` when it's provided.

packages/vite-plugin-checker/src/client/index.ts

@@ -1,17 +1,24 @@
 import fs from 'fs'
 import { createRequire } from 'module'
+import type { SharedConfig } from '../types'
 const _require = createRequire(import.meta.url)
 
 export const RUNTIME_CLIENT_RUNTIME_PATH = '/@vite-plugin-checker-runtime'
 export const RUNTIME_CLIENT_ENTRY_PATH = '/@vite-plugin-checker-runtime-entry'
 
 export const wrapVirtualPrefix = (id: `/${string}`): `virtual:${string}` =>
   `virtual:${id.slice('/'.length)}`
-export const composePreambleCode = (base = '/', config: Record<string, any>) => `
-import { inject } from "${base}${RUNTIME_CLIENT_RUNTIME_PATH.slice(1)}";
+export const composePreambleCode = ({
+  baseWithOrigin = '/',
+  overlayConfig,
+}: {
+  baseWithOrigin: string
+  overlayConfig: SharedConfig['overlay']
+}) => `
+import { inject } from "${baseWithOrigin}${RUNTIME_CLIENT_RUNTIME_PATH.slice(1)}";
 inject({
-  overlayConfig: ${JSON.stringify(config)},
-  base: "${base}",
+  overlayConfig: ${JSON.stringify(overlayConfig)},
+  base: "${baseWithOrigin}",
 });
 `
 

packages/vite-plugin-checker/src/main.ts

@@ -24,8 +24,8 @@ import {
   type SharedConfig,
   type UserPluginConfig,
 } from './types.js'
-
 import type { ConfigEnv, Plugin, Logger } from 'vite'
+
 const sharedConfigKeys: (keyof SharedConfig)[] = ['enableBuild', 'overlay']
 const buildInCheckerKeys: BuildInCheckerNames[] = [
   'typescript',
@@ -63,7 +63,7 @@ export function checker(userConfig: UserPluginConfig): Plugin {
   let initializeCounter = 0
   let checkers: ServeAndBuildChecker[] = []
   let isProduction = false
-  let devBase = '/'
+  let baseWithOrigin: string
   let viteMode: ConfigEnv['command'] | undefined
   let buildWatch = false
   let logger: Logger | null = null
@@ -99,7 +99,7 @@ export function checker(userConfig: UserPluginConfig): Plugin {
     },
     configResolved(config) {
       logger = config.logger
-      devBase = config.base
+      baseWithOrigin = config.server.origin ? config.server.origin + config.base : config.base
       isProduction ||= config.isProduction || config.command === 'build'
       buildWatch = !!config.build.watch
     },
@@ -126,7 +126,7 @@ export function checker(userConfig: UserPluginConfig): Plugin {
       }
 
       if (id === wrapVirtualPrefix(RUNTIME_CLIENT_ENTRY_PATH)) {
-        return composePreambleCode(devBase, overlayConfig)
+        return composePreambleCode({ baseWithOrigin, overlayConfig })
       }
 
       return
@@ -139,7 +139,7 @@ export function checker(userConfig: UserPluginConfig): Plugin {
         {
           tag: 'script',
           attrs: { type: 'module' },
-          children: composePreambleCode(devBase, overlayConfig),
+          children: composePreambleCode({ baseWithOrigin, overlayConfig }),
         },
       ]
     },