@cloudflare/pages-shared 0.13.8 → 0.13.10

package/environment-polyfills/html-rewriter.ts

@@ -0,0 +1,85 @@
+import { TransformStream } from "stream/web";
+import { Response } from "miniflare";
+import type {
+	HTMLRewriter as BaseHTMLRewriter,
+	DocumentHandlers,
+	ElementHandlers,
+} from "html-rewriter-wasm";
+import type { ReadableStream } from "stream/web";
+
+// Vendored from Miniflare v2: https://github.com/cloudflare/miniflare/blob/master/packages/html-rewriter/src/rewriter.ts
+
+type SelectorElementHandlers = [selector: string, handlers: ElementHandlers];
+
+export class HTMLRewriter {
+	readonly #elementHandlers: SelectorElementHandlers[] = [];
+	readonly #documentHandlers: DocumentHandlers[] = [];
+
+	on(selector: string, handlers: ElementHandlers): this {
+		this.#elementHandlers.push([selector, handlers]);
+		return this;
+	}
+
+	onDocument(handlers: DocumentHandlers): this {
+		this.#documentHandlers.push(handlers);
+		return this;
+	}
+
+	transform(response: Response): Response {
+		const body = response.body as ReadableStream<Uint8Array> | null;
+		// HTMLRewriter doesn't run the end handler if the body is null, so it's
+		// pointless to setup the transform stream.
+		if (body === null) {
+			return new Response(body, response);
+		}
+
+		// Make sure we validate chunks are BufferSources and convert them to
+		// Uint8Arrays as required by the Rust glue code.
+		response = new Response(response.body, response);
+
+		let rewriter: BaseHTMLRewriter;
+		const transformStream = new TransformStream<Uint8Array, Uint8Array>({
+			start: async (controller) => {
+				// Create a rewriter instance for this transformation that writes its
+				// output to the transformed response's stream. Note that each
+				// BaseHTMLRewriter can only be used once. Importing html-rewriter-wasm
+				// will also synchronously compile a WebAssembly module, so delay doing
+				// this until we really need it.
+				// TODO: async compile the WebAssembly module
+				const {
+					HTMLRewriter: BaseHTMLRewriter,
+					// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+				}: typeof import("html-rewriter-wasm") = await import(
+					"html-rewriter-wasm"
+				);
+				rewriter = new BaseHTMLRewriter((output) => {
+					// enqueue will throw on empty chunks
+					if (output.length !== 0) {
+						controller.enqueue(output);
+					}
+				});
+				// Add all registered handlers
+				for (const [selector, handlers] of this.#elementHandlers) {
+					rewriter.on(selector, handlers);
+				}
+				for (const handlers of this.#documentHandlers) {
+					rewriter.onDocument(handlers);
+				}
+			},
+			// The finally() below will ensure the rewriter is always freed.
+			// chunk is guaranteed to be a Uint8Array as we're using the
+			// @miniflare/core Response class, which transforms to a byte stream.
+			transform: (chunk) => rewriter.write(chunk),
+			flush: () => rewriter.end(),
+		});
+		const promise = body.pipeTo(transformStream.writable);
+		promise.catch(() => {}).finally(() => rewriter.free());
+
+		// Return a response with the transformed body, copying over headers, etc
+		const res = new Response(transformStream.readable, response);
+		// If Content-Length is set, it's probably going to be wrong, since we're
+		// rewriting content, so remove it
+		res.headers.delete("Content-Length");
+		return res;
+	}
+}

package/environment-polyfills/miniflare.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/pages-shared",
-  "version": "0.13.8",
+  "version": "0.13.10",
   "repository": {
     "type": "git",
     "url": "https://github.com/cloudflare/workers-sdk.git",
@@ -13,17 +13,15 @@
     "metadata-generator/**/*"
   ],
   "dependencies": {
-    "miniflare": "3.20250214.0"
+    "miniflare": "3.20250214.1"
   },
   "devDependencies": {
+    "@cloudflare/vitest-pool-workers": "0.7.0",
     "@cloudflare/workers-types": "^4.20250214.0",
-    "@miniflare/cache": "^2.14.4",
-    "@miniflare/core": "^2.14.4",
-    "@miniflare/html-rewriter": "^2.14.4",
-    "@miniflare/storage-memory": "^2.14.4",
     "concurrently": "^8.2.2",
     "glob": "^10.4.5",
-    "vitest": "~2.1.0",
+    "html-rewriter-wasm": "^0.4.1",
+    "vitest": "~3.0.5",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "volta": {