@cloudflare/pages-shared 0.4.2 → 0.5.1

package/asset-server/handler.ts

@@ -74,6 +74,7 @@ type FullHandlerContext<AssetEntry, ContentNegotiation, Asset> = {
 	request: Request;
 	metadata: Metadata;
 	xServerEnvHeader?: string;
+	xDeploymentIdHeader?: boolean;
 	logError: (err: Error) => void;
 	findAssetEntryForPath: FindAssetEntryForPath<AssetEntry>;
 	getAssetKey(assetEntry: AssetEntry, content: ContentNegotiation): string;
@@ -120,6 +121,7 @@ export async function generateHandler<
 	request,
 	metadata,
 	xServerEnvHeader,
+	xDeploymentIdHeader,
 	logError,
 	findAssetEntryForPath,
 	getAssetKey,
@@ -480,6 +482,10 @@ export async function generateHandler<
 				headers["x-server-env"] = xServerEnvHeader;
 			}
 
+			if (xDeploymentIdHeader && metadata.deploymentId) {
+				headers["x-deployment-id"] = metadata.deploymentId;
+			}
+
 			if (content.encoding) {
 				encodeBody = "manual";
 				headers["cache-control"] = "no-transform";

package/asset-server/responses.ts

@@ -1,12 +1,12 @@
 type HeadersInit = ConstructorParameters<typeof Headers>[0];
 
 function mergeHeaders(base: HeadersInit, extra: HeadersInit) {
-	base = new Headers(base ?? {});
-	extra = new Headers(extra ?? {});
+	const baseHeaders = new Headers(base ?? {});
+	const extraHeaders = new Headers(extra ?? {});
 
 	return new Headers({
-		...Object.fromEntries(base.entries()),
-		...Object.fromEntries(extra.entries()),
+		...Object.fromEntries(baseHeaders.entries()),
+		...Object.fromEntries(extraHeaders.entries()),
 	});
 }
 

package/environment-polyfills/miniflare.ts

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

package/environment-polyfills/types.ts

@@ -1,35 +1,25 @@
 import {
-	Headers as MiniflareHeaders,
-	Request as MiniflareRequest,
-	Response as MiniflareResponse,
-} from "@miniflare/core";
-import { HTMLRewriter as MiniflareHTMLRewriter } from "@miniflare/html-rewriter";
-import type { CacheInterface as MiniflareCacheInterface } from "@miniflare/cache";
-import type { fetch as miniflareFetch } from "@miniflare/core";
-import type { ReadableStream as SimilarReadableStream } from "stream/web";
+	Headers as WorkerHeaders,
+	Request as WorkerRequest,
+	Response as WorkerResponse,
+	HTMLRewriter as WorkerHTMLRewriter,
+} from "@cloudflare/workers-types/experimental";
+import type {
+	fetch as workerFetch,
+	ReadableStream as WorkerReadableStream,
+	CacheStorage as WorkerCacheStorage,
+} from "@cloudflare/workers-types/experimental";
 
 declare global {
-	const fetch: typeof miniflareFetch;
-	class Headers extends MiniflareHeaders {}
-	class Request extends MiniflareRequest {}
-	class Response extends MiniflareResponse {}
+	const fetch: typeof workerFetch;
+	class Headers extends WorkerHeaders {}
+	class Request extends WorkerRequest {}
+	class Response extends WorkerResponse {}
 
-	type CacheInterface = Omit<MiniflareCacheInterface, "match"> & {
-		match(
-			...args: Parameters<MiniflareCacheInterface["match"]>
-		): Promise<Response | undefined>;
-	};
-
-	class CacheStorage {
-		get default(): CacheInterface;
-		open(cacheName: string): Promise<CacheInterface>;
-	}
-
-	class HTMLRewriter extends MiniflareHTMLRewriter {
-		transform(response: Response): Response;
-	}
-
-	type ReadableStream = SimilarReadableStream;
+	// Not polyfilled
+	type ReadableStream = WorkerReadableStream;
+	type CacheStorage = WorkerCacheStorage;
+	class HTMLRewriter extends WorkerHTMLRewriter {}
 }
 
 export type PolyfilledRuntimeEnvironment = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cloudflare/pages-shared",
-	"version": "0.4.2",
+	"version": "0.5.1",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/cloudflare/workers-sdk.git",
@@ -43,11 +43,10 @@
 		]
 	},
 	"dependencies": {
-		"@miniflare/core": "2.13.0"
+		"miniflare": "^3.0.0"
 	},
 	"devDependencies": {
-		"@miniflare/cache": "2.13.0",
-		"@miniflare/html-rewriter": "2.13.0",
+		"@cloudflare/workers-types": "^4.20230511.0",
 		"@types/service-worker-mock": "^2.0.1",
 		"concurrently": "^7.3.0",
 		"glob": "^8.0.3",

package/environment-polyfills/miniflare-tre.ts

@@ -1,12 +0,0 @@
-import { polyfill } from ".";
-
-export default async () => {
-	const mf = await import("@miniflare/tre");
-
-	polyfill({
-		fetch: mf.fetch,
-		Headers: mf.Headers,
-		Request: mf.Request,
-		Response: mf.Response,
-	});
-};