@astrojs/cloudflare 13.0.0-alpha.2 → 13.0.0-alpha.3

package/dist/entrypoints/preview.js

@@ -6,28 +6,20 @@ import { cloudflare as cfVitePlugin } from "@cloudflare/vite-plugin";
 import colors from "piccolore";
 import { performance } from "node:perf_hooks";
 import { hasWranglerConfig, defaultCloudflareConfig } from "../wrangler.js";
-import { copyFileSync, existsSync } from "node:fs";
 const createPreviewServer = async ({
   logger,
   base,
-  outDir,
+  server,
   headers,
   port,
   host,
-  createCodegenDir,
   root
 }) => {
   const startServerTime = performance.now();
   let previewServer;
   let cfPluginConfig = { viteEnvironment: { name: "ssr" } };
-  if (!hasWranglerConfig(outDir)) {
+  if (!hasWranglerConfig(server)) {
     cfPluginConfig.config = defaultCloudflareConfig();
-    const codegenDir = createCodegenDir();
-    const devVarsPath = new URL(".dev.vars", outDir);
-    const devVarsCodegenPath = new URL(".dev.vars", codegenDir);
-    if (existsSync(devVarsPath)) {
-      copyFileSync(devVarsPath, devVarsCodegenPath);
-    }
   }
   try {
     previewServer = await preview({
@@ -35,7 +27,7 @@ const createPreviewServer = async ({
       base,
       appType: "mpa",
       build: {
-        outDir: fileURLToPath(outDir)
+        outDir: fileURLToPath(server)
       },
       root: fileURLToPath(root),
       preview: {
@@ -91,7 +83,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "13.0.0-alpha.2";
+  const version = "13.0.0-alpha.3";
   const localPrefix = `${colors.dim("\u2503")} Local    `;
   const networkPrefix = `${colors.dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);

package/dist/index.js

@@ -1,13 +1,9 @@
-import { createReadStream, copyFileSync, existsSync, readFileSync } from "node:fs";
+import { createReadStream, existsSync, readFileSync } from "node:fs";
 import { appendFile, stat } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { createInterface } from "node:readline/promises";
 import { pathToFileURL } from "node:url";
-import {
-  appendForwardSlash,
-  prependForwardSlash,
-  removeLeadingForwardSlash
-} from "@astrojs/internal-helpers/path";
+import { removeLeadingForwardSlash } from "@astrojs/internal-helpers/path";
 import { createRedirectsFromAstroRoutes, printAsRedirects } from "@astrojs/underscore-redirects";
 import { cloudflare as cfVitePlugin } from "@cloudflare/vite-plugin";
 import { cloudflareModuleLoader } from "./utils/cloudflare-module-loader.js";
@@ -16,9 +12,7 @@ import { setImageConfig } from "./utils/image-config.js";
 import { createConfigPlugin } from "./vite-plugin-config.js";
 import { hasWranglerConfig, defaultCloudflareConfig } from "./wrangler.js";
 import { parse } from "dotenv";
-function wrapWithSlashes(path) {
-  return prependForwardSlash(appendForwardSlash(path));
-}
+import { sessionDrivers } from "astro/config";
 function createIntegration(args) {
   let _config;
   let finalBuildOutput;
@@ -30,53 +24,33 @@ function createIntegration(args) {
   return {
     name: "@astrojs/cloudflare",
     hooks: {
-      "astro:config:setup": ({
-        command,
-        config,
-        updateConfig,
-        logger,
-        addWatchFile,
-        createCodegenDir
-      }) => {
+      "astro:config:setup": ({ command, config, updateConfig, logger, addWatchFile }) => {
         let session = config.session;
         if (args?.imageService === "cloudflare-binding") {
           const bindingName = args?.imagesBindingName ?? "IMAGES";
           logger.info(
             `Enabling image processing with Cloudflare Images for production with the "${bindingName}" Images binding.`
           );
-          logger.info(
-            `If you see the error "Invalid binding \`${bindingName}\`" in your build output, you need to add the binding to your wrangler config file.`
-          );
         }
         if (!session?.driver) {
           logger.info(
             `Enabling sessions with Cloudflare KV with the "${SESSION_KV_BINDING_NAME}" KV binding.`
           );
-          logger.info(
-            `If you see the error "Invalid binding \`${SESSION_KV_BINDING_NAME}\`" in your build output, you need to add the binding to your wrangler config file.`
-          );
           session = {
-            ...session,
-            driver: "cloudflare-kv-binding",
-            options: {
-              binding: SESSION_KV_BINDING_NAME,
-              ...session?.options
-            }
+            driver: sessionDrivers.cloudflareKVBinding({
+              binding: SESSION_KV_BINDING_NAME
+            }),
+            cookie: session?.cookie,
+            ttl: session?.ttl
           };
         }
         const cfPluginConfig = { viteEnvironment: { name: "ssr" } };
         if (!hasWranglerConfig(config.root)) {
           cfPluginConfig.config = defaultCloudflareConfig();
-          const codegenDir = createCodegenDir();
-          const devVarsPath = new URL(".dev.vars", config.root);
-          const devVarsCodegenPath = new URL(".dev.vars", codegenDir);
-          if (existsSync(devVarsPath)) {
-            copyFileSync(devVarsPath, devVarsCodegenPath);
-          }
         }
         updateConfig({
           build: {
-            client: new URL(`.${wrapWithSlashes(config.base)}`, config.outDir),
+            client: new URL(`./client/`, config.outDir),
             server: new URL("./_worker.js/", config.outDir),
             serverEntry: "index.js",
             redirects: false
@@ -122,6 +96,7 @@ function createIntegration(args) {
                           "astro > es-module-lexer",
                           "astro > unstorage",
                           "astro > neotraverse/modern",
+                          "astro > piccolore",
                           "astro/app",
                           "astro/compiler-runtime"
                         ],
@@ -136,8 +111,7 @@ function createIntegration(args) {
                   } else if (environmentName === "client") {
                     return {
                       optimizeDeps: {
-                        include: ["astro/runtime/client/dev-toolbar/entrypoint.js"],
-                        exclude: ["astro:*"]
+                        include: ["astro/runtime/client/dev-toolbar/entrypoint.js"]
                       }
                     };
                   }
@@ -244,7 +218,7 @@ function createIntegration(args) {
       "astro:build:done": async ({ pages, dir, logger, assets }) => {
         let redirectsExists = false;
         try {
-          const redirectsStat = await stat(new URL("./_redirects", _config.outDir));
+          const redirectsStat = await stat(new URL("./_redirects", _config.build.client));
           if (redirectsStat.isFile()) {
             redirectsExists = true;
           }
@@ -254,7 +228,7 @@ function createIntegration(args) {
         const redirects = [];
         if (redirectsExists) {
           const rl = createInterface({
-            input: createReadStream(new URL("./_redirects", _config.outDir)),
+            input: createReadStream(new URL("./_redirects", _config.build.client)),
             crlfDelay: Number.POSITIVE_INFINITY
           });
           for await (const line of rl) {
@@ -270,7 +244,7 @@ function createIntegration(args) {
         }
         let routesExists = false;
         try {
-          const routesStat = await stat(new URL("./_routes.json", _config.outDir));
+          const routesStat = await stat(new URL("./_routes.json", _config.build.client));
           if (routesStat.isFile()) {
             routesExists = true;
           }
@@ -302,7 +276,7 @@ function createIntegration(args) {
         if (!trueRedirects.empty()) {
           try {
             await appendFile(
-              new URL("./_redirects", _config.outDir),
+              new URL("./_redirects", _config.build.client),
               printAsRedirects(trueRedirects)
             );
           } catch (_error) {

package/dist/wrangler.js

@@ -7,6 +7,7 @@ function defaultCloudflareConfig() {
     // TODO: better way to handle name, maybe package.json#name ?
     name: "test-application",
     compatibility_date: "2025-05-21",
+    compatibility_flags: ["global_fetch_strictly_public"],
     main: "@astrojs/cloudflare/entrypoints/server",
     assets: {
       directory: "./dist",
@@ -17,8 +18,8 @@ function defaultCloudflareConfig() {
     },
     kv_namespaces: [
       {
-        binding: "SESSION",
-        id: "SESSION"
+        binding: "SESSION"
+        // KV with no binding gets automatically created
       }
     ]
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "13.0.0-alpha.2",
+  "version": "13.0.0-alpha.3",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -51,7 +51,7 @@
     "cheerio": "1.1.2",
     "devalue": "^5.5.0",
     "rollup": "^4.53.3",
-    "astro": "6.0.0-alpha.2",
+    "astro": "6.0.0-alpha.3",
     "astro-scripts": "0.0.14"
   },
   "publishConfig": {