@farm.js/core 0.1.0-beta.45 → 0.1.0-beta.46

package/dist/client.mjs

@@ -62,7 +62,7 @@ import {
   createClientPluginManager,
   installChunkErrorRecovery,
   isChunkLoadError
-} from "./chunk-QLCUQD3U.mjs";
+} from "./chunk-W2O6SKJU.mjs";
 import "./chunk-GQVQESLY.mjs";
 import {
   api,
@@ -80,7 +80,7 @@ import "./chunk-RBRLLZL5.mjs";
 import "./chunk-WZ5QFROO.mjs";
 import "./chunk-7ZMKVETU.mjs";
 import "./chunk-FXG2PS27.mjs";
-import "./chunk-FLGRRGVU.mjs";
+import "./chunk-LGCIIMFR.mjs";
 import "./chunk-CGILA3WO.mjs";
 export {
   APIClientError,

package/dist/index.cjs

@@ -256,6 +256,13 @@ function matchRoute(url, segments) {
 function resolveAppPath(root, ...paths) {
   return import_path.default.resolve(root, ...paths);
 }
+function toRootRelativeUrlPath(absolutePath, projectRoot) {
+  if (absolutePath === projectRoot) return "";
+  if (absolutePath.startsWith(`${projectRoot}/`) || absolutePath.startsWith(`${projectRoot}\\`)) {
+    return absolutePath.slice(projectRoot.length).replace(/\\/g, "/");
+  }
+  return void 0;
+}
 function toViteModuleId(filePath, root) {
   if (!import_path.default.isAbsolute(filePath)) return filePath;
   const relativePath2 = import_path.default.relative(root, filePath);
@@ -304,6 +311,7 @@ var init_utils = __esm({
     __name(segmentsToPattern, "segmentsToPattern");
     __name(matchRoute, "matchRoute");
     __name(resolveAppPath, "resolveAppPath");
+    __name(toRootRelativeUrlPath, "toRootRelativeUrlPath");
     __name(toViteModuleId, "toViteModuleId");
     __name(fileExists, "fileExists");
     __name(globFiles, "globFiles");
@@ -10544,9 +10552,8 @@ var init_route_manager = __esm({
           return this.clientManifestCache.manifest;
         }
         const toUrlPath = /* @__PURE__ */ __name((absolutePath) => {
-          if (absolutePath === normalizedProjectRoot || absolutePath.startsWith(`${normalizedProjectRoot}${import_path5.default.sep}`)) {
-            return absolutePath.slice(normalizedProjectRoot.length);
-          }
+          const rootRelative = toRootRelativeUrlPath(absolutePath, normalizedProjectRoot);
+          if (rootRelative !== void 0) return rootRelative;
           if (import_path5.default.isAbsolute(absolutePath)) {
             const normalized = absolutePath.replace(/\\/g, "/");
             return normalized.startsWith("/") ? `/@fs${normalized}` : `/@fs/${normalized}`;
@@ -15188,7 +15195,7 @@ var init_server3 = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "0.1.0-beta.45";
+    version = "0.1.0-beta.46";
   }
 });
 
@@ -16236,7 +16243,7 @@ var init_renderer2 = __esm({
           );
           const clientLayouts = layouts.map((layout2, index) => ({
             pattern: layout2.pattern,
-            modulePath: layout2.modulePath.startsWith(this.config.root) ? layout2.modulePath.slice(this.config.root.length) : layout2.modulePath,
+            modulePath: toRootRelativeUrlPath(layout2.modulePath, this.config.root) ?? layout2.modulePath,
             shouldHydrate: layoutHydrationMetadata[index]?.shouldHydrate === true,
             islandStrategy: layoutHydrationMetadata[index]?.islandStrategy ?? null
           }));
@@ -16812,7 +16819,7 @@ var init_renderer2 = __esm({
           const routeSlots = (req.__FARM_ROUTE_SLOTS__ || []).map(
             (slot) => ({
               ...slot,
-              modulePath: typeof slot.modulePath === "string" && slot.modulePath.startsWith(this.config.root) ? slot.modulePath.slice(this.config.root.length) : slot.modulePath
+              modulePath: typeof slot.modulePath === "string" ? toRootRelativeUrlPath(slot.modulePath, this.config.root) ?? slot.modulePath : slot.modulePath
             })
           );
           const deferredProps = prepareDeferredData({
@@ -16820,7 +16827,7 @@ var init_renderer2 = __esm({
             slots: routeSlots
           });
           const pagePath = req.__FARM_PAGE_PATH__;
-          const relativePath2 = pagePath ? pagePath.startsWith(this.config.root) ? pagePath.slice(this.config.root.length) : pagePath : "/src/app/page.tsx";
+          const relativePath2 = pagePath ? toRootRelativeUrlPath(pagePath, this.config.root) ?? pagePath : "/src/app/page.tsx";
           const deploymentId = this.getDeploymentId();
           const bootstrapScript = `<script>
 window.__FARM_PROPS__ = ${serializeInlineValue2(deferredProps.data.page)};
@@ -16916,7 +16923,7 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
           let didError = false;
           const pagePath = req.__FARM_PAGE_PATH__;
           const isClientComponent = req.__FARM_IS_CLIENT_COMPONENT__ === true;
-          const relativePath2 = pagePath ? pagePath.startsWith(this.config.root) ? pagePath.slice(this.config.root.length) : pagePath : "/src/app/page.tsx";
+          const relativePath2 = pagePath ? toRootRelativeUrlPath(pagePath, this.config.root) ?? pagePath : "/src/app/page.tsx";
           const manifest = options.routeManifest ?? this.routeManager.generateClientManifest(this.config.root);
           const clientManifest = {
             clientEntry: "/@farm/client.js",
@@ -16964,7 +16971,7 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
           const routeSlotPayload = (req.__FARM_ROUTE_SLOTS__ || []).map(
             (slot) => ({
               ...slot,
-              modulePath: typeof slot.modulePath === "string" && slot.modulePath.startsWith(this.config.root) ? slot.modulePath.slice(this.config.root.length) : slot.modulePath
+              modulePath: typeof slot.modulePath === "string" ? toRootRelativeUrlPath(slot.modulePath, this.config.root) ?? slot.modulePath : slot.modulePath
             })
           );
           const deferredProps = prepareDeferredData({
@@ -34212,6 +34219,7 @@ __export(src_exports, {
   storageCacheAdapter: () => storageCacheAdapter,
   titleFromMarkdown: () => titleFromMarkdown,
   toFormData: () => toFormData,
+  toRootRelativeUrlPath: () => toRootRelativeUrlPath,
   toViteModuleId: () => toViteModuleId,
   toggleTheme: () => toggleTheme,
   unstable_cache: () => unstable_cache,
@@ -50297,6 +50305,7 @@ __name(decodeCookiePart, "decodeCookiePart");
   storageCacheAdapter,
   titleFromMarkdown,
   toFormData,
+  toRootRelativeUrlPath,
   toViteModuleId,
   toggleTheme,
   unstable_cache,