@astrojs/cloudflare 0.2.4 → 0.3.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-@astrojs/cloudflare:build: cache hit, replaying output af6a8235acaf44a1
-@astrojs/cloudflare:build: 
-@astrojs/cloudflare:build: > @astrojs/cloudflare@0.2.4 build /home/runner/work/astro/astro/packages/integrations/cloudflare
-@astrojs/cloudflare:build: > astro-scripts build "src/**/*.ts" && tsc
-@astrojs/cloudflare:build: 
+@astrojs/cloudflare:build: cache hit, replaying output 7d2a1e1c56d7ba86
+@astrojs/cloudflare:build: 
+@astrojs/cloudflare:build: > @astrojs/cloudflare@0.3.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,44 @@
 # @astrojs/cloudflare
 
+## 0.3.0
+
+### Minor Changes
+
+- [#4015](https://github.com/withastro/astro/pull/4015) [`6fd161d76`](https://github.com/withastro/astro/commit/6fd161d7691cbf9d3ffa4646e46059dfd0940010) Thanks [@matthewp](https://github.com/matthewp)! - New `output` configuration option
+
+  This change introduces a new "output target" configuration option (`output`). Setting the output target lets you decide the format of your final build, either:
+
+  - `"static"` (default): A static site. Your final build will be a collection of static assets (HTML, CSS, JS) that you can deploy to any static site host.
+  - `"server"`: A dynamic server application. Your final build will be an application that will run in a hosted server environment, generating HTML dynamically for different requests.
+
+  If `output` is omitted from your config, the default value `"static"` will be used.
+
+  When using the `"server"` output target, you must also include a runtime adapter via the `adapter` configuration. An adapter will _adapt_ your final build to run on the deployed platform of your choice (Netlify, Vercel, Node.js, Deno, etc).
+
+  To migrate: No action is required for most users. If you currently define an `adapter`, you will need to also add `output: 'server'` to your config file to make it explicit that you are building a server. Here is an example of what that change would look like for someone deploying to Netlify:
+
+  ```diff
+  import { defineConfig } from 'astro/config';
+  import netlify from '@astrojs/netlify/functions';
+
+  export default defineConfig({
+    adapter: netlify(),
+  + output: 'server',
+  });
+  ```
+
+* [#4018](https://github.com/withastro/astro/pull/4018) [`0cc6ede36`](https://github.com/withastro/astro/commit/0cc6ede362996b9faba57481a790d6eb7fba2045) Thanks [@okikio](https://github.com/okikio)! - Support for 404 and 500 pages in SSR
+
+- [#3973](https://github.com/withastro/astro/pull/3973) [`5a23483ef`](https://github.com/withastro/astro/commit/5a23483efb3ba614b05a00064f84415620605204) Thanks [@matthewp](https://github.com/matthewp)! - Adds support for Astro.clientAddress
+
+  The new `Astro.clientAddress` property allows you to get the IP address of the requested user.
+
+  ```astro
+  <div>Your address { Astro.clientAddress }</div>
+  ```
+
+  This property is only available when building for SSR, and only if the adapter you are using supports providing the IP address. If you attempt to access the property in a SSG app it will throw an error.
+
 ## 0.2.4
 
 ### Patch Changes

package/README.md

@@ -9,6 +9,7 @@ import { defineConfig } from 'astro/config';
 import cloudflare from '@astrojs/cloudflare';
 
 export default defineConfig({
+  output: 'server',
   adapter: cloudflare()
 });
 ```

package/dist/index.js

@@ -17,6 +17,14 @@ function createIntegration() {
       "astro:config:done": ({ setAdapter, config }) => {
         setAdapter(getAdapter());
         _config = config;
+        if (config.output === "static") {
+          console.warn(
+            `[@astrojs/cloudflare] \`output: "server"\` is required to use this adapter.`
+          );
+          console.warn(
+            `[@astrojs/cloudflare] Otherwise, this adapter is not required to deploy a static site to Cloudflare.`
+          );
+        }
       },
       "astro:build:start": ({ buildConfig }) => {
         _buildConfig = buildConfig;

package/dist/server.js

@@ -8,12 +8,14 @@ function createExports(manifest) {
       const assetRequest = new Request(`${origin}/static${pathname}`, request);
       return env.ASSETS.fetch(assetRequest);
     }
-    if (app.match(request)) {
-      return app.render(request);
-    }
-    const _404Request = new Request(`${origin}/404`, request);
-    if (app.match(_404Request)) {
-      return app.render(_404Request);
+    let routeData = app.match(request, { matchNotFound: true });
+    if (routeData) {
+      Reflect.set(
+        request,
+        Symbol.for("astro.clientAddress"),
+        request.headers.get("cf-connecting-ip")
+      );
+      return app.render(request, routeData);
     }
     return new Response(null, {
       status: 404,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to cloudflare pages functions",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -25,7 +25,7 @@
     "esbuild": "^0.14.42"
   },
   "devDependencies": {
-    "astro": "1.0.0-beta.69",
+    "astro": "1.0.0-rc.1",
     "astro-scripts": "0.0.6"
   },
   "scripts": {

package/src/index.ts

@@ -21,6 +21,15 @@ export default function createIntegration(): AstroIntegration {
 			'astro:config:done': ({ setAdapter, config }) => {
 				setAdapter(getAdapter());
 				_config = config;
+
+				if (config.output === 'static') {
+					console.warn(
+						`[@astrojs/cloudflare] \`output: "server"\` is required to use this adapter.`
+					);
+					console.warn(
+						`[@astrojs/cloudflare] Otherwise, this adapter is not required to deploy a static site to Cloudflare.`
+					);
+				}
 			},
 			'astro:build:start': ({ buildConfig }) => {
 				_buildConfig = buildConfig;

package/src/server.ts

@@ -19,14 +19,14 @@ export function createExports(manifest: SSRManifest) {
 			return env.ASSETS.fetch(assetRequest);
 		}
 
-		if (app.match(request)) {
-			return app.render(request);
-		}
-
-		// 404
-		const _404Request = new Request(`${origin}/404`, request);
-		if (app.match(_404Request)) {
-			return app.render(_404Request);
+		let routeData = app.match(request, { matchNotFound: true });
+		if (routeData) {
+			Reflect.set(
+				request,
+				Symbol.for('astro.clientAddress'),
+				request.headers.get('cf-connecting-ip')
+			);
+			return app.render(request, routeData);
 		}
 
 		return new Response(null, {