@vinext/cloudflare 1.0.0-beta.0 → 1.0.0-beta.1

package/dist/cache/kv-data-adapter.runtime.js

@@ -324,7 +324,7 @@ var KVCacheHandler = class {
 		return promise;
 	}
 };
-const VALID_KINDS = new Set([
+const VALID_KINDS = /* @__PURE__ */ new Set([
 	"FETCH",
 	"APP_PAGE",
 	"PAGES",

package/dist/deploy.js

@@ -14,8 +14,8 @@ import { parseArgs } from "node:util";
 import { pathToFileURL } from "node:url";
 import { runPrerender } from "vinext/internal/build/run-prerender";
 import { loadDotenv } from "vinext/internal/config/dotenv";
-import { loadNextConfig, resolveNextConfig } from "vinext/internal/config/next-config";
-import { formatVinextPrerenderLabel, loadVinextCacheConfigFromViteConfig, loadVinextPrerenderConfigFromViteConfig, loadVinextRouteRootConfigFromViteConfig, resolveVinextPrerenderDecision } from "vinext/internal/config/prerender";
+import { findVinextNextConfigInPlugins, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "vinext/internal/config/next-config";
+import { findVinextCacheConfigInPlugins, findVinextPrerenderConfigInPlugins, findVinextRouteRootConfigInPlugins, formatVinextPrerenderLabel, resolveVinextPrerenderDecision } from "vinext/internal/config/prerender";
 import { detectProject, findInNodeModules, formatMissingCloudflarePluginError, getMissingDeps } from "vinext/internal/utils/project";
 import { PHASE_PRODUCTION_BUILD } from "vinext/shims/constants";
 //#region src/deploy.ts
@@ -164,6 +164,18 @@ async function loadProjectViteApi(root) {
 	}
 	return await (vitePath === "vite" ? import(vitePath) : import(pathToFileURL(vitePath).href));
 }
+async function loadDeployViteConfigMetadata(root) {
+	const plugins = (await (await loadProjectViteApi(root)).loadConfigFromFile({
+		command: "build",
+		mode: "production"
+	}, void 0, root))?.config.plugins;
+	return {
+		cacheConfig: viteConfigHasCacheAdapter(root) ? await findVinextCacheConfigInPlugins(plugins) : null,
+		nextConfig: await findVinextNextConfigInPlugins(plugins),
+		prerenderConfig: await findVinextPrerenderConfigInPlugins(plugins),
+		routeRootConfig: await findVinextRouteRootConfigInPlugins(plugins)
+	};
+}
 async function runBuild(info, env) {
 	console.log("\n  Building for Cloudflare Workers...\n");
 	const { createBuilder } = await loadProjectViteApi(info.root);
@@ -171,10 +183,8 @@ async function runBuild(info, env) {
 		await (await createBuilder({ root: info.root })).buildApp();
 	});
 }
-async function populateKVCacheFromPrerenderedArtifacts(root, buildEnv, wranglerEnv) {
-	if (!viteConfigHasCacheAdapter(root)) return;
-	const vite = await loadProjectViteApi(root);
-	const kvConfig = resolveKvDataAdapterConfig(await withCloudflareEnv(buildEnv, () => loadVinextCacheConfigFromViteConfig(vite, root)));
+async function populateKVCacheFromPrerenderedArtifacts(root, wranglerEnv, cacheConfig) {
+	const kvConfig = resolveKvDataAdapterConfig(cacheConfig);
 	if (!kvConfig) return;
 	const { routeCount, pairs } = buildPrerenderKVPairs(path.join(root, "dist", "server"), {
 		appPrefix: kvConfig.appPrefix,
@@ -483,11 +493,13 @@ async function deploy(options) {
 		console.log("\n  Dry run complete. No build or deploy performed.\n");
 		return;
 	}
-	const nextConfig = await resolveNextConfig(await loadNextConfig(info.root, PHASE_PRODUCTION_BUILD), info.root);
 	const buildEnv = deployEnv === "production" && !options.env ? void 0 : deployEnv;
-	const vinextPrerenderConfig = !options.prerenderAll && nextConfig.output !== "export" ? await withCloudflareEnv(buildEnv, async () => {
-		return loadVinextPrerenderConfigFromViteConfig(await loadProjectViteApi(info.root), info.root);
-	}) : null;
+	const viteConfigMetadata = await withCloudflareEnv(buildEnv, () => loadDeployViteConfigMetadata(info.root));
+	const nextConfig = await withCloudflareEnv(buildEnv, async () => {
+		const inlineNextConfig = viteConfigMetadata.nextConfig;
+		return resolveNextConfig(inlineNextConfig ? await resolveNextConfigInput(inlineNextConfig, PHASE_PRODUCTION_BUILD) : await loadNextConfig(info.root, PHASE_PRODUCTION_BUILD), info.root);
+	});
+	const vinextPrerenderConfig = !options.prerenderAll && nextConfig.output !== "export" ? viteConfigMetadata.prerenderConfig : null;
 	const prerenderDecision = resolveVinextPrerenderDecision({
 		prerenderAllFlag: options.prerenderAll,
 		vinextPrerenderConfig,
@@ -496,16 +508,11 @@ async function deploy(options) {
 	const shouldEmitPrerenderPathManifest = options.warmCdnCache || !options.skipBuild && prerenderDecision;
 	if (!options.skipBuild) await runBuild(info, buildEnv);
 	else console.log("\n  Skipping build (--skip-build)");
-	if (shouldEmitPrerenderPathManifest) {
-		const routeRootConfig = await withCloudflareEnv(buildEnv, async () => {
-			return loadVinextRouteRootConfigFromViteConfig(await loadProjectViteApi(info.root), info.root);
-		});
-		await emitPrerenderPathManifest({
-			root: info.root,
-			nextConfigOverride: nextConfig,
-			routeRootConfig
-		});
-	}
+	if (shouldEmitPrerenderPathManifest) await emitPrerenderPathManifest({
+		root: info.root,
+		nextConfig,
+		routeRootConfig: viteConfigMetadata.routeRootConfig
+	});
 	let ranPrerender = false;
 	if (prerenderDecision) {
 		console.log(`\n  ${formatVinextPrerenderLabel(prerenderDecision)}`);
@@ -515,12 +522,13 @@ async function deploy(options) {
 		}
 		await runPrerender({
 			root: info.root,
-			concurrency: options.prerenderConcurrency
+			concurrency: options.prerenderConcurrency,
+			nextConfig
 		});
 		ranPrerender = true;
 	}
 	if (ranPrerender) try {
-		await populateKVCacheFromPrerenderedArtifacts(root, buildEnv, deployEnv === "production" && !options.env ? void 0 : deployEnv);
+		await populateKVCacheFromPrerenderedArtifacts(root, deployEnv === "production" && !options.env ? void 0 : deployEnv, viteConfigMetadata.cacheConfig);
 	} catch (error) {
 		console.log(`  KV cache: Skipping prerender upload (${formatUnknownError(error)}). Continuing with deploy.`);
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vinext/cloudflare",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0-beta.1",
   "description": "Cloudflare adapters for vinext (KV data cache and Images-backed image optimization).",
   "license": "MIT",
   "repository": {
@@ -52,8 +52,9 @@
   },
   "devDependencies": {
     "@types/node": "^25.9.2",
-    "vite-plus": "0.2.1",
-    "vinext": "1.0.0-beta.0"
+    "vite": "npm:@voidzero-dev/vite-plus-core@0.2.2",
+    "vite-plus": "0.2.2",
+    "vinext": "1.0.0-beta.1"
   },
   "peerDependencies": {
     "vinext": ">=0.0.0"