@webtypen/webframez-react 0.0.23 → 0.0.25

package/defaults/webpack.client.cjs

@@ -6,9 +6,14 @@ const frameworkDistDir = path.resolve(__dirname, "..", "dist");
 const clientEntry = process.env.WEBFRAMEZ_REACT_CLIENT_ENTRY
   ? path.resolve(projectRoot, process.env.WEBFRAMEZ_REACT_CLIENT_ENTRY)
   : path.resolve(projectRoot, "src/client.tsx");
+const isWatchMode = process.argv.includes("--watch");
+const mode =
+  process.env.NODE_ENV === "production" || (typeof process.env.NODE_ENV === "undefined" && !isWatchMode)
+    ? "production"
+    : "development";
 
 module.exports = {
-  mode: process.env.NODE_ENV === "production" ? "production" : "development",
+  mode,
   entry: {
     client: clientEntry,
   },
@@ -38,6 +43,8 @@ module.exports = {
   optimization: {
     splitChunks: false,
     runtimeChunk: false,
+    moduleIds: "named",
+    chunkIds: "named",
   },
   plugins: [
     new ReactFlightWebpackPlugin({

package/dist/http.cjs

@@ -409,8 +409,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -497,7 +514,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!import_node_fs.default.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h1", { children: statusCode }),
@@ -511,7 +528,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -560,7 +577,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -615,8 +635,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);
@@ -712,7 +732,21 @@ globalThis.__webpack_require__ = function __webframezNodeRequire(id) {
   }
 
   if (id.startsWith("./")) {
-    return require(path.resolve(process.cwd(), id.slice(2)));
+    const relativeId = id.slice(2);
+    const candidates = [
+      path.resolve(process.cwd(), relativeId),
+      path.resolve(process.cwd(), "..", relativeId)
+    ];
+    for (const candidate of candidates) {
+      try {
+        return require(candidate);
+      } catch (error) {
+        const missingCandidate = error && error.code === "MODULE_NOT_FOUND" && typeof error.message === "string" && error.message.includes("'" + candidate + "'");
+        if (!missingCandidate) {
+          throw error;
+        }
+      }
+    }
   }
 
   return require(id);
@@ -1016,22 +1050,64 @@ function normalizeClientManifest(manifest, options) {
 }
 function createServerConsumerManifest(manifest) {
   const consumerManifest = {};
+  const normalizeWorkerModuleId = (requestKey, rawModuleId) => {
+    if (typeof rawModuleId === "string" && rawModuleId.trim() !== "") {
+      return rawModuleId;
+    }
+    if (typeof rawModuleId !== "number" || !Number.isFinite(rawModuleId)) {
+      return null;
+    }
+    if (!requestKey || requestKey.trim() === "") {
+      return String(rawModuleId);
+    }
+    if (requestKey.startsWith("file://")) {
+      try {
+        return (0, import_node_url.fileURLToPath)(requestKey);
+      } catch {
+        return String(rawModuleId);
+      }
+    }
+    if (requestKey.startsWith("/")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("./")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("node_modules/") || requestKey.startsWith("build/")) {
+      return `./${requestKey}`;
+    }
+    return requestKey;
+  };
+  const addReference = (lookupKey, reference) => {
+    if (!lookupKey || lookupKey.trim() === "") {
+      return;
+    }
+    if (lookupKey in consumerManifest) {
+      return;
+    }
+    consumerManifest[lookupKey] = {
+      "*": reference
+    };
+  };
   for (const [key, value] of Object.entries(manifest)) {
     if (!value || typeof value !== "object") {
       continue;
     }
     const entry = value;
-    if (typeof entry.id !== "string" || entry.id.trim() === "") {
+    const workerModuleId = normalizeWorkerModuleId(key, entry.id);
+    if (!workerModuleId) {
       continue;
     }
-    consumerManifest[key] = {
-      "*": {
-        id: entry.id,
-        chunks: [],
-        name: entry.name ?? "*",
-        ...entry.async ? { async: entry.async } : {}
-      }
+    const reference = {
+      id: workerModuleId,
+      chunks: Array.isArray(entry.chunks) ? entry.chunks : [],
+      name: entry.name ?? "*",
+      ...entry.async ? { async: entry.async } : {}
     };
+    addReference(key, reference);
+    if (typeof entry.id === "number" && Number.isFinite(entry.id)) {
+      addReference(String(entry.id), reference);
+    }
   }
   return consumerManifest;
 }

package/dist/http.js

@@ -384,8 +384,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete __require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = __require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = __require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete __require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return __require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -472,7 +489,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!fs.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ jsxs("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ jsx("h1", { children: statusCode }),
@@ -486,7 +503,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -535,7 +552,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -590,8 +610,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);
@@ -687,7 +707,21 @@ globalThis.__webpack_require__ = function __webframezNodeRequire(id) {
   }
 
   if (id.startsWith("./")) {
-    return require(path.resolve(process.cwd(), id.slice(2)));
+    const relativeId = id.slice(2);
+    const candidates = [
+      path.resolve(process.cwd(), relativeId),
+      path.resolve(process.cwd(), "..", relativeId)
+    ];
+    for (const candidate of candidates) {
+      try {
+        return require(candidate);
+      } catch (error) {
+        const missingCandidate = error && error.code === "MODULE_NOT_FOUND" && typeof error.message === "string" && error.message.includes("'" + candidate + "'");
+        if (!missingCandidate) {
+          throw error;
+        }
+      }
+    }
   }
 
   return require(id);
@@ -991,22 +1025,64 @@ function normalizeClientManifest(manifest, options) {
 }
 function createServerConsumerManifest(manifest) {
   const consumerManifest = {};
+  const normalizeWorkerModuleId = (requestKey, rawModuleId) => {
+    if (typeof rawModuleId === "string" && rawModuleId.trim() !== "") {
+      return rawModuleId;
+    }
+    if (typeof rawModuleId !== "number" || !Number.isFinite(rawModuleId)) {
+      return null;
+    }
+    if (!requestKey || requestKey.trim() === "") {
+      return String(rawModuleId);
+    }
+    if (requestKey.startsWith("file://")) {
+      try {
+        return fileURLToPath(requestKey);
+      } catch {
+        return String(rawModuleId);
+      }
+    }
+    if (requestKey.startsWith("/")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("./")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("node_modules/") || requestKey.startsWith("build/")) {
+      return `./${requestKey}`;
+    }
+    return requestKey;
+  };
+  const addReference = (lookupKey, reference) => {
+    if (!lookupKey || lookupKey.trim() === "") {
+      return;
+    }
+    if (lookupKey in consumerManifest) {
+      return;
+    }
+    consumerManifest[lookupKey] = {
+      "*": reference
+    };
+  };
   for (const [key, value] of Object.entries(manifest)) {
     if (!value || typeof value !== "object") {
       continue;
     }
     const entry = value;
-    if (typeof entry.id !== "string" || entry.id.trim() === "") {
+    const workerModuleId = normalizeWorkerModuleId(key, entry.id);
+    if (!workerModuleId) {
       continue;
     }
-    consumerManifest[key] = {
-      "*": {
-        id: entry.id,
-        chunks: [],
-        name: entry.name ?? "*",
-        ...entry.async ? { async: entry.async } : {}
-      }
+    const reference = {
+      id: workerModuleId,
+      chunks: Array.isArray(entry.chunks) ? entry.chunks : [],
+      name: entry.name ?? "*",
+      ...entry.async ? { async: entry.async } : {}
     };
+    addReference(key, reference);
+    if (typeof entry.id === "number" && Number.isFinite(entry.id)) {
+      addReference(String(entry.id), reference);
+    }
   }
   return consumerManifest;
 }

package/dist/index.cjs

@@ -442,8 +442,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -530,7 +547,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!import_node_fs.default.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h1", { children: statusCode }),
@@ -544,7 +561,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -593,7 +610,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -648,8 +668,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);
@@ -749,7 +769,21 @@ globalThis.__webpack_require__ = function __webframezNodeRequire(id) {
   }
 
   if (id.startsWith("./")) {
-    return require(path.resolve(process.cwd(), id.slice(2)));
+    const relativeId = id.slice(2);
+    const candidates = [
+      path.resolve(process.cwd(), relativeId),
+      path.resolve(process.cwd(), "..", relativeId)
+    ];
+    for (const candidate of candidates) {
+      try {
+        return require(candidate);
+      } catch (error) {
+        const missingCandidate = error && error.code === "MODULE_NOT_FOUND" && typeof error.message === "string" && error.message.includes("'" + candidate + "'");
+        if (!missingCandidate) {
+          throw error;
+        }
+      }
+    }
   }
 
   return require(id);
@@ -1053,22 +1087,64 @@ function normalizeClientManifest(manifest, options) {
 }
 function createServerConsumerManifest(manifest) {
   const consumerManifest = {};
+  const normalizeWorkerModuleId = (requestKey, rawModuleId) => {
+    if (typeof rawModuleId === "string" && rawModuleId.trim() !== "") {
+      return rawModuleId;
+    }
+    if (typeof rawModuleId !== "number" || !Number.isFinite(rawModuleId)) {
+      return null;
+    }
+    if (!requestKey || requestKey.trim() === "") {
+      return String(rawModuleId);
+    }
+    if (requestKey.startsWith("file://")) {
+      try {
+        return (0, import_node_url.fileURLToPath)(requestKey);
+      } catch {
+        return String(rawModuleId);
+      }
+    }
+    if (requestKey.startsWith("/")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("./")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("node_modules/") || requestKey.startsWith("build/")) {
+      return `./${requestKey}`;
+    }
+    return requestKey;
+  };
+  const addReference = (lookupKey, reference) => {
+    if (!lookupKey || lookupKey.trim() === "") {
+      return;
+    }
+    if (lookupKey in consumerManifest) {
+      return;
+    }
+    consumerManifest[lookupKey] = {
+      "*": reference
+    };
+  };
   for (const [key, value] of Object.entries(manifest)) {
     if (!value || typeof value !== "object") {
       continue;
     }
     const entry = value;
-    if (typeof entry.id !== "string" || entry.id.trim() === "") {
+    const workerModuleId = normalizeWorkerModuleId(key, entry.id);
+    if (!workerModuleId) {
       continue;
     }
-    consumerManifest[key] = {
-      "*": {
-        id: entry.id,
-        chunks: [],
-        name: entry.name ?? "*",
-        ...entry.async ? { async: entry.async } : {}
-      }
+    const reference = {
+      id: workerModuleId,
+      chunks: Array.isArray(entry.chunks) ? entry.chunks : [],
+      name: entry.name ?? "*",
+      ...entry.async ? { async: entry.async } : {}
     };
+    addReference(key, reference);
+    if (typeof entry.id === "number" && Number.isFinite(entry.id)) {
+      addReference(String(entry.id), reference);
+    }
   }
   return consumerManifest;
 }

package/dist/index.js

@@ -406,8 +406,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete __require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = __require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = __require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete __require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return __require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -494,7 +511,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!fs.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ jsxs("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ jsx("h1", { children: statusCode }),
@@ -508,7 +525,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -557,7 +574,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -612,8 +632,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);
@@ -713,7 +733,21 @@ globalThis.__webpack_require__ = function __webframezNodeRequire(id) {
   }
 
   if (id.startsWith("./")) {
-    return require(path.resolve(process.cwd(), id.slice(2)));
+    const relativeId = id.slice(2);
+    const candidates = [
+      path.resolve(process.cwd(), relativeId),
+      path.resolve(process.cwd(), "..", relativeId)
+    ];
+    for (const candidate of candidates) {
+      try {
+        return require(candidate);
+      } catch (error) {
+        const missingCandidate = error && error.code === "MODULE_NOT_FOUND" && typeof error.message === "string" && error.message.includes("'" + candidate + "'");
+        if (!missingCandidate) {
+          throw error;
+        }
+      }
+    }
   }
 
   return require(id);
@@ -1017,22 +1051,64 @@ function normalizeClientManifest(manifest, options) {
 }
 function createServerConsumerManifest(manifest) {
   const consumerManifest = {};
+  const normalizeWorkerModuleId = (requestKey, rawModuleId) => {
+    if (typeof rawModuleId === "string" && rawModuleId.trim() !== "") {
+      return rawModuleId;
+    }
+    if (typeof rawModuleId !== "number" || !Number.isFinite(rawModuleId)) {
+      return null;
+    }
+    if (!requestKey || requestKey.trim() === "") {
+      return String(rawModuleId);
+    }
+    if (requestKey.startsWith("file://")) {
+      try {
+        return fileURLToPath(requestKey);
+      } catch {
+        return String(rawModuleId);
+      }
+    }
+    if (requestKey.startsWith("/")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("./")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("node_modules/") || requestKey.startsWith("build/")) {
+      return `./${requestKey}`;
+    }
+    return requestKey;
+  };
+  const addReference = (lookupKey, reference) => {
+    if (!lookupKey || lookupKey.trim() === "") {
+      return;
+    }
+    if (lookupKey in consumerManifest) {
+      return;
+    }
+    consumerManifest[lookupKey] = {
+      "*": reference
+    };
+  };
   for (const [key, value] of Object.entries(manifest)) {
     if (!value || typeof value !== "object") {
       continue;
     }
     const entry = value;
-    if (typeof entry.id !== "string" || entry.id.trim() === "") {
+    const workerModuleId = normalizeWorkerModuleId(key, entry.id);
+    if (!workerModuleId) {
       continue;
     }
-    consumerManifest[key] = {
-      "*": {
-        id: entry.id,
-        chunks: [],
-        name: entry.name ?? "*",
-        ...entry.async ? { async: entry.async } : {}
-      }
+    const reference = {
+      id: workerModuleId,
+      chunks: Array.isArray(entry.chunks) ? entry.chunks : [],
+      name: entry.name ?? "*",
+      ...entry.async ? { async: entry.async } : {}
     };
+    addReference(key, reference);
+    if (typeof entry.id === "number" && Number.isFinite(entry.id)) {
+      addReference(String(entry.id), reference);
+    }
   }
   return consumerManifest;
 }

package/dist/router.cjs

@@ -300,8 +300,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -388,7 +405,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!import_node_fs.default.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h1", { children: statusCode }),
@@ -402,7 +419,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -451,7 +468,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -506,8 +526,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);

package/dist/router.js

@@ -270,8 +270,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete __require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = __require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = __require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete __require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return __require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -358,7 +375,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!fs.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ jsxs("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ jsx("h1", { children: statusCode }),
@@ -372,7 +389,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -421,7 +438,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -476,8 +496,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);

package/dist/webframez-core.cjs

@@ -412,8 +412,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -500,7 +517,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!import_node_fs.default.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h1", { children: statusCode }),
@@ -514,7 +531,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -563,7 +580,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -618,8 +638,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);
@@ -715,7 +735,21 @@ globalThis.__webpack_require__ = function __webframezNodeRequire(id) {
   }
 
   if (id.startsWith("./")) {
-    return require(path.resolve(process.cwd(), id.slice(2)));
+    const relativeId = id.slice(2);
+    const candidates = [
+      path.resolve(process.cwd(), relativeId),
+      path.resolve(process.cwd(), "..", relativeId)
+    ];
+    for (const candidate of candidates) {
+      try {
+        return require(candidate);
+      } catch (error) {
+        const missingCandidate = error && error.code === "MODULE_NOT_FOUND" && typeof error.message === "string" && error.message.includes("'" + candidate + "'");
+        if (!missingCandidate) {
+          throw error;
+        }
+      }
+    }
   }
 
   return require(id);
@@ -1019,22 +1053,64 @@ function normalizeClientManifest(manifest, options) {
 }
 function createServerConsumerManifest(manifest) {
   const consumerManifest = {};
+  const normalizeWorkerModuleId = (requestKey, rawModuleId) => {
+    if (typeof rawModuleId === "string" && rawModuleId.trim() !== "") {
+      return rawModuleId;
+    }
+    if (typeof rawModuleId !== "number" || !Number.isFinite(rawModuleId)) {
+      return null;
+    }
+    if (!requestKey || requestKey.trim() === "") {
+      return String(rawModuleId);
+    }
+    if (requestKey.startsWith("file://")) {
+      try {
+        return (0, import_node_url.fileURLToPath)(requestKey);
+      } catch {
+        return String(rawModuleId);
+      }
+    }
+    if (requestKey.startsWith("/")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("./")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("node_modules/") || requestKey.startsWith("build/")) {
+      return `./${requestKey}`;
+    }
+    return requestKey;
+  };
+  const addReference = (lookupKey, reference) => {
+    if (!lookupKey || lookupKey.trim() === "") {
+      return;
+    }
+    if (lookupKey in consumerManifest) {
+      return;
+    }
+    consumerManifest[lookupKey] = {
+      "*": reference
+    };
+  };
   for (const [key, value] of Object.entries(manifest)) {
     if (!value || typeof value !== "object") {
       continue;
     }
     const entry = value;
-    if (typeof entry.id !== "string" || entry.id.trim() === "") {
+    const workerModuleId = normalizeWorkerModuleId(key, entry.id);
+    if (!workerModuleId) {
       continue;
     }
-    consumerManifest[key] = {
-      "*": {
-        id: entry.id,
-        chunks: [],
-        name: entry.name ?? "*",
-        ...entry.async ? { async: entry.async } : {}
-      }
+    const reference = {
+      id: workerModuleId,
+      chunks: Array.isArray(entry.chunks) ? entry.chunks : [],
+      name: entry.name ?? "*",
+      ...entry.async ? { async: entry.async } : {}
     };
+    addReference(key, reference);
+    if (typeof entry.id === "number" && Number.isFinite(entry.id)) {
+      addReference(String(entry.id), reference);
+    }
   }
   return consumerManifest;
 }

package/dist/webframez-core.js

@@ -384,8 +384,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete __require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = __require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = __require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete __require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return __require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -472,7 +489,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!fs.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ jsxs("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ jsx("h1", { children: statusCode }),
@@ -486,7 +503,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -535,7 +552,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -590,8 +610,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);
@@ -687,7 +707,21 @@ globalThis.__webpack_require__ = function __webframezNodeRequire(id) {
   }
 
   if (id.startsWith("./")) {
-    return require(path.resolve(process.cwd(), id.slice(2)));
+    const relativeId = id.slice(2);
+    const candidates = [
+      path.resolve(process.cwd(), relativeId),
+      path.resolve(process.cwd(), "..", relativeId)
+    ];
+    for (const candidate of candidates) {
+      try {
+        return require(candidate);
+      } catch (error) {
+        const missingCandidate = error && error.code === "MODULE_NOT_FOUND" && typeof error.message === "string" && error.message.includes("'" + candidate + "'");
+        if (!missingCandidate) {
+          throw error;
+        }
+      }
+    }
   }
 
   return require(id);
@@ -991,22 +1025,64 @@ function normalizeClientManifest(manifest, options) {
 }
 function createServerConsumerManifest(manifest) {
   const consumerManifest = {};
+  const normalizeWorkerModuleId = (requestKey, rawModuleId) => {
+    if (typeof rawModuleId === "string" && rawModuleId.trim() !== "") {
+      return rawModuleId;
+    }
+    if (typeof rawModuleId !== "number" || !Number.isFinite(rawModuleId)) {
+      return null;
+    }
+    if (!requestKey || requestKey.trim() === "") {
+      return String(rawModuleId);
+    }
+    if (requestKey.startsWith("file://")) {
+      try {
+        return fileURLToPath(requestKey);
+      } catch {
+        return String(rawModuleId);
+      }
+    }
+    if (requestKey.startsWith("/")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("./")) {
+      return requestKey;
+    }
+    if (requestKey.startsWith("node_modules/") || requestKey.startsWith("build/")) {
+      return `./${requestKey}`;
+    }
+    return requestKey;
+  };
+  const addReference = (lookupKey, reference) => {
+    if (!lookupKey || lookupKey.trim() === "") {
+      return;
+    }
+    if (lookupKey in consumerManifest) {
+      return;
+    }
+    consumerManifest[lookupKey] = {
+      "*": reference
+    };
+  };
   for (const [key, value] of Object.entries(manifest)) {
     if (!value || typeof value !== "object") {
       continue;
     }
     const entry = value;
-    if (typeof entry.id !== "string" || entry.id.trim() === "") {
+    const workerModuleId = normalizeWorkerModuleId(key, entry.id);
+    if (!workerModuleId) {
       continue;
     }
-    consumerManifest[key] = {
-      "*": {
-        id: entry.id,
-        chunks: [],
-        name: entry.name ?? "*",
-        ...entry.async ? { async: entry.async } : {}
-      }
+    const reference = {
+      id: workerModuleId,
+      chunks: Array.isArray(entry.chunks) ? entry.chunks : [],
+      name: entry.name ?? "*",
+      ...entry.async ? { async: entry.async } : {}
     };
+    addReference(key, reference);
+    if (typeof entry.id === "number" && Number.isFinite(entry.id)) {
+      addReference(String(entry.id), reference);
+    }
   }
   return consumerManifest;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-react",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "description": "TypeScript React RSC addition for @webtypen/webframez-core",
   "homepage": "https://webtypen.de/",
   "author": {