@astrojs/cloudflare 13.0.0-alpha.1 → 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.1";
+  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
@@ -91,11 +65,13 @@ function createIntegration(args) {
               {
                 name: "@astrojs/cloudflare:cf-imports",
                 enforce: "pre",
-                resolveId(source) {
-                  if (source.startsWith("cloudflare:")) {
-                    return { id: source, external: true };
+                resolveId: {
+                  filter: {
+                    id: /^cloudflare:/
+                  },
+                  handler(id) {
+                    return { id, external: true };
                   }
-                  return null;
                 }
               },
               {
@@ -119,15 +95,25 @@ function createIntegration(args) {
                           "astro > @oslojs/encoding",
                           "astro > es-module-lexer",
                           "astro > unstorage",
-                          "astro > neotraverse/modern"
+                          "astro > neotraverse/modern",
+                          "astro > piccolore",
+                          "astro/app",
+                          "astro/compiler-runtime"
                         ],
                         exclude: [
                           "unstorage/drivers/cloudflare-kv-binding",
-                          "astro:toolbar:internal",
-                          "virtual:astro:middleware"
+                          "astro:*",
+                          "virtual:astro:*",
+                          "virtual:astro-cloudflare:*"
                         ]
                       }
                     };
+                  } else if (environmentName === "client") {
+                    return {
+                      optimizeDeps: {
+                        include: ["astro/runtime/client/dev-toolbar/entrypoint.js"]
+                      }
+                    };
                   }
                 }
               },
@@ -232,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;
           }
@@ -242,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) {
@@ -258,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;
           }
@@ -290,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/utils/cloudflare-module-loader.js

@@ -28,42 +28,45 @@ function cloudflareModuleLoader(enabled) {
         }
       };
     },
-    async load(id, _) {
-      const maybeExtension = extensions.find((x) => id.endsWith(x));
-      const moduleType = maybeExtension && adaptersByExtension[maybeExtension] || void 0;
-      if (!moduleType || !maybeExtension) {
-        return;
-      }
-      if (!enabled) {
-        throw new Error(
-          `Cloudflare module loading is experimental. The ${maybeExtension} module cannot be loaded unless you add \`cloudflareModules: true\` to your astro config.`
-        );
-      }
-      const moduleLoader = renderers[moduleType];
-      const filePath = id.replace(/\?\w+$/, "");
-      const extension = maybeExtension.replace(/\?\w+$/, "");
-      const data = await fs.readFile(filePath);
-      const base64 = data.toString("base64");
-      const inlineModule = moduleLoader(data);
-      if (isDev) {
-        return inlineModule;
+    load: {
+      filter: {
+        // Escape the dot in the regex
+        id: new RegExp(`.(${extensions.map((ext) => ext.slice(1)).join("|")})$`)
+      },
+      async handler(id, _) {
+        const maybeExtension = extensions.find((x) => id.endsWith(x));
+        const moduleType = adaptersByExtension[maybeExtension];
+        if (!enabled) {
+          throw new Error(
+            `Cloudflare module loading is experimental. The ${maybeExtension} module cannot be loaded unless you add \`cloudflareModules: true\` to your astro config.`
+          );
+        }
+        const moduleLoader = renderers[moduleType];
+        const filePath = id.replace(/\?\w+$/, "");
+        const extension = maybeExtension.replace(/\?\w+$/, "");
+        const data = await fs.readFile(filePath);
+        const base64 = data.toString("base64");
+        const inlineModule = moduleLoader(data);
+        if (isDev) {
+          return inlineModule;
+        }
+        const hash = hashString(base64);
+        const assetName = `${path.basename(filePath).split(".")[0]}.${hash}${extension}`;
+        this.emitFile({
+          type: "asset",
+          // emit the data explicitly as an asset with `fileName` rather than `name` so that
+          // vite doesn't give it a random hash-id in its name--We need to be able to easily rewrite from
+          // the loader and the actual asset later in the build for the worker
+          fileName: assetName,
+          source: data
+        });
+        const chunkId = this.emitFile({
+          type: "prebuilt-chunk",
+          fileName: assetName,
+          code: inlineModule
+        });
+        return `import module from "${MAGIC_STRING}${chunkId}${extension}";export default module;`;
       }
-      const hash = hashString(base64);
-      const assetName = `${path.basename(filePath).split(".")[0]}.${hash}${extension}`;
-      this.emitFile({
-        type: "asset",
-        // emit the data explicitly as an asset with `fileName` rather than `name` so that
-        // vite doesn't give it a random hash-id in its name--We need to be able to easily rewrite from
-        // the loader and the actual asset later in the build for the worker
-        fileName: assetName,
-        source: data
-      });
-      const chunkId = this.emitFile({
-        type: "prebuilt-chunk",
-        fileName: assetName,
-        code: inlineModule
-      });
-      return `import module from "${MAGIC_STRING}${chunkId}${extension}";export default module;`;
     },
     // output original wasm file relative to the chunk now that chunking has been achieved
     renderChunk(code, chunk, _) {

package/dist/vite-plugin-config.js

@@ -3,13 +3,19 @@ const RESOLVED_VIRTUAL_CONFIG_ID = "\0" + VIRTUAL_CONFIG_ID;
 function createConfigPlugin(config) {
   return {
     name: "vite:astro-cloudflare-config",
-    resolveId(id) {
-      if (id === VIRTUAL_CONFIG_ID) {
+    resolveId: {
+      filter: {
+        id: new RegExp(`^${VIRTUAL_CONFIG_ID}$`)
+      },
+      handler() {
         return RESOLVED_VIRTUAL_CONFIG_ID;
       }
     },
-    load(id) {
-      if (id === RESOLVED_VIRTUAL_CONFIG_ID) {
+    load: {
+      filter: {
+        id: new RegExp(`^${RESOLVED_VIRTUAL_CONFIG_ID}$`)
+      },
+      handler() {
         return `export const sessionKVBindingName = ${JSON.stringify(config.sessionKVBindingName)};`;
       }
     }

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.1",
+  "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.1",
+    "astro": "6.0.0-alpha.3",
     "astro-scripts": "0.0.14"
   },
   "publishConfig": {