Merge branch 'main' into feat/all-notifications-toolbar

withastro · Mar 8, 2024 · 6c936ec · 6c936ec
2 parents 65c5a4c + 5a95287
commit 6c936ec
Show file tree

Hide file tree

Showing 141 changed files with 2,061 additions and 944 deletions.
diff --git a/.changeset/curvy-hats-shave.md b/.changeset/curvy-hats-shave.md
@@ -0,0 +1,5 @@
+---
+"astro": minor
+---
+
+Stabilizes `markdown.shikiConfig.experimentalThemes` as `markdown.shikiConfig.themes`. No behaviour changes are made to this option.
diff --git a/.changeset/khaki-elephants-hang.md b/.changeset/khaki-elephants-hang.md
@@ -0,0 +1,5 @@
+---
+"astro": minor
+---
+
+Adds the ability to set colors on all the included UI elements for dev toolbar apps. Previously, only badge and buttons could be customized.
diff --git a/.changeset/khaki-emus-wait.md b/.changeset/khaki-emus-wait.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fixes an issue where some CLI commands attempted to directly read vite config files.
diff --git a/.changeset/sharp-scissors-think.md b/.changeset/sharp-scissors-think.md
diff --git a/.changeset/slimy-berries-mate.md b/.changeset/slimy-berries-mate.md
diff --git a/.changeset/thin-chicken-greet.md b/.changeset/thin-chicken-greet.md
@@ -0,0 +1,6 @@
+---
+"@astrojs/markdown-remark": minor
+"astro": minor
+---
+
+Migrates `shikiji` to `shiki` 1.0
diff --git a/.github/workflows/check-merge.yml b/.github/workflows/check-merge.yml
@@ -1,6 +1,6 @@
 name: Check mergeability
 
-on: pull_request
+on: pull_request_target
 
 permissions:
  pull-requests: write
@@ -35,6 +35,7 @@ jobs:
  - uses: actions/checkout@v4
  if: steps.blocked.outputs.result != 'true'
  with:
+ repository: ${{ github.event.pull_request.head.repo.full_name }}
  fetch-depth: 0
 
  - name: Get changed files in the .changeset folder

diff --git a/SECURITY.md b/SECURITY.md
@@ -2,11 +2,11 @@
 
 ## Reporting a Vulnerability
 
-To report a security issue, please email security@astro.build with a detailed description of the issue, the steps you took to create the issue, affected versions, and, if known, mitigations for the issue.
+To report a security issue, please [open a security advisory](https://github.com/withastro/astro/security/advisories/new) on GitHub with a detailed description of the issue, the steps you took to create the issue, affected versions, and, if known, mitigations for the issue.
 
 Please remember to include everything required for us to reproduce the issue, including but not limited to a publicly accessible git repository and/or StackBlitz repository. All code samples shared with our Security team will only be used to verify and diagnose the issue and will not be publicly shared with anyone outside of Astro's teams. Astro's Security Team members may share information only within the Astro teams on a need-to-know basis to fix the related issue in Astro.
 
-Our Security team will acknowledge receiving your email within 3 working days.
+Our Security team will respond to the security advisory within 3 working days.
 
 <ins>**If you think you've found a security issue, please DO NOT report, discuss, or describe it on Discord, GitHub, or any other public forum; without prior contact and acknowledgment of Astro's Security team.**<ins>
 

diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -11,6 +11,6 @@
  "astro": "astro"
  },
  "dependencies": {
- "astro": "^4.4.11"
+ "astro": "^4.4.15"
  }
 }
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.11"
+ "astro": "^4.4.15"
  }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -15,7 +15,7 @@
  ],
  "scripts": {},
  "devDependencies": {
- "astro": "^4.4.11"
+ "astro": "^4.4.15"
  },
  "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.11"
+ "astro": "^4.4.15"
  }
 }
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.11",
+ "astro": "^4.4.15",
  "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.11",
+ "astro": "^4.4.15",
  "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.11",
+ "astro": "^4.4.15",
  "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.11",
+ "astro": "^4.4.15",
  "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.11",
+ "astro": "^4.4.15",
  "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.11",
+ "astro": "^4.4.15",
  "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.11",
+ "astro": "^4.4.15",
  "vue": "^3.3.8"
  }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
  },
  "dependencies": {
  "@astrojs/node": "^8.2.3",
- "astro": "^4.4.11"
+ "astro": "^4.4.15"
  }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
@@ -15,7 +15,7 @@
  ],
  "scripts": {},
  "devDependencies": {
- "astro": "^4.4.11"
+ "astro": "^4.4.15"
  },
  "peerDependencies": {
  "astro": "^4.0.0"

diff --git a/examples/middleware/package.json b/examples/middleware/package.json
@@ -13,7 +13,7 @@
  },
  "dependencies": {
  "@astrojs/node": "^8.2.3",
- "astro": "^4.4.11",
+ "astro": "^4.4.15",
  "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.11"
+ "astro": "^4.4.15"
  }
 }
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.11"
+ "astro": "^4.4.15"
  }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
  "astro": "astro"
  },
  "dependencies": {
- "astro": "^4.4.11"
+ "astro": "^4.4.15"
  }
 }
diff --git 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.11",
+ "astro": "^4.4.15",
  "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.11",
+ "astro": "^4.4.15",
  "sass": "^1.69.5",
  "sharp": "^0.32.6"
  }

diff --git 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.11"
+ "astro": "^4.4.15"
  }
 }
diff --git 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.11"
+ "astro": "^4.4.15"
  }
 }
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.11",
+ "astro": "^4.4.15",
  "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.11"
+ "astro": "^4.4.15"
  }
 }
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.11",
+ "astro": "^4.4.15",
  "preact": "^10.19.2"
  }
 }
diff --git a/examples/with-mdx/src/pages/index.mdx b/examples/with-mdx/src/pages/index.mdx
@@ -18,7 +18,7 @@ Published on: {new Intl.DateTimeFormat('en', {dateStyle: 'long'}).format(publish
 
 ## Syntax highlighting
 
-We also support syntax highlighting in MDX out-of-the-box! This example uses our default [Shiki theme](https://github.com/shikijs/shiki). See the [MDX integration docs](https://docs.astro.build/en/guides/integrations-guide/mdx/#syntax-highlighting) for configuration options.
+We also support syntax highlighting in MDX out-of-the-box! This example uses the default [Shiki](https://shiki.style) theme. See the [MDX integration docs](https://docs.astro.build/en/guides/integrations-guide/mdx/#syntax-highlighting) for configuration options.
 
 ```astro
 ---

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.11",
+ "astro": "^4.4.15",
  "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.11",
+ "astro": "^4.4.15",
  "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.11",
+ "astro": "^4.4.15",
  "vitest": "^1.3.1"
  }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,37 @@
 # astro
 
+## 4.4.15
+
+### Patch Changes
+
+- [#10317](https://github.com/withastro/astro/pull/10317) [`33583e8b31ee8a33e26cf57f30bb422921f4745d`](https://github.com/withastro/astro/commit/33583e8b31ee8a33e26cf57f30bb422921f4745d) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixes an issue where elements slotted within interactive framework components disappeared after hydration.
+
+## 4.4.14
+
+### Patch Changes
+
+- [#10355](https://github.com/withastro/astro/pull/10355) [`8ce9fffd44b0740621178d61fb1425bf4155c2d7`](https://github.com/withastro/astro/commit/8ce9fffd44b0740621178d61fb1425bf4155c2d7) Thanks [@ematipico](https://github.com/ematipico)! - Fixes a regression where full dynamic routes were prioritized over partial dynamic routes. Now a route like `food-[name].astro` is matched **before** `[name].astro`.
+
+- [#10356](https://github.com/withastro/astro/pull/10356) [`d121311a3f4b5345e344e31f75d4e7164d65f729`](https://github.com/withastro/astro/commit/d121311a3f4b5345e344e31f75d4e7164d65f729) Thanks [@mingjunlu](https://github.com/mingjunlu)! - Fixes an issue where `getCollection` might return `undefined` when content collection is empty
+
+- [#10325](https://github.com/withastro/astro/pull/10325) [`f33cce8f6c3a2e17847658cdedb015bd93cc1ee3`](https://github.com/withastro/astro/commit/f33cce8f6c3a2e17847658cdedb015bd93cc1ee3) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixes an issue where `ctx.site` included the configured `base` in API routes and middleware, unlike `Astro.site` in astro pages.
+
+- [#10343](https://github.com/withastro/astro/pull/10343) [`f973aa9110592fa9017bbe84387f22c24a6d7159`](https://github.com/withastro/astro/commit/f973aa9110592fa9017bbe84387f22c24a6d7159) Thanks [@ematipico](https://github.com/ematipico)! - Fixes some false positive in the dev toolbar a11y audits, by adding the `a` element to the list of interactive elements.
+
+- [#10295](https://github.com/withastro/astro/pull/10295) [`fdd5bf277e5c1cfa30c1bd2ca123f4e90e8d09d9`](https://github.com/withastro/astro/commit/fdd5bf277e5c1cfa30c1bd2ca123f4e90e8d09d9) Thanks [@rossrobino](https://github.com/rossrobino)! - Adds a prefetch fallback when using the `experimental.clientPrerender` option. If prerendering fails, which can happen if [Chrome extensions block prerendering](https://developer.chrome.com/blog/speculation-rules-improvements#chrome-limits), it will fallback to prefetching the URL. This works by adding a `prefetch` field to the `speculationrules` script, but does not create an extra request.
+
+## 4.4.13
+
+### Patch Changes
+
+- [#10342](https://github.com/withastro/astro/pull/10342) [`a2e9b2b936666b2a4779feb00dcb8ff0ab82c2ec`](https://github.com/withastro/astro/commit/a2e9b2b936666b2a4779feb00dcb8ff0ab82c2ec) Thanks [@matthewp](https://github.com/matthewp)! - Fixes @astrojs/db loading TS in the fixtures
+
+## 4.4.12
+
+### Patch Changes
+
+- [#10336](https://github.com/withastro/astro/pull/10336) [`f2e60a96754ed1d86001fe4d5d3a0c0ef657408d`](https://github.com/withastro/astro/commit/f2e60a96754ed1d86001fe4d5d3a0c0ef657408d) Thanks [@FredKSchott](https://github.com/FredKSchott)! - 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