From ab7e745cc9abd592aa631bffb35880221e7ac89c Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Thu, 2 Nov 2023 08:42:14 -0400 Subject: [PATCH 1/2] Increase the scroll restoration throttle time (#8981) * Increase the scroll restoration throttle time * Add changeset * Update packages/astro/src/transitions/router.ts Co-authored-by: Nate Moore --------- Co-authored-by: Nate Moore --- .changeset/dirty-dolls-joke.md | 5 +++++ packages/astro/src/transitions/router.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/dirty-dolls-joke.md diff --git a/.changeset/dirty-dolls-joke.md b/.changeset/dirty-dolls-joke.md new file mode 100644 index 000000000000..fc14a2a7ac3e --- /dev/null +++ b/.changeset/dirty-dolls-joke.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Increase the scroll restoration throttle time diff --git a/packages/astro/src/transitions/router.ts b/packages/astro/src/transitions/router.ts index e0e93c845171..af8a09d97643 100644 --- a/packages/astro/src/transitions/router.ts +++ b/packages/astro/src/transitions/router.ts @@ -515,7 +515,7 @@ if (inBrowser) { addEventListener('popstate', onPopState); addEventListener('load', onPageLoad); if ('onscrollend' in window) addEventListener('scrollend', onScroll); - else addEventListener('scroll', throttle(onScroll, 300)); + else addEventListener('scroll', throttle(onScroll, 350), { passive: true }); } for (const script of document.scripts) { script.dataset.astroExec = ''; From 3cb1098d45aa1eea60bc75949955356ce956f3d0 Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Thu, 2 Nov 2023 11:13:43 -0700 Subject: [PATCH 2/2] [ci] release (#8982) Co-authored-by: github-actions[bot] --- .changeset/dirty-dolls-joke.md | 5 -- .changeset/long-roses-shave.md | 5 -- examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 2 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 2 +- examples/framework-vue/package.json | 2 +- examples/hackernews/package.json | 2 +- examples/integration/package.json | 2 +- examples/middleware/package.json | 2 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 2 +- examples/view-transitions/package.json | 2 +- examples/with-markdoc/package.json | 2 +- examples/with-markdown-plugins/package.json | 2 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-mdx/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 8 +++ packages/astro/package.json | 2 +- pnpm-lock.yaml | 54 ++++++++++----------- 32 files changed, 63 insertions(+), 65 deletions(-) delete mode 100644 .changeset/dirty-dolls-joke.md delete mode 100644 .changeset/long-roses-shave.md diff --git a/.changeset/dirty-dolls-joke.md b/.changeset/dirty-dolls-joke.md deleted file mode 100644 index fc14a2a7ac3e..000000000000 --- a/.changeset/dirty-dolls-joke.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Increase the scroll restoration throttle time diff --git a/.changeset/long-roses-shave.md b/.changeset/long-roses-shave.md deleted file mode 100644 index 65c6d0922753..000000000000 --- a/.changeset/long-roses-shave.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"astro": patch ---- - -Omit nullish and falsy (non-zero) values when stringifying object-form `style` attributes in Astro files diff --git a/examples/basics/package.json b/examples/basics/package.json index 928056b52df6..39702e9638eb 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.4.2" + "astro": "^3.4.3" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 81fe276f0ff1..0b8af8857ac6 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^1.1.3", "@astrojs/rss": "^3.0.0", "@astrojs/sitemap": "^3.0.3", - "astro": "^3.4.2" + "astro": "^3.4.3" } } diff --git a/examples/component/package.json b/examples/component/package.json index 6c33fcd07caa..75f8b3cd183d 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^3.4.2" + "astro": "^3.4.3" }, "peerDependencies": { "astro": "^3.0.0" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 01db188b45d1..ed7954629498 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.3.1", "@types/alpinejs": "^3.7.2", "alpinejs": "^3.12.3", - "astro": "^3.4.2" + "astro": "^3.4.3" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index c410416d9636..0957567c2b21 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^3.0.2", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^3.4.2", + "astro": "^3.4.3", "lit": "^2.8.0" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 0554d688d612..f2fdec9efc65 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -16,7 +16,7 @@ "@astrojs/solid-js": "^3.0.2", "@astrojs/svelte": "^4.0.3", "@astrojs/vue": "^3.0.3", - "astro": "^3.4.2", + "astro": "^3.4.3", "preact": "^10.17.1", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 26e38caa274e..313635111437 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.0.1", "@preact/signals": "^1.2.1", - "astro": "^3.4.2", + "astro": "^3.4.3", "preact": "^10.17.1" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 4ebbfc2caaaa..6ecd2052c6c7 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^3.0.4", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", - "astro": "^3.4.2", + "astro": "^3.4.3", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 352dcf08a06e..0c340a6d1724 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/solid-js": "^3.0.2", - "astro": "^3.4.2", + "astro": "^3.4.3", "solid-js": "^1.7.11" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index e28587c91ec8..ae96a6c05b1f 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/svelte": "^4.0.3", - "astro": "^3.4.2", + "astro": "^3.4.3", "svelte": "^4.2.0" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 6dc17889e2f3..5f3c17bda749 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^3.0.3", - "astro": "^3.4.2", + "astro": "^3.4.3", "vue": "^3.3.4" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 5218c548d32b..b2480cf532e8 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^6.0.3", - "astro": "^3.4.2" + "astro": "^3.4.3" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 2e3d4a3d4991..614e04e51573 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^3.4.2" + "astro": "^3.4.3" }, "peerDependencies": { "astro": "^3.0.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index c72ef7dda1cb..eb6c1adcc3a8 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@astrojs/node": "^6.0.3", - "astro": "^3.4.2", + "astro": "^3.4.3", "html-minifier": "^4.0.0" } } diff --git a/examples/minimal/package.json b/examples/minimal/package.json index e13f039418ca..2200fa7ac1a4 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.4.2" + "astro": "^3.4.3" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 4c186ff3d8e5..23db74768a42 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.4.2" + "astro": "^3.4.3" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 17fa09cf8da7..a873cba16f5e 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.4.2" + "astro": "^3.4.3" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 55fe0cd2e507..7abfd79fb802 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -14,7 +14,7 @@ "dependencies": { "@astrojs/node": "^6.0.3", "@astrojs/svelte": "^4.0.3", - "astro": "^3.4.2", + "astro": "^3.4.3", "svelte": "^4.2.0" } } diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json index 7c556c7d3581..9672d52337c2 100644 --- a/examples/view-transitions/package.json +++ b/examples/view-transitions/package.json @@ -12,6 +12,6 @@ "devDependencies": { "@astrojs/tailwind": "^5.0.2", "@astrojs/node": "^6.0.3", - "astro": "^3.4.2" + "astro": "^3.4.3" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index ac1e7c30ef21..d1828a378496 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.7.1", - "astro": "^3.4.2" + "astro": "^3.4.3" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 5d9144f85efb..953d5774830e 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdown-remark": "^3.3.0", - "astro": "^3.4.2", + "astro": "^3.4.3", "hast-util-select": "^5.0.5", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.1.0", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 93cf5795c46d..e5c6ed2141fa 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.4.2" + "astro": "^3.4.3" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index c083e1f3fc7a..1cfff684816c 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/mdx": "^1.1.3", "@astrojs/preact": "^3.0.1", - "astro": "^3.4.2", + "astro": "^3.4.3", "preact": "^10.17.1" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 5e7bb489af50..af279e00d65f 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.0.1", "@nanostores/preact": "^0.5.0", - "astro": "^3.4.2", + "astro": "^3.4.3", "nanostores": "^0.9.3", "preact": "^10.17.1" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 5c519c509a8c..0e02c9453ccd 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -14,7 +14,7 @@ "@astrojs/mdx": "^1.1.3", "@astrojs/tailwind": "^5.0.2", "@types/canvas-confetti": "^1.6.0", - "astro": "^3.4.2", + "astro": "^3.4.3", "autoprefixer": "^10.4.15", "canvas-confetti": "^1.6.0", "postcss": "^8.4.28", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 970a4d19c241..fadcfcaa2f6b 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.4.2", + "astro": "^3.4.3", "vite-plugin-pwa": "0.16.4", "workbox-window": "^7.0.0" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 5c543a059617..8b5acdf3816b 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^3.4.2", + "astro": "^3.4.3", "vitest": "^0.34.2" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 85d0fc825a32..64cee3bb68ae 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,13 @@ # astro +## 3.4.3 + +### Patch Changes + +- [#8981](https://github.com/withastro/astro/pull/8981) [`ab7e745cc`](https://github.com/withastro/astro/commit/ab7e745cc9abd592aa631bffb35880221e7ac89c) Thanks [@matthewp](https://github.com/matthewp)! - Increase the scroll restoration throttle time + +- [#8940](https://github.com/withastro/astro/pull/8940) [`937522fb7`](https://github.com/withastro/astro/commit/937522fb70be522378268d04e6bb20d8dc401c0b) Thanks [@MarvinXu](https://github.com/MarvinXu)! - Omit nullish and falsy (non-zero) values when stringifying object-form `style` attributes in Astro files + ## 3.4.2 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index db6fb53ad73b..684eed0cfe7a 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "3.4.2", + "version": "3.4.3", "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 805ec5896063..0bfaef637100 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -125,7 +125,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro examples/blog: @@ -140,13 +140,13 @@ importers: specifier: ^3.0.3 version: link:../../packages/integrations/sitemap astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro examples/framework-alpine: @@ -161,7 +161,7 @@ importers: specifier: ^3.12.3 version: 3.13.2 astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro examples/framework-lit: @@ -173,7 +173,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro lit: specifier: ^2.8.0 @@ -197,7 +197,7 @@ importers: specifier: ^3.0.3 version: link:../../packages/integrations/vue astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -227,7 +227,7 @@ importers: specifier: ^1.2.1 version: 1.2.1(preact@10.18.1) astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -245,7 +245,7 @@ importers: specifier: ^18.2.7 version: 18.2.14 astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -260,7 +260,7 @@ importers: specifier: ^3.0.2 version: link:../../packages/integrations/solid astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro solid-js: specifier: ^1.7.11 @@ -272,7 +272,7 @@ importers: specifier: ^4.0.3 version: link:../../packages/integrations/svelte astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro svelte: specifier: ^4.2.0 @@ -284,7 +284,7 @@ importers: specifier: ^3.0.3 version: link:../../packages/integrations/vue astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro vue: specifier: ^3.3.4 @@ -296,13 +296,13 @@ importers: specifier: ^6.0.3 version: link:../../packages/integrations/node astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro examples/middleware: @@ -311,7 +311,7 @@ importers: specifier: ^6.0.3 version: link:../../packages/integrations/node astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -320,19 +320,19 @@ importers: examples/minimal: dependencies: astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro examples/ssr: @@ -344,7 +344,7 @@ importers: specifier: ^4.0.3 version: link:../../packages/integrations/svelte astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro svelte: specifier: ^4.2.0 @@ -359,7 +359,7 @@ importers: specifier: ^5.0.2 version: link:../../packages/integrations/tailwind astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro examples/with-markdoc: @@ -368,7 +368,7 @@ importers: specifier: ^0.7.1 version: link:../../packages/integrations/markdoc astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro examples/with-markdown-plugins: @@ -377,7 +377,7 @@ importers: specifier: ^3.3.0 version: link:../../packages/markdown/remark astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro hast-util-select: specifier: ^5.0.5 @@ -398,7 +398,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro examples/with-mdx: @@ -410,7 +410,7 @@ importers: specifier: ^3.0.1 version: link:../../packages/integrations/preact astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -425,7 +425,7 @@ importers: specifier: ^0.5.0 version: 0.5.0(nanostores@0.9.4)(preact@10.18.1) astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro nanostores: specifier: ^0.9.3 @@ -446,7 +446,7 @@ importers: specifier: ^1.6.0 version: 1.6.2 astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro autoprefixer: specifier: ^10.4.15 @@ -464,7 +464,7 @@ importers: examples/with-vite-plugin-pwa: dependencies: astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro vite-plugin-pwa: specifier: 0.16.4 @@ -476,7 +476,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^3.4.2 + specifier: ^3.4.3 version: link:../../packages/astro vitest: specifier: ^0.34.2