Merge branch 'main' into feat/astro-check-on-strictest

.changeset/lazy-actors-enjoy.md

@@ -0,0 +1,14 @@
+---
+'@astrojs/vercel': minor
+---
+
+You can now configure how long your functions can run before timing out.
+
+```diff
+export default defineConfig({
+    output: "server",
+    adapter: vercel({
++       maxDuration: 60
+    }),
+});
+```

.changeset/silent-goats-invent.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes CSS modules ordering by rendering styles before links

.github/workflows/snapshot-release.yml

@@ -61,6 +61,9 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ steps.refs.outputs.head_ref }}
+          fetch-depth: 0
+
+      - run: git fetch origin main:main
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v2

examples/basics/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.3.2"
+    "astro": "^3.3.3"
   }
 }

examples/blog/package.json

@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^1.1.2",
     "@astrojs/rss": "^3.0.0",
     "@astrojs/sitemap": "^3.0.2",
-    "astro": "^3.3.2"
+    "astro": "^3.3.3"
   }
 }

examples/component/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^3.3.2"
+    "astro": "^3.3.3"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"

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.3.2"
+    "astro": "^3.3.3"
   }
 }

examples/framework-lit/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.2",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^3.3.2",
+    "astro": "^3.3.3",
     "lit": "^2.8.0"
   }
 }

examples/framework-multiple/package.json

@@ -15,8 +15,8 @@
     "@astrojs/react": "^3.0.3",
     "@astrojs/solid-js": "^3.0.2",
     "@astrojs/svelte": "^4.0.3",
-    "@astrojs/vue": "^3.0.1",
-    "astro": "^3.3.2",
+    "@astrojs/vue": "^3.0.2",
+    "astro": "^3.3.3",
     "preact": "^10.17.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

examples/framework-preact/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^3.3.2",
+    "astro": "^3.3.3",
     "preact": "^10.17.1"
   }
 }

examples/framework-react/package.json

@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.3",
     "@types/react": "^18.2.21",
     "@types/react-dom": "^18.2.7",
-    "astro": "^3.3.2",
+    "astro": "^3.3.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/framework-solid/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.2",
-    "astro": "^3.3.2",
+    "astro": "^3.3.3",
     "solid-js": "^1.7.11"
   }
 }

examples/framework-svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^4.0.3",
-    "astro": "^3.3.2",
+    "astro": "^3.3.3",
     "svelte": "^4.2.0"
   }
 }

examples/framework-vue/package.json

@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/vue": "^3.0.1",
-    "astro": "^3.3.2",
+    "@astrojs/vue": "^3.0.2",
+    "astro": "^3.3.3",
     "vue": "^3.3.4"
   }
 }

examples/hackernews/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^6.0.3",
-    "astro": "^3.3.2"
+    "astro": "^3.3.3"
   }
 }

examples/integration/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^3.3.2"
+    "astro": "^3.3.3"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"

examples/middleware/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^6.0.3",
-    "astro": "^3.3.2",
+    "astro": "^3.3.3",
     "html-minifier": "^4.0.0"
   }
 }

examples/minimal/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.3.2"
+    "astro": "^3.3.3"
   }
 }

examples/non-html-pages/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.3.2"
+    "astro": "^3.3.3"
   }
 }

examples/portfolio/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.3.2"
+    "astro": "^3.3.3"
   }
 }

examples/ssr/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^6.0.3",
     "@astrojs/svelte": "^4.0.3",
-    "astro": "^3.3.2",
+    "astro": "^3.3.3",
     "svelte": "^4.2.0"
   }
 }

examples/view-transitions/package.json

@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^5.0.2",
     "@astrojs/node": "^6.0.3",
-    "astro": "^3.3.2"
+    "astro": "^3.3.3"
   }
 }

examples/with-markdoc/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.6.0",
-    "astro": "^3.3.2"
+    "astro": "^3.3.3"
   }
 }

examples/with-markdown-plugins/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^3.3.0",
-    "astro": "^3.3.2",
+    "astro": "^3.3.3",
     "hast-util-select": "^5.0.5",
     "rehype-autolink-headings": "^6.1.1",
     "rehype-slug": "^5.1.0",

examples/with-markdown-shiki/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.3.2"
+    "astro": "^3.3.3"
   }
 }

examples/with-mdx/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^1.1.2",
     "@astrojs/preact": "^3.0.1",
-    "astro": "^3.3.2",
+    "astro": "^3.3.3",
     "preact": "^10.17.1"
   }
 }

examples/with-nanostores/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^3.3.2",
+    "astro": "^3.3.3",
     "nanostores": "^0.9.3",
     "preact": "^10.17.1"
   }

examples/with-tailwindcss/package.json

@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^1.1.2",
     "@astrojs/tailwind": "^5.0.2",
     "@types/canvas-confetti": "^1.6.0",
-    "astro": "^3.3.2",
+    "astro": "^3.3.3",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.6.0",
     "postcss": "^8.4.28",

examples/with-vite-plugin-pwa/package.json

@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.3.2",
+    "astro": "^3.3.3",
     "vite-plugin-pwa": "0.16.4",
     "workbox-window": "^7.0.0"
   }

examples/with-vitest/package.json

@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^3.3.2",
+    "astro": "^3.3.3",
     "vitest": "^0.34.2"
   }
 }

packages/astro/CHANGELOG.md

@@ -1,5 +1,17 @@
 # astro
 
+## 3.3.3
+
+### Patch Changes
+
+- [#8870](https://github.com/withastro/astro/pull/8870) [`5ea6ee0ed`](https://github.com/withastro/astro/commit/5ea6ee0ed494c792a4c94928a83c5c85b9b6ac32) Thanks [@xstevenyung](https://github.com/xstevenyung)! - prevent production install on astro add cmd
+
+- [#8840](https://github.com/withastro/astro/pull/8840) [`5c888c10b`](https://github.com/withastro/astro/commit/5c888c10b712ca60a23e66b88af8051b54b42323) Thanks [@martrapp](https://github.com/martrapp)! - Fixes styles of `client:only` components not persisting during view transitions in dev mode
+
+- [#8814](https://github.com/withastro/astro/pull/8814) [`ad2bb9155`](https://github.com/withastro/astro/commit/ad2bb9155997380d0880b0c6c7b12f079a031d48) Thanks [@lilnasy](https://github.com/lilnasy)! - Fix an issue where `500.astro` did not render when the middleware threw an error.
+
+- [#8863](https://github.com/withastro/astro/pull/8863) [`326e17893`](https://github.com/withastro/astro/commit/326e178933f7a22f4e897b763832619f168b53dd) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes an issue where the dev server logged the full file path on updates.
+
 ## 3.3.2
 
 ### Patch Changes

packages/astro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

packages/astro/src/runtime/server/render/head.ts

@@ -34,7 +34,13 @@ export function renderAllHeadContent(result: SSRResult) {
 		.filter(uniqueElements)
 		.map((link) => renderElement('link', link, false));
 
-	let content = links.join('\n') + styles.join('\n') + scripts.join('\n');
+	// Order styles -> links -> scripts similar to src/content/runtime.ts
+	// The order is usually fine as the ordering between these groups are mutually exclusive,
+	// except for CSS styles and CSS stylesheet links. However CSS stylesheet links usually
+	// consist of CSS modules which should naturally take precedence over CSS styles, so the
+	// order will still work. In prod, all CSS are stylesheet links.
+	// In the future, it may be better to have only an array of head elements to avoid these assumptions.
+	let content = styles.join('\n') + links.join('\n') + scripts.join('\n');
 
 	if (result._metadata.extraHead.length > 0) {
 		for (const part of result._metadata.extraHead) {

packages/astro/test/0-css.test.js

@@ -170,6 +170,15 @@ describe('CSS', function () {
 				// 2. check CSS
 				expect(bundledCSS).to.match(new RegExp(`.${moduleClass}[^{]*{font-family:fantasy`));
 			});
+
+			it('.module.css ordering', () => {
+				const globalStyleClassIndex = bundledCSS.indexOf('.module-ordering');
+				const moduleStyleClassIndex = bundledCSS.indexOf('._module_ordering');
+				// css module has higher priority than global style
+				expect(globalStyleClassIndex).to.be.greaterThan(-1);
+				expect(moduleStyleClassIndex).to.be.greaterThan(-1);
+				expect(moduleStyleClassIndex).to.be.greaterThan(globalStyleClassIndex);
+			});
 		});
 
 		describe('Vue', () => {
@@ -412,6 +421,17 @@ describe('CSS', function () {
 			);
 		});
 
+		it('.module.css ordering', () => {
+			const globalStyleTag = $('style[data-vite-dev-id$="default.css"]');
+			const moduleStyleTag = $('link[href$="ModuleOrdering.module.css"]');
+			const globalStyleClassIndex = globalStyleTag.index();
+			const moduleStyleClassIndex = moduleStyleTag.index();
+			// css module has higher priority than global style
+			expect(globalStyleClassIndex).to.be.greaterThan(-1);
+			expect(moduleStyleClassIndex).to.be.greaterThan(-1);
+			expect(moduleStyleClassIndex).to.be.greaterThan(globalStyleClassIndex);
+		});
+
 		it('.css?raw return a string', () => {
 			const el = $('#css-raw');
 			expect(el.text()).to.equal('.foo {color: red;}');

packages/astro/test/fixtures/0-css/src/components/ModuleOrdering.jsx

@@ -0,0 +1,7 @@
+import { module_ordering } from './ModuleOrdering.module.css';
+
+export default function Counter() {
+  return (
+    <p className={`module-ordering ${module_ordering}`}>This should be green</p>
+  )
+}

packages/astro/test/fixtures/0-css/src/components/ModuleOrdering.module.css

@@ -0,0 +1,3 @@
+.module_ordering {
+  color: green;
+}