Merge branch 'main' into fix-invalid-image-orientation-when-using-squ…

…oosh

.github/workflows/ci.yml

@@ -243,6 +243,24 @@ jobs:
       - name: Remove docs translations except for English and Korean
         run: find smoke/docs/src/content/docs ! -name 'en' ! -name 'ko' -type d -mindepth 1 -maxdepth 1 -exec rm -rf {} +
 
+      - name: Check if docs changed
+        id: changes
+        uses: dorny/paths-filter@v2
+        with:
+          filters: |
+            docs:
+              - 'packages/integrations/*/README.md'
+              - 'packages/astro/src/@types/astro.ts'
+              - 'packages/astro/src/core/errors/errors-data.ts'
+
+      - name: Build autogenerated docs pages from current astro branch
+        if: ${{ steps.changes.outputs.docs == 'true' }}
+        run: cd smoke/docs && pnpm docgen && pnpm docgen:errors && pnpm docgen:integrations
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SOURCE_REPO: ${{ github.event.pull_request.head.repo.full_name || github.event.repository.full_name }}
+          SOURCE_BRANCH: ${{ github.head_ref || github.ref_name }}
+
       - name: Test
         run: pnpm run test:smoke
         env:

examples/basics/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.7.1"
+    "astro": "^2.7.2"
   }
 }

examples/blog/package.json

@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^0.19.7",
     "@astrojs/rss": "^2.4.3",
     "@astrojs/sitemap": "^1.3.3",
-    "astro": "^2.7.1"
+    "astro": "^2.7.2"
   }
 }

examples/component/package.json

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

examples/deno/package.json

@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.7.1"
+    "astro": "^2.7.2"
   },
   "devDependencies": {
     "@astrojs/deno": "^4.2.0"

examples/framework-alpine/package.json

@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.2.2",
     "@types/alpinejs": "^3.7.1",
     "alpinejs": "^3.12.2",
-    "astro": "^2.7.1"
+    "astro": "^2.7.2"
   }
 }

examples/framework-lit/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^2.1.0",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "lit": "^2.7.5"
   }
 }

examples/framework-multiple/package.json

@@ -16,7 +16,7 @@
     "@astrojs/solid-js": "^2.2.0",
     "@astrojs/svelte": "^3.1.0",
     "@astrojs/vue": "^2.2.1",
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "preact": "^10.15.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

examples/framework-preact/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^2.2.1",
     "@preact/signals": "^1.1.3",
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "preact": "^10.15.1"
   }
 }

examples/framework-react/package.json

@@ -14,7 +14,7 @@
     "@astrojs/react": "^2.2.1",
     "@types/react": "^18.2.13",
     "@types/react-dom": "^18.2.6",
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/framework-solid/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^2.2.0",
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "solid-js": "^1.7.6"
   }
 }

examples/framework-svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^3.1.0",
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "svelte": "^3.59.1"
   }
 }

examples/framework-vue/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^2.2.1",
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "vue": "^3.3.4"
   }
 }

examples/hackernews/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^5.3.0",
-    "astro": "^2.7.1"
+    "astro": "^2.7.2"
   }
 }

examples/integration/package.json

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

examples/middleware/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^5.3.0",
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "html-minifier": "^4.0.0"
   }
 }

examples/minimal/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.7.1"
+    "astro": "^2.7.2"
   }
 }

examples/non-html-pages/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.7.1"
+    "astro": "^2.7.2"
   }
 }

examples/portfolio/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.7.1"
+    "astro": "^2.7.2"
   }
 }

examples/ssr/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^5.3.0",
     "@astrojs/svelte": "^3.1.0",
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "svelte": "^3.59.1"
   }
 }

examples/with-markdoc/package.json

@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/markdoc": "^0.3.3",
-    "astro": "^2.7.1"
+    "@astrojs/markdoc": "^0.4.0",
+    "astro": "^2.7.2"
   }
 }

examples/with-markdown-plugins/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^2.2.1",
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "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": "^2.7.1"
+    "astro": "^2.7.2"
   }
 }

examples/with-mdx/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^0.19.7",
     "@astrojs/preact": "^2.2.1",
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "preact": "^10.15.1"
   }
 }

examples/with-nanostores/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^2.2.1",
     "@nanostores/preact": "^0.4.1",
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "nanostores": "^0.8.1",
     "preact": "^10.15.1"
   }

examples/with-tailwindcss/package.json

@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^0.19.7",
     "@astrojs/tailwind": "^4.0.0",
     "@types/canvas-confetti": "^1.6.0",
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "autoprefixer": "^10.4.14",
     "canvas-confetti": "^1.6.0",
     "postcss": "^8.4.24",

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

@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "vite-plugin-pwa": "0.14.7",
     "workbox-window": "^6.6.0"
   }

examples/with-vitest/package.json

@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^2.7.1",
+    "astro": "^2.7.2",
     "vitest": "^0.31.4"
   }
 }

packages/astro/CHANGELOG.md

@@ -1,5 +1,21 @@
 # astro
 
+## 2.7.2
+
+### Patch Changes
+
+- [#7273](https://github.com/withastro/astro/pull/7273) [`6dfd7081b`](https://github.com/withastro/astro/commit/6dfd7081b7a1532ab0fe3af8bcf079b10a5640a9) Thanks [@bluwy](https://github.com/bluwy)! - Fix error stacktrace from Vite SSR runtime
+
+- [#7370](https://github.com/withastro/astro/pull/7370) [`83016795e`](https://github.com/withastro/astro/commit/83016795e9e149bc64e2441d477cf8c65ef5a117) Thanks [@bluwy](https://github.com/bluwy)! - Simplify nested hydration flow
+
+- [#7488](https://github.com/withastro/astro/pull/7488) [`d3247851f`](https://github.com/withastro/astro/commit/d3247851f04e911c134cfedc22db17b7d61c53d9) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Pass `compressHTML` setting to server adapters
+
+- [#7491](https://github.com/withastro/astro/pull/7491) [`a3928016c`](https://github.com/withastro/astro/commit/a3928016cc375842cf47e7a227835cd17e48a409) Thanks [@bluwy](https://github.com/bluwy)! - Fix CSS error line offset
+
+- [#7494](https://github.com/withastro/astro/pull/7494) [`2726098bc`](https://github.com/withastro/astro/commit/2726098bc82f910edda4198b9fb94f2bfd048976) Thanks [@itsmatteomanf](https://github.com/itsmatteomanf)! - Replaces the instance of `setTimeout()` in the runtime to use `queueMicrotask()`, to resolve limitations on Cloudflare Workers.
+
+- [#7509](https://github.com/withastro/astro/pull/7509) [`f4fea3b02`](https://github.com/withastro/astro/commit/f4fea3b02b0737053c7c7521a7d4dd235648918a) Thanks [@ematipico](https://github.com/ematipico)! - Correctly emit pre-rendered pages when `build.split` is set to `true`
+
 ## 2.7.1
 
 ### Patch Changes

packages/astro/package.json

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

packages/astro/src/core/app/index.ts

@@ -204,6 +204,7 @@ export class App {
 		const url = new URL(request.url);
 		const pathname = prependForwardSlash(this.removeBase(url.pathname));
 		const info = this.#routeDataToRouteInfo.get(routeData!)!;
+		const isCompressHTML = this.#manifest.compressHTML ?? false;
 		// may be used in the future for handling rel=modulepreload, rel=icon, rel=manifest etc.
 		const links = new Set<never>();
 		const styles = createStylesheetElementSet(info.styles);
@@ -252,7 +253,13 @@ export class App {
 					page.onRequest as MiddlewareResponseHandler,
 					apiContext,
 					() => {
-						return renderPage({ mod, renderContext, env: this.#env, cookies: apiContext.cookies });
+						return renderPage({
+							mod,
+							renderContext,
+							env: this.#env,
+							cookies: apiContext.cookies,
+							isCompressHTML,
+						});
 					}
 				);
 			} else {
@@ -261,6 +268,7 @@ export class App {
 					renderContext,
 					env: this.#env,
 					cookies: apiContext.cookies,
+					isCompressHTML,
 				});
 			}
 			Reflect.set(request, responseSentSymbol, true);

packages/astro/src/core/app/types.ts

@@ -38,6 +38,7 @@ export type SSRManifest = {
 	routes: RouteInfo[];
 	site?: string;
 	base?: string;
+	compressHTML?: boolean;
 	assetsPrefix?: string;
 	markdown: MarkdownRenderingOptions;
 	renderers: SSRLoadedRenderer[];