vite-plugin-phpsandbox 0.3.0 → 0.4.1

package/README.md

@@ -49,6 +49,8 @@ The plugin reads these environment variables by default:
 
 When `PHPSANDBOX_TYPE=laravel`, the plugin does not create a standalone HMR server. It sets `server.port` to the resolved HMR port and configures the advertised HMR endpoint instead.
 
+When a public host is available, Laravel mode also defaults `server.origin` to its HTTPS URL so development assets use the public proxy rather than localhost. An explicitly configured origin is preserved. Other sandbox types retain their existing asset origin because their standalone server handles HMR only.
+
 ## API
 
 ```ts

package/dist/index.cjs

@@ -52,8 +52,17 @@ function normalizeSandboxType(value) {
   const normalized = value?.trim().toLowerCase();
   return normalized ? normalized : void 0;
 }
-function resolvePublicHost(env) {
-  return env.SUBDOMAIN && env.NOTEBOOK_HOST ? `${env.SUBDOMAIN}-${HMR_PORT}.${env.NOTEBOOK_HOST}` : void 0;
+function resolvePublicHost(env, hmrPort) {
+  return env.SUBDOMAIN && env.NOTEBOOK_HOST ? `${env.SUBDOMAIN}-${hmrPort}.${env.NOTEBOOK_HOST}` : void 0;
+}
+function resolveHmrPort(existingServer, env) {
+  const existingHmr = resolveExistingHmrOptions(existingServer);
+  const value = env.PHPSANDBOX_HMR_PORT ?? env.VITE_HMR_PORT ?? existingHmr?.port;
+  const port = Number(value);
+  return Number.isInteger(port) && port > 0 ? port : HMR_PORT;
+}
+function shouldSkipHmrSetup(configEnv) {
+  return configEnv.command !== "serve" || process.argv.some((arg) => arg === "optimize");
 }
 function isRecord(value) {
   return typeof value === "object" && value !== null;
@@ -136,11 +145,11 @@ function resolveAllowedHosts(existingAllowedHosts, notebookHost, publicHost) {
 function resolveExistingHmrOptions(serverOptions) {
   return isRecord(serverOptions.hmr) ? serverOptions.hmr : void 0;
 }
-function resolveHmrOptions(existingServer, publicHost, hmrServer) {
+function resolveHmrOptions(existingServer, publicHost, hmrServer, hmrPort) {
   if (existingServer.hmr === false) return false;
   return {
     ...resolveExistingHmrOptions(existingServer),
-    port: HMR_PORT,
+    port: hmrPort,
     ...hmrServer ? { server: hmrServer } : {},
     ...publicHost ? {
       protocol: "wss",
@@ -152,12 +161,13 @@ function resolveHmrOptions(existingServer, publicHost, hmrServer) {
 function shouldCreateHmrServer(existingServer, isLaravel) {
   return !isLaravel && existingServer.hmr !== false;
 }
-function resolveServerConfig(existingServer, env, isLaravel, publicHost, hmrServer) {
+function resolveServerConfig(existingServer, env, isLaravel, publicHost, hmrServer, hmrPort) {
   return {
     ...existingServer,
     host: existingServer.host ?? true,
-    ...isLaravel ? { port: HMR_PORT } : {},
-    hmr: resolveHmrOptions(existingServer, publicHost, hmrServer),
+    ...isLaravel ? { port: hmrPort } : {},
+    ...isLaravel && publicHost ? { origin: existingServer.origin ?? `https://${publicHost}` } : {},
+    hmr: resolveHmrOptions(existingServer, publicHost, hmrServer, hmrPort),
     allowedHosts: resolveAllowedHosts(
       existingServer.allowedHosts,
       env.NOTEBOOK_HOST,
@@ -184,7 +194,8 @@ function formatHmrEndpoint(hmr) {
 function formatHmrSummary(serverOptions, hasManagedServer) {
   if (serverOptions.hmr === false) return "disabled";
   const hmr = resolveExistingHmrOptions(serverOptions);
-  const localEndpoint = hasManagedServer ? `0.0.0.0:${HMR_PORT}` : `vite:${serverOptions.port ?? HMR_PORT}`;
+  const port = hmr?.port ?? serverOptions.port ?? HMR_PORT;
+  const localEndpoint = hasManagedServer ? `0.0.0.0:${port}` : `vite:${port}`;
   return `${localEndpoint}, public=${formatHmrEndpoint(hmr)}`;
 }
 function formatStartupLog(sandboxType, serverOptions, hasManagedServer) {
@@ -201,6 +212,7 @@ function phpSandboxPlugin() {
   let releaseManagedHmrServer;
   let sandboxType;
   let needsHmrServer = false;
+  let hmrPort = HMR_PORT;
   let startupLog;
   function setManagedHmrServer(server) {
     if (managedHmrServer === server) return;
@@ -210,6 +222,7 @@ function phpSandboxPlugin() {
       releaseManagedHmrServer = void 0;
       return;
     }
+    const port = hmrPort;
     let released = false;
     releaseManagedHmrServer = () => {
       if (released) return;
@@ -218,32 +231,47 @@ function phpSandboxPlugin() {
         managedHmrServer = void 0;
         releaseManagedHmrServer = void 0;
       }
-      releaseServer(getGlobalState(), HMR_PORT, server);
+      releaseServer(getGlobalState(), port, server);
     };
   }
   return {
     name: "vite-plugin-phpsandbox",
     apply: "serve",
     enforce: "post",
-    config(userConfig) {
+    async config(userConfig, configEnv) {
       const env = process.env;
+      if (shouldSkipHmrSetup(configEnv)) {
+        sandboxType = void 0;
+        needsHmrServer = false;
+        startupLog = void 0;
+        setManagedHmrServer(void 0);
+        return {};
+      }
       sandboxType = normalizeSandboxType(env.PHPSANDBOX_TYPE);
       if (!sandboxType) {
         needsHmrServer = false;
         startupLog = void 0;
+        setManagedHmrServer(void 0);
         return {};
       }
       const isLaravel = sandboxType === "laravel";
-      const publicHost = resolvePublicHost(env);
       const existingServer = userConfig.server ?? {};
+      hmrPort = resolveHmrPort(existingServer, env);
+      const publicHost = resolvePublicHost(env, hmrPort);
       needsHmrServer = shouldCreateHmrServer(existingServer, isLaravel);
+      let hmrServer;
+      if (needsHmrServer) {
+        hmrServer = managedHmrServer ?? await acquireServer(getGlobalState(), hmrPort);
+        setManagedHmrServer(hmrServer);
+      }
       return {
         server: resolveServerConfig(
           existingServer,
           env,
           isLaravel,
           publicHost,
-          void 0
+          hmrServer,
+          hmrPort
         )
       };
     },
@@ -258,16 +286,8 @@ function phpSandboxPlugin() {
       startupLog = nextStartupLog;
       console.info(nextStartupLog);
     },
-    async configureServer(server) {
+    configureServer(server) {
       if (!sandboxType) return;
-      if (needsHmrServer) {
-        const hmrServer = managedHmrServer ?? await acquireServer(getGlobalState(), HMR_PORT);
-        setManagedHmrServer(hmrServer);
-        const hmrConfig = server.config.server.hmr;
-        if (isRecord(hmrConfig)) {
-          hmrConfig.server = hmrServer;
-        }
-      }
       const release = releaseManagedHmrServer;
       if (!release) return;
       server.httpServer?.once("close", release);

package/dist/index.js

@@ -16,8 +16,17 @@ function normalizeSandboxType(value) {
   const normalized = value?.trim().toLowerCase();
   return normalized ? normalized : void 0;
 }
-function resolvePublicHost(env) {
-  return env.SUBDOMAIN && env.NOTEBOOK_HOST ? `${env.SUBDOMAIN}-${HMR_PORT}.${env.NOTEBOOK_HOST}` : void 0;
+function resolvePublicHost(env, hmrPort) {
+  return env.SUBDOMAIN && env.NOTEBOOK_HOST ? `${env.SUBDOMAIN}-${hmrPort}.${env.NOTEBOOK_HOST}` : void 0;
+}
+function resolveHmrPort(existingServer, env) {
+  const existingHmr = resolveExistingHmrOptions(existingServer);
+  const value = env.PHPSANDBOX_HMR_PORT ?? env.VITE_HMR_PORT ?? existingHmr?.port;
+  const port = Number(value);
+  return Number.isInteger(port) && port > 0 ? port : HMR_PORT;
+}
+function shouldSkipHmrSetup(configEnv) {
+  return configEnv.command !== "serve" || process.argv.some((arg) => arg === "optimize");
 }
 function isRecord(value) {
   return typeof value === "object" && value !== null;
@@ -100,11 +109,11 @@ function resolveAllowedHosts(existingAllowedHosts, notebookHost, publicHost) {
 function resolveExistingHmrOptions(serverOptions) {
   return isRecord(serverOptions.hmr) ? serverOptions.hmr : void 0;
 }
-function resolveHmrOptions(existingServer, publicHost, hmrServer) {
+function resolveHmrOptions(existingServer, publicHost, hmrServer, hmrPort) {
   if (existingServer.hmr === false) return false;
   return {
     ...resolveExistingHmrOptions(existingServer),
-    port: HMR_PORT,
+    port: hmrPort,
     ...hmrServer ? { server: hmrServer } : {},
     ...publicHost ? {
       protocol: "wss",
@@ -116,12 +125,13 @@ function resolveHmrOptions(existingServer, publicHost, hmrServer) {
 function shouldCreateHmrServer(existingServer, isLaravel) {
   return !isLaravel && existingServer.hmr !== false;
 }
-function resolveServerConfig(existingServer, env, isLaravel, publicHost, hmrServer) {
+function resolveServerConfig(existingServer, env, isLaravel, publicHost, hmrServer, hmrPort) {
   return {
     ...existingServer,
     host: existingServer.host ?? true,
-    ...isLaravel ? { port: HMR_PORT } : {},
-    hmr: resolveHmrOptions(existingServer, publicHost, hmrServer),
+    ...isLaravel ? { port: hmrPort } : {},
+    ...isLaravel && publicHost ? { origin: existingServer.origin ?? `https://${publicHost}` } : {},
+    hmr: resolveHmrOptions(existingServer, publicHost, hmrServer, hmrPort),
     allowedHosts: resolveAllowedHosts(
       existingServer.allowedHosts,
       env.NOTEBOOK_HOST,
@@ -148,7 +158,8 @@ function formatHmrEndpoint(hmr) {
 function formatHmrSummary(serverOptions, hasManagedServer) {
   if (serverOptions.hmr === false) return "disabled";
   const hmr = resolveExistingHmrOptions(serverOptions);
-  const localEndpoint = hasManagedServer ? `0.0.0.0:${HMR_PORT}` : `vite:${serverOptions.port ?? HMR_PORT}`;
+  const port = hmr?.port ?? serverOptions.port ?? HMR_PORT;
+  const localEndpoint = hasManagedServer ? `0.0.0.0:${port}` : `vite:${port}`;
   return `${localEndpoint}, public=${formatHmrEndpoint(hmr)}`;
 }
 function formatStartupLog(sandboxType, serverOptions, hasManagedServer) {
@@ -165,6 +176,7 @@ function phpSandboxPlugin() {
   let releaseManagedHmrServer;
   let sandboxType;
   let needsHmrServer = false;
+  let hmrPort = HMR_PORT;
   let startupLog;
   function setManagedHmrServer(server) {
     if (managedHmrServer === server) return;
@@ -174,6 +186,7 @@ function phpSandboxPlugin() {
       releaseManagedHmrServer = void 0;
       return;
     }
+    const port = hmrPort;
     let released = false;
     releaseManagedHmrServer = () => {
       if (released) return;
@@ -182,32 +195,47 @@ function phpSandboxPlugin() {
         managedHmrServer = void 0;
         releaseManagedHmrServer = void 0;
       }
-      releaseServer(getGlobalState(), HMR_PORT, server);
+      releaseServer(getGlobalState(), port, server);
     };
   }
   return {
     name: "vite-plugin-phpsandbox",
     apply: "serve",
     enforce: "post",
-    config(userConfig) {
+    async config(userConfig, configEnv) {
       const env = process.env;
+      if (shouldSkipHmrSetup(configEnv)) {
+        sandboxType = void 0;
+        needsHmrServer = false;
+        startupLog = void 0;
+        setManagedHmrServer(void 0);
+        return {};
+      }
       sandboxType = normalizeSandboxType(env.PHPSANDBOX_TYPE);
       if (!sandboxType) {
         needsHmrServer = false;
         startupLog = void 0;
+        setManagedHmrServer(void 0);
         return {};
       }
       const isLaravel = sandboxType === "laravel";
-      const publicHost = resolvePublicHost(env);
       const existingServer = userConfig.server ?? {};
+      hmrPort = resolveHmrPort(existingServer, env);
+      const publicHost = resolvePublicHost(env, hmrPort);
       needsHmrServer = shouldCreateHmrServer(existingServer, isLaravel);
+      let hmrServer;
+      if (needsHmrServer) {
+        hmrServer = managedHmrServer ?? await acquireServer(getGlobalState(), hmrPort);
+        setManagedHmrServer(hmrServer);
+      }
       return {
         server: resolveServerConfig(
           existingServer,
           env,
           isLaravel,
           publicHost,
-          void 0
+          hmrServer,
+          hmrPort
         )
       };
     },
@@ -222,16 +250,8 @@ function phpSandboxPlugin() {
       startupLog = nextStartupLog;
       console.info(nextStartupLog);
     },
-    async configureServer(server) {
+    configureServer(server) {
       if (!sandboxType) return;
-      if (needsHmrServer) {
-        const hmrServer = managedHmrServer ?? await acquireServer(getGlobalState(), HMR_PORT);
-        setManagedHmrServer(hmrServer);
-        const hmrConfig = server.config.server.hmr;
-        if (isRecord(hmrConfig)) {
-          hmrConfig.server = hmrServer;
-        }
-      }
       const release = releaseManagedHmrServer;
       if (!release) return;
       server.httpServer?.once("close", release);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-phpsandbox",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "Vite plugin for PHP sandbox environments that need stable HMR over public proxy hosts.",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -36,7 +36,8 @@
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",
     "check": "tsc --noEmit",
-    "release:check": "npm run check && npm run build && npm pack --dry-run",
+    "test": "npm run build && node --test tests/*.test.mjs",
+    "release:check": "npm run check && npm run test && npm pack --dry-run",
     "release": "npm version minor && npm run release:check && npm publish",
     "prepublishOnly": "npm run build && npm run check"
   },