Merge branch 'main' into fix/astro-content-deprecated-functions

withastro · Aug 2, 2024 · 6b96ffc · 6b96ffc
2 parents 4a94ca8 + 1b3c81c
commit 6b96ffc
Show file tree

Hide file tree

Showing 35 changed files with 131 additions and 121 deletions.
diff --git a/.changeset/many-mayflies-enjoy.md b/.changeset/many-mayflies-enjoy.md
diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.13.0"
+    "astro": "^4.13.1"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^3.1.3",
     "@astrojs/rss": "^4.0.7",
     "@astrojs/sitemap": "^3.1.6",
-    "astro": "^4.13.0"
+    "astro": "^4.13.1"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.13.0"
+    "astro": "^4.13.1"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

diff --git a/examples/container-with-vitest/package.json b/examples/container-with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "@astrojs/react": "^3.6.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.4.0",
     "@types/alpinejs": "^3.13.10",
     "alpinejs": "^3.14.1",
-    "astro": "^4.13.0"
+    "astro": "^4.13.1"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^4.3.0",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "lit": "^3.1.4"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -18,7 +18,7 @@
     "@astrojs/vue": "^4.5.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "preact": "^10.23.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.5.1",
     "@preact/signals": "^1.3.0",
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "preact": "^10.23.1"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.6.1",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^4.4.0",
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "solid-js": "^1.8.19"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.7.0",
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "svelte": "^4.2.18"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^4.5.0",
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "vue": "^3.4.35"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.3.2",
-    "astro": "^4.13.0"
+    "astro": "^4.13.1"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.13.0"
+    "astro": "^4.13.1"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

diff --git a/examples/middleware/package.json b/examples/middleware/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.3.2",
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "html-minifier": "^4.0.0"
   },
   "devDependencies": {

diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.13.0"
+    "astro": "^4.13.1"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.13.0"
+    "astro": "^4.13.1"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.13.0"
+    "astro": "^4.13.1"
   }
 }
diff --git a/examples/server-islands/package.json b/examples/server-islands/package.json
@@ -17,7 +17,7 @@
     "@tailwindcss/forms": "^0.5.7",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "postcss": "^8.4.40",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^8.3.2",
     "@astrojs/svelte": "^5.7.0",
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "svelte": "^4.2.18"
   }
 }
diff --git a/examples/starlog/package.json b/examples/starlog/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "sass": "^1.77.8",
     "sharp": "^0.33.3"
   }

diff --git a/examples/toolbar-app/package.json b/examples/toolbar-app/package.json
@@ -15,6 +15,6 @@
     "./app": "./dist/app.js"
   },
   "devDependencies": {
-    "astro": "^4.13.0"
+    "astro": "^4.13.1"
   }
 }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^5.1.0",
     "@astrojs/node": "^8.3.2",
-    "astro": "^4.13.0"
+    "astro": "^4.13.1"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.11.3",
-    "astro": "^4.13.0"
+    "astro": "^4.13.1"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^5.2.0",
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",

diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.13.0"
+    "astro": "^4.13.1"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^3.1.3",
     "@astrojs/preact": "^3.5.1",
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "preact": "^10.23.1"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.5.1",
     "@nanostores/preact": "^0.5.1",
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "nanostores": "^0.10.3",
     "preact": "^10.23.1"
   }

diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^3.1.3",
     "@astrojs/tailwind": "^5.1.0",
     "@types/canvas-confetti": "^1.6.4",
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "autoprefixer": "^10.4.19",
     "canvas-confetti": "^1.9.3",
     "postcss": "^8.4.40",

diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.13.0",
+    "astro": "^4.13.1",
     "vitest": "^2.0.5"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,69 @@
 # astro
 
+## 4.13.1
+
+### Patch Changes
+
+- [#11584](https://github.com/withastro/astro/pull/11584) [`a65ffe3`](https://github.com/withastro/astro/commit/a65ffe314b112213421def26c7cc5b7e7b93558c) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Removes async local storage dependency from Astro Actions. This allows Actions to run in Cloudflare and Stackblitz without opt-in flags or other configuration.
+
+  This also introduces a new convention for calling actions from server code. Instead of calling actions directly, you must wrap function calls with the new `Astro.callAction()` utility.
+
+  > `callAction()` is meant to _trigger_ an action from server code. `getActionResult()` usage with form submissions remains unchanged.
+
+  ```astro
+  ---
+  import { actions } from 'astro:actions';
+
+  const result = await Astro.callAction(actions.searchPosts, {
+    searchTerm: Astro.url.searchParams.get('search'),
+  });
+  ---
+
+  {
+    result.data &&
+      {
+        /* render the results */
+      }
+  }
+  ```
+
+  ## Migration
+
+  If you call actions directly from server code, update function calls to use the `Astro.callAction()` wrapper for pages and `context.callAction()` for endpoints:
+
+  ```diff
+  ---
+  import { actions } from 'astro:actions';
+
+  - const result = await actions.searchPosts({ searchTerm: 'test' });
+  + const result = await Astro.callAction(actions.searchPosts, { searchTerm: 'test' });
+  ---
+  ```
+
+  If you deploy with Cloudflare and added [the `nodejs_compat` or `nodejs_als` flags](https://developers.cloudflare.com/workers/runtime-apis/nodejs) for Actions, we recommend removing these:
+
+  ```diff
+  compatibility_flags = [
+  - "nodejs_compat",
+  - "nodejs_als"
+  ]
+  ```
+
+  You can also remove `node:async_hooks` from the `vite.ssr.external` option in your `astro.config` file:
+
+  ```diff
+  // astro.config.mjs
+  import { defineConfig } from 'astro/config';
+
+  export default defineConfig({
+  - vite: {
+  -   ssr: {
+  -     external: ["node:async_hooks"]
+  -   }
+  - }
+  })
+  ```
+
 ## 4.13.0
 
 ### Minor Changes

diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.13.0",
+  "version": "4.13.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",