diff options
33 files changed, 77 insertions, 78 deletions
diff --git a/.changeset/loud-bikes-pay.md b/.changeset/loud-bikes-pay.md deleted file mode 100644 index 937f14dae..000000000 --- a/.changeset/loud-bikes-pay.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fixes uses of inline hoisted scripts in SSR diff --git a/.changeset/unlucky-eyes-attend.md b/.changeset/unlucky-eyes-attend.md deleted file mode 100644 index e54c1078a..000000000 --- a/.changeset/unlucky-eyes-attend.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -'astro': patch ---- - -Add support for optional integrations - -By making integration optional, Astro can now ignore null, undefined or other [falsy](https://developer.mozilla.org/en-US/docs/Glossary/Falsy) "Integration" values instead of giving an internal error most devs can't and/or won't understand. - -This also enables conditional integrations, -e.g. -```ts -integration: [ - // Only run `compress` integration when in production environments, etc... - import.meta.env.production ? compress() : null -] -```
\ No newline at end of file diff --git a/examples/basics/package.json b/examples/basics/package.json index 3d313c4c1..c2ff59569 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" } } diff --git a/examples/blog-multiple-authors/package.json b/examples/blog-multiple-authors/package.json index 3faf0ed9d..8380f38d6 100644 --- a/examples/blog-multiple-authors/package.json +++ b/examples/blog-multiple-authors/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/preact": "^0.1.3", - "astro": "^1.0.0-beta.44", + "astro": "^1.0.0-beta.45", "sass": "^1.52.2" }, "dependencies": { diff --git a/examples/blog/package.json b/examples/blog/package.json index afd3fa1ae..f36499b11 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/preact": "^0.1.3", - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" }, "dependencies": { "preact": "^10.7.3" diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json index fe097f5ee..bee7e5038 100644 --- a/examples/component/demo/package.json +++ b/examples/component/demo/package.json @@ -10,6 +10,6 @@ }, "devDependencies": { "@example/my-component": "workspace:*", - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" } } diff --git a/examples/component/package.json b/examples/component/package.json index 7c85f99e6..501fe67e4 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -8,6 +8,6 @@ "serve": "astro --root demo preview" }, "devDependencies": { - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" } } diff --git a/examples/docs/package.json b/examples/docs/package.json index 6b4e3713c..a4422a90f 100644 --- a/examples/docs/package.json +++ b/examples/docs/package.json @@ -20,6 +20,6 @@ "devDependencies": { "@astrojs/preact": "^0.1.3", "@astrojs/react": "^0.1.3", - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" } } diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json index e0c86b7bb..6a38e7b0e 100644 --- a/examples/env-vars/package.json +++ b/examples/env-vars/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" } } diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 1ab846760..4300932fa 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -9,7 +9,7 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" }, "dependencies": { "alpinejs": "^3.10.2" diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 8178b467d..daf1b6893 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/lit": "^0.1.5", - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" }, "dependencies": { "@webcomponents/template-shadowroot": "^0.1.0", diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index ceec1290f..8d4d7be72 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -15,7 +15,7 @@ "@astrojs/solid-js": "^0.1.4", "@astrojs/svelte": "^0.1.4", "@astrojs/vue": "^0.1.5", - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" }, "dependencies": { "@webcomponents/template-shadowroot": "^0.1.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index eb23ec39e..14c7e278b 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/preact": "^0.1.3", - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" }, "dependencies": { "preact": "^10.7.3" diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index e512821dc..eaed7c62d 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/react": "^0.1.3", - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" }, "dependencies": { "@types/react": "^18.0.10", diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index d3d6925c3..1849b41c3 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/solid-js": "^0.1.4", - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" }, "dependencies": { "solid-js": "^1.4.3" diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 12ca1fc80..eb02ffde3 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/svelte": "^0.1.4", - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" }, "dependencies": { "svelte": "^3.48.0" diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index cbb73137b..b2a8dc413 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/vue": "^0.1.5", - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" }, "dependencies": { "vue": "^3.2.36" diff --git a/examples/integrations-playground/package.json b/examples/integrations-playground/package.json index 874280b0f..0645f4c59 100644 --- a/examples/integrations-playground/package.json +++ b/examples/integrations-playground/package.json @@ -16,7 +16,7 @@ "@astrojs/solid-js": "0.1.4", "@astrojs/tailwind": "^0.2.1", "@astrojs/turbolinks": "^0.1.3", - "astro": "^1.0.0-beta.44", + "astro": "^1.0.0-beta.45", "solid-js": "^1.4.3" }, "dependencies": { diff --git a/examples/minimal/package.json b/examples/minimal/package.json index b910d1259..68da2e55f 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 85e209234..0c1b4fce8 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 07a51d389..606571744 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/preact": "^0.1.3", - "astro": "^1.0.0-beta.44", + "astro": "^1.0.0-beta.45", "sass": "^1.52.2" }, "dependencies": { diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 65007b1fe..cd40ea047 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@astrojs/node": "^0.1.2", "@astrojs/svelte": "^0.1.4", - "astro": "^1.0.0-beta.44", + "astro": "^1.0.0-beta.45", "concurrently": "^7.2.1", "lightcookie": "^1.0.25", "unocss": "^0.15.6", diff --git a/examples/starter/package.json b/examples/starter/package.json index 2f047a498..2ec8e40e2 100644 --- a/examples/starter/package.json +++ b/examples/starter/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" } } diff --git a/examples/subpath/package.json b/examples/subpath/package.json index ac87b2eba..f41c97975 100644 --- a/examples/subpath/package.json +++ b/examples/subpath/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/react": "^0.1.3", - "astro": "^1.0.0-beta.44", + "astro": "^1.0.0-beta.45", "sass": "^1.52.2" }, "dependencies": { diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index d4879ce34..c774eb9d6 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/markdown-remark": "^0.11.2", - "astro": "^1.0.0-beta.44", + "astro": "^1.0.0-beta.45", "hast-util-select": "5.0.1", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.0.1", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index ca615e20b..8c84968a9 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -10,6 +10,6 @@ }, "devDependencies": { "@astrojs/markdown-remark": "^0.11.2", - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" } } diff --git a/examples/with-markdown/package.json b/examples/with-markdown/package.json index 6fcdaa3d4..5e674e78a 100644 --- a/examples/with-markdown/package.json +++ b/examples/with-markdown/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^0.1.3", "@astrojs/svelte": "^0.1.4", "@astrojs/vue": "^0.1.5", - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" }, "dependencies": { "preact": "^10.7.3", diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 99645670b..f530bac1a 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -25,6 +25,6 @@ "@astrojs/solid-js": "^0.1.4", "@astrojs/svelte": "^0.1.4", "@astrojs/vue": "^0.1.5", - "astro": "^1.0.0-beta.44" + "astro": "^1.0.0-beta.45" } } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 254948b1d..6a59746fe 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/tailwind": "^0.2.1", - "astro": "^1.0.0-beta.44", + "astro": "^1.0.0-beta.45", "autoprefixer": "^10.4.7", "canvas-confetti": "^1.5.1", "postcss": "^8.4.14", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 26ee68a19..df3e287a9 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -9,7 +9,7 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^1.0.0-beta.44", + "astro": "^1.0.0-beta.45", "vite-plugin-pwa": "0.11.11", "workbox-window": "^6.5.3" } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index c3db8370a..57cc8358f 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,25 @@ # astro +## 1.0.0-beta.45 + +### Patch Changes + +- [#3593](https://github.com/withastro/astro/pull/3593) [`0e2314d8`](https://github.com/withastro/astro/commit/0e2314d8e5b01f7b2184a243c6d7e53e14b0cd0f) Thanks [@matthewp](https://github.com/matthewp)! - Fixes uses of inline hoisted scripts in SSR + +* [#3590](https://github.com/withastro/astro/pull/3590) [`d46f8fb1`](https://github.com/withastro/astro/commit/d46f8fb14d3c702d62cc327de23562078fca0088) Thanks [@okikio](https://github.com/okikio)! - Add support for optional integrations + + By making integration optional, Astro can now ignore null, undefined or other [falsy](https://developer.mozilla.org/en-US/docs/Glossary/Falsy) "Integration" values instead of giving an internal error most devs can't and/or won't understand. + + This also enables conditional integrations, + e.g. + + ```ts + integration: [ + // Only run `compress` integration when in production environments, etc... + import.meta.env.production ? compress() : null, + ]; + ``` + ## 1.0.0-beta.44 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 6921fcb3a..a774f509e 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "1.0.0-beta.44", + "version": "1.0.0-beta.45", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b65f9394b..07937a4ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -47,14 +47,14 @@ importers: examples/basics: specifiers: - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 devDependencies: astro: link:../../packages/astro examples/blog: specifiers: '@astrojs/preact': ^0.1.3 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 preact: ^10.7.3 dependencies: preact: 10.7.3 @@ -65,7 +65,7 @@ importers: examples/blog-multiple-authors: specifiers: '@astrojs/preact': ^0.1.3 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 preact: ^10.7.3 sass: ^1.52.2 dependencies: @@ -77,14 +77,14 @@ importers: examples/component: specifiers: - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 devDependencies: astro: link:../../packages/astro examples/component/demo: specifiers: '@example/my-component': workspace:* - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 devDependencies: '@example/my-component': link:../packages/my-component astro: link:../../../packages/astro @@ -100,7 +100,7 @@ importers: '@docsearch/css': ^3.1.0 '@docsearch/react': ^3.1.0 '@types/react': ^17.0.45 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 preact: ^10.7.3 react: ^17.0.2 react-dom: ^17.0.2 @@ -119,14 +119,14 @@ importers: examples/env-vars: specifiers: - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 devDependencies: astro: link:../../packages/astro examples/framework-alpine: specifiers: alpinejs: ^3.10.2 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 dependencies: alpinejs: 3.10.2 devDependencies: @@ -136,7 +136,7 @@ importers: specifiers: '@astrojs/lit': ^0.1.5 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 lit: ^2.2.5 dependencies: '@webcomponents/template-shadowroot': 0.1.0 @@ -154,7 +154,7 @@ importers: '@astrojs/svelte': ^0.1.4 '@astrojs/vue': ^0.1.5 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 lit: ^2.2.5 preact: ^10.7.3 react: ^18.1.0 @@ -183,7 +183,7 @@ importers: examples/framework-preact: specifiers: '@astrojs/preact': ^0.1.3 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 preact: ^10.7.3 dependencies: preact: 10.7.3 @@ -196,7 +196,7 @@ importers: '@astrojs/react': ^0.1.3 '@types/react': ^18.0.10 '@types/react-dom': ^18.0.5 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 react: ^18.1.0 react-dom: ^18.1.0 dependencies: @@ -211,7 +211,7 @@ importers: examples/framework-solid: specifiers: '@astrojs/solid-js': ^0.1.4 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 solid-js: ^1.4.3 dependencies: solid-js: 1.4.3 @@ -222,7 +222,7 @@ importers: examples/framework-svelte: specifiers: '@astrojs/svelte': ^0.1.4 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 svelte: ^3.48.0 dependencies: svelte: 3.48.0 @@ -233,7 +233,7 @@ importers: examples/framework-vue: specifiers: '@astrojs/vue': ^0.1.5 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 vue: ^3.2.36 dependencies: vue: 3.2.37 @@ -251,7 +251,7 @@ importers: '@astrojs/tailwind': ^0.2.1 '@astrojs/turbolinks': ^0.1.3 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 lit: ^2.2.5 preact: ^10.7.3 react: ^18.1.0 @@ -280,20 +280,20 @@ importers: examples/minimal: specifiers: - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 devDependencies: astro: link:../../packages/astro examples/non-html-pages: specifiers: - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 devDependencies: astro: link:../../packages/astro examples/portfolio: specifiers: '@astrojs/preact': ^0.1.3 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 preact: ^10.7.3 sass: ^1.52.2 dependencies: @@ -307,7 +307,7 @@ importers: specifiers: '@astrojs/node': ^0.1.2 '@astrojs/svelte': ^0.1.4 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 concurrently: ^7.2.1 lightcookie: ^1.0.25 svelte: ^3.48.0 @@ -326,14 +326,14 @@ importers: examples/starter: specifiers: - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 devDependencies: astro: link:../../packages/astro examples/subpath: specifiers: '@astrojs/react': ^0.1.3 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 react: ^18.1.0 react-dom: ^18.1.0 sass: ^1.52.2 @@ -352,7 +352,7 @@ importers: '@astrojs/react': ^0.1.3 '@astrojs/svelte': ^0.1.4 '@astrojs/vue': ^0.1.5 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 preact: ^10.7.3 react: ^18.1.0 react-dom: ^18.1.0 @@ -375,7 +375,7 @@ importers: examples/with-markdown-plugins: specifiers: '@astrojs/markdown-remark': ^0.11.2 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 hast-util-select: 5.0.1 rehype-autolink-headings: ^6.1.1 rehype-slug: ^5.0.1 @@ -393,7 +393,7 @@ importers: examples/with-markdown-shiki: specifiers: '@astrojs/markdown-remark': ^0.11.2 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 devDependencies: '@astrojs/markdown-remark': link:../../packages/markdown/remark astro: link:../../packages/astro @@ -408,7 +408,7 @@ importers: '@nanostores/preact': ^0.1.3 '@nanostores/react': ^0.1.5 '@nanostores/vue': ^0.4.1 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 nanostores: ^0.5.12 preact: ^10.7.3 react: ^18.1.0 @@ -436,7 +436,7 @@ importers: examples/with-tailwindcss: specifiers: '@astrojs/tailwind': ^0.2.1 - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 autoprefixer: ^10.4.7 canvas-confetti: ^1.5.1 postcss: ^8.4.14 @@ -451,7 +451,7 @@ importers: examples/with-vite-plugin-pwa: specifiers: - astro: ^1.0.0-beta.44 + astro: ^1.0.0-beta.45 vite-plugin-pwa: 0.11.11 workbox-window: ^6.5.3 devDependencies: |