one 1.2.40 → 1.2.42

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.js

@@ -26,10 +26,58 @@ async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, pos
   const handler = async (req, res) => {
     // console.debug("req.url", req.url);
     const url = new URL(req.url, \`https://\${process.env.VERCEL_URL}\`);
+
+    // Check if this is a loader request (routed here by config.json rewrite)
+    const isLoaderRequest = url.searchParams.get('__loader') === '1';
+
+    // Extract route params - from URL path match OR from query params (for loader requests)
+    const routePattern = ${JSON.stringify(route.page)};
+    const paramNames = [];
+    const regexPattern = routePattern
+      .replace(/\\[\\.\\.\\.(\\w+)\\]/g, (_, name) => { paramNames.push({ name, catch: true }); return '(.+)'; })
+      .replace(/\\[(\\w+)\\]/g, (_, name) => { paramNames.push({ name, catch: false }); return '([^/]+)'; });
+
+    const routeParams = {};
+
+    // First try to get params from query string (set by Vercel rewrite rules)
+    // This handles both loader requests and regular page requests that went through rewrites
+    for (const param of paramNames) {
+      const value = url.searchParams.get(param.name);
+      if (value) {
+        routeParams[param.name] = param.catch ? value.split('/') : value;
+      }
+    }
+
+    // If no params found in query string, try extracting from URL path
+    if (Object.keys(routeParams).length === 0) {
+      const match = url.pathname.match(new RegExp(\`^\${regexPattern}$\`));
+      if (match) {
+        paramNames.forEach((param, index) => {
+          const value = match[index + 1];
+          routeParams[param.name] = param.catch ? value.split('/') : value;
+        });
+      }
+    }
+
+    // Create a proper Request object for SSR loaders
+    const request = new Request(url.toString(), {
+      method: req.method || 'GET',
+      headers: new Headers(req.headers || {}),
+    });
+
+    // Reconstruct the original path by replacing :param placeholders with actual values
+    // The pathname might be the rewritten path (e.g., /dynamic/:id instead of /dynamic/123)
+    let originalPath = url.pathname;
+    for (const [key, value] of Object.entries(routeParams)) {
+      originalPath = originalPath.replace(\`:\${key}\`, String(value));
+    }
+
     const loaderProps = {
-      path: url.pathname,
-      params: Object.fromEntries(url.searchParams.entries())
+      path: originalPath,
+      params: routeParams,
+      request,
     }
+
     const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
     // const routeFile = \`.\${url.pathname}\${postfix}\`;
     let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
@@ -42,16 +90,28 @@ async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, pos
       route = buildInfoConfig.default.routeToBuildInfo[routeName];
     }
 
-    const render = entry.default.render;
     const exported = await import(route.serverJsPath.replace('dist/','../'))
     const loaderData = await exported.loader?.(loaderProps)
+
+    // For loader requests, return the loader data as a JavaScript module
+    if (isLoaderRequest) {
+      res.setHeader('Content-Type', 'application/javascript; charset=utf-8')
+      res.setHeader('Cache-Control', 'no-store')
+      res.end(\`export function loader() { return \${JSON.stringify(loaderData)} }\`)
+      return
+    }
+
+    // For page requests, render the full HTML
+    const render = entry.default.render;
     const preloads = route.preloads
+    const css = route.css || []
     const rendered = await render({
       mode: route.type,
       loaderData,
       loaderProps,
       path: loaderProps?.path || '/',
       preloads,
+      css,
     })
     res.setHeader('Content-Type', 'text/html; charset=utf-8')
     // https://vercel.com/docs/deployments/skew-protection#supported-frameworks__

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],
-  "mappings": "AAAA,SAAS,MAAM,eAAe;AAC9B,OAAO,QAAQ;AAEf,SAAS,oCAAoC;AAC7C,SAAS,mCAAmC;AAC5C,SAAS,wBAAwB;AAIjC,eAAsB,4BACpB,OACA,WACA,gBACA,eACA;AACA,MAAI;AACF,UAAM,OAAO,iBAAiB,OAAO,EAAE,cAAc,GAAK,CAAC;AAC3D,kBAAc,KAAK,yDAAyD,IAAI,EAAE;AAElF,UAAM,oBAAoB,KAAK,UAAU,SAAS,GAC5C,aAAa,QAAQ,KAAK,gBAAgB,4BAA4B,IAAI,OAAO,CAAC;AACxF,UAAM,GAAG,UAAU,UAAU;AAE7B,UAAM,iBAAiB,QAAQ,KAAK,gBAAgB,QAAQ,QAAQ,CAAC,GAC/D,eAAe,QAAQ,KAAK,YAAY,QAAQ,CAAC;AACvD,UAAM,GAAG,UAAU,YAAY,GAC/B,cAAc;AAAA,MACZ,+EAA+E,cAAc,OAAO,YAAY;AAAA,IAClH,GACA,MAAM,GAAG,KAAK,gBAAgB,YAAY,GAE1C,cAAc,KAAK,wEAAwE,GAC3F,MAAM,GAAG,UAAU,KAAK,YAAY,cAAc,GAAG,kBAAkB,iBAAiB,EAAE,GAE1F,MAAM,GAAG,UAAU,KAAK,YAAY,YAAY,CAAC;AACjD,UAAM,qBAAqB,QAAQ,KAAK,YAAY,cAAc,UAAU,CAAC;AAC7E,kBAAc;AAAA,MACZ,yEAAyE,kBAAkB;AAAA,IAC7F,GACA,MAAM,GAAG;AAAA,MACP;AAAA,MACA;AAAA;AAAA;AAAA,sBAGgB,KAAK,UAAU,MAAM,IAAI,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IA4C5C;AAEA,UAAM,sBAAsB,QAAQ,KAAK,YAAY,cAAc,CAAC;AACpE,kBAAc;AAAA,MACZ,2EAA2E,mBAAmB;AAAA,IAChG,GACA,MAAM,GAAG,UAAU,qBAAqB,2BAA2B;AAInE,UAAM,mBAAmB,QAAQ,KAAK,YAAY,iBAAiB,CAAC;AACpE,yBAAc;AAAA,MACZ,8EAA8E,gBAAgB;AAAA,IAChG,GACO,GAAG,UAAU,kBAAkB;AAAA,MACpC,GAAG;AAAA,MACH,SAAS;AAAA,MACT,aAAa;AAAA,QACX,GAAG,6BAA6B;AAAA,QAChC,yBAAyB;AAAA,MAC3B;AAAA,IACF,CAAC;AAAA,EACH,SAAS,GAAG;AACV,YAAQ;AAAA,MACN,+EAA+E,MAAM,IAAI;AAAA,MACzF;AAAA,IACF;AAAA,EACF;AACF;",
+  "mappings": "AAAA,SAAS,MAAM,eAAe;AAC9B,OAAO,QAAQ;AAEf,SAAS,oCAAoC;AAC7C,SAAS,mCAAmC;AAC5C,SAAS,wBAAwB;AAIjC,eAAsB,4BACpB,OACA,WACA,gBACA,eACA;AACA,MAAI;AACF,UAAM,OAAO,iBAAiB,OAAO,EAAE,cAAc,GAAK,CAAC;AAC3D,kBAAc,KAAK,yDAAyD,IAAI,EAAE;AAElF,UAAM,oBAAoB,KAAK,UAAU,SAAS,GAC5C,aAAa,QAAQ,KAAK,gBAAgB,4BAA4B,IAAI,OAAO,CAAC;AACxF,UAAM,GAAG,UAAU,UAAU;AAE7B,UAAM,iBAAiB,QAAQ,KAAK,gBAAgB,QAAQ,QAAQ,CAAC,GAC/D,eAAe,QAAQ,KAAK,YAAY,QAAQ,CAAC;AACvD,UAAM,GAAG,UAAU,YAAY,GAC/B,cAAc;AAAA,MACZ,+EAA+E,cAAc,OAAO,YAAY;AAAA,IAClH,GACA,MAAM,GAAG,KAAK,gBAAgB,YAAY,GAE1C,cAAc,KAAK,wEAAwE,GAC3F,MAAM,GAAG,UAAU,KAAK,YAAY,cAAc,GAAG,kBAAkB,iBAAiB,EAAE,GAE1F,MAAM,GAAG,UAAU,KAAK,YAAY,YAAY,CAAC;AACjD,UAAM,qBAAqB,QAAQ,KAAK,YAAY,cAAc,UAAU,CAAC;AAC7E,kBAAc;AAAA,MACZ,yEAAyE,kBAAkB;AAAA,IAC7F,GACA,MAAM,GAAG;AAAA,MACP;AAAA,MACA;AAAA;AAAA;AAAA,sBAGgB,KAAK,UAAU,MAAM,IAAI,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,2BAUrB,KAAK,UAAU,MAAM,IAAI,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IA8FjD;AAEA,UAAM,sBAAsB,QAAQ,KAAK,YAAY,cAAc,CAAC;AACpE,kBAAc;AAAA,MACZ,2EAA2E,mBAAmB;AAAA,IAChG,GACA,MAAM,GAAG,UAAU,qBAAqB,2BAA2B;AAInE,UAAM,mBAAmB,QAAQ,KAAK,YAAY,iBAAiB,CAAC;AACpE,yBAAc;AAAA,MACZ,8EAA8E,gBAAgB;AAAA,IAChG,GACO,GAAG,UAAU,kBAAkB;AAAA,MACpC,GAAG;AAAA,MACH,SAAS;AAAA,MACT,aAAa;AAAA,QACX,GAAG,6BAA6B;AAAA,QAChC,yBAAyB;AAAA,MAC3B;AAAA,IACF,CAAC;AAAA,EACH,SAAS,GAAG;AACV,YAAQ;AAAA,MACN,+EAA+E,MAAM,IAAI;AAAA,MACzF;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.mjs

@@ -24,10 +24,58 @@ async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, pos
   const handler = async (req, res) => {
     // console.debug("req.url", req.url);
     const url = new URL(req.url, \`https://\${process.env.VERCEL_URL}\`);
+
+    // Check if this is a loader request (routed here by config.json rewrite)
+    const isLoaderRequest = url.searchParams.get('__loader') === '1';
+
+    // Extract route params - from URL path match OR from query params (for loader requests)
+    const routePattern = ${JSON.stringify(route.page)};
+    const paramNames = [];
+    const regexPattern = routePattern
+      .replace(/\\[\\.\\.\\.(\\w+)\\]/g, (_, name) => { paramNames.push({ name, catch: true }); return '(.+)'; })
+      .replace(/\\[(\\w+)\\]/g, (_, name) => { paramNames.push({ name, catch: false }); return '([^/]+)'; });
+
+    const routeParams = {};
+
+    // First try to get params from query string (set by Vercel rewrite rules)
+    // This handles both loader requests and regular page requests that went through rewrites
+    for (const param of paramNames) {
+      const value = url.searchParams.get(param.name);
+      if (value) {
+        routeParams[param.name] = param.catch ? value.split('/') : value;
+      }
+    }
+
+    // If no params found in query string, try extracting from URL path
+    if (Object.keys(routeParams).length === 0) {
+      const match = url.pathname.match(new RegExp(\`^\${regexPattern}$\`));
+      if (match) {
+        paramNames.forEach((param, index) => {
+          const value = match[index + 1];
+          routeParams[param.name] = param.catch ? value.split('/') : value;
+        });
+      }
+    }
+
+    // Create a proper Request object for SSR loaders
+    const request = new Request(url.toString(), {
+      method: req.method || 'GET',
+      headers: new Headers(req.headers || {}),
+    });
+
+    // Reconstruct the original path by replacing :param placeholders with actual values
+    // The pathname might be the rewritten path (e.g., /dynamic/:id instead of /dynamic/123)
+    let originalPath = url.pathname;
+    for (const [key, value] of Object.entries(routeParams)) {
+      originalPath = originalPath.replace(\`:\${key}\`, String(value));
+    }
+
     const loaderProps = {
-      path: url.pathname,
-      params: Object.fromEntries(url.searchParams.entries())
+      path: originalPath,
+      params: routeParams,
+      request,
     }
+
     const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
     // const routeFile = \`.\${url.pathname}\${postfix}\`;
     let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
@@ -40,16 +88,28 @@ async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, pos
       route = buildInfoConfig.default.routeToBuildInfo[routeName];
     }
 
-    const render = entry.default.render;
     const exported = await import(route.serverJsPath.replace('dist/','../'))
     const loaderData = await exported.loader?.(loaderProps)
+
+    // For loader requests, return the loader data as a JavaScript module
+    if (isLoaderRequest) {
+      res.setHeader('Content-Type', 'application/javascript; charset=utf-8')
+      res.setHeader('Cache-Control', 'no-store')
+      res.end(\`export function loader() { return \${JSON.stringify(loaderData)} }\`)
+      return
+    }
+
+    // For page requests, render the full HTML
+    const render = entry.default.render;
     const preloads = route.preloads
+    const css = route.css || []
     const rendered = await render({
       mode: route.type,
       loaderData,
       loaderProps,
       path: loaderProps?.path || '/',
       preloads,
+      css,
     })
     res.setHeader('Content-Type', 'text/html; charset=utf-8')
     // https://vercel.com/docs/deployments/skew-protection#supported-frameworks__

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["join","resolve","fs","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","getPathFromRoute","createSsrServerlessFunction","route","buildInfo","oneOptionsRoot","postBuildLogs","path","includeIndex","push","buildInfoAsString","JSON","stringify","funcFolder","ensureDir","distServerFrom","distServerTo","copy","writeFile","entrypointFilePath","file","packageJsonFilePath","writeJSON","vcConfigFilePath","writeJson","handler","environment","ONE_DEFAULT_RENDER_MODE","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,EAAMC,OAAA,QAAe;AAC9B,OAAOC,EAAA,MAAQ;AAEf,SAASC,4BAAA,QAAoC;AAC7C,SAASC,2BAAA,QAAmC;AAC5C,SAASC,gBAAA,QAAwB;AAIjC,eAAsBC,4BACpBC,KAAA,EACAC,SAAA,EACAC,cAAA,EACAC,aAAA,EACA;EACA,IAAI;IACF,MAAMC,IAAA,GAAON,gBAAA,CAAiBE,KAAA,EAAO;MAAEK,YAAA,EAAc;IAAK,CAAC;IAC3DF,aAAA,CAAcG,IAAA,CAAK,yDAAyDF,IAAI,EAAE;IAElF,MAAMG,iBAAA,GAAoBC,IAAA,CAAKC,SAAA,CAAUR,SAAS;MAC5CS,UAAA,GAAahB,OAAA,CAAQD,IAAA,CAAKS,cAAA,EAAgB,4BAA4BE,IAAI,OAAO,CAAC;IACxF,MAAMT,EAAA,CAAGgB,SAAA,CAAUD,UAAU;IAE7B,MAAME,cAAA,GAAiBlB,OAAA,CAAQD,IAAA,CAAKS,cAAA,EAAgB,QAAQ,QAAQ,CAAC;MAC/DW,YAAA,GAAenB,OAAA,CAAQD,IAAA,CAAKiB,UAAA,EAAY,QAAQ,CAAC;IACvD,MAAMf,EAAA,CAAGgB,SAAA,CAAUE,YAAY,GAC/BV,aAAA,CAAcG,IAAA,CACZ,+EAA+EM,cAAc,OAAOC,YAAY,EAClH,GACA,MAAMlB,EAAA,CAAGmB,IAAA,CAAKF,cAAA,EAAgBC,YAAY,GAE1CV,aAAA,CAAcG,IAAA,CAAK,wEAAwE,GAC3F,MAAMX,EAAA,CAAGoB,SAAA,CAAUtB,IAAA,CAAKiB,UAAA,EAAY,cAAc,GAAG,kBAAkBH,iBAAiB,EAAE,GAE1F,MAAMZ,EAAA,CAAGgB,SAAA,CAAUlB,IAAA,CAAKiB,UAAA,EAAY,YAAY,CAAC;IACjD,MAAMM,kBAAA,GAAqBtB,OAAA,CAAQD,IAAA,CAAKiB,UAAA,EAAY,cAAc,UAAU,CAAC;IAC7EP,aAAA,CAAcG,IAAA,CACZ,yEAAyEU,kBAAkB,EAC7F,GACA,MAAMrB,EAAA,CAAGoB,SAAA,CACPC,kBAAA,EACA;AAAA;AAAA;AAAA,sBAGgBR,IAAA,CAAKC,SAAA,CAAUT,KAAA,CAAMiB,IAAI,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GA4C5C;IAEA,MAAMC,mBAAA,GAAsBxB,OAAA,CAAQD,IAAA,CAAKiB,UAAA,EAAY,cAAc,CAAC;IACpEP,aAAA,CAAcG,IAAA,CACZ,2EAA2EY,mBAAmB,EAChG,GACA,MAAMvB,EAAA,CAAGwB,SAAA,CAAUD,mBAAA,EAAqBrB,2BAA2B;IAInE,MAAMuB,gBAAA,GAAmB1B,OAAA,CAAQD,IAAA,CAAKiB,UAAA,EAAY,iBAAiB,CAAC;IACpE,OAAAP,aAAA,CAAcG,IAAA,CACZ,8EAA8Ec,gBAAgB,EAChG,GACOzB,EAAA,CAAG0B,SAAA,CAAUD,gBAAA,EAAkB;MACpC,GAAGxB,4BAAA;MACH0B,OAAA,EAAS;MACTC,WAAA,EAAa;QACX,GAAG3B,4BAAA,CAA6B2B,WAAA;QAChCC,uBAAA,EAAyB;MAC3B;IACF,CAAC;EACH,SAASC,CAAA,EAAG;IACVC,OAAA,CAAQC,KAAA,CACN,+EAA+E3B,KAAA,CAAMiB,IAAI,IACzFQ,CACF;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["join","resolve","fs","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","getPathFromRoute","createSsrServerlessFunction","route","buildInfo","oneOptionsRoot","postBuildLogs","path","includeIndex","push","buildInfoAsString","JSON","stringify","funcFolder","ensureDir","distServerFrom","distServerTo","copy","writeFile","entrypointFilePath","file","page","packageJsonFilePath","writeJSON","vcConfigFilePath","writeJson","handler","environment","ONE_DEFAULT_RENDER_MODE","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.native.js

@@ -24,10 +24,58 @@ async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, pos
   const handler = async (req, res) => {
     // console.debug("req.url", req.url);
     const url = new URL(req.url, \`https://\${process.env.VERCEL_URL}\`);
+
+    // Check if this is a loader request (routed here by config.json rewrite)
+    const isLoaderRequest = url.searchParams.get('__loader') === '1';
+
+    // Extract route params - from URL path match OR from query params (for loader requests)
+    const routePattern = ${JSON.stringify(route.page)};
+    const paramNames = [];
+    const regexPattern = routePattern
+      .replace(/\\[\\.\\.\\.(\\w+)\\]/g, (_, name) => { paramNames.push({ name, catch: true }); return '(.+)'; })
+      .replace(/\\[(\\w+)\\]/g, (_, name) => { paramNames.push({ name, catch: false }); return '([^/]+)'; });
+
+    const routeParams = {};
+
+    // First try to get params from query string (set by Vercel rewrite rules)
+    // This handles both loader requests and regular page requests that went through rewrites
+    for (const param of paramNames) {
+      const value = url.searchParams.get(param.name);
+      if (value) {
+        routeParams[param.name] = param.catch ? value.split('/') : value;
+      }
+    }
+
+    // If no params found in query string, try extracting from URL path
+    if (Object.keys(routeParams).length === 0) {
+      const match = url.pathname.match(new RegExp(\`^\${regexPattern}$\`));
+      if (match) {
+        paramNames.forEach((param, index) => {
+          const value = match[index + 1];
+          routeParams[param.name] = param.catch ? value.split('/') : value;
+        });
+      }
+    }
+
+    // Create a proper Request object for SSR loaders
+    const request = new Request(url.toString(), {
+      method: req.method || 'GET',
+      headers: new Headers(req.headers || {}),
+    });
+
+    // Reconstruct the original path by replacing :param placeholders with actual values
+    // The pathname might be the rewritten path (e.g., /dynamic/:id instead of /dynamic/123)
+    let originalPath = url.pathname;
+    for (const [key, value] of Object.entries(routeParams)) {
+      originalPath = originalPath.replace(\`:\${key}\`, String(value));
+    }
+
     const loaderProps = {
-      path: url.pathname,
-      params: Object.fromEntries(url.searchParams.entries())
+      path: originalPath,
+      params: routeParams,
+      request,
     }
+
     const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
     // const routeFile = \`.\${url.pathname}\${postfix}\`;
     let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
@@ -40,16 +88,28 @@ async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, pos
       route = buildInfoConfig.default.routeToBuildInfo[routeName];
     }
 
-    const render = entry.default.render;
     const exported = await import(route.serverJsPath.replace('dist/','../'))
     const loaderData = await exported.loader?.(loaderProps)
+
+    // For loader requests, return the loader data as a JavaScript module
+    if (isLoaderRequest) {
+      res.setHeader('Content-Type', 'application/javascript; charset=utf-8')
+      res.setHeader('Cache-Control', 'no-store')
+      res.end(\`export function loader() { return \${JSON.stringify(loaderData)} }\`)
+      return
+    }
+
+    // For page requests, render the full HTML
+    const render = entry.default.render;
     const preloads = route.preloads
+    const css = route.css || []
     const rendered = await render({
       mode: route.type,
       loaderData,
       loaderProps,
       path: loaderProps?.path || '/',
       preloads,
+      css,
     })
     res.setHeader('Content-Type', 'text/html; charset=utf-8')
     // https://vercel.com/docs/deployments/skew-protection#supported-frameworks__

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["join","resolve","fs","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","getPathFromRoute","createSsrServerlessFunction","route","buildInfo","oneOptionsRoot","postBuildLogs","path","includeIndex","push","buildInfoAsString","JSON","stringify","funcFolder","ensureDir","distServerFrom","distServerTo","copy","writeFile","entrypointFilePath","file","packageJsonFilePath","writeJSON","vcConfigFilePath","writeJson","handler","environment","ONE_DEFAULT_RENDER_MODE","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,EAAMC,OAAA,QAAe;AAC9B,OAAOC,EAAA,MAAQ;AAEf,SAASC,4BAAA,QAAoC;AAC7C,SAASC,2BAAA,QAAmC;AAC5C,SAASC,gBAAA,QAAwB;AAIjC,eAAsBC,4BACpBC,KAAA,EACAC,SAAA,EACAC,cAAA,EACAC,aAAA,EACA;EACA,IAAI;IACF,IAAAC,IAAM,GAAAN,gBAAO,CAAAE,KAAiB;MAC9BK,YAAc;IAEd;IAEAF,aAAS,CAAAG,IAAA,CAAU,yDAAUF,IAAA;IAE7B,IAAAG,iBAAM,GAAiBC,IAAA,CAAAC,SAAa,CAAAR,SAAA;MAAAS,UAAwB,GAAAhB,OAAS,CAC/DD,IAAA,CAAAS,cAAe,8BAAkCE,IAAA;IACvD,MAAMT,EAAA,CAAGgB,SAAA,CAAUD,UAAA;IACL,IACZE,cAAA,GAAAlB,OAAA,CAAAD,IAAA,CAAAS,cAAA;MAAAW,YAA+E,GAAAnB,OAAA,CAAAD,IAAc,CAAAiB,UAAO,UAAY;IAClH,MACAf,EAAA,CAAMgB,SAAQ,CAAAE,YAAA,GAAgBV,aAAY,CAE1CG,IAAA,gFAAmBM,cACnB,OAASC,YAAU,EAAK,SAAAlB,EAAY,CAAAmB,IAAA,CAAAF,cAAiB,EAAAC,YAAA,CAAkB,EAAAV,aAAA,CAAAG,IAAmB,yEAEzC,SAAAX,EAAA,CAAAoB,SAAA,CAAAtB,IAAA,CAAAiB,UAAA,qCAAAH,iBAAA,WAAAZ,EAAA,CAAAgB,SAAA,CAAAlB,IAAA,CAAAiB,UAAA;IACjD,IAAAM,kBAAM,GAAAtB,OAAqB,CAAAD,IAAQ,CAAAiB,UAAK,cAAY,YAAc,EAAU;IAC5EP,aAAA,CAAcG,IAAA,0EAAAU,kBAAA,WAAArB,EAAA,CAAAoB,SAAA,CAAAC,kBAAA;AAAA;AAC+E;AAEpF,sBACPR,IAAA,CAAAC,SAAA,CAAAT,KAAA,CAAAiB,IAAA;AAAA;AACA;AAAA;AAAA;AAG0C;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IAAA,IAAAC,mBAAA,GAAAxB,OAAA,CAAAD,IAAA,CAAAiB,UAAA;IAAAP,aAAA,CAAAG,IAAA,4EAAAY,mBAAA,WAAAvB,EAAA,CAAAwB,SAAA,CAAAD,mBAAA,EAAArB,2BAAA;IAAA,IAAAuB,gBAAA,GAAA1B,OAAA,CAAAD,IAAA,CAAAiB,UAAA;IAAA,OAAAP,aAAA,CAAAG,IAAA,+EAAAc,gBAAA,KAAAzB,EAAA,CAAA0B,SAAA,CAAAD,gBAAA;MA4C5C,GAAAxB,4BAAA;MAEA0B,OAAM,uBAAsB;MAC5BC,WAAA,EAAc;QACZ,GAAA3B,4BAAA,CAAA2B,WAAA;QAEFC,uBAAmB;MAInB;IACA;EAAc,SACZC,CAAA;IACFC,OACU,CAAAC,KAAA,gFAA4B3B,KAAA,CAAAiB,IAAA,IAAAQ,CAAA;EAAA;AACjC;AACM,SACI1B,2BACR","ignoreList":[]}
+{"version":3,"names":["join","resolve","fs","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","getPathFromRoute","createSsrServerlessFunction","route","buildInfo","oneOptionsRoot","postBuildLogs","path","includeIndex","push","buildInfoAsString","JSON","stringify","funcFolder","ensureDir","distServerFrom","distServerTo","copy","writeFile","entrypointFilePath","file","page","packageJsonFilePath","writeJSON","vcConfigFilePath","writeJson","handler","environment","ONE_DEFAULT_RENDER_MODE","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/vite/one-server-only.js

@@ -24,14 +24,17 @@ function mergeHeaders(onto, from) {
     value === void 0 || value === "undefined" ? onto.delete(key2) : onto.append(key2, value);
   });
 }
-const globalId = { _id: Math.random() };
+const globalId = { _id: Math.random() }, GLOBAL_ID_KEY = "__oneGlobalContextId";
+globalThis[GLOBAL_ID_KEY] || (globalThis[GLOBAL_ID_KEY] = globalId);
 function ensureAsyncLocalID() {
-  const id = process.env.VERCEL ? globalId : requestAsyncLocalStore?.getStore();
+  const id = process.env.VERCEL ? globalThis[GLOBAL_ID_KEY] : requestAsyncLocalStore?.getStore();
   if (!id)
     throw new Error("Internal One error, no AsyncLocalStorage id!");
   return id;
 }
-const serverContexts = /* @__PURE__ */ new WeakMap();
+const SERVER_CONTEXTS_KEY = "__oneServerContexts";
+globalThis[SERVER_CONTEXTS_KEY] || (globalThis[SERVER_CONTEXTS_KEY] = /* @__PURE__ */ new WeakMap());
+const serverContexts = globalThis[SERVER_CONTEXTS_KEY];
 function setServerContext(data) {
   if (process.env.VITE_ENVIRONMENT === "ssr") {
     const id = ensureAsyncLocalID();

package/dist/esm/vite/one-server-only.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/vite/one-server-only.tsx"],
-  "mappings": "AAQA,SAAS,yBAAyB;AAClC,SAAS,0BAA0B;AAKnC,MAAM,MAAM,gCACN,OAAO,MAAM,WAAW,GAAG,GAE3B,oBAAoB;AAAA,EACxB,IAAI,UAAU;AACZ,QAAI,KAAK,EAAG,QAAO,KAAK;AACxB,UAAM,IAAI,IAAI,kBAAkB;AAChC,sBAAW,GAAG,IAAI,GACX;AAAA,EACT;AACF,GAEa,yBACX,QAAQ,IAAI,qBAAqB,QAAQ,kBAAkB,UAAU,MAEjE,WAAW,oBAAI,QAAsB,GAE9B,oBACV,WAAW,2BAAkD;AAEhE,WAAW,4BAA+B;AAE1C,eAAsB,yBAA4B,IAA4C;AAC5F,QAAM,KAAK,EAAE,KAAK,KAAK,OAAO,EAAE;AAChC,MAAI,MAAS;AACb,eAAM,kBAAkB,QAAS,IAAI,IAAI,YAAY;AACnD,UAAM,MAAM,GAAG,EAAE;AAAA,EACnB,CAAC,GACM;AACT;AAEA,eAAsB,mBAAmB,IAAgC;AACvE,QAAM,KAAK,mBAAmB,GACxB,UAAU,kBAAkB,IAAI,EAAE,KAAK,IAAI,QAAQ;AACzD,oBAAkB,IAAI,IAAI,OAAO,GACjC,GAAG,OAAO;AACZ;AAEO,SAAS,aAAa,MAAe,MAAe;AACzD,OAAK,QAAQ,CAAC,OAAOA,SAAQ;AAC3B,IAAI,UAAU,UAAa,UAAU,cACnC,KAAK,OAAOA,IAAG,IAEf,KAAK,OAAOA,MAAK,KAAK;AAAA,EAE1B,CAAC;AACH;AAEA,MAAM,WAAW,EAAE,KAAK,KAAK,OAAO,EAAE;AAE/B,SAAS,qBAAqB;AAMnC,QAAM,KAAK,QAAQ,IAAI,SAAS,WAAW,wBAAwB,SAAS;AAE5E,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,8CAA8C;AAGhE,SAAO;AACT;AAIA,MAAM,iBAAiB,oBAAI,QAAgC;AAEpD,SAAS,iBAAiB,MAAyB;AACxD,MAAI,QAAQ,IAAI,qBAAqB,OAAO;AAC1C,UAAM,KAAK,mBAAmB;AAC9B,IAAK,eAAe,IAAI,EAAE,KACxB,eAAe,IAAI,IAAI,CAAC,CAAC;AAG3B,UAAM,UAAU,eAAe,IAAI,EAAE;AACrC,WAAO,OAAO,SAAS,IAAI;AAAA,EAC7B;AACE,UAAM,IAAI,MAAM,uCAAuC;AAE3D;AAEO,SAAS,mBAAmB;AASjC,UARa,MAAM;AACjB,QAAI,QAAQ,IAAI,qBAAqB,OAAO;AAC1C,YAAM,KAAK,mBAAmB;AAC9B,aAAO,eAAe,IAAI,EAAE;AAAA,IAC9B;AACA,WAAO,WAAW,kBAAkB;AAAA,EACtC,GAAG;AAGL;AAEO,SAAS,mBAAmB;AACjC,MAAI,QAAQ,IAAI,qBAAqB;AACnC,QAAI;AACF,YAAM,aAAa,WAAW;AAC9B,UAAI;AACF,eAAO,eAAe,IAAI,WAAW,CAAC;AAAA,IAE1C,QAAQ;AAAA,IAER;AAGF,SAAO,iBAAiB;AAC1B;AAQO,SAAS,cACdA,MACA,OACA;AACA,MAAI,QAAQ,IAAI,qBAAqB,OAAO;AAC1C,UAAM,UAAU,iBAAiB;AACjC,qBAAiB;AAAA,MACf,gBAAgB;AAAA,QACd,GAAG,SAAS;AAAA,QACZ,CAACA,IAAG,GAAG;AAAA,MACT;AAAA,IACF,CAAC;AAAA,EACH;AACE,UAAM,IAAI,MAAM,2BAA2B,QAAQ,IAAI,gBAAgB,eAAe;AAE1F;AAKO,SAAS,cAAcA,MAA2B;AACvD,MAAI,QAAQ,IAAI,qBAAqB;AACnC,UAAM,IAAI,MAAM,oCAAoC;AAEtD,MAAI,QAAQ,IAAI,qBAAqB;AACnC,WAAO,iBAAiB,GAAG,iBAAiBA,IAAG;AAEnD;",
+  "mappings": "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",
   "names": ["key"]
 }

package/dist/esm/vite/one-server-only.mjs

@@ -33,14 +33,18 @@ function mergeHeaders(onto, from) {
   });
 }
 const globalId = {
-  _id: Math.random()
-};
+    _id: Math.random()
+  },
+  GLOBAL_ID_KEY = "__oneGlobalContextId";
+globalThis[GLOBAL_ID_KEY] || (globalThis[GLOBAL_ID_KEY] = globalId);
 function ensureAsyncLocalID() {
-  const id = process.env.VERCEL ? globalId : requestAsyncLocalStore?.getStore();
+  const id = process.env.VERCEL ? globalThis[GLOBAL_ID_KEY] : requestAsyncLocalStore?.getStore();
   if (!id) throw new Error("Internal One error, no AsyncLocalStorage id!");
   return id;
 }
-const serverContexts = /* @__PURE__ */new WeakMap();
+const SERVER_CONTEXTS_KEY = "__oneServerContexts";
+globalThis[SERVER_CONTEXTS_KEY] || (globalThis[SERVER_CONTEXTS_KEY] = /* @__PURE__ */new WeakMap());
+const serverContexts = globalThis[SERVER_CONTEXTS_KEY];
 function setServerContext(data) {
   if (process.env.VITE_ENVIRONMENT === "ssr") {
     const id = ensureAsyncLocalID();

package/dist/esm/vite/one-server-only.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["AsyncLocalStorage","SERVER_CONTEXT_KEY","key","read","globalThis","ASYNC_LOCAL_STORE","current","_","requestAsyncLocalStore","process","env","VITE_ENVIRONMENT","newCache","WeakMap","asyncHeadersCache","__vxrnasyncHeadersCache","runWithAsyncLocalContext","cb","id","_id","Math","random","out","run","setResponseHeaders","ensureAsyncLocalID","headers","get","Headers","set","mergeHeaders","onto","from","forEach","value","key2","delete","append","globalId","VERCEL","getStore","Error","serverContexts","setServerContext","data","has","context","Object","assign","getServerContext","useServerContext","useContext","__vxrnGetContextFromReactContext","setServerData","postRenderData","getServerData"],"sources":["../../../src/vite/one-server-only.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["AsyncLocalStorage","SERVER_CONTEXT_KEY","key","read","globalThis","ASYNC_LOCAL_STORE","current","_","requestAsyncLocalStore","process","env","VITE_ENVIRONMENT","newCache","WeakMap","asyncHeadersCache","__vxrnasyncHeadersCache","runWithAsyncLocalContext","cb","id","_id","Math","random","out","run","setResponseHeaders","ensureAsyncLocalID","headers","get","Headers","set","mergeHeaders","onto","from","forEach","value","key2","delete","append","globalId","GLOBAL_ID_KEY","VERCEL","getStore","Error","SERVER_CONTEXTS_KEY","serverContexts","setServerContext","data","has","context","Object","assign","getServerContext","useServerContext","useContext","__vxrnGetContextFromReactContext","setServerData","postRenderData","getServerData"],"sources":["../../../src/vite/one-server-only.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.2.40",
+  "version": "1.2.42",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -124,17 +124,17 @@
     "@react-navigation/routers": "~7.5.1",
     "@swc/core": "^1.14.0",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/color-scheme": "1.2.40",
-    "@vxrn/compiler": "1.2.40",
-    "@vxrn/resolve": "1.2.40",
-    "@vxrn/tslib-lite": "1.2.40",
-    "@vxrn/use-isomorphic-layout-effect": "1.2.40",
-    "@vxrn/vite-plugin-metro": "1.2.40",
+    "@vxrn/color-scheme": "1.2.42",
+    "@vxrn/compiler": "1.2.42",
+    "@vxrn/resolve": "1.2.42",
+    "@vxrn/tslib-lite": "1.2.42",
+    "@vxrn/use-isomorphic-layout-effect": "1.2.42",
+    "@vxrn/vite-plugin-metro": "1.2.42",
     "babel-dead-code-elimination": "^1.0.10",
     "babel-plugin-module-resolver": "^5.0.2",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.2.40",
+    "create-vxrn": "1.2.42",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~8.0.8",
     "expo-modules-core": "~3.0.24",
@@ -160,7 +160,7 @@
     "vite": "^7.1.12",
     "vite-plugin-barrel": "^0.4.1",
     "vite-tsconfig-paths": "^5.1.4",
-    "vxrn": "1.2.40",
+    "vxrn": "1.2.42",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },

package/src/Root.tsx

@@ -88,7 +88,10 @@ export function Root(props: RootProps) {
 
   onRenderId?.(id)
 
-  const value = globalThis['__vxrnrequestAsyncLocalStore']?.getStore() || null
+  // Use Vercel's global ID if available, otherwise use AsyncLocalStorage
+  const value = process.env.VERCEL
+    ? globalThis['__oneGlobalContextId']
+    : globalThis['__vxrnrequestAsyncLocalStore']?.getStore() || null
 
   let contents = (
     <ServerAsyncLocalIDContext.Provider value={value}>