Merge branch 'main' into add-multiple-cdn-v2

* main: [ci] format fix(withastro#8625): smooth scrolling in SPA mode on iOS (withastro#10235) [ci] release (withastro#10292) [ci] format finalize WIP API (withastro#10280) [ci] format fix(markdoc & mdx): Proxy crimes (withastro#10278) [ci] release (withastro#10286) fix(audits): Don't warn about loading on data URIs (withastro#10275) fix(node): Safely create requests (withastro#10285) [ci] release (withastro#10265) [ci] format fix(assets): Solidify Node endpoint (withastro#10284)
peng · Mar 4, 2024 · ecd9414 · ecd9414
2 parents 99f53f7 + 718eed7
commit ecd9414
Show file tree

Hide file tree

Showing 115 changed files with 1,505 additions and 1,381 deletions.
diff --git a/.changeset/curvy-donkeys-knock.md b/.changeset/curvy-donkeys-knock.md
diff --git a/.changeset/few-worms-rush.md b/.changeset/few-worms-rush.md
diff --git a/.changeset/purple-tips-camp.md b/.changeset/purple-tips-camp.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fixes jerky scrolling on IOS when using view transitions.
diff --git a/.changeset/smooth-singers-kiss.md b/.changeset/smooth-singers-kiss.md
diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.4.6"
+    "astro": "^4.4.9"
   }
 }
diff --git 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.6"
+    "astro": "^4.4.9"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.4.6"
+    "astro": "^4.4.9"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

diff --git 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.6"
+    "astro": "^4.4.9"
   }
 }
diff --git 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.6",
+    "astro": "^4.4.9",
     "lit": "^3.1.2"
   }
 }
diff --git 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.6",
+    "astro": "^4.4.9",
     "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.1.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.4.6",
+    "astro": "^4.4.9",
     "preact": "^10.19.2"
   }
 }
diff --git 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.6",
+    "astro": "^4.4.9",
     "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": "^4.0.1",
-    "astro": "^4.4.6",
+    "astro": "^4.4.9",
     "solid-js": "^1.8.5"
   }
 }
diff --git 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.6",
+    "astro": "^4.4.9",
     "svelte": "^4.2.5"
   }
 }
diff --git 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.6",
+    "astro": "^4.4.9",
     "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": "^8.2.1",
-    "astro": "^4.4.6"
+    "@astrojs/node": "^8.2.3",
+    "astro": "^4.4.9"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.4.6"
+    "astro": "^4.4.9"
   },
   "peerDependencies": {
     "astro": "^4.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": "^8.2.1",
-    "astro": "^4.4.6",
+    "@astrojs/node": "^8.2.3",
+    "astro": "^4.4.9",
     "html-minifier": "^4.0.0"
   },
   "devDependencies": {

diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.4.6"
+    "astro": "^4.4.9"
   }
 }
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.4.6"
+    "astro": "^4.4.9"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.4.6"
+    "astro": "^4.4.9"
   }
 }
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": "^8.2.1",
+    "@astrojs/node": "^8.2.3",
     "@astrojs/svelte": "^5.2.0",
-    "astro": "^4.4.6",
+    "astro": "^4.4.9",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/starlog/package.json b/examples/starlog/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.4.6",
+    "astro": "^4.4.9",
     "sass": "^1.69.5",
     "sharp": "^0.32.6"
   }

diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@astrojs/tailwind": "^5.1.0",
-    "@astrojs/node": "^8.2.1",
-    "astro": "^4.4.6"
+    "@astrojs/node": "^8.2.3",
+    "astro": "^4.4.9"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/markdoc": "^0.9.0",
-    "astro": "^4.4.6"
+    "@astrojs/markdoc": "^0.9.1",
+    "astro": "^4.4.9"
   }
 }
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.2.1",
-    "astro": "^4.4.6",
+    "astro": "^4.4.9",
     "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.4.6"
+    "astro": "^4.4.9"
   }
 }
diff --git 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.6",
+    "astro": "^4.4.9",
     "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.1.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.4.6",
+    "astro": "^4.4.9",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }

diff --git 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.6",
+    "astro": "^4.4.9",
     "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.4.6",
+    "astro": "^4.4.9",
     "vitest": "^1.3.1"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,31 @@
 # astro
 
+## 4.4.9
+
+### Patch Changes
+
+- [#10278](https://github.com/withastro/astro/pull/10278) [`a548a3a99c2835c19662fc38636f92b2bda26614`](https://github.com/withastro/astro/commit/a548a3a99c2835c19662fc38636f92b2bda26614) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fixes original images sometimes being kept / deleted when they shouldn't in both MDX and Markdoc
+
+- [#10280](https://github.com/withastro/astro/pull/10280) [`3488be9b59d1cb65325b0e087c33bcd74aaa4926`](https://github.com/withastro/astro/commit/3488be9b59d1cb65325b0e087c33bcd74aaa4926) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Finalize db API to a shared db/ directory.
+
+## 4.4.8
+
+### Patch Changes
+
+- [#10275](https://github.com/withastro/astro/pull/10275) [`5e3e74b61daa2ba44c761c9ab5745818661a656e`](https://github.com/withastro/astro/commit/5e3e74b61daa2ba44c761c9ab5745818661a656e) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fixes dev toolbar warning about using the proper loading attributes on images using `data:` URIs
+
+## 4.4.7
+
+### Patch Changes
+
+- [#10274](https://github.com/withastro/astro/pull/10274) [`e556151603a2f0173059d0f98fdcbec0610b48ff`](https://github.com/withastro/astro/commit/e556151603a2f0173059d0f98fdcbec0610b48ff) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixes a regression introduced in v4.4.5 where image optimization did not work in dev mode when a base was configured.
+
+- [#10263](https://github.com/withastro/astro/pull/10263) [`9bdbed723e0aa4243d7d6ee64d1c1df3b75b9aeb`](https://github.com/withastro/astro/commit/9bdbed723e0aa4243d7d6ee64d1c1df3b75b9aeb) Thanks [@martrapp](https://github.com/martrapp)! - Adds auto completion for `astro:` event names when adding or removing event listeners on `document`.
+
+- [#10284](https://github.com/withastro/astro/pull/10284) [`07f89429a1ef5173d3321e0b362a9dc71fc74fe5`](https://github.com/withastro/astro/commit/07f89429a1ef5173d3321e0b362a9dc71fc74fe5) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fixes an issue where in Node SSR, the image endpoint could be used maliciously to reveal unintended information about the underlying system.
+
+  Thanks to Google Security Team for reporting this issue.
+
 ## 4.4.6
 
 ### Patch Changes

diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.4.6",
+  "version": "4.4.9",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -108,6 +108,7 @@
     "dev": "astro-scripts dev --copy-wasm --prebuild \"src/runtime/server/astro-island.ts\" --prebuild \"src/runtime/client/{idle,load,media,only,visible}.ts\" \"src/**/*.{ts,js}\"",
     "postbuild": "astro-scripts copy \"src/**/*.astro\" && astro-scripts copy \"src/**/*.wasm\"",
     "test": "pnpm run test:node",
+    "test:match": "pnpm run test:node --match",
     "test:e2e": "playwright test",
     "test:e2e:match": "playwright test -g",
     "test:node": "astro-scripts test \"test/**/*.test.js\""

diff --git a/packages/astro/src/assets/build/generate.ts b/packages/astro/src/assets/build/generate.ts
@@ -119,7 +119,13 @@ export async function generateImagesForPath(
 		!globalThis.astroAsset.referencedImages?.has(transformsAndPath.originalSrcPath)
 	) {
 		try {
-			await fs.promises.unlink(getFullImagePath(originalFilePath, env));
+			if (transformsAndPath.originalSrcPath) {
+				env.logger.debug(
+					'assets',
+					`Deleting ${originalFilePath} as it's not referenced outside of image processing.`
+				);
+				await fs.promises.unlink(getFullImagePath(originalFilePath, env));
+			}
 		} catch (e) {
 			/* No-op, it's okay if we fail to delete one of the file, we're not too picky. */
 		}