@cloudflare/pages-shared 0.11.29 → 0.11.31

package/asset-server/handler.ts

@@ -328,7 +328,10 @@ export async function generateHandler<
 			...Object.fromEntries(extraHeaders.entries()),
 		});
 
-		if (earlyHintsCache) {
+		if (
+			earlyHintsCache &&
+			isHTMLContentType(response.headers.get("Content-Type"))
+		) {
 			const preEarlyHintsHeaders = new Headers(headers);
 
 			// "Early Hints cache entries are keyed by request URI and ignore query strings."
@@ -347,65 +350,70 @@ export async function generateHandler<
 				}
 			} else {
 				if (setMetrics) setMetrics({ earlyHintsResult: "notused-miss" });
-			}
 
-			const clonedResponse = response.clone();
-
-			if (waitUntil) {
-				waitUntil(
-					(async () => {
-						try {
-							const links: { href: string; rel: string; as?: string }[] = [];
-
-							const transformedResponse = new HTMLRewriter()
-								.on("link[rel~=preconnect],link[rel~=preload]", {
-									element(element) {
-										for (const [attributeName] of element.attributes) {
-											if (
-												!ALLOWED_EARLY_HINT_LINK_ATTRIBUTES.includes(
-													attributeName.toLowerCase()
-												)
-											) {
-												return;
+				const clonedResponse = response.clone();
+
+				if (waitUntil) {
+					waitUntil(
+						(async () => {
+							try {
+								const links: { href: string; rel: string; as?: string }[] = [];
+
+								const transformedResponse = new HTMLRewriter()
+									.on("link[rel~=preconnect],link[rel~=preload]", {
+										element(element) {
+											for (const [attributeName] of element.attributes) {
+												if (
+													!ALLOWED_EARLY_HINT_LINK_ATTRIBUTES.includes(
+														attributeName.toLowerCase()
+													)
+												) {
+													return;
+												}
+											}
+
+											const href = element.getAttribute("href") || undefined;
+											const rel = element.getAttribute("rel") || undefined;
+											const as = element.getAttribute("as") || undefined;
+											if (href && !href.startsWith("data:") && rel) {
+												links.push({ href, rel, as });
 											}
-										}
-
-										const href = element.getAttribute("href") || undefined;
-										const rel = element.getAttribute("rel") || undefined;
-										const as = element.getAttribute("as") || undefined;
-										if (href && !href.startsWith("data:") && rel) {
-											links.push({ href, rel, as });
-										}
-									},
-								})
-								.transform(clonedResponse);
-
-							// Needed to actually execute the HTMLRewriter handlers
-							await transformedResponse.text();
-
-							links.forEach(({ href, rel, as }) => {
-								let link = `<${href}>; rel="${rel}"`;
-								if (as) {
-									link += `; as=${as}`;
+										},
+									})
+									.transform(clonedResponse);
+
+								// Needed to actually execute the HTMLRewriter handlers
+								await transformedResponse.text();
+
+								links.forEach(({ href, rel, as }) => {
+									let link = `<${href}>; rel="${rel}"`;
+									if (as) {
+										link += `; as=${as}`;
+									}
+									preEarlyHintsHeaders.append("Link", link);
+								});
+
+								const linkHeader = preEarlyHintsHeaders.get("Link");
+								if (linkHeader) {
+									await earlyHintsCache.put(
+										earlyHintsCacheKey,
+										new Response(null, {
+											headers: {
+												Link: linkHeader,
+												"Cache-Control": "max-age=2592000", // 30 days
+											},
+										})
+									);
 								}
-								preEarlyHintsHeaders.append("Link", link);
-							});
-
-							const linkHeader = preEarlyHintsHeaders.get("Link");
-							if (linkHeader) {
-								await earlyHintsCache.put(
-									earlyHintsCacheKey,
-									new Response(null, { headers: { Link: linkHeader } })
-								);
+							} catch (err) {
+								// Nbd if we fail here in the deferred 'waitUntil' work. We're probably trying to parse a malformed page or something.
+								// Totally fine to skip over any errors.
+								// If we need to debug something, you can uncomment the following:
+								// logError(err)
 							}
-						} catch (err) {
-							// Nbd if we fail here in the deferred 'waitUntil' work. We're probably trying to parse a malformed page or something.
-							// Totally fine to skip over any errors.
-							// If we need to debug something, you can uncomment the following:
-							// logError(err)
-						}
-					})()
-				);
+						})()
+					);
+				}
 			}
 		} else {
 			if (setMetrics) setMetrics({ earlyHintsResult: "disabled" });
@@ -553,7 +561,7 @@ export async function generateHandler<
 			}
 
 			if (
-				asset.contentType.startsWith("text/html") &&
+				isHTMLContentType(asset.contentType) &&
 				metadata.analytics?.version === ANALYTICS_VERSION
 			) {
 				return new HTMLRewriter()
@@ -653,3 +661,11 @@ function isPreview(url: URL): boolean {
 	}
 	return false;
 }
+
+/**
+ * Whether or not the passed in string looks like an HTML
+ * Content-Type header
+ */
+function isHTMLContentType(contentType?: string | null) {
+	return contentType?.toLowerCase().startsWith("text/html") || false;
+}

package/environment-polyfills/miniflare.ts

@@ -1,11 +1,13 @@
 import { polyfill } from ".";
 
 export default async () => {
+	const { HTMLRewriter } = await import("@miniflare/html-rewriter");
 	const mf = await import("miniflare");
 	polyfill({
 		fetch: mf.fetch,
 		Headers: mf.Headers,
 		Request: mf.Request,
 		Response: mf.Response,
+		HTMLRewriter: HTMLRewriter,
 	});
 };

package/environment-polyfills/types.ts

@@ -27,6 +27,7 @@ export type PolyfilledRuntimeEnvironment = {
 	Headers: typeof Headers;
 	Request: typeof Request;
 	Response: typeof Response;
+	HTMLRewriter: typeof HTMLRewriter;
 };
 
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/pages-shared",
-  "version": "0.11.29",
+  "version": "0.11.31",
   "repository": {
     "type": "git",
     "url": "https://github.com/cloudflare/workers-sdk.git",
@@ -13,14 +13,16 @@
     "metadata-generator/**/*"
   ],
   "dependencies": {
-    "miniflare": "3.20240405.2"
+    "miniflare": "3.20240419.0"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20240405.0",
-    "@types/service-worker-mock": "^2.0.1",
+    "@miniflare/storage-memory": "^2.14.2",
+    "@cloudflare/workers-types": "^4.20240419.0",
+    "@miniflare/cache": "^2.14.2",
+    "@miniflare/core": "^2.14.2",
+    "@miniflare/html-rewriter": "^2.14.2",
     "concurrently": "^7.3.0",
     "glob": "^8.0.3",
-    "service-worker-mock": "^2.0.5",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "workers-sdk": {