diff options
35 files changed, 117 insertions, 120 deletions
diff --git a/.changeset/flat-snakes-hammer.md b/.changeset/flat-snakes-hammer.md deleted file mode 100644 index 787d2899d..000000000 --- a/.changeset/flat-snakes-hammer.md +++ /dev/null @@ -1,54 +0,0 @@ ---- -"@astrojs/vercel": minor ---- - -Introduces a new config option, `isr`, that allows you to deploy your project as an ISR function. [ISR (Incremental Static Regeneration)](https://vercel.com/docs/incremental-static-regeneration) caches your on-demand rendered pages in the same way as prerendered pages after first request. - -To enable this feature, set `isr` to true in your Vercel adapter configuration in `astro.config.mjs`: - -```js -export default defineConfig({ - output: "server", - adapter: vercel({ isr: true }) -}) -``` - - -## Cache invalidation options - -By default, ISR responses are cached for the duration of your deployment. You can further control caching by setting an `expiration` time or prevent caching entirely for certain routes. - -### Time-based invalidation - -You can change the length of time to cache routes this by configuring an `expiration` value in seconds: - -```js -export default defineConfig({ - output: "server", - adapter: vercel({ - isr: { - // caches all pages on first request and saves for 1 day - expiration: 60 * 60 * 24 - } - }) -}) -``` - -### Manual invalidation - -To implement Vercel's [Draft mode](https://vercel.com/docs/build-output-api/v3/features#draft-mode), or [On-Demand Incremental Static Regeneration (ISR)](https://vercel.com/docs/build-output-api/v3/features#on-demand-incremental-static-regeneration-isr), you can create a bypass token and provide it to the `isr` config along with the paths to exclude from caching: - -```js -export default defineConfig({ - output: "server", - adapter: vercel({ - isr: { - // A secret random string that you create. - bypassToken: "005556d774a8", - // Paths that will always be served fresh. - exclude: [ "/api/invalidate" ] - } - }) -}) -``` - diff --git a/.changeset/slimy-ravens-stare.md b/.changeset/slimy-ravens-stare.md deleted file mode 100644 index b1655b200..000000000 --- a/.changeset/slimy-ravens-stare.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"astro": patch ---- - -Fixes a regression in content collection types diff --git a/.changeset/strong-pets-rhyme.md b/.changeset/strong-pets-rhyme.md deleted file mode 100644 index eea88944f..000000000 --- a/.changeset/strong-pets-rhyme.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"astro": patch ---- - -Adds support for `.strict()` on content collection schemas when a custom `slug` is present. diff --git a/examples/basics/package.json b/examples/basics/package.json index 68239df0b..12b34a782 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.3.3" + "astro": "^4.3.4" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index be054f12e..0901434a6 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^2.1.1", "@astrojs/rss": "^4.0.5", "@astrojs/sitemap": "^3.0.5", - "astro": "^4.3.3" + "astro": "^4.3.4" } } diff --git a/examples/component/package.json b/examples/component/package.json index 90e2292d5..cdf0f683c 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^4.3.3" + "astro": "^4.3.4" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index b44c6f6dc..1bd1e723b 100644 --- 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.5", "alpinejs": "^3.13.3", - "astro": "^4.3.3" + "astro": "^4.3.4" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 63e83e7c6..14d603d23 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^4.0.1", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^4.3.3", + "astro": "^4.3.4", "lit": "^3.1.2" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index fff7e80c9..d90d024f8 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -16,7 +16,7 @@ "@astrojs/solid-js": "^4.0.1", "@astrojs/svelte": "^5.0.3", "@astrojs/vue": "^4.0.8", - "astro": "^4.3.3", + "astro": "^4.3.4", "preact": "^10.19.2", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 5a5e27c83..6609bb562 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.1.0", "@preact/signals": "^1.2.1", - "astro": "^4.3.3", + "astro": "^4.3.4", "preact": "^10.19.2" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 93727ee92..b2f3f0556 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^3.0.9", "@types/react": "^18.2.37", "@types/react-dom": "^18.2.15", - "astro": "^4.3.3", + "astro": "^4.3.4", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index b97d7961c..7720633c0 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/solid-js": "^4.0.1", - "astro": "^4.3.3", + "astro": "^4.3.4", "solid-js": "^1.8.5" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index ad464495f..927975ddf 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/svelte": "^5.0.3", - "astro": "^4.3.3", + "astro": "^4.3.4", "svelte": "^4.2.5" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index b6bd40606..61b9f7640 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^4.0.8", - "astro": "^4.3.3", + "astro": "^4.3.4", "vue": "^3.3.8" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index f288712bc..1e6d6b545 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^8.2.0", - "astro": "^4.3.3" + "astro": "^4.3.4" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 73e528156..c1e74a884 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^4.3.3" + "astro": "^4.3.4" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index 9657a88d8..518620711 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@astrojs/node": "^8.2.0", - "astro": "^4.3.3", + "astro": "^4.3.4", "html-minifier": "^4.0.0" }, "devDependencies": { diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 00b690849..18506877e 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.3.3" + "astro": "^4.3.4" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 11eb244dd..e300458fb 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.3.3" + "astro": "^4.3.4" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index b8721ae9d..e02337e4a 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.3.3" + "astro": "^4.3.4" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 9541ba951..dac64007d 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -14,7 +14,7 @@ "dependencies": { "@astrojs/node": "^8.2.0", "@astrojs/svelte": "^5.0.3", - "astro": "^4.3.3", + "astro": "^4.3.4", "svelte": "^4.2.5" } } diff --git a/examples/starlog/package.json b/examples/starlog/package.json index 83e96f772..7b32b9b32 100644 --- a/examples/starlog/package.json +++ b/examples/starlog/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.3.3", + "astro": "^4.3.4", "sass": "^1.69.5", "sharp": "^0.32.6" } diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json index fdeac8f8c..d4b4de99e 100644 --- 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.2.0", - "astro": "^4.3.3" + "astro": "^4.3.4" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 2a3bc7a64..5500134e0 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.8.3", - "astro": "^4.3.3" + "astro": "^4.3.4" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index d28a77cd1..b357e8531 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdown-remark": "^4.2.1", - "astro": "^4.3.3", + "astro": "^4.3.4", "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 index b366d25e4..e62973633 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.3.3" + "astro": "^4.3.4" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index d11fb1623..eb587275d 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/mdx": "^2.1.1", "@astrojs/preact": "^3.1.0", - "astro": "^4.3.3", + "astro": "^4.3.4", "preact": "^10.19.2" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index cf92a5428..b3b3c515b 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.1.0", "@nanostores/preact": "^0.5.0", - "astro": "^4.3.3", + "astro": "^4.3.4", "nanostores": "^0.9.5", "preact": "^10.19.2" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index c43365294..ae8b7a433 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -14,7 +14,7 @@ "@astrojs/mdx": "^2.1.1", "@astrojs/tailwind": "^5.1.0", "@types/canvas-confetti": "^1.6.3", - "astro": "^4.3.3", + "astro": "^4.3.4", "autoprefixer": "^10.4.15", "canvas-confetti": "^1.9.1", "postcss": "^8.4.28", diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index c5717d0d1..40df088ae 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^4.3.3", + "astro": "^4.3.4", "vitest": "^1.2.1" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 0abb65bd0..7a61a7996 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,13 @@ # astro +## 4.3.4 + +### Patch Changes + +- [#10013](https://github.com/withastro/astro/pull/10013) [`e6b5306a7de779ce495d0ff076d302de0aa57eaf`](https://github.com/withastro/astro/commit/e6b5306a7de779ce495d0ff076d302de0aa57eaf) Thanks [@delucis](https://github.com/delucis)! - Fixes a regression in content collection types + +- [#10003](https://github.com/withastro/astro/pull/10003) [`ce4283331f18c6178654dd705e3cf02efeef004a`](https://github.com/withastro/astro/commit/ce4283331f18c6178654dd705e3cf02efeef004a) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Adds support for `.strict()` on content collection schemas when a custom `slug` is present. + ## 4.3.3 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 0d73a1be4..f0b60bc44 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "4.3.3", + "version": "4.3.4", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/packages/integrations/vercel/CHANGELOG.md b/packages/integrations/vercel/CHANGELOG.md index fabdbd061..7d3992dd6 100644 --- a/packages/integrations/vercel/CHANGELOG.md +++ b/packages/integrations/vercel/CHANGELOG.md @@ -1,5 +1,58 @@ # @astrojs/vercel +## 7.2.0 + +### Minor Changes + +- [#9714](https://github.com/withastro/astro/pull/9714) [`e2fe51c828dc7ea8204788e59e3953fe36c97836`](https://github.com/withastro/astro/commit/e2fe51c828dc7ea8204788e59e3953fe36c97836) Thanks [@lilnasy](https://github.com/lilnasy)! - Introduces a new config option, `isr`, that allows you to deploy your project as an ISR function. [ISR (Incremental Static Regeneration)](https://vercel.com/docs/incremental-static-regeneration) caches your on-demand rendered pages in the same way as prerendered pages after first request. + + To enable this feature, set `isr` to true in your Vercel adapter configuration in `astro.config.mjs`: + + ```js + export default defineConfig({ + output: 'server', + adapter: vercel({ isr: true }), + }); + ``` + + ## Cache invalidation options + + By default, ISR responses are cached for the duration of your deployment. You can further control caching by setting an `expiration` time or prevent caching entirely for certain routes. + + ### Time-based invalidation + + You can change the length of time to cache routes this by configuring an `expiration` value in seconds: + + ```js + export default defineConfig({ + output: 'server', + adapter: vercel({ + isr: { + // caches all pages on first request and saves for 1 day + expiration: 60 * 60 * 24, + }, + }), + }); + ``` + + ### Manual invalidation + + To implement Vercel's [Draft mode](https://vercel.com/docs/build-output-api/v3/features#draft-mode), or [On-Demand Incremental Static Regeneration (ISR)](https://vercel.com/docs/build-output-api/v3/features#on-demand-incremental-static-regeneration-isr), you can create a bypass token and provide it to the `isr` config along with the paths to exclude from caching: + + ```js + export default defineConfig({ + output: 'server', + adapter: vercel({ + isr: { + // A secret random string that you create. + bypassToken: '005556d774a8', + // Paths that will always be served fresh. + exclude: ['/api/invalidate'], + }, + }), + }); + ``` + ## 7.1.1 ### Patch Changes diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index 94ddc07f4..16f80931e 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/vercel", "description": "Deploy your site to Vercel", - "version": "7.1.1", + "version": "7.2.0", "type": "module", "author": "withastro", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7aa6e9840..0f41a4c7e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -131,7 +131,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro examples/blog: @@ -146,13 +146,13 @@ importers: specifier: ^3.0.5 version: link:../../packages/integrations/sitemap astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro examples/framework-alpine: @@ -167,7 +167,7 @@ importers: specifier: ^3.13.3 version: 3.13.3 astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro examples/framework-lit: @@ -179,7 +179,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro lit: specifier: ^3.1.2 @@ -203,7 +203,7 @@ importers: specifier: ^4.0.8 version: link:../../packages/integrations/vue astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro preact: specifier: ^10.19.2 @@ -233,7 +233,7 @@ importers: specifier: ^1.2.1 version: 1.2.1(preact@10.19.3) astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro preact: specifier: ^10.19.2 @@ -251,7 +251,7 @@ importers: specifier: ^18.2.15 version: 18.2.18 astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -266,7 +266,7 @@ importers: specifier: ^4.0.1 version: link:../../packages/integrations/solid astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro solid-js: specifier: ^1.8.5 @@ -278,7 +278,7 @@ importers: specifier: ^5.0.3 version: link:../../packages/integrations/svelte astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro svelte: specifier: ^4.2.5 @@ -290,7 +290,7 @@ importers: specifier: ^4.0.8 version: link:../../packages/integrations/vue astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro vue: specifier: ^3.3.8 @@ -302,13 +302,13 @@ importers: specifier: ^8.2.0 version: link:../../packages/integrations/node astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro examples/middleware: @@ -317,7 +317,7 @@ importers: specifier: ^8.2.0 version: link:../../packages/integrations/node astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -330,19 +330,19 @@ importers: examples/minimal: dependencies: astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro examples/ssr: @@ -354,7 +354,7 @@ importers: specifier: ^5.0.3 version: link:../../packages/integrations/svelte astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro svelte: specifier: ^4.2.5 @@ -363,7 +363,7 @@ importers: examples/starlog: dependencies: astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro sass: specifier: ^1.69.5 @@ -381,7 +381,7 @@ importers: specifier: ^5.1.0 version: link:../../packages/integrations/tailwind astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro examples/with-markdoc: @@ -390,7 +390,7 @@ importers: specifier: ^0.8.3 version: link:../../packages/integrations/markdoc astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro examples/with-markdown-plugins: @@ -399,7 +399,7 @@ importers: specifier: ^4.2.1 version: link:../../packages/markdown/remark astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro hast-util-select: specifier: ^6.0.2 @@ -420,7 +420,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro examples/with-mdx: @@ -432,7 +432,7 @@ importers: specifier: ^3.1.0 version: link:../../packages/integrations/preact astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro preact: specifier: ^10.19.2 @@ -447,7 +447,7 @@ importers: specifier: ^0.5.0 version: 0.5.0(nanostores@0.9.5)(preact@10.19.3) astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro nanostores: specifier: ^0.9.5 @@ -468,7 +468,7 @@ importers: specifier: ^1.6.3 version: 1.6.4 astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro autoprefixer: specifier: ^10.4.15 @@ -486,7 +486,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^4.3.3 + specifier: ^4.3.4 version: link:../../packages/astro vitest: specifier: ^1.2.1 |