one 2.11.4 → 2.12.0

package/dist/cjs/cli/build.cjs

@@ -345,6 +345,7 @@ async function build(args) {
 	const cssFileContentsCache = /* @__PURE__ */ new Map();
 	const criticalCSSOutputPaths = (0, import_criticalCSSPlugin.getCriticalCSSOutputPaths)(vxrnOutput.clientManifest);
 	const limit = (0, import_pLimit.pLimit)(buildConcurrency);
+	const skipNativeLoaders = oneOptions.native === false;
 	const useWorkers = shouldUseWorkers(oneOptions);
 	const workerPool = useWorkers ? (0, import_workerPool.getWorkerPool)(buildConcurrency) : null;
 	if (workerPool) {
@@ -633,7 +634,8 @@ async function build(args) {
 					criticalPreloads,
 					deferredPreloads,
 					useAfterLCP,
-					useAfterLCPAggressive
+					useAfterLCPAggressive,
+					skipNativeLoaders
 				}).then((built) => ({
 					built,
 					path
@@ -642,7 +644,7 @@ async function build(args) {
 			return limit(async () => {
 				console.info(`  \u21A6 route ${path}`);
 				const built = await (0, import_one_server_only.runWithAsyncLocalContext)(async () => {
-					return await (0, import_buildPage.buildPage)(vxrnOutput.serverEntry, routerRoot, path, relativeId, params, foundRoute, clientManifestEntry, staticDir, clientDir, builtMiddlewares, serverJsPath, preloads2, allCSS, layoutCSS, routePreloads, allCSSContents, criticalPreloads, deferredPreloads, useAfterLCP, useAfterLCPAggressive);
+					return await (0, import_buildPage.buildPage)(vxrnOutput.serverEntry, routerRoot, path, relativeId, params, foundRoute, clientManifestEntry, staticDir, clientDir, builtMiddlewares, serverJsPath, preloads2, allCSS, layoutCSS, routePreloads, allCSSContents, criticalPreloads, deferredPreloads, useAfterLCP, useAfterLCPAggressive, skipNativeLoaders);
 				});
 				return {
 					built,
@@ -818,7 +820,7 @@ if (typeof MessageChannel === 'undefined') {
   }
 }
 
-import { serve, setFetchStaticHtml, withRange } from 'one/serve-worker'
+import { serve, withRange } from 'one/serve-worker'
 
 // Lazy import map - modules load on-demand when route is matched
 const lazyRoutes = {
@@ -841,44 +843,40 @@ export default {
       server = await serve(buildInfo, lazyRoutes)
     }
 
-    // set up static HTML fetcher for this request (uses ASSETS binding)
-    if (env.ASSETS) {
-      setFetchStaticHtml(async (path) => {
-        try {
-          const url = new URL(request.url)
-          url.pathname = path
-          const assetResponse = await env.ASSETS.fetch(new Request(url))
-          if (assetResponse && assetResponse.ok) {
-            return await assetResponse.text()
+    // keep the asset binding and origin scoped to this request
+    const fetchStaticHtml = env.ASSETS
+      ? async (path) => {
+          try {
+            const url = new URL(request.url)
+            url.pathname = path
+            const assetResponse = await env.ASSETS.fetch(new Request(url))
+            if (assetResponse && assetResponse.ok) {
+              return await assetResponse.text()
+            }
+          } catch (e) {
+            // asset not found
           }
-        } catch (e) {
-          // asset not found
+          return null
         }
-        return null
-      })
-    }
+      : undefined
 
-    try {
-      const response = await server.fetch(request, env, ctx)
+    const response = await server.fetch(request, env, ctx, fetchStaticHtml)
 
-      // no route matched or 404 \u2192 try static assets
-      if (!response || response.status === 404) {
-        if (env.ASSETS) {
-          try {
-            const assetResponse = await env.ASSETS.fetch(request)
-            if (assetResponse && assetResponse.status !== 404) {
-              return await withRange(request, assetResponse)
-            }
-          } catch (e) {
-            // asset not found, continue with original response
+    // no route matched or 404 \u2192 try static assets
+    if (!response || response.status === 404) {
+      if (env.ASSETS) {
+        try {
+          const assetResponse = await env.ASSETS.fetch(request)
+          if (assetResponse && assetResponse.status !== 404) {
+            return await withRange(request, assetResponse)
           }
+        } catch (e) {
+          // asset not found, continue with original response
         }
       }
-
-      return response
-    } finally {
-      setFetchStaticHtml(null)
     }
+
+    return response
   }
 }
 `;

package/dist/cjs/cli/build.native.cjs

@@ -426,6 +426,7 @@ async function build(args) {
 	var cssFileContentsCache = /* @__PURE__ */ new Map();
 	var criticalCSSOutputPaths = (0, import_criticalCSSPlugin.getCriticalCSSOutputPaths)(vxrnOutput.clientManifest);
 	var limit = (0, import_pLimit.pLimit)(buildConcurrency);
+	var skipNativeLoaders = oneOptions.native === false;
 	var useWorkers = shouldUseWorkers(oneOptions);
 	var workerPool = useWorkers ? (0, import_workerPool.getWorkerPool)(buildConcurrency) : null;
 	if (workerPool) {
@@ -956,7 +957,8 @@ async function build(args) {
 						criticalPreloads,
 						deferredPreloads,
 						useAfterLCP,
-						useAfterLCPAggressive
+						useAfterLCPAggressive,
+						skipNativeLoaders
 					}).then(function(built2) {
 						return {
 							built: built2,
@@ -967,7 +969,7 @@ async function build(args) {
 				return limit(async function() {
 					console.info(`  \u21A6 route ${path2}`);
 					var built2 = await (0, import_one_server_only.runWithAsyncLocalContext)(async function() {
-						return await (0, import_buildPage.buildPage)(vxrnOutput.serverEntry, routerRoot, path2, relativeId1, params, foundRoute, clientManifestEntry, staticDir, clientDir, builtMiddlewares, serverJsPath, preloads2, allCSS, layoutCSS, routePreloads, allCSSContents, criticalPreloads, deferredPreloads, useAfterLCP, useAfterLCPAggressive);
+						return await (0, import_buildPage.buildPage)(vxrnOutput.serverEntry, routerRoot, path2, relativeId1, params, foundRoute, clientManifestEntry, staticDir, clientDir, builtMiddlewares, serverJsPath, preloads2, allCSS, layoutCSS, routePreloads, allCSSContents, criticalPreloads, deferredPreloads, useAfterLCP, useAfterLCPAggressive, skipNativeLoaders);
 					});
 					return {
 						built: built2,
@@ -1267,7 +1269,7 @@ if (typeof MessageChannel === 'undefined') {
   }
 }
 
-import { serve, setFetchStaticHtml, withRange } from 'one/serve-worker'
+import { serve, withRange } from 'one/serve-worker'
 
 // Lazy import map - modules load on-demand when route is matched
 const lazyRoutes = {
@@ -1290,44 +1292,40 @@ export default {
       server = await serve(buildInfo, lazyRoutes)
     }
 
-    // set up static HTML fetcher for this request (uses ASSETS binding)
-    if (env.ASSETS) {
-      setFetchStaticHtml(async (path) => {
-        try {
-          const url = new URL(request.url)
-          url.pathname = path
-          const assetResponse = await env.ASSETS.fetch(new Request(url))
-          if (assetResponse && assetResponse.ok) {
-            return await assetResponse.text()
+    // keep the asset binding and origin scoped to this request
+    const fetchStaticHtml = env.ASSETS
+      ? async (path) => {
+          try {
+            const url = new URL(request.url)
+            url.pathname = path
+            const assetResponse = await env.ASSETS.fetch(new Request(url))
+            if (assetResponse && assetResponse.ok) {
+              return await assetResponse.text()
+            }
+          } catch (e) {
+            // asset not found
           }
-        } catch (e) {
-          // asset not found
+          return null
         }
-        return null
-      })
-    }
+      : undefined
 
-    try {
-      const response = await server.fetch(request, env, ctx)
+    const response = await server.fetch(request, env, ctx, fetchStaticHtml)
 
-      // no route matched or 404 \u2192 try static assets
-      if (!response || response.status === 404) {
-        if (env.ASSETS) {
-          try {
-            const assetResponse = await env.ASSETS.fetch(request)
-            if (assetResponse && assetResponse.status !== 404) {
-              return await withRange(request, assetResponse)
-            }
-          } catch (e) {
-            // asset not found, continue with original response
+    // no route matched or 404 \u2192 try static assets
+    if (!response || response.status === 404) {
+      if (env.ASSETS) {
+        try {
+          const assetResponse = await env.ASSETS.fetch(request)
+          if (assetResponse && assetResponse.status !== 404) {
+            return await withRange(request, assetResponse)
           }
+        } catch (e) {
+          // asset not found, continue with original response
         }
       }
-
-      return response
-    } finally {
-      setFetchStaticHtml(null)
     }
+
+    return response
   }
 }
 `;

package/dist/cjs/cli/build.native.js

@@ -426,6 +426,7 @@ async function build(args) {
 	var cssFileContentsCache = /* @__PURE__ */ new Map();
 	var criticalCSSOutputPaths = (0, import_criticalCSSPlugin.getCriticalCSSOutputPaths)(vxrnOutput.clientManifest);
 	var limit = (0, import_pLimit.pLimit)(buildConcurrency);
+	var skipNativeLoaders = oneOptions.native === false;
 	var useWorkers = shouldUseWorkers(oneOptions);
 	var workerPool = useWorkers ? (0, import_workerPool.getWorkerPool)(buildConcurrency) : null;
 	if (workerPool) {
@@ -956,7 +957,8 @@ async function build(args) {
 						criticalPreloads,
 						deferredPreloads,
 						useAfterLCP,
-						useAfterLCPAggressive
+						useAfterLCPAggressive,
+						skipNativeLoaders
 					}).then(function(built2) {
 						return {
 							built: built2,
@@ -967,7 +969,7 @@ async function build(args) {
 				return limit(async function() {
 					console.info(`  \u21A6 route ${path2}`);
 					var built2 = await (0, import_one_server_only.runWithAsyncLocalContext)(async function() {
-						return await (0, import_buildPage.buildPage)(vxrnOutput.serverEntry, routerRoot, path2, relativeId1, params, foundRoute, clientManifestEntry, staticDir, clientDir, builtMiddlewares, serverJsPath, preloads2, allCSS, layoutCSS, routePreloads, allCSSContents, criticalPreloads, deferredPreloads, useAfterLCP, useAfterLCPAggressive);
+						return await (0, import_buildPage.buildPage)(vxrnOutput.serverEntry, routerRoot, path2, relativeId1, params, foundRoute, clientManifestEntry, staticDir, clientDir, builtMiddlewares, serverJsPath, preloads2, allCSS, layoutCSS, routePreloads, allCSSContents, criticalPreloads, deferredPreloads, useAfterLCP, useAfterLCPAggressive, skipNativeLoaders);
 					});
 					return {
 						built: built2,
@@ -1267,7 +1269,7 @@ if (typeof MessageChannel === 'undefined') {
   }
 }
 
-import { serve, setFetchStaticHtml, withRange } from 'one/serve-worker'
+import { serve, withRange } from 'one/serve-worker'
 
 // Lazy import map - modules load on-demand when route is matched
 const lazyRoutes = {
@@ -1290,44 +1292,40 @@ export default {
       server = await serve(buildInfo, lazyRoutes)
     }
 
-    // set up static HTML fetcher for this request (uses ASSETS binding)
-    if (env.ASSETS) {
-      setFetchStaticHtml(async (path) => {
-        try {
-          const url = new URL(request.url)
-          url.pathname = path
-          const assetResponse = await env.ASSETS.fetch(new Request(url))
-          if (assetResponse && assetResponse.ok) {
-            return await assetResponse.text()
+    // keep the asset binding and origin scoped to this request
+    const fetchStaticHtml = env.ASSETS
+      ? async (path) => {
+          try {
+            const url = new URL(request.url)
+            url.pathname = path
+            const assetResponse = await env.ASSETS.fetch(new Request(url))
+            if (assetResponse && assetResponse.ok) {
+              return await assetResponse.text()
+            }
+          } catch (e) {
+            // asset not found
           }
-        } catch (e) {
-          // asset not found
+          return null
         }
-        return null
-      })
-    }
+      : undefined
 
-    try {
-      const response = await server.fetch(request, env, ctx)
+    const response = await server.fetch(request, env, ctx, fetchStaticHtml)
 
-      // no route matched or 404 \u2192 try static assets
-      if (!response || response.status === 404) {
-        if (env.ASSETS) {
-          try {
-            const assetResponse = await env.ASSETS.fetch(request)
-            if (assetResponse && assetResponse.status !== 404) {
-              return await withRange(request, assetResponse)
-            }
-          } catch (e) {
-            // asset not found, continue with original response
+    // no route matched or 404 \u2192 try static assets
+    if (!response || response.status === 404) {
+      if (env.ASSETS) {
+        try {
+          const assetResponse = await env.ASSETS.fetch(request)
+          if (assetResponse && assetResponse.status !== 404) {
+            return await withRange(request, assetResponse)
           }
+        } catch (e) {
+          // asset not found, continue with original response
         }
       }
-
-      return response
-    } finally {
-      setFetchStaticHtml(null)
     }
+
+    return response
   }
 }
 `;