@base44-preview/vite-plugin 1.0.44-pr.132.56d48fe → 1.0.44-pr.132.5c3c2d8

package/dist/base44-runtime-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base44-runtime-plugin.d.ts","sourceRoot":"","sources":["../src/base44-runtime-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAsFnC,wBAAgB,mBAAmB,IAAI,MAAM,CAiC5C"}
+{"version":3,"file":"base44-runtime-plugin.d.ts","sourceRoot":"","sources":["../src/base44-runtime-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAqFnC,wBAAgB,mBAAmB,IAAI,MAAM,CA+C5C"}

package/dist/base44-runtime-plugin.js

@@ -23,9 +23,6 @@
  * public import. Without that wrapper (including local dev), TCP fails closed.
  */
 const SPECIFIER = "base44:runtime";
-// Rollup convention: a resolved virtual id starts with NUL so no other plugin
-// (and no filesystem lookup) tries to claim it.
-const RESOLVED = "\0base44:runtime";
 // Reserved so a route importing it fails with an explanation instead of a bare
 // "failed to resolve import". Actors are never imported — they live in the app's
 // actors directory, in server routes exactly as in backend functions.
@@ -77,6 +74,7 @@ export const staticEgress = Object.freeze({
   },
 });
 `;
+const IMPORTER_QUERY = "?importer=";
 export function base44RuntimePlugin() {
     return {
         name: "base44-runtime",
@@ -85,27 +83,42 @@ export function base44RuntimePlugin() {
         enforce: "pre",
         // Errors are raised in `load`, never `resolveId`: Vite's dep scanner resolves
         // the raw source of server routes and server-fn handlers in the client
-        // environment, before TanStack strips them, and treats a virtual id as
-        // external without loading it. A throw at resolution fails the scan and
-        // Vite skips pre-bundling.
-        resolveId(id) {
-            if (id === SPECIFIER || unsupportedReason(id))
-                return `\0${id}`;
-            return null;
+        // environment, before TanStack strips them, and a throw there fails the scan
+        // so Vite skips pre-bundling. This relies on the scanner externalizing
+        // resolved virtual ids rather than loading them (true of the esbuild scan in
+        // Vite 7 and the Rolldown scan in Vite 8); re-check it on a bundler change.
+        resolveId(id, importer) {
+            if (id !== SPECIFIER && !unsupportedReason(id))
+                return null;
+            // Rollup convention: a NUL-prefixed id is virtual, so no other plugin
+            // (and no filesystem lookup) tries to claim it.
+            const virtual = `\0${id}`;
+            // A module that only exists to fail carries its importer in its id, so the
+            // error names that exact file. Server environments share one instance.
+            const fails = id !== SPECIFIER || this.environment?.name === "client";
+            if (!fails || !importer)
+                return virtual;
+            // Drop the importer's own query (e.g. TanStack's `?tsr-split=component`).
+            return `${virtual}${IMPORTER_QUERY}${encodeURIComponent(importer.split("?")[0])}`;
         },
         load(id) {
-            if (!id.startsWith(RESOLVED))
+            if (!id.startsWith("\0"))
                 return null;
-            const reason = unsupportedReason(id.slice(1));
-            if (reason) {
-                this.error(`"${id.slice(1)}" is not available in server routes. ${reason}`);
-            }
-            if (id !== RESOLVED)
+            const [specifier = "", importer] = id.slice(1).split(IMPORTER_QUERY);
+            const reason = unsupportedReason(specifier);
+            if (specifier !== SPECIFIER && !reason)
                 return null;
+            // The dev server decodes the URL once before we see it, which can leave a
+            // bare `%` from the path (`100%25` → `100%`); escape it back before decoding.
+            const from = importer
+                ? ` Imported from ${decodeURIComponent(importer.replace(/%(?![0-9A-Fa-f]{2})/g, "%25"))}.`
+                : "";
+            if (reason)
+                this.error(`"${specifier}" is not available in server routes. ${reason}${from}`);
             // `cloudflare:workers` has no browser equivalent, so a client-side import
             // would bundle a module that cannot run. Fail with the reason instead.
             if (this.environment?.name === "client") {
-                this.error(`"${SPECIFIER}" is server-only. Move this import into a server route.`);
+                this.error(`"${SPECIFIER}" is server-only. Move this import into a server route.${from}`);
             }
             return RUNTIME_MODULE;
         },

package/dist/base44-runtime-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"base44-runtime-plugin.js","sourceRoot":"","sources":["../src/base44-runtime-plugin.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,8EAA8E;AAC9E,gDAAgD;AAChD,MAAM,QAAQ,GAAG,kBAAkB,CAAC;AAEpC,+EAA+E;AAC/E,iFAAiF;AACjF,sEAAsE;AACtE,MAAM,aAAa,GACjB,8EAA8E,CAAC;AAEjF,SAAS,iBAAiB,CAAC,EAAU;IACnC,IAAI,EAAE,KAAK,uBAAuB;QAAE,OAAO,aAAa,CAAC;IACzD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;CAsBtB,CAAC;AAEF,MAAM,UAAU,mBAAmB;IACjC,OAAO;QACL,IAAI,EAAE,gBAAgB;QACtB,0EAA0E;QAC1E,+BAA+B;QAC/B,OAAO,EAAE,KAAK;QAEd,8EAA8E;QAC9E,uEAAuE;QACvE,uEAAuE;QACvE,wEAAwE;QACxE,2BAA2B;QAC3B,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,SAAS,IAAI,iBAAiB,CAAC,EAAE,CAAC;gBAAE,OAAO,KAAK,EAAE,EAAE,CAAC;YAChE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,EAAE;YACL,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAAE,OAAO,IAAI,CAAC;YAC1C,MAAM,MAAM,GAAG,iBAAiB,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,wCAAwC,MAAM,EAAE,CAAC,CAAC;YAC9E,CAAC;YACD,IAAI,EAAE,KAAK,QAAQ;gBAAE,OAAO,IAAI,CAAC;YAEjC,0EAA0E;YAC1E,uEAAuE;YACvE,IAAI,IAAI,CAAC,WAAW,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACxC,IAAI,CAAC,KAAK,CAAC,IAAI,SAAS,yDAAyD,CAAC,CAAC;YACrF,CAAC;YACD,OAAO,cAAc,CAAC;QACxB,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"base44-runtime-plugin.js","sourceRoot":"","sources":["../src/base44-runtime-plugin.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,MAAM,SAAS,GAAG,gBAAgB,CAAC;AAEnC,+EAA+E;AAC/E,iFAAiF;AACjF,sEAAsE;AACtE,MAAM,aAAa,GACjB,8EAA8E,CAAC;AAEjF,SAAS,iBAAiB,CAAC,EAAU;IACnC,IAAI,EAAE,KAAK,uBAAuB;QAAE,OAAO,aAAa,CAAC;IACzD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;CAsBtB,CAAC;AAEF,MAAM,cAAc,GAAG,YAAY,CAAC;AAEpC,MAAM,UAAU,mBAAmB;IACjC,OAAO;QACL,IAAI,EAAE,gBAAgB;QACtB,0EAA0E;QAC1E,+BAA+B;QAC/B,OAAO,EAAE,KAAK;QAEd,8EAA8E;QAC9E,uEAAuE;QACvE,6EAA6E;QAC7E,uEAAuE;QACvE,6EAA6E;QAC7E,4EAA4E;QAC5E,SAAS,CAAC,EAAE,EAAE,QAAQ;YACpB,IAAI,EAAE,KAAK,SAAS,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAAE,OAAO,IAAI,CAAC;YAC5D,sEAAsE;YACtE,gDAAgD;YAChD,MAAM,OAAO,GAAG,KAAK,EAAE,EAAE,CAAC;YAC1B,2EAA2E;YAC3E,uEAAuE;YACvE,MAAM,KAAK,GAAG,EAAE,KAAK,SAAS,IAAI,IAAI,CAAC,WAAW,EAAE,IAAI,KAAK,QAAQ,CAAC;YACtE,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ;gBAAE,OAAO,OAAO,CAAC;YACxC,0EAA0E;YAC1E,OAAO,GAAG,OAAO,GAAG,cAAc,GAAG,kBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC;QACrF,CAAC;QAED,IAAI,CAAC,EAAE;YACL,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;gBAAE,OAAO,IAAI,CAAC;YACtC,MAAM,CAAC,SAAS,GAAG,EAAE,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YACrE,MAAM,MAAM,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;YAC5C,IAAI,SAAS,KAAK,SAAS,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC;YACpD,0EAA0E;YAC1E,8EAA8E;YAC9E,MAAM,IAAI,GAAG,QAAQ;gBACnB,CAAC,CAAC,kBAAkB,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC,GAAG;gBAC1F,CAAC,CAAC,EAAE,CAAC;YAEP,IAAI,MAAM;gBAAE,IAAI,CAAC,KAAK,CAAC,IAAI,SAAS,wCAAwC,MAAM,GAAG,IAAI,EAAE,CAAC,CAAC;YAE7F,0EAA0E;YAC1E,uEAAuE;YACvE,IAAI,IAAI,CAAC,WAAW,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACxC,IAAI,CAAC,KAAK,CAAC,IAAI,SAAS,0DAA0D,IAAI,EAAE,CAAC,CAAC;YAC5F,CAAC;YACD,OAAO,cAAc,CAAC;QACxB,CAAC;KACF,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@base44-preview/vite-plugin",
-  "version": "1.0.44-pr.132.56d48fe",
+  "version": "1.0.44-pr.132.5c3c2d8",
   "description": "The Vite plugin for base44 based applications",
   "type": "module",
   "license": "MIT",

package/src/base44-runtime-plugin.ts

@@ -26,9 +26,6 @@ import type { Plugin } from "vite";
  */
 
 const SPECIFIER = "base44:runtime";
-// Rollup convention: a resolved virtual id starts with NUL so no other plugin
-// (and no filesystem lookup) tries to claim it.
-const RESOLVED = "\0base44:runtime";
 
 // Reserved so a route importing it fails with an explanation instead of a bare
 // "failed to resolve import". Actors are never imported — they live in the app's
@@ -84,6 +81,8 @@ export const staticEgress = Object.freeze({
 });
 `;
 
+const IMPORTER_QUERY = "?importer=";
+
 export function base44RuntimePlugin(): Plugin {
   return {
     name: "base44-runtime",
@@ -93,26 +92,40 @@ export function base44RuntimePlugin(): Plugin {
 
     // Errors are raised in `load`, never `resolveId`: Vite's dep scanner resolves
     // the raw source of server routes and server-fn handlers in the client
-    // environment, before TanStack strips them, and treats a virtual id as
-    // external without loading it. A throw at resolution fails the scan and
-    // Vite skips pre-bundling.
-    resolveId(id) {
-      if (id === SPECIFIER || unsupportedReason(id)) return `\0${id}`;
-      return null;
+    // environment, before TanStack strips them, and a throw there fails the scan
+    // so Vite skips pre-bundling. This relies on the scanner externalizing
+    // resolved virtual ids rather than loading them (true of the esbuild scan in
+    // Vite 7 and the Rolldown scan in Vite 8); re-check it on a bundler change.
+    resolveId(id, importer) {
+      if (id !== SPECIFIER && !unsupportedReason(id)) return null;
+      // Rollup convention: a NUL-prefixed id is virtual, so no other plugin
+      // (and no filesystem lookup) tries to claim it.
+      const virtual = `\0${id}`;
+      // A module that only exists to fail carries its importer in its id, so the
+      // error names that exact file. Server environments share one instance.
+      const fails = id !== SPECIFIER || this.environment?.name === "client";
+      if (!fails || !importer) return virtual;
+      // Drop the importer's own query (e.g. TanStack's `?tsr-split=component`).
+      return `${virtual}${IMPORTER_QUERY}${encodeURIComponent(importer.split("?")[0]!)}`;
     },
 
     load(id) {
-      if (!id.startsWith(RESOLVED)) return null;
-      const reason = unsupportedReason(id.slice(1));
-      if (reason) {
-        this.error(`"${id.slice(1)}" is not available in server routes. ${reason}`);
-      }
-      if (id !== RESOLVED) return null;
+      if (!id.startsWith("\0")) return null;
+      const [specifier = "", importer] = id.slice(1).split(IMPORTER_QUERY);
+      const reason = unsupportedReason(specifier);
+      if (specifier !== SPECIFIER && !reason) return null;
+      // The dev server decodes the URL once before we see it, which can leave a
+      // bare `%` from the path (`100%25` → `100%`); escape it back before decoding.
+      const from = importer
+        ? ` Imported from ${decodeURIComponent(importer.replace(/%(?![0-9A-Fa-f]{2})/g, "%25"))}.`
+        : "";
+
+      if (reason) this.error(`"${specifier}" is not available in server routes. ${reason}${from}`);
 
       // `cloudflare:workers` has no browser equivalent, so a client-side import
       // would bundle a module that cannot run. Fail with the reason instead.
       if (this.environment?.name === "client") {
-        this.error(`"${SPECIFIER}" is server-only. Move this import into a server route.`);
+        this.error(`"${SPECIFIER}" is server-only. Move this import into a server route.${from}`);
       }
       return RUNTIME_MODULE;
     },