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

package/dist/plugin.mjs

@@ -6,7 +6,7 @@ import {
 import "./chunk-RQ633A5I.mjs";
 import {
   farmPlugin
-} from "./chunk-LIIZPHDO.mjs";
+} from "./chunk-TQJMU5BP.mjs";
 import "./chunk-XJTDE4L4.mjs";
 import "./chunk-CAUVJN4X.mjs";
 import "./chunk-AMZZCRQ7.mjs";
@@ -21,7 +21,7 @@ import "./chunk-E257KFBU.mjs";
 import "./chunk-7MABZJIM.mjs";
 import "./chunk-H3A35IQ2.mjs";
 import "./chunk-BNTDKO7T.mjs";
-import "./chunk-TUYEGV7H.mjs";
+import "./chunk-YKAUAZA4.mjs";
 import "./chunk-7ZVN3YZI.mjs";
 import "./chunk-GY2STC2S.mjs";
 import "./chunk-JHCNZLFT.mjs";
@@ -36,15 +36,15 @@ import "./chunk-H53KVQUU.mjs";
 import "./chunk-QKVUNGAH.mjs";
 import "./chunk-HFQ2I2EA.mjs";
 import "./chunk-T4QJQK76.mjs";
-import "./chunk-VHYARVB7.mjs";
+import "./chunk-TIESOJ7Z.mjs";
 import "./chunk-P7QDS5AT.mjs";
 import "./chunk-E6EPN5BT.mjs";
-import "./chunk-MU2QKVYL.mjs";
+import "./chunk-MP2SDRRB.mjs";
 import "./chunk-XJ65E7MB.mjs";
 import "./chunk-FQYDHKKU.mjs";
 import "./chunk-SXWF4QRU.mjs";
 import "./chunk-GIELMNBG.mjs";
-import "./chunk-KEPCW6EI.mjs";
+import "./chunk-U5SPS2HR.mjs";
 import "./chunk-QGOHVJ6J.mjs";
 import "./chunk-5B33VWGX.mjs";
 import "./chunk-YTMDIHQN.mjs";
@@ -63,7 +63,7 @@ import "./chunk-RBRLLZL5.mjs";
 import "./chunk-WZ5QFROO.mjs";
 import "./chunk-7ZMKVETU.mjs";
 import "./chunk-FXG2PS27.mjs";
-import "./chunk-FY34HLY7.mjs";
+import "./chunk-LGCIIMFR.mjs";
 import "./chunk-CGILA3WO.mjs";
 export {
   FarmRuntimeShutdownError,

package/dist/server.cjs

@@ -3283,6 +3283,9 @@ function getFarmLayerAliases(layers) {
     (layers ?? []).map((layer) => [`#layers/${layer.name}`, import_node_path.default.join(layer.root, layer.srcDir)])
   );
 }
+function toExternalSpecifier(resolvedPath) {
+  return import_node_path.default.isAbsolute(resolvedPath) ? (0, import_node_url.pathToFileURL)(resolvedPath).href : resolvedPath;
+}
 function createFarmConfigResolutionPlugin(options) {
   const configEntryChecks = /* @__PURE__ */ new Map();
   return {
@@ -3307,7 +3310,7 @@ function createFarmConfigResolutionPlugin(options) {
         });
         if (resolved.errors.length > 0 || !resolved.path) return;
         return {
-          path: resolved.path,
+          path: toExternalSpecifier(resolved.path),
           external: true,
           warnings: resolved.warnings
         };
@@ -3328,7 +3331,7 @@ function createFarmConfigResolutionPlugin(options) {
           return { path: args.path, external: true };
         }
         return {
-          path: resolved.path,
+          path: toExternalSpecifier(resolved.path),
           external: true,
           warnings: resolved.warnings
         };
@@ -3614,6 +3617,7 @@ var init_layers = __esm({
     __name(getFarmAppDirectories, "getFarmAppDirectories");
     __name(getFarmLayerAliases, "getFarmLayerAliases");
     WINDOWS_ABSOLUTE_PATH_RE = /^(?:[A-Za-z]:[\\/]|\\\\)/;
+    __name(toExternalSpecifier, "toExternalSpecifier");
     __name(createFarmConfigResolutionPlugin, "createFarmConfigResolutionPlugin");
     __name(loadFarmConfigFile, "loadFarmConfigFile");
     __name(onlyImportsFarmConfigHelpers, "onlyImportsFarmConfigHelpers");
@@ -14824,6 +14828,7 @@ __export(server_exports2, {
   sqliteStorage: () => sqliteStorage,
   startDevServer: () => startDevServer,
   storageCacheAdapter: () => storageCacheAdapter,
+  toRootRelativeUrlPath: () => toRootRelativeUrlPath,
   toViteModuleId: () => toViteModuleId,
   unstable_cache: () => unstable_cache,
   updateTag: () => updateTag,
@@ -14953,6 +14958,14 @@ function resolveAppPath(root, ...paths) {
   return import_path.default.resolve(root, ...paths);
 }
 __name(resolveAppPath, "resolveAppPath");
+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;
+}
+__name(toRootRelativeUrlPath, "toRootRelativeUrlPath");
 function toViteModuleId(filePath, root) {
   if (!import_path.default.isAbsolute(filePath)) return filePath;
   const relativePath2 = import_path.default.relative(root, filePath);
@@ -17119,9 +17132,8 @@ var _RouteManager = class _RouteManager {
       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}`;
@@ -21171,7 +21183,7 @@ _setFarmThemeServerSnapshotResolver(() => {
 });
 
 // package.json
-var version = "0.1.0-beta.44";
+var version = "0.1.0-beta.46";
 
 // src/version.ts
 var FARM_VERSION = version;
@@ -22115,7 +22127,7 @@ var _ServerRenderer = class _ServerRenderer {
       );
       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
       }));
@@ -22691,7 +22703,7 @@ var _ServerRenderer = class _ServerRenderer {
       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({
@@ -22699,7 +22711,7 @@ var _ServerRenderer = class _ServerRenderer {
         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)};
@@ -22795,7 +22807,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",
@@ -22843,7 +22855,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({
@@ -32368,6 +32380,7 @@ __name(assertFunction, "assertFunction");
   sqliteStorage,
   startDevServer,
   storageCacheAdapter,
+  toRootRelativeUrlPath,
   toViteModuleId,
   unstable_cache,
   updateTag,