diff options
38 files changed, 75 insertions, 96 deletions
diff --git a/.changeset/sharp-scissors-think.md b/.changeset/sharp-scissors-think.md new file mode 100644 index 000000000..60498d213 --- /dev/null +++ b/.changeset/sharp-scissors-think.md @@ -0,0 +1,5 @@ +--- +"astro": patch +--- + +Fixes an issue where slotting interactive components within a "client:only" component prevented all component code in the page from running. diff --git a/.changeset/slimy-berries-mate.md b/.changeset/slimy-berries-mate.md new file mode 100644 index 000000000..ee39a3a4f --- /dev/null +++ b/.changeset/slimy-berries-mate.md @@ -0,0 +1,5 @@ +--- +"@astrojs/vercel": patch +--- + +Fixes an issue that was preventing the use of `sharp` in some cases and causing a runtime error diff --git a/.changeset/two-coats-smoke.md b/.changeset/two-coats-smoke.md new file mode 100644 index 000000000..ed0e8abc5 --- /dev/null +++ b/.changeset/two-coats-smoke.md @@ -0,0 +1,5 @@ +--- +"@astrojs/db": patch +--- + +Add back confirmation handling on verify and push diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a9e8d6cb..eb5cd362e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,8 +20,8 @@ env: jobs: changelog: - if: ${{ github.repository_owner == 'withastro' }} name: Changelog PR or Release + if: ${{ github.repository_owner == 'withastro' }} runs-on: ubuntu-latest permissions: contents: write @@ -43,32 +43,14 @@ jobs: - name: Build Packages run: pnpm run build - - - name: Set PUBLISH_FLAGS variable - id: tag - run: | - BRANCH_NAME="${GITHUB_REF##*/}" - if [ "$BRANCH_NAME" = "main" ]; then - # do not set any flags (`latest` is the default) - echo "PUBLISH_FLAGS=" >> $GITHUB_ENV - elif [ "$BRANCH_NAME" = "next" ]; then - # just use `--tag next` - echo "PUBLISH_FLAGS=--tag next" >> $GITHUB_ENV - else - # extract the integer prefix from the branch name - VERSION_NUMBER="${BRANCH_NAME%%-*}" - # pass a shorthand tag like `--tag v3` - echo "PUBLISH_FLAGS=--tag v$VERSION_NUMBER" >> $GITHUB_ENV - fi - name: Create Release Pull Request or Publish id: changesets uses: changesets/action@v1 with: - # Note: Run custom version script which runs pnpm install - # the install step is necessary to refresh lockfile after versioning + # Note: pnpm install after versioning is necessary to refresh lockfile version: pnpm run version - publish: pnpm exec changeset publish $PUBLISH_FLAGS + publish: pnpm exec changeset publish commit: "[ci] release" title: "[ci] release" env: diff --git a/examples/basics/package.json b/examples/basics/package.json index ae9e64b6b..2bf33b0f4 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.4.12" + "astro": "^4.4.11" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 7bb73ad85..7800f1bc0 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.1.1", - "astro": "^4.4.12" + "astro": "^4.4.11" } } diff --git a/examples/component/package.json b/examples/component/package.json index 09a967f07..24fae7c9c 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^4.4.12" + "astro": "^4.4.11" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 8727bedcc..214e1096e 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.4.12" + "astro": "^4.4.11" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index a66caeb28..020d3137f 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.4.12", + "astro": "^4.4.11", "lit": "^3.1.2" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index ab39cac8e..5c95a9d47 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.2.0", "@astrojs/vue": "^4.0.8", - "astro": "^4.4.12", + "astro": "^4.4.11", "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 1274059ee..3b0ea56f9 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.1.1", "@preact/signals": "^1.2.1", - "astro": "^4.4.12", + "astro": "^4.4.11", "preact": "^10.19.2" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 4c61ad019..6de73ac84 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^3.0.10", "@types/react": "^18.2.37", "@types/react-dom": "^18.2.15", - "astro": "^4.4.12", + "astro": "^4.4.11", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index abd080682..0695b641d 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.4.12", + "astro": "^4.4.11", "solid-js": "^1.8.5" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 68d1133c5..abef53b53 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/svelte": "^5.2.0", - "astro": "^4.4.12", + "astro": "^4.4.11", "svelte": "^4.2.5" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 309803ed8..ea03a8e83 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.4.12", + "astro": "^4.4.11", "vue": "^3.3.8" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index c7d235fb0..7bf332ccf 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^8.2.3", - "astro": "^4.4.12" + "astro": "^4.4.11" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 659d67906..e80d16965 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^4.4.12" + "astro": "^4.4.11" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index 43b12a7db..df5fed18e 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@astrojs/node": "^8.2.3", - "astro": "^4.4.12", + "astro": "^4.4.11", "html-minifier": "^4.0.0" }, "devDependencies": { diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 14c5d81bf..e56aa6518 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.4.12" + "astro": "^4.4.11" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 4c8281a13..b130a511b 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.4.12" + "astro": "^4.4.11" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 1596f2e54..b454a0f0d 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.4.12" + "astro": "^4.4.11" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 7d9da4795..ae1088333 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -14,7 +14,7 @@ "dependencies": { "@astrojs/node": "^8.2.3", "@astrojs/svelte": "^5.2.0", - "astro": "^4.4.12", + "astro": "^4.4.11", "svelte": "^4.2.5" } } diff --git a/examples/starlog/package.json b/examples/starlog/package.json index fff0e208e..76c4a644c 100644 --- a/examples/starlog/package.json +++ b/examples/starlog/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.4.12", + "astro": "^4.4.11", "sass": "^1.69.5", "sharp": "^0.32.6" } diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json index 0bd83f9c3..41285cea5 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.3", - "astro": "^4.4.12" + "astro": "^4.4.11" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 8bb57e5e7..4d49a3a7c 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.9.1", - "astro": "^4.4.12" + "astro": "^4.4.11" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 43ab9fe56..f1c3b97e3 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.4.12", + "astro": "^4.4.11", "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 be58ebd00..d9105d754 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.4.12" + "astro": "^4.4.11" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index dcf7ff549..fc942fddf 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.1", - "astro": "^4.4.12", + "astro": "^4.4.11", "preact": "^10.19.2" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index e719548ea..552bd1422 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.1.1", "@nanostores/preact": "^0.5.0", - "astro": "^4.4.12", + "astro": "^4.4.11", "nanostores": "^0.9.5", "preact": "^10.19.2" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 234fa0f8a..f990748a4 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.4.12", + "astro": "^4.4.11", "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 cf1c92e76..1d32b67d2 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^4.4.12", + "astro": "^4.4.11", "vitest": "^1.3.1" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index edbb12c97..1eae1d763 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,11 +1,5 @@ # astro -## 4.4.12 - -### Patch Changes - -- [#10316](https://github.com/withastro/astro/pull/10316) [`507b4ac246fa95cc31e5f73e863a785cdff92e13`](https://github.com/withastro/astro/commit/507b4ac246fa95cc31e5f73e863a785cdff92e13) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixes an issue where slotting interactive components within a "client:only" component prevented all component code in the page from running. - ## 4.4.11 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index d738aa56e..080248725 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "4.4.12", + "version": "4.4.11", "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/db/CHANGELOG.md b/packages/db/CHANGELOG.md index 491b673e1..c77471c90 100644 --- a/packages/db/CHANGELOG.md +++ b/packages/db/CHANGELOG.md @@ -1,11 +1,5 @@ # @astrojs/db -## 0.6.2 - -### Patch Changes - -- [#10335](https://github.com/withastro/astro/pull/10335) [`d6a6b7dff249bdf0b427a58ff8551e70c5e14ba2`](https://github.com/withastro/astro/commit/d6a6b7dff249bdf0b427a58ff8551e70c5e14ba2) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Add back confirmation handling on verify and push - ## 0.6.1 ### Patch Changes diff --git a/packages/db/package.json b/packages/db/package.json index 2fe4909cf..a9341a4d5 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/db", - "version": "0.6.2", + "version": "0.6.1", "description": "", "license": "MIT", "type": "module", diff --git a/packages/integrations/vercel/CHANGELOG.md b/packages/integrations/vercel/CHANGELOG.md index adf665f29..a7b814fb5 100644 --- a/packages/integrations/vercel/CHANGELOG.md +++ b/packages/integrations/vercel/CHANGELOG.md @@ -1,11 +1,5 @@ # @astrojs/vercel -## 7.3.5 - -### Patch Changes - -- [#10305](https://github.com/withastro/astro/pull/10305) [`29cbb88afd79875a2ad57efe60dcbc4a14672d37`](https://github.com/withastro/astro/commit/29cbb88afd79875a2ad57efe60dcbc4a14672d37) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes an issue that was preventing the use of `sharp` in some cases and causing a runtime error - ## 7.3.4 ### Patch Changes diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index 61af57e2c..97a7edc0e 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.3.5", + "version": "7.3.4", "type": "module", "author": "withastro", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a6e9b3b07..9a2a8b6be 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -134,7 +134,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro examples/blog: @@ -149,13 +149,13 @@ importers: specifier: ^3.1.1 version: link:../../packages/integrations/sitemap astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro examples/framework-alpine: @@ -170,7 +170,7 @@ importers: specifier: ^3.13.3 version: 3.13.3 astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro examples/framework-lit: @@ -182,7 +182,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro lit: specifier: ^3.1.2 @@ -206,7 +206,7 @@ importers: specifier: ^4.0.8 version: link:../../packages/integrations/vue astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro preact: specifier: ^10.19.2 @@ -236,7 +236,7 @@ importers: specifier: ^1.2.1 version: 1.2.1(preact@10.19.3) astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro preact: specifier: ^10.19.2 @@ -254,7 +254,7 @@ importers: specifier: ^18.2.15 version: 18.2.18 astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -269,7 +269,7 @@ importers: specifier: ^4.0.1 version: link:../../packages/integrations/solid astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro solid-js: specifier: ^1.8.5 @@ -281,7 +281,7 @@ importers: specifier: ^5.2.0 version: link:../../packages/integrations/svelte astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro svelte: specifier: ^4.2.5 @@ -293,7 +293,7 @@ importers: specifier: ^4.0.8 version: link:../../packages/integrations/vue astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro vue: specifier: ^3.3.8 @@ -305,13 +305,13 @@ importers: specifier: ^8.2.3 version: link:../../packages/integrations/node astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro examples/middleware: @@ -320,7 +320,7 @@ importers: specifier: ^8.2.3 version: link:../../packages/integrations/node astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -333,19 +333,19 @@ importers: examples/minimal: dependencies: astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro examples/ssr: @@ -357,7 +357,7 @@ importers: specifier: ^5.2.0 version: link:../../packages/integrations/svelte astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro svelte: specifier: ^4.2.5 @@ -366,7 +366,7 @@ importers: examples/starlog: dependencies: astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro sass: specifier: ^1.69.5 @@ -384,7 +384,7 @@ importers: specifier: ^5.1.0 version: link:../../packages/integrations/tailwind astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro examples/with-markdoc: @@ -393,7 +393,7 @@ importers: specifier: ^0.9.1 version: link:../../packages/integrations/markdoc astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro examples/with-markdown-plugins: @@ -402,7 +402,7 @@ importers: specifier: ^4.2.1 version: link:../../packages/markdown/remark astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro hast-util-select: specifier: ^6.0.2 @@ -423,7 +423,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro examples/with-mdx: @@ -435,7 +435,7 @@ importers: specifier: ^3.1.1 version: link:../../packages/integrations/preact astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro preact: specifier: ^10.19.2 @@ -450,7 +450,7 @@ importers: specifier: ^0.5.0 version: 0.5.0(nanostores@0.9.5)(preact@10.19.3) astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro nanostores: specifier: ^0.9.5 @@ -471,7 +471,7 @@ importers: specifier: ^1.6.3 version: 1.6.4 astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro autoprefixer: specifier: ^10.4.15 @@ -489,7 +489,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^4.4.12 + specifier: ^4.4.11 version: link:../../packages/astro vitest: specifier: ^1.3.1 |