Merge pull request #114 from withastro/main

PO4
akshit20421 · Jan 19, 2024 · f562e40 · f562e40
2 parents 7e6d2c1 + 53c69dc
commit f562e40
Show file tree

Hide file tree

Showing 67 changed files with 713 additions and 332 deletions.
diff --git a/.changeset/eight-turtles-itch.md b/.changeset/eight-turtles-itch.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Improves HMR behavior for style-only changes in `.astro` files
diff --git a/.changeset/lemon-carrots-cheer.md b/.changeset/lemon-carrots-cheer.md
@@ -0,0 +1,5 @@
+---
+"@astrojs/markdown-remark": patch
+---
+
+Initializes internal `cwdUrlStr` variable lazily for performance, and workaround Rollup side-effect detection bug when building for non-Node runtimes
diff --git a/.changeset/red-carrots-fail.md b/.changeset/red-carrots-fail.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Adds support for dynamic slot names
diff --git a/.changeset/selfish-donuts-approve.md b/.changeset/selfish-donuts-approve.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Improves the CLI output of `astro preferences list` to include additional relevant information
diff --git a/.changeset/sweet-owls-trade.md b/.changeset/sweet-owls-trade.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Allow i18n routing utilities like getRelativeLocaleUrl to also get the default local path when redirectToDefaultLocale is false
diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.2.0"
+    "astro": "^4.2.1"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^2.0.5",
     "@astrojs/rss": "^4.0.2",
     "@astrojs/sitemap": "^3.0.5",
-    "astro": "^4.2.0"
+    "astro": "^4.2.1"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.2.0"
+    "astro": "^4.2.1"
   },
   "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.2",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.2.0"
+    "astro": "^4.2.1"
   }
 }
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.2.0",
+    "astro": "^4.2.1",
     "lit": "^2.8.0"
   }
 }
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.0.3",
     "@astrojs/vue": "^4.0.8",
-    "astro": "^4.2.0",
+    "astro": "^4.2.1",
     "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.0",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.2.0",
+    "astro": "^4.2.1",
     "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.9",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.2.0",
+    "astro": "^4.2.1",
     "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.2.0",
+    "astro": "^4.2.1",
     "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.0.3",
-    "astro": "^4.2.0",
+    "astro": "^4.2.1",
     "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.2.0",
+    "astro": "^4.2.1",
     "vue": "^3.3.8"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.0.0",
-    "astro": "^4.2.0"
+    "astro": "^4.2.1"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.2.0"
+    "astro": "^4.2.1"
   },
   "peerDependencies": {
     "astro": "^3.0.0"

diff --git a/examples/middleware/package.json b/examples/middleware/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.0.0",
-    "astro": "^4.2.0",
+    "astro": "^4.2.1",
     "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.2.0"
+    "astro": "^4.2.1"
   }
 }
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.2.0"
+    "astro": "^4.2.1"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.2.0"
+    "astro": "^4.2.1"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^8.0.0",
     "@astrojs/svelte": "^5.0.3",
-    "astro": "^4.2.0",
+    "astro": "^4.2.1",
     "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.2.0",
+    "astro": "^4.2.1",
     "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.0.0",
-    "astro": "^4.2.0"
+    "astro": "^4.2.1"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.8.3",
-    "astro": "^4.2.0"
+    "astro": "^4.2.1"
   }
 }
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.1.0",
-    "astro": "^4.2.0",
+    "astro": "^4.2.1",
     "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.2.0"
+    "astro": "^4.2.1"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^2.0.5",
     "@astrojs/preact": "^3.1.0",
-    "astro": "^4.2.0",
+    "astro": "^4.2.1",
     "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.0",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.2.0",
+    "astro": "^4.2.1",
     "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.0.5",
     "@astrojs/tailwind": "^5.1.0",
     "@types/canvas-confetti": "^1.6.3",
-    "astro": "^4.2.0",
+    "astro": "^4.2.1",
     "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.2.0",
+    "astro": "^4.2.1",
     "vitest": "^0.34.2"
   }
 }
diff --git a/packages/astro-rss/test/rss.test.js b/packages/astro-rss/test/rss.test.js
@@ -23,8 +23,6 @@ chai.use(chaiXml);
 // prettier-ignore
 const validXmlResult = `<?xml version="1.0" encoding="UTF-8"?><rss version="2.0"><channel><title><![CDATA[${title}]]></title><description><![CDATA[${description}]]></description><link>${site}/</link><item><title><![CDATA[${phpFeedItem.title}]]></title><link>${site}${phpFeedItem.link}/</link><guid isPermaLink="true">${site}${phpFeedItem.link}/</guid><description><![CDATA[${phpFeedItem.description}]]></description><pubDate>${new Date(phpFeedItem.pubDate).toUTCString()}</pubDate></item><item><title><![CDATA[${web1FeedItem.title}]]></title><link>${site}${web1FeedItem.link}/</link><guid isPermaLink="true">${site}${web1FeedItem.link}/</guid><description><![CDATA[${web1FeedItem.description}]]></description><pubDate>${new Date(web1FeedItem.pubDate).toUTCString()}</pubDate></item></channel></rss>`;
 // prettier-ignore
-const validXmlWithoutWeb1FeedResult = `<?xml version="1.0" encoding="UTF-8"?><rss version="2.0"><channel><title><![CDATA[${title}]]></title><description><![CDATA[${description}]]></description><link>${site}/</link><item><title><![CDATA[${phpFeedItem.title}]]></title><link>${site}${phpFeedItem.link}/</link><guid isPermaLink="true">${site}${phpFeedItem.link}/</guid><description><![CDATA[${phpFeedItem.description}]]></description><pubDate>${new Date(phpFeedItem.pubDate).toUTCString()}</pubDate></item></channel></rss>`;
-// prettier-ignore
 const validXmlWithContentResult = `<?xml version="1.0" encoding="UTF-8"?><rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/"><channel><title><![CDATA[${title}]]></title><description><![CDATA[${description}]]></description><link>${site}/</link><item><title><![CDATA[${phpFeedItemWithContent.title}]]></title><link>${site}${phpFeedItemWithContent.link}/</link><guid isPermaLink="true">${site}${phpFeedItemWithContent.link}/</guid><description><![CDATA[${phpFeedItemWithContent.description}]]></description><pubDate>${new Date(phpFeedItemWithContent.pubDate).toUTCString()}</pubDate><content:encoded><![CDATA[${phpFeedItemWithContent.content}]]></content:encoded></item><item><title><![CDATA[${web1FeedItemWithContent.title}]]></title><link>${site}${web1FeedItemWithContent.link}/</link><guid isPermaLink="true">${site}${web1FeedItemWithContent.link}/</guid><description><![CDATA[${web1FeedItemWithContent.description}]]></description><pubDate>${new Date(web1FeedItemWithContent.pubDate).toUTCString()}</pubDate><content:encoded><![CDATA[${web1FeedItemWithContent.content}]]></content:encoded></item></channel></rss>`;
 // prettier-ignore
 const validXmlResultWithAllData = `<?xml version="1.0" encoding="UTF-8"?><rss version="2.0"><channel><title><![CDATA[${title}]]></title><description><![CDATA[${description}]]></description><link>${site}/</link><item><title><![CDATA[${phpFeedItem.title}]]></title><link>${site}${phpFeedItem.link}/</link><guid isPermaLink="true">${site}${phpFeedItem.link}/</guid><description><![CDATA[${phpFeedItem.description}]]></description><pubDate>${new Date(phpFeedItem.pubDate).toUTCString()}</pubDate></item><item><title><![CDATA[${web1FeedItemWithAllData.title}]]></title><link>${site}${web1FeedItemWithAllData.link}/</link><guid isPermaLink="true">${site}${web1FeedItemWithAllData.link}/</guid><description><![CDATA[${web1FeedItemWithAllData.description}]]></description><pubDate>${new Date(web1FeedItemWithAllData.pubDate).toUTCString()}</pubDate><category>${web1FeedItemWithAllData.categories[0]}</category><category>${web1FeedItemWithAllData.categories[1]}</category><author>${web1FeedItemWithAllData.author}</author><comments>${web1FeedItemWithAllData.commentsUrl}</comments><source url="${web1FeedItemWithAllData.source.url}">${web1FeedItemWithAllData.source.title}</source><enclosure url="${site}${web1FeedItemWithAllData.enclosure.url}" length="${web1FeedItemWithAllData.enclosure.length}" type="${web1FeedItemWithAllData.enclosure.type}"/></item></channel></rss>`;

diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,11 @@
 # astro
 
+## 4.2.1
+
+### Patch Changes
+
+- [#9726](https://github.com/withastro/astro/pull/9726) [`a4b696def3a7eb18c1ae48b10fd3758a1874b6fe`](https://github.com/withastro/astro/commit/a4b696def3a7eb18c1ae48b10fd3758a1874b6fe) Thanks [@Fryuni](https://github.com/Fryuni)! - Fixes a regression in routing priority between `index.astro` and dynamic routes with rest parameters
+
 ## 4.2.0
 
 ### Minor Changes

diff --git a/packages/astro/e2e/errors.test.js b/packages/astro/e2e/errors.test.js
@@ -25,7 +25,7 @@ test.describe('Error display', () => {
 		await page.goto(astro.resolveUrl('/astro-syntax-error'), { waitUntil: 'networkidle' });
 
 		const message = (await getErrorOverlayContent(page)).message;
-		expect(message).toMatch('Unexpected "}"');
+		expect(message).toMatch('Unexpected "while"');
 
 		await Promise.all([
 			// Wait for page reload

diff --git a/packages/astro/e2e/fixtures/errors/src/pages/astro-syntax-error.astro b/packages/astro/e2e/fixtures/errors/src/pages/astro-syntax-error.astro
@@ -1 +1 @@
-<h1>{// comment
+<h1>{while (true){}}</h1>
diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -114,7 +114,7 @@
     "test:e2e:match": "playwright test -g"
   },
   "dependencies": {
-    "@astrojs/compiler": "^2.3.4",
+    "@astrojs/compiler": "^2.5.0",
     "@astrojs/internal-helpers": "workspace:*",
     "@astrojs/markdown-remark": "workspace:*",
     "@astrojs/telemetry": "workspace:*",

diff --git a/packages/astro/src/assets/endpoint/generic.ts b/packages/astro/src/assets/endpoint/generic.ts
@@ -71,6 +71,7 @@ export const GET: APIRoute = async ({ request }) => {
 			},
 		});
 	} catch (err: unknown) {
+		// eslint-disable-next-line no-console
 		console.error('Could not process image request:', err);
 		return new Response(`Server Error: ${err}`, { status: 500 });
 	}

diff --git a/packages/astro/src/assets/endpoint/node.ts b/packages/astro/src/assets/endpoint/node.ts
@@ -89,6 +89,7 @@ export const GET: APIRoute = async ({ request }) => {
 			},
 		});
 	} catch (err: unknown) {
+		// eslint-disable-next-line no-console
 		console.error('Could not process image request:', err);
 		return new Response(`Server Error: ${err}`, { status: 500 });
 	}