@cloudflare/vite-plugin 1.44.0 → 1.45.1

package/dist/workers/asset-worker/index.js

@@ -4657,6 +4657,15 @@ let EntrypointType = /* @__PURE__ */ function(EntrypointType$1) {
 	EntrypointType$1[EntrypointType$1["Inner"] = 1] = "Inner";
 	return EntrypointType$1;
 }({});
+function getRequestKind(request) {
+	const dest = request.headers.get("Sec-Fetch-Dest");
+	if (dest) return dest === "document" || dest === "iframe" ? "navigation" : "subresource";
+	const { pathname } = new URL(request.url);
+	const lastSegment = pathname.slice(pathname.lastIndexOf("/") + 1);
+	const dotIndex = lastSegment.lastIndexOf(".");
+	if (dotIndex <= 0) return "navigation";
+	return lastSegment.slice(dotIndex + 1).toLowerCase() === "html" ? "navigation" : "subresource";
+}
 const COMPATIBILITY_FLAG_MASKS = { assets_navigation_prefers_asset_serving: 1 };
 var Analytics = class {
 	data = {};
@@ -4702,7 +4711,9 @@ var Analytics = class {
 				this.data.version,
 				this.data.coloRegion,
 				this.data.cacheStatus,
-				this.data.cohort
+				this.data.cohort,
+				this.data.servedBy,
+				this.data.requestKind
 			]
 		});
 	}
@@ -5127,16 +5138,20 @@ function attachCustomHeaders(request, response, configuration, env) {
 //#region ../workers-shared/asset-worker/src/handler.ts
 const REDIRECTS_VERSION = 1;
 const HEADERS_VERSION = 2;
-const getResponseOrAssetIntent = async (request, env, configuration, exists) => {
+const getResponseOrAssetIntent = async (request, env, configuration, exists, analytics) => {
 	const url = new URL(request.url);
 	const { search } = url;
 	const redirectResult = handleRedirects(env, request, configuration, url.host, url.pathname, search);
-	if (redirectResult instanceof Response) return redirectResult;
+	if (redirectResult instanceof Response) {
+		analytics?.setData({ servedBy: "redirect" });
+		return redirectResult;
+	}
 	const { proxied, pathname } = redirectResult;
 	const decodedPathname = decodePath(pathname);
 	const intent = await getIntent(decodedPathname, request, configuration, exists);
 	if (!intent) {
 		const response = proxied ? new NotFoundResponse() : new NoIntentResponse();
+		analytics?.setData({ servedBy: "none" });
 		return env.JAEGER.enterSpan("no_intent", (span) => {
 			span.setTags({
 				decodedPathname,
@@ -5148,34 +5163,43 @@ const getResponseOrAssetIntent = async (request, env, configuration, exists) =>
 		});
 	}
 	const method = request.method.toUpperCase();
-	if (!["GET", "HEAD"].includes(method)) return env.JAEGER.enterSpan("method_not_allowed", (span) => {
-		span.setTags({
-			method,
-			status: MethodNotAllowedResponse.status
+	if (!["GET", "HEAD"].includes(method)) {
+		analytics?.setData({ servedBy: "method-not-allowed" });
+		return env.JAEGER.enterSpan("method_not_allowed", (span) => {
+			span.setTags({
+				method,
+				status: MethodNotAllowedResponse.status
+			});
+			return new MethodNotAllowedResponse();
 		});
-		return new MethodNotAllowedResponse();
-	});
+	}
 	const encodedDestination = encodePath(intent.redirect ?? decodedPathname);
 	/**
 	* The canonical path we serve an asset at is the decoded and re-encoded version.
 	* Thus we need to redirect if that is different from the decoded version.
 	* We combine this with other redirects (e.g. for html_handling) to avoid multiple redirects.
 	*/
-	if (encodedDestination !== pathname && intent.asset || intent.redirect) return env.JAEGER.enterSpan("redirect", (span) => {
-		span.setTags({
-			originalPath: pathname,
-			location: encodedDestination !== pathname ? encodedDestination : intent.redirect ?? "<unknown>",
-			status: TemporaryRedirectResponse.status
+	if (encodedDestination !== pathname && intent.asset || intent.redirect) {
+		analytics?.setData({ servedBy: "redirect" });
+		return env.JAEGER.enterSpan("redirect", (span) => {
+			span.setTags({
+				originalPath: pathname,
+				location: encodedDestination !== pathname ? encodedDestination : intent.redirect ?? "<unknown>",
+				status: TemporaryRedirectResponse.status
+			});
+			return new TemporaryRedirectResponse(encodedDestination + search);
 		});
-		return new TemporaryRedirectResponse(encodedDestination + search);
-	});
-	if (!intent.asset) return env.JAEGER.enterSpan("unknown_action", (span) => {
-		span.setTags({
-			pathname,
-			status: InternalServerErrorResponse.status
+	}
+	if (!intent.asset) {
+		analytics?.setData({ servedBy: "error" });
+		return env.JAEGER.enterSpan("unknown_action", (span) => {
+			span.setTags({
+				pathname,
+				status: InternalServerErrorResponse.status
+			});
+			return new InternalServerErrorResponse(/* @__PURE__ */ new Error("Unknown action"));
 		});
-		return new InternalServerErrorResponse(/* @__PURE__ */ new Error("Unknown action"));
-	});
+	}
 	return {
 		...intent.asset,
 		resolver: intent.resolver
@@ -5197,13 +5221,17 @@ const resolveAssetIntentToResponse = async (assetIntent, request, env, configura
 	const strongETag = `"${assetIntent.eTag}"`;
 	const weakETag = `W/${strongETag}`;
 	const ifNoneMatch = request.headers.get("If-None-Match") || "";
-	if ([weakETag, strongETag].includes(ifNoneMatch)) return env.JAEGER.enterSpan("matched_etag", (span) => {
-		span.setTags({
-			matchedEtag: ifNoneMatch,
-			status: NotModifiedResponse.status
+	if ([weakETag, strongETag].includes(ifNoneMatch)) {
+		analytics.setData({ servedBy: "not-modified" });
+		return env.JAEGER.enterSpan("matched_etag", (span) => {
+			span.setTags({
+				matchedEtag: ifNoneMatch,
+				status: NotModifiedResponse.status
+			});
+			return new NotModifiedResponse(null, { headers });
 		});
-		return new NotModifiedResponse(null, { headers });
-	});
+	}
+	analytics.setData({ servedBy: servedByForResolver(assetIntent.resolver, configuration) });
 	return env.JAEGER.enterSpan("response", (span) => {
 		span.setTags({
 			etag: assetIntent.eTag,
@@ -5226,9 +5254,20 @@ const canFetch = async (request, env, configuration, exists) => {
 	return true;
 };
 const handleRequest = async (request, env, configuration, exists, getByETag, analytics) => {
-	const responseOrAssetIntent = await getResponseOrAssetIntent(request, env, configuration, exists);
+	const responseOrAssetIntent = await getResponseOrAssetIntent(request, env, configuration, exists, analytics);
 	return attachCustomHeaders(request, responseOrAssetIntent instanceof Response ? responseOrAssetIntent : await resolveAssetIntentToResponse(responseOrAssetIntent, request, env, configuration, getByETag, analytics), configuration, env);
 };
+function servedByForResolver(resolver, configuration) {
+	if (resolver === "html-handling") return "asset";
+	switch (configuration.not_found_handling) {
+		case "single-page-application": return "spa";
+		case "404-page": return "404-page";
+		case "none": return "none";
+		default:
+			configuration.not_found_handling;
+			return "error";
+	}
+}
 const getIntent = async (pathname, request, configuration, exists, skipRedirects = false) => {
 	switch (configuration.html_handling) {
 		case "auto-trailing-slash": return htmlHandlingAutoTrailingSlash(pathname, request, configuration, exists, skipRedirects);
@@ -5568,6 +5607,7 @@ function handleError(sentry, analytics, err) {
 	try {
 		const response = new InternalServerErrorResponse(err);
 		if (sentry) sentry.captureException(err);
+		analytics.setData({ servedBy: "error" });
 		if (err instanceof Error) analytics.setData({ error: err.message });
 		return response;
 	} catch (e) {
@@ -5586,7 +5626,7 @@ function submitMetrics(analytics, performance, startTimeMs) {
 
 //#endregion
 //#region ../workers-shared/asset-worker/src/utils/kv.ts
-async function getAssetWithMetadataFromKV(assetsKVNamespace, assetKey, sentry, retries = 1) {
+async function getAssetWithMetadataFromKV(assetsKVNamespace, assetKey, sentry, retries = 3) {
 	let attempts = 0;
 	while (attempts <= retries) try {
 		const asset = await assetsKVNamespace.getWithMetadata(assetKey, {
@@ -5702,7 +5742,8 @@ async function runFetchRequest(request, env, ctx, exists, getByETag, cohort) {
 			compatibilityFlags: config.compatibility_flags,
 			userAgent,
 			entrypoint: EntrypointType.Inner,
-			cohort: cohort ?? "unknown"
+			cohort: cohort ?? "unknown",
+			requestKind: getRequestKind(request)
 		});
 		return await env.JAEGER.enterSpan("handleRequest", async (span) => {
 			span.setTags({
@@ -5726,7 +5767,8 @@ var AssetWorkerInner = class extends WorkerEntrypoint {
 		this.env.JAEGER ??= mockJaegerBinding();
 		const traceContext = this.ctx.props?.traceContext ?? null;
 		const cohort = this.ctx.version?.cohort;
-		const response = await this.env.JAEGER.runWithSpanContext(traceContext, () => runFetchRequest(request, this.env, this.ctx, this.unstable_exists.bind(this), this.unstable_getByETag.bind(this), cohort));
+		const runRequest = () => runFetchRequest(request, this.env, this.ctx, this.unstable_exists.bind(this), this.unstable_getByETag.bind(this), cohort);
+		const response = traceContext ? await this.env.JAEGER.runWithSpanContext(traceContext, runRequest) : await runRequest();
 		if (response instanceof Response) return response;
 		throw new Error("AssetWorkerInner fetch returned non-Response value.");
 	}

package/dist/workers/router-worker/index.js

@@ -6241,33 +6241,35 @@ function renderLimitedResponse(req) {
 
 //#endregion
 //#region ../workers-shared/router-worker/src/worker.ts
-var worker_default = { async fetch(request, env, ctx) {
-	const loopbackCtx = ctx;
-	const analytics = new Analytics(env.ANALYTICS);
-	let inner;
-	try {
-		if (env.COLO_METADATA && env.VERSION_METADATA && env.CONFIG) {
-			const url = new URL(request.url);
-			analytics.setData({
-				accountId: env.CONFIG.account_id,
-				scriptId: env.CONFIG.script_id,
-				coloId: env.COLO_METADATA.coloId,
-				metalId: env.COLO_METADATA.metalId,
-				coloTier: env.COLO_METADATA.coloTier,
-				coloRegion: env.COLO_METADATA.coloRegion,
-				hostname: url.hostname,
-				version: env.VERSION_METADATA.tag
-			});
+var RouterOuterEntrypoint = class extends WorkerEntrypoint {
+	async fetch(request) {
+		const loopbackCtx = this.ctx;
+		const analytics = new Analytics(this.env.ANALYTICS);
+		let inner;
+		try {
+			if (this.env.COLO_METADATA && this.env.VERSION_METADATA && this.env.CONFIG) {
+				const url = new URL(request.url);
+				analytics.setData({
+					accountId: this.env.CONFIG.account_id,
+					scriptId: this.env.CONFIG.script_id,
+					coloId: this.env.COLO_METADATA.coloId,
+					metalId: this.env.COLO_METADATA.metalId,
+					coloTier: this.env.COLO_METADATA.coloTier,
+					coloRegion: this.env.COLO_METADATA.coloRegion,
+					hostname: url.hostname,
+					version: this.env.VERSION_METADATA.tag
+				});
+			}
+			inner = loopbackCtx.exports.RouterInnerEntrypoint({ props: {} });
+		} catch (err) {
+			setupSentry(request, this.ctx, this.env.SENTRY_DSN, this.env.SENTRY_ACCESS_CLIENT_ID, this.env.SENTRY_ACCESS_CLIENT_SECRET, this.env.COLO_METADATA, this.env.VERSION_METADATA, this.env.CONFIG?.account_id, this.env.CONFIG?.script_id)?.captureException(err);
+			if (err instanceof Error) analytics.setData({ error: err.message });
+			analytics.write();
+			throw err;
 		}
-		inner = loopbackCtx.exports.RouterInnerEntrypoint({ props: {} });
-	} catch (err) {
-		setupSentry(request, ctx, env.SENTRY_DSN, env.SENTRY_ACCESS_CLIENT_ID, env.SENTRY_ACCESS_CLIENT_SECRET, env.COLO_METADATA, env.VERSION_METADATA, env.CONFIG?.account_id, env.CONFIG?.script_id)?.captureException(err);
-		if (err instanceof Error) analytics.setData({ error: err.message });
-		analytics.write();
-		throw err;
+		return inner.fetch(request);
 	}
-	return inner.fetch(request);
-} };
+};
 var RouterInnerEntrypoint = class extends WorkerEntrypoint {
 	async fetch(request) {
 		let sentry;
@@ -6391,6 +6393,7 @@ var RouterInnerEntrypoint = class extends WorkerEntrypoint {
 		}
 	}
 };
+var worker_default = RouterInnerEntrypoint;
 /**
 * Check if the Content Type is allowed for the the `_next/image` endpoint.
 *
@@ -6408,4 +6411,4 @@ function shouldBlockContentType(response) {
 }
 
 //#endregion
-export { RouterInnerEntrypoint, worker_default as default };
+export { RouterInnerEntrypoint, RouterOuterEntrypoint, worker_default as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "1.44.0",
+  "version": "1.45.1",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -45,13 +45,14 @@
   },
   "dependencies": {
     "unenv": "2.0.0-rc.24",
+    "workerd": "1.20260714.1",
     "ws": "8.21.0",
     "@cloudflare/unenv-preset": "2.16.1",
-    "miniflare": "4.20260708.1",
-    "wrangler": "4.110.0"
+    "wrangler": "4.112.0",
+    "miniflare": "4.20260714.0"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^5.20260708.1",
+    "@cloudflare/workers-types": "^5.20260714.1",
     "@remix-run/node-fetch-server": "^0.8.0",
     "@types/node": "22.15.17",
     "@types/semver": "^7.5.1",
@@ -71,16 +72,17 @@
     "vite": "8.0.13",
     "vite-legacy": "npm:vite@7.1.12",
     "vitest": "4.1.0",
+    "@cloudflare/config": "0.2.1",
     "@cloudflare/containers-shared": "0.16.0",
+    "@cloudflare/runtime-types": "0.0.3",
     "@cloudflare/mock-npm-registry": "0.0.0",
-    "@cloudflare/workers-shared": "0.19.7",
-    "@cloudflare/config": "0.0.0",
+    "@cloudflare/workers-shared": "0.19.9",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/workers-utils": "0.26.0"
+    "@cloudflare/workers-utils": "0.27.0"
   },
   "peerDependencies": {
     "vite": "^6.1.0 || ^7.0.0 || ^8.0.0",
-    "wrangler": "^4.110.0"
+    "wrangler": "^4.112.0"
   },
   "workers-sdk": {
     "prerelease": true

package/dist/package-BmIyCmGP.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"package-BmIyCmGP.mjs","names":[],"sources":["../package.json"],"sourcesContent":["{\n\t\"name\": \"@cloudflare/vite-plugin\",\n\t\"version\": \"1.44.0\",\n\t\"description\": \"Cloudflare plugin for Vite\",\n\t\"keywords\": [\n\t\t\"cloudflare\",\n\t\t\"cloudflare-workers\",\n\t\t\"vite\",\n\t\t\"vite-plugin\",\n\t\t\"workers\"\n\t],\n\t\"homepage\": \"https://github.com/cloudflare/workers-sdk/tree/main/packages/vite-plugin-cloudflare#readme\",\n\t\"bugs\": {\n\t\t\"url\": \"https://github.com/cloudflare/workers-sdk/issues\"\n\t},\n\t\"license\": \"MIT\",\n\t\"repository\": {\n\t\t\"type\": \"git\",\n\t\t\"url\": \"https://github.com/cloudflare/workers-sdk.git\",\n\t\t\"directory\": \"packages/vite-plugin-cloudflare\"\n\t},\n\t\"bin\": {\n\t\t\"cf-vite\": \"./bin/cf-vite\"\n\t},\n\t\"files\": [\n\t\t\"bin\",\n\t\t\"dist\"\n\t],\n\t\"type\": \"module\",\n\t\"sideEffects\": false,\n\t\"main\": \"./dist/index.mjs\",\n\t\"types\": \"./dist/index.d.mts\",\n\t\"exports\": {\n\t\t\".\": {\n\t\t\t\"types\": \"./dist/index.d.mts\",\n\t\t\t\"import\": \"./dist/index.mjs\"\n\t\t},\n\t\t\"./experimental-config\": {\n\t\t\t\"types\": \"./dist/experimental-config.d.mts\",\n\t\t\t\"import\": \"./dist/experimental-config.mjs\"\n\t\t}\n\t},\n\t\"publishConfig\": {\n\t\t\"access\": \"public\"\n\t},\n\t\"scripts\": {\n\t\t\"build\": \"tsdown\",\n\t\t\"check:type\": \"tsc --build\",\n\t\t\"dev\": \"tsdown --watch\",\n\t\t\"test\": \"vitest run\",\n\t\t\"test:ci\": \"pnpm test\",\n\t\t\"test:e2e\": \"vitest run -c e2e/vitest.config.ts\",\n\t\t\"test:watch\": \"vitest\"\n\t},\n\t\"dependencies\": {\n\t\t\"@cloudflare/unenv-preset\": \"workspace:*\",\n\t\t\"miniflare\": \"workspace:*\",\n\t\t\"unenv\": \"2.0.0-rc.24\",\n\t\t\"wrangler\": \"workspace:*\",\n\t\t\"ws\": \"catalog:default\"\n\t},\n\t\"devDependencies\": {\n\t\t\"@cloudflare/config\": \"workspace:*\",\n\t\t\"@cloudflare/containers-shared\": \"workspace:*\",\n\t\t\"@cloudflare/mock-npm-registry\": \"workspace:*\",\n\t\t\"@cloudflare/workers-shared\": \"workspace:*\",\n\t\t\"@cloudflare/workers-tsconfig\": \"workspace:*\",\n\t\t\"@cloudflare/workers-types\": \"catalog:default\",\n\t\t\"@cloudflare/workers-utils\": \"workspace:*\",\n\t\t\"@remix-run/node-fetch-server\": \"^0.8.0\",\n\t\t\"@types/node\": \"catalog:default\",\n\t\t\"@types/semver\": \"^7.5.1\",\n\t\t\"@types/ws\": \"^8.5.13\",\n\t\t\"defu\": \"^6.1.4\",\n\t\t\"get-port\": \"^7.1.0\",\n\t\t\"magic-string\": \"^0.30.12\",\n\t\t\"mlly\": \"^1.7.4\",\n\t\t\"open\": \"catalog:default\",\n\t\t\"picocolors\": \"^1.1.1\",\n\t\t\"qr\": \"^0.6.0\",\n\t\t\"semver\": \"^7.7.1\",\n\t\t\"tinyglobby\": \"catalog:default\",\n\t\t\"tree-kill\": \"catalog:default\",\n\t\t\"tsdown\": \"0.16.3\",\n\t\t\"typescript\": \"catalog:default\",\n\t\t\"vite\": \"catalog:default\",\n\t\t\"vite-legacy\": \"npm:vite@7.1.12\",\n\t\t\"vitest\": \"catalog:default\"\n\t},\n\t\"peerDependencies\": {\n\t\t\"vite\": \"^6.1.0 || ^7.0.0 || ^8.0.0\",\n\t\t\"wrangler\": \"workspace:^\"\n\t},\n\t\"workers-sdk\": {\n\t\t\"prerelease\": true\n\t}\n}\n"],"mappings":";sBAAA;OACS;UACG;cACI;WACH;EACX;EACA;EACA;EACA;EACA;EACA;WACW;OACJ,EACP,OAAO,oDACP;UACU;aACG;EACb,QAAQ;EACR,OAAO;EACP,aAAa;EACb;MACM,EACN,WAAW,iBACX;QACQ,CACR,OACA,OACA;OACO;cACO;OACP;QACC;UACE;EACV,KAAK;GACJ,SAAS;GACT,UAAU;GACV;EACD,yBAAyB;GACxB,SAAS;GACT,UAAU;GACV;EACD;gBACgB,EAChB,UAAU,UACV;UACU;EACV,SAAS;EACT,cAAc;EACd,OAAO;EACP,QAAQ;EACR,WAAW;EACX,YAAY;EACZ,cAAc;EACd;eACe;EACf,4BAA4B;EAC5B,aAAa;EACb,SAAS;EACT,YAAY;EACZ,MAAM;EACN;kBACkB;EAClB,sBAAsB;EACtB,iCAAiC;EACjC,iCAAiC;EACjC,8BAA8B;EAC9B,gCAAgC;EAChC,6BAA6B;EAC7B,6BAA6B;EAC7B,gCAAgC;EAChC,eAAe;EACf,iBAAiB;EACjB,aAAa;EACb,QAAQ;EACR,YAAY;EACZ,gBAAgB;EAChB,QAAQ;EACR,QAAQ;EACR,cAAc;EACd,MAAM;EACN,UAAU;EACV,cAAc;EACd,aAAa;EACb,UAAU;EACV,cAAc;EACd,QAAQ;EACR,eAAe;EACf,UAAU;EACV;mBACmB;EACnB,QAAQ;EACR,YAAY;EACZ;CACD,eAAe,EACd,cAAc,MACd;CACD"}