@astrojs/cloudflare 6.6.1 → 7.0.0-beta.0

package/dist/index.js

@@ -1,19 +1,39 @@
 import { createRedirectsFromAstroRoutes } from "@astrojs/underscore-redirects";
 import esbuild from "esbuild";
-import * as fs from "fs";
-import * as os from "os";
-import { dirname } from "path";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import { sep } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import glob from "tiny-glob";
-import { fileURLToPath, pathToFileURL } from "url";
 function getAdapter(isModeDirectory) {
   return isModeDirectory ? {
     name: "@astrojs/cloudflare",
     serverEntrypoint: "@astrojs/cloudflare/server.directory.js",
-    exports: ["onRequest", "manifest"]
+    exports: ["onRequest", "manifest"],
+    supportedAstroFeatures: {
+      hybridOutput: "stable",
+      staticOutput: "unsupported",
+      serverOutput: "stable",
+      assets: {
+        supportKind: "unsupported",
+        isSharpCompatible: false,
+        isSquooshCompatible: false
+      }
+    }
   } : {
     name: "@astrojs/cloudflare",
     serverEntrypoint: "@astrojs/cloudflare/server.advanced.js",
-    exports: ["default"]
+    exports: ["default"],
+    supportedAstroFeatures: {
+      hybridOutput: "stable",
+      staticOutput: "unsupported",
+      serverOutput: "stable",
+      assets: {
+        supportKind: "stable",
+        isSharpCompatible: false,
+        isSquooshCompatible: false
+      }
+    }
   };
 }
 const SHIM = `globalThis.process = {
@@ -24,7 +44,7 @@ const SERVER_BUILD_FOLDER = "/$server_build/";
 function createIntegration(args) {
   let _config;
   let _buildConfig;
-  const isModeDirectory = (args == null ? void 0 : args.mode) === "directory";
+  const isModeDirectory = args?.mode === "directory";
   let _entryPoints = /* @__PURE__ */ new Map();
   return {
     name: "@astrojs/cloudflare",
@@ -68,23 +88,26 @@ function createIntegration(args) {
           }
           vite.ssr ||= {};
           vite.ssr.target = "webworker";
+          vite.define = {
+            "process.env": "process.env",
+            ...vite.define
+          };
         }
       },
       "astro:build:ssr": ({ entryPoints }) => {
         _entryPoints = entryPoints;
       },
       "astro:build:done": async ({ pages, routes, dir }) => {
-        var _a, _b, _c, _d;
         const functionsUrl = new URL("functions/", _config.root);
         if (isModeDirectory) {
           await fs.promises.mkdir(functionsUrl, { recursive: true });
         }
         if (isModeDirectory && _buildConfig.split) {
-          const entryPointsRouteData = [..._entryPoints.keys()];
           const entryPointsURL = [..._entryPoints.values()];
           const entryPaths = entryPointsURL.map((entry) => fileURLToPath(entry));
-          const outputDir = fileURLToPath(new URL(".astro", _buildConfig.server));
-          const { outputFiles } = await esbuild.build({
+          const outputUrl = new URL("$astro", _buildConfig.server);
+          const outputDir = fileURLToPath(outputUrl);
+          await esbuild.build({
             target: "es2020",
             platform: "browser",
             conditions: ["workerd", "worker", "browser"],
@@ -93,25 +116,37 @@ function createIntegration(args) {
             allowOverwrite: true,
             format: "esm",
             bundle: true,
-            minify: ((_b = (_a = _config.vite) == null ? void 0 : _a.build) == null ? void 0 : _b.minify) !== false,
+            minify: _config.vite?.build?.minify !== false,
             banner: {
               js: SHIM
             },
             logOverride: {
               "ignored-bare-import": "silent"
-            },
-            write: false
+            }
+          });
+          const outputFiles = await glob(`**/*`, {
+            cwd: outputDir,
+            filesOnly: true
           });
-          for (const [index, outputFile] of outputFiles.entries()) {
-            const fileName = entryPointsRouteData[index].component.replace("src/pages/", "").replace(".astro", ".js").replace(/(\[\.\.\.)(\w+)(\])/g, (_match, _p1, p2) => {
-              return `[[${p2}]]`;
+          for (const outputFile of outputFiles) {
+            const path = outputFile.split(sep);
+            const finalSegments = path.map(
+              (segment) => segment.replace(/(\_)(\w+)(\_)/g, (_, __, prop) => {
+                return `[${prop}]`;
+              }).replace(/(\_\-\-\-)(\w+)(\_)/g, (_, __, prop) => {
+                return `[[${prop}]]`;
+              })
+            );
+            finalSegments[finalSegments.length - 1] = finalSegments[finalSegments.length - 1].replace("entry.", "").replace(/(.*)\.(\w+)\.(\w+)$/g, (_, fileName, __, newExt) => {
+              return `${fileName}.${newExt}`;
             });
-            const fileUrl = new URL(fileName, functionsUrl);
-            const newFileDir = dirname(fileURLToPath(fileUrl));
-            if (!fs.existsSync(newFileDir)) {
-              fs.mkdirSync(newFileDir, { recursive: true });
-            }
-            await fs.promises.writeFile(fileUrl, outputFile.contents);
+            const finalDirPath = finalSegments.slice(0, -1).join(sep);
+            const finalPath = finalSegments.join(sep);
+            const newDirUrl = new URL(finalDirPath, functionsUrl);
+            await fs.promises.mkdir(newDirUrl, { recursive: true });
+            const oldFileUrl = new URL(`$astro/${outputFile}`, outputUrl);
+            const newFileUrl = new URL(finalPath, functionsUrl);
+            await fs.promises.rename(oldFileUrl, newFileUrl);
           }
         } else {
           const entryPath = fileURLToPath(new URL(_buildConfig.serverEntry, _buildConfig.server));
@@ -127,7 +162,7 @@ function createIntegration(args) {
             allowOverwrite: true,
             format: "esm",
             bundle: true,
-            minify: ((_d = (_c = _config.vite) == null ? void 0 : _c.build) == null ? void 0 : _d.minify) !== false,
+            minify: _config.vite?.build?.minify !== false,
             banner: {
               js: SHIM
             },

package/dist/server.advanced.d.ts

@@ -1,4 +1,4 @@
-import type { ExecutionContext, Request as CFRequest } from '@cloudflare/workers-types';
+import type { Request as CFRequest, ExecutionContext } from '@cloudflare/workers-types';
 import type { SSRManifest } from 'astro';
 type Env = {
     ASSETS: {

package/dist/server.directory.d.ts

@@ -1,10 +1,10 @@
-import type { EventContext, Request as CFRequest } from '@cloudflare/workers-types';
+import type { Request as CFRequest, EventContext } from '@cloudflare/workers-types';
 import type { SSRManifest } from 'astro';
 export declare function createExports(manifest: SSRManifest): {
     onRequest: ({ request, next, ...runtimeEnv }: {
         request: Request & CFRequest;
         next: (request: Request) => void;
         waitUntil: EventContext<unknown, any, unknown>['waitUntil'];
-    } & Record<string, unknown>) => Promise<void | Response>;
+    } & Record<string, unknown>) => Promise<import("@cloudflare/workers-types").Response | Response>;
     manifest: SSRManifest;
 };

package/dist/server.directory.js

@@ -13,7 +13,9 @@ function createExports(manifest) {
     process.env = runtimeEnv.env;
     const { pathname } = new URL(request.url);
     if (manifest.assets.has(pathname)) {
-      return next(request);
+      return runtimeEnv.env.ASSETS.fetch(
+        request
+      );
     }
     let routeData = app.match(request, { matchNotFound: true });
     if (routeData) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "6.6.1",
+  "version": "7.0.0-beta.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -32,20 +32,20 @@
     "runtime.d.ts"
   ],
   "dependencies": {
-    "@astrojs/underscore-redirects": "^0.2.0",
     "@cloudflare/workers-types": "^4.20230518.0",
-    "esbuild": "^0.17.19",
-    "tiny-glob": "^0.2.9"
+    "esbuild": "^0.18.16",
+    "tiny-glob": "^0.2.9",
+    "@astrojs/underscore-redirects": "0.3.0-beta.0"
   },
   "peerDependencies": {
-    "astro": "^2.8.2"
+    "astro": "^3.0.0-beta.0"
   },
   "devDependencies": {
     "chai": "^4.3.7",
     "cheerio": "1.0.0-rc.12",
     "mocha": "^9.2.2",
     "wrangler": "^2.0.23",
-    "astro": "2.8.2",
+    "astro": "3.0.0-beta.0",
     "astro-scripts": "0.0.14"
   },
   "scripts": {