@astrojs/cloudflare 3.0.0 → 3.1.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-@astrojs/cloudflare:build: cache hit, replaying output 3257cd3ed40cd0ec
+@astrojs/cloudflare:build: cache hit, replaying output bb5a25392613b0d2
 @astrojs/cloudflare:build: 
-@astrojs/cloudflare:build: > @astrojs/cloudflare@3.0.0 build /home/runner/work/astro/astro/packages/integrations/cloudflare
+@astrojs/cloudflare:build: > @astrojs/cloudflare@3.1.0 build /home/runner/work/astro/astro/packages/integrations/cloudflare
 @astrojs/cloudflare:build: > astro-scripts build "src/**/*.ts" && tsc
 @astrojs/cloudflare:build: 

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # @astrojs/cloudflare
 
+## 3.1.0
+
+### Minor Changes
+
+- [#5056](https://github.com/withastro/astro/pull/5056) [`e55af8a23`](https://github.com/withastro/astro/commit/e55af8a23233b6335f45b7a04b9d026990fb616c) Thanks [@matthewp](https://github.com/matthewp)! - # New build configuration
+
+  The ability to customize SSR build configuration more granularly is now available in Astro. You can now customize the output folder for `server` (the server code for SSR), `client` (your client-side JavaScript and assets), and `serverEntry` (the name of the entrypoint server module). Here are the defaults:
+
+  ```js
+  import { defineConfig } from 'astro/config';
+
+  export default defineConfig({
+    output: 'server',
+    build: {
+      server: './dist/server/',
+      client: './dist/client/',
+      serverEntry: 'entry.mjs',
+    },
+  });
+  ```
+
+  These new configuration options are only supported in SSR mode and are ignored when building to SSG (a static site).
+
+  ## Integration hook change
+
+  The integration hook `astro:build:start` includes a param `buildConfig` which includes all of these same options. You can continue to use this param in Astro 1.x, but it is deprecated in favor of the new `build.config` options. All of the built-in adapters have been updated to the new format. If you have an integration that depends on this param we suggest upgrading to do this instead:
+
+  ```js
+  export default function myIntegration() {
+    return {
+      name: 'my-integration',
+      hooks: {
+        'astro:config:setup': ({ updateConfig }) => {
+          updateConfig({
+            build: {
+              server: '...',
+            },
+          });
+        },
+      },
+    };
+  }
+  ```
+
 ## 3.0.0
 
 ### Major Changes

package/dist/index.js

@@ -19,13 +19,25 @@ const SHIM = `globalThis.process = {
 function createIntegration(args) {
   let _config;
   let _buildConfig;
+  let needsBuildConfig = false;
   const isModeDirectory = (args == null ? void 0 : args.mode) === "directory";
   return {
     name: "@astrojs/cloudflare",
     hooks: {
+      "astro:config:setup": ({ config, updateConfig }) => {
+        needsBuildConfig = !config.build.client;
+        updateConfig({
+          build: {
+            client: new URL("./static/", config.outDir),
+            server: new URL("./", config.outDir),
+            serverEntry: "_worker.js"
+          }
+        });
+      },
       "astro:config:done": ({ setAdapter, config }) => {
         setAdapter(getAdapter(isModeDirectory));
         _config = config;
+        _buildConfig = config.build;
         if (config.output === "static") {
           throw new Error(`
   [@astrojs/cloudflare] \`output: "server"\` is required to use this adapter. Otherwise, this adapter is not necessary to deploy a static site to Cloudflare.
@@ -33,12 +45,6 @@ function createIntegration(args) {
 `);
         }
       },
-      "astro:build:start": ({ buildConfig }) => {
-        _buildConfig = buildConfig;
-        buildConfig.client = new URL("./static/", _config.outDir);
-        buildConfig.serverEntry = "_worker.js";
-        buildConfig.server = new URL("./", _config.outDir);
-      },
       "astro:build:setup": ({ vite, target }) => {
         if (target === "server") {
           vite.resolve = vite.resolve || {};
@@ -55,6 +61,13 @@ function createIntegration(args) {
           vite.ssr.target = vite.ssr.target || "webworker";
         }
       },
+      "astro:build:start": ({ buildConfig }) => {
+        if (needsBuildConfig) {
+          buildConfig.client = new URL("./static/", _config.outDir);
+          buildConfig.server = new URL("./", _config.outDir);
+          buildConfig.serverEntry = "_worker.js";
+        }
+      },
       "astro:build:done": async () => {
         const entryUrl = new URL(_buildConfig.serverEntry, _buildConfig.server);
         const pkg = fileURLToPath(entryUrl);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to cloudflare pages functions",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -27,7 +27,7 @@
     "esbuild": "^0.14.42"
   },
   "devDependencies": {
-    "astro": "1.4.5",
+    "astro": "1.5.0",
     "astro-scripts": "0.0.8",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",

package/src/index.ts

@@ -1,4 +1,4 @@
-import type { AstroAdapter, AstroConfig, AstroIntegration, BuildConfig } from 'astro';
+import type { AstroAdapter, AstroConfig, AstroIntegration } from 'astro';
 import esbuild from 'esbuild';
 import * as fs from 'fs';
 import { fileURLToPath } from 'url';
@@ -7,6 +7,12 @@ type Options = {
 	mode: 'directory' | 'advanced';
 };
 
+interface BuildConfig {
+	server: URL;
+	client: URL;
+	serverEntry: string;
+}
+
 export function getAdapter(isModeDirectory: boolean): AstroAdapter {
 	return isModeDirectory
 		? {
@@ -29,14 +35,26 @@ const SHIM = `globalThis.process = {
 export default function createIntegration(args?: Options): AstroIntegration {
 	let _config: AstroConfig;
 	let _buildConfig: BuildConfig;
+	let needsBuildConfig = false;
 	const isModeDirectory = args?.mode === 'directory';
 
 	return {
 		name: '@astrojs/cloudflare',
 		hooks: {
+			'astro:config:setup': ({ config, updateConfig }) => {
+				needsBuildConfig = !config.build.client;
+				updateConfig({
+					build: {
+						client: new URL('./static/', config.outDir),
+						server: new URL('./', config.outDir),
+						serverEntry: '_worker.js',
+					},
+				});
+			},
 			'astro:config:done': ({ setAdapter, config }) => {
 				setAdapter(getAdapter(isModeDirectory));
 				_config = config;
+				_buildConfig = config.build;
 
 				if (config.output === 'static') {
 					throw new Error(`
@@ -45,12 +63,6 @@ export default function createIntegration(args?: Options): AstroIntegration {
 `);
 				}
 			},
-			'astro:build:start': ({ buildConfig }) => {
-				_buildConfig = buildConfig;
-				buildConfig.client = new URL('./static/', _config.outDir);
-				buildConfig.serverEntry = '_worker.js';
-				buildConfig.server = new URL('./', _config.outDir);
-			},
 			'astro:build:setup': ({ vite, target }) => {
 				if (target === 'server') {
 					vite.resolve = vite.resolve || {};
@@ -69,6 +81,14 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					vite.ssr.target = vite.ssr.target || 'webworker';
 				}
 			},
+			'astro:build:start': ({ buildConfig }) => {
+				// Backwards compat
+				if (needsBuildConfig) {
+					buildConfig.client = new URL('./static/', _config.outDir);
+					buildConfig.server = new URL('./', _config.outDir);
+					buildConfig.serverEntry = '_worker.js';
+				}
+			},
 			'astro:build:done': async () => {
 				const entryUrl = new URL(_buildConfig.serverEntry, _buildConfig.server);
 				const pkg = fileURLToPath(entryUrl);