Merge branch 'main' into fix/qwik-compat

withastro · Dec 20, 2023 · 8e70feb · 8e70feb
2 parents 3f7e6d0 + 97342d2
commit 8e70feb
Show file tree

Hide file tree

Showing 65 changed files with 430 additions and 229 deletions.
diff --git a/.changeset/breezy-hairs-yell.md b/.changeset/breezy-hairs-yell.md
diff --git a/.changeset/eight-sheep-nail.md b/.changeset/eight-sheep-nail.md
diff --git a/.changeset/famous-cars-sell.md b/.changeset/famous-cars-sell.md
diff --git a/.changeset/friendly-tables-worry.md b/.changeset/friendly-tables-worry.md
diff --git a/.changeset/modern-humans-think.md b/.changeset/modern-humans-think.md
diff --git a/.changeset/real-bags-hope.md b/.changeset/real-bags-hope.md
diff --git a/.changeset/selfish-rings-occur.md b/.changeset/selfish-rings-occur.md
diff --git a/.changeset/silly-cycles-clap.md b/.changeset/silly-cycles-clap.md
diff --git a/.changeset/warm-bats-eat.md b/.changeset/warm-bats-eat.md
diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.6"
+    "astro": "^4.0.7"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^2.0.1",
+    "@astrojs/mdx": "^2.0.2",
     "@astrojs/rss": "^4.0.1",
     "@astrojs/sitemap": "^3.0.3",
-    "astro": "^4.0.6"
+    "astro": "^4.0.7"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.6"
+    "astro": "^4.0.7"
   },
   "peerDependencies": {
     "astro": "^3.0.0"

diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.1",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.0.6"
+    "astro": "^4.0.7"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^4.0.0",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.0.6",
+    "astro": "^4.0.7",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -12,11 +12,11 @@
   },
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
-    "@astrojs/react": "^3.0.7",
+    "@astrojs/react": "^3.0.8",
     "@astrojs/solid-js": "^3.0.2",
-    "@astrojs/svelte": "^5.0.1",
-    "@astrojs/vue": "^4.0.4",
-    "astro": "^4.0.6",
+    "@astrojs/svelte": "^5.0.2",
+    "@astrojs/vue": "^4.0.5",
+    "astro": "^4.0.7",
     "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
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.0.6",
+    "astro": "^4.0.7",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/react": "^3.0.7",
+    "@astrojs/react": "^3.0.8",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.0.6",
+    "astro": "^4.0.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.2",
-    "astro": "^4.0.6",
+    "astro": "^4.0.7",
     "solid-js": "^1.8.5"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/svelte": "^5.0.1",
-    "astro": "^4.0.6",
+    "@astrojs/svelte": "^5.0.2",
+    "astro": "^4.0.7",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/vue": "^4.0.4",
-    "astro": "^4.0.6",
+    "@astrojs/vue": "^4.0.5",
+    "astro": "^4.0.7",
     "vue": "^3.3.8"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/node": "^7.0.1",
-    "astro": "^4.0.6"
+    "@astrojs/node": "^7.0.2",
+    "astro": "^4.0.7"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.6"
+    "astro": "^4.0.7"
   },
   "peerDependencies": {
     "astro": "^3.0.0"

diff --git a/examples/middleware/package.json b/examples/middleware/package.json
@@ -12,8 +12,8 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "@astrojs/node": "^7.0.1",
-    "astro": "^4.0.6",
+    "@astrojs/node": "^7.0.2",
+    "astro": "^4.0.7",
     "html-minifier": "^4.0.0"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.6"
+    "astro": "^4.0.7"
   }
 }
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.0.6"
+    "astro": "^4.0.7"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.6"
+    "astro": "^4.0.7"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -12,9 +12,9 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "@astrojs/node": "^7.0.1",
-    "@astrojs/svelte": "^5.0.1",
-    "astro": "^4.0.6",
+    "@astrojs/node": "^7.0.2",
+    "@astrojs/svelte": "^5.0.2",
+    "astro": "^4.0.7",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
@@ -10,8 +10,8 @@
     "astro": "astro"
   },
   "devDependencies": {
-    "@astrojs/tailwind": "^5.0.3",
-    "@astrojs/node": "^7.0.1",
-    "astro": "^4.0.6"
+    "@astrojs/tailwind": "^5.0.4",
+    "@astrojs/node": "^7.0.2",
+    "astro": "^4.0.7"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/markdoc": "^0.8.0",
-    "astro": "^4.0.6"
+    "@astrojs/markdoc": "^0.8.1",
+    "astro": "^4.0.7"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^4.0.1",
-    "astro": "^4.0.6",
+    "astro": "^4.0.7",
     "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.0.6"
+    "astro": "^4.0.7"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^2.0.1",
+    "@astrojs/mdx": "^2.0.2",
     "@astrojs/preact": "^3.0.1",
-    "astro": "^4.0.6",
+    "astro": "^4.0.7",
     "preact": "^10.19.2"
   }
 }
diff --git 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": "^4.0.6",
+    "astro": "^4.0.7",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }

diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^2.0.1",
-    "@astrojs/tailwind": "^5.0.3",
+    "@astrojs/mdx": "^2.0.2",
+    "@astrojs/tailwind": "^5.0.4",
     "@types/canvas-confetti": "^1.6.3",
-    "astro": "^4.0.6",
+    "astro": "^4.0.7",
     "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
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.0.6",
+    "astro": "^4.0.7",
     "vitest": "^0.34.2"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,37 @@
 # astro
 
+## 4.0.7
+
+### Patch Changes
+
+- [#9452](https://github.com/withastro/astro/pull/9452) [`e83b5095f`](https://github.com/withastro/astro/commit/e83b5095f164f48ba40fc715a805fc66a3e39dcf) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Upgrades vite to latest
+
+- [#9352](https://github.com/withastro/astro/pull/9352) [`f515b1421`](https://github.com/withastro/astro/commit/f515b1421afa335b8d6e4491fbe24419df53bfeb) Thanks [@tmcw](https://github.com/tmcw)! - Add a more descriptive error message when image conversion fails
+
+- [#9486](https://github.com/withastro/astro/pull/9486) [`f6714f677`](https://github.com/withastro/astro/commit/f6714f677cffa2484565f51d5eb55bd34309653b) Thanks [@martrapp](https://github.com/martrapp)! - Fixes View Transition's form submission prevention, allowing `preventDefault` to be used.
+
+- [#9461](https://github.com/withastro/astro/pull/9461) [`429be8cc3`](https://github.com/withastro/astro/commit/429be8cc3ed0623df4fdca76f1531265f5ba5dfc) Thanks [@Skn0tt](https://github.com/Skn0tt)! - update import created for `astro create netlify`
+
+- [#9464](https://github.com/withastro/astro/pull/9464) [`faf6c7e11`](https://github.com/withastro/astro/commit/faf6c7e1104ee247e847836020a3ce07a2053705) Thanks [@Fryuni](https://github.com/Fryuni)! - Fixes an edge case with view transitions where some spec-compliant `Content-Type` headers would cause a valid HTML response to be ignored.
+
+- [#9400](https://github.com/withastro/astro/pull/9400) [`1e984389b`](https://github.com/withastro/astro/commit/1e984389bafd87b0a631ed4aba930447669234f8) Thanks [@bluwy](https://github.com/bluwy)! - Fixes importing dev toolbar apps from integrations on Windows
+
+- [#9487](https://github.com/withastro/astro/pull/9487) [`19169db1f`](https://github.com/withastro/astro/commit/19169db1f1574d36cc284fd9a0319d9b1e92b49a) Thanks [@ematipico](https://github.com/ematipico)! - Improves logging of the generated pages during the build
+
+- [#9460](https://github.com/withastro/astro/pull/9460) [`047d285be`](https://github.com/withastro/astro/commit/047d285be1ab764bc82f88b8553b46429c37efca) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix Astro failing to build on certain exotic platform that reports their CPU count incorrectly
+
+- [#9466](https://github.com/withastro/astro/pull/9466) [`5062d27a1`](https://github.com/withastro/astro/commit/5062d27a186c5020522614b9d6f3da218f7afd96) Thanks [@knpwrs](https://github.com/knpwrs)! - Updates view transitions `form` handling with logic for the [`enctype`](https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement/enctype) attribute
+
+- [#9458](https://github.com/withastro/astro/pull/9458) [`fa3078ce9`](https://github.com/withastro/astro/commit/fa3078ce9f5eda408340a78c6d275f3e0b2437dc) Thanks [@ematipico](https://github.com/ematipico)! - Correctly handle the error in case the middleware throws a runtime error
+
+- [#9089](https://github.com/withastro/astro/pull/9089) [`5ae657882`](https://github.com/withastro/astro/commit/5ae657882287645c967249aee91bd06497f6624d) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixes an issue where redirects did not replace slugs when the target of the redirect rule was not a verbatim route in the project.
+
+- [#9483](https://github.com/withastro/astro/pull/9483) [`c384f6924`](https://github.com/withastro/astro/commit/c384f6924edc161d3ff631e658f017a37e4207e3) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix some false positive in the audit logic of the dev toolbar
+
+- [#9437](https://github.com/withastro/astro/pull/9437) [`354a62c86`](https://github.com/withastro/astro/commit/354a62c86e9187af5d05540ed321bdc889384d97) Thanks [@dkobierski](https://github.com/dkobierski)! - Fixes incorrect hoisted script paths when custom rollup output file names are configured
+
+- [#9475](https://github.com/withastro/astro/pull/9475) [`7ae4928f3`](https://github.com/withastro/astro/commit/7ae4928f303720d3b2f611474fc08d3b96c2e4af) Thanks [@ematipico](https://github.com/ematipico)! - Remove the manifest from the generated files in the `dist/` folder.
+
 ## 4.0.6
 
 ### Patch Changes

diff --git a/packages/astro/components/ViewTransitions.astro b/packages/astro/components/ViewTransitions.astro
@@ -94,7 +94,7 @@ const { fallback = 'animate' } = Astro.props;
 
 		document.addEventListener('submit', (ev) => {
 			let el = ev.target as HTMLElement;
-			if (el.tagName !== 'FORM' || isReloadEl(el)) {
+			if (el.tagName !== 'FORM' || ev.defaultPrevented || isReloadEl(el)) {
 				return;
 			}
 			const form = el as HTMLFormElement;

diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/form-one.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/form-one.astro
@@ -1,13 +1,15 @@
 ---
 import Layout from '../components/Layout.astro';
 const method = Astro.url.searchParams.get('method') ?? 'POST';
+const enctype = Astro.url.searchParams.get('enctype');
 const postShowThrow = Astro.url.searchParams.has('throw') ?? false;
 ---
+
 <Layout>
 	<h2>Contact Form</h2>
-	<form action="/contact" method={method}>
-		<input type="hidden" name="name" value="Testing">
-		{postShowThrow ? <input type="hidden" name="throw" value="true"> : ''}
-		<input type="submit" value="Submit" id="submit">
+	<form action="/contact" method={method} {...enctype ? { enctype } : {}}>
+		<input type="hidden" name="name" value="Testing" />
+		{postShowThrow ? <input type="hidden" name="throw" value="true" /> : ''}
+		<input type="submit" value="Submit" id="submit" />
 	</form>
 </Layout>
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/one.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/one.astro
@@ -6,6 +6,7 @@ import Layout from '../components/Layout.astro';
 	<a id="click-one" href="#test">test</a>
 	<a id="click-two" href="/two">go to 2</a>
 	<a id="click-three" href="/three">go to 3</a>
+	<a id="click-seven" href="/seven">go to 7</a>
 	<a id="click-longpage" href="/long-page">go to long page</a>
 	<a id="click-self" href="">go to top</a>
 	<a id="click-redirect-two" href="/redirect-two">go to redirect 2</a>