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

package/dist/entrypoints/preview.js

@@ -91,7 +91,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "13.0.0-alpha.1";
+  const version = "13.0.0-alpha.2";
   const localPrefix = `${colors.dim("\u2503")} Local    `;
   const networkPrefix = `${colors.dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);

package/dist/index.js

@@ -91,11 +91,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 +121,25 @@ function createIntegration(args) {
                           "astro > @oslojs/encoding",
                           "astro > es-module-lexer",
                           "astro > unstorage",
-                          "astro > neotraverse/modern"
+                          "astro > neotraverse/modern",
+                          "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"],
+                        exclude: ["astro:*"]
+                      }
+                    };
                   }
                 }
               },

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/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.2",
   "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.2",
     "astro-scripts": "0.0.14"
   },
   "publishConfig": {