Merge branch 'withastro:main' into cloudflare

withastro · Oct 20, 2022 · d53df75 · d53df75
2 parents f88fad8 + 863391f
commit d53df75
Show file tree

Hide file tree

Showing 46 changed files with 225 additions and 78 deletions.
diff --git a/.changeset/eight-swans-divide.md b/.changeset/eight-swans-divide.md
diff --git a/.changeset/many-lions-relate.md b/.changeset/many-lions-relate.md
diff --git a/.changeset/tall-trainers-do.md b/.changeset/tall-trainers-do.md
diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1"
+    "astro": "^1.5.2"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "@astrojs/mdx": "^0.11.4",
     "@astrojs/rss": "^1.0.2",
     "@astrojs/sitemap": "^1.0.0"

diff --git a/examples/component/package.json b/examples/component/package.json
@@ -15,9 +15,9 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^1.5.1"
+    "astro": "^1.5.2"
   },
   "peerDependencies": {
-    "astro": "^1.5.1"
+    "astro": "^1.5.2"
   }
 }
diff --git a/examples/deno/package.json b/examples/deno/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1"
+    "astro": "^1.5.2"
   },
   "devDependencies": {
     "@astrojs/deno": "^1.2.0"

diff --git a/examples/docs/package.json b/examples/docs/package.json
@@ -12,7 +12,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "preact": "^10.7.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",

diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "alpinejs": "^3.10.2",
     "@astrojs/alpinejs": "^0.1.2",
     "@types/alpinejs": "^3.7.0"

diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "lit": "^2.2.5",
     "@astrojs/lit": "^1.0.0",
     "@webcomponents/template-shadowroot": "^0.1.0"

diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "preact": "^10.7.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
@@ -22,6 +22,6 @@
     "@astrojs/react": "^1.2.1",
     "@astrojs/solid-js": "^1.2.1",
     "@astrojs/svelte": "^1.0.2",
-    "@astrojs/vue": "^1.2.0"
+    "@astrojs/vue": "^1.2.1"
   }
 }
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "preact": "^10.7.3",
     "@astrojs/preact": "^1.2.0",
     "@preact/signals": "^1.1.0"

diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "@astrojs/react": "^1.2.1",

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "solid-js": "^1.4.3",
     "@astrojs/solid-js": "^1.2.1"
   }

diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -13,6 +13,6 @@
   "dependencies": {
     "svelte": "^3.48.0",
     "@astrojs/svelte": "^1.0.2",
-    "astro": "^1.5.1"
+    "astro": "^1.5.2"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "vue": "^3.2.37",
-    "@astrojs/vue": "^1.2.0"
+    "@astrojs/vue": "^1.2.1"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
@@ -15,9 +15,9 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^1.5.1"
+    "astro": "^1.5.2"
   },
   "peerDependencies": {
-    "astro": "^1.5.1"
+    "astro": "^1.5.2"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1"
+    "astro": "^1.5.2"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1"
+    "astro": "^1.5.2"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1"
+    "astro": "^1.5.2"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -12,7 +12,7 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "svelte": "^3.48.0",
     "@astrojs/svelte": "^1.0.2",
     "@astrojs/node": "^2.0.1",

diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "@astrojs/markdown-remark": "^1.1.3",
     "hast-util-select": "5.0.1",
     "rehype-autolink-headings": "^6.1.1",

diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1"
+    "astro": "^1.5.2"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "preact": "^10.6.5",
     "@astrojs/preact": "^1.2.0",
     "@astrojs/mdx": "^0.11.4"

diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "preact": "^10.7.3",
     "@astrojs/preact": "^1.2.0",
     "nanostores": "^0.5.12",

diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^0.11.4",
     "@astrojs/tailwind": "^2.1.1",
     "@types/canvas-confetti": "^1.4.3",
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "autoprefixer": "^10.4.7",
     "canvas-confetti": "^1.5.1",
     "postcss": "^8.4.14",

diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "vite-plugin-pwa": "0.11.11",
     "workbox-window": "^6.5.3"
   }

diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^1.5.1",
+    "astro": "^1.5.2",
     "vitest": "^0.20.3"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,15 @@
 # astro
 
+## 1.5.2
+
+### Patch Changes
+
+- [#5119](https://github.com/withastro/astro/pull/5119) [`430e0346c`](https://github.com/withastro/astro/commit/430e0346c9dc0def8af93e0a393dc2847e145d2f) Thanks [@bluwy](https://github.com/bluwy)! - Use `fs.promises.rm` to remove node deprecation warning
+
+- [#5123](https://github.com/withastro/astro/pull/5123) [`9745009ae`](https://github.com/withastro/astro/commit/9745009ae0e7fe8691c75657c5c9586a548bf2e0) Thanks [@matthewp](https://github.com/matthewp)! - Fixes index page with build.format=file
+
+- [#5116](https://github.com/withastro/astro/pull/5116) [`500acb3c1`](https://github.com/withastro/astro/commit/500acb3c117070ee5838a8b567e9bdcf68703227) Thanks [@matthewp](https://github.com/matthewp)! - Throws when using Response.redirect in SSG mode
+
 ## 1.5.1
 
 ### Patch Changes

diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

diff --git a/packages/integrations/prefetch/CHANGELOG.md b/packages/integrations/prefetch/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/prefetch
 
+## 0.1.0
+
+### Minor Changes
+
+- [#5125](https://github.com/withastro/astro/pull/5125) [`5a674f976`](https://github.com/withastro/astro/commit/5a674f976d6138ec5c87441a579c2ccf37713e73) Thanks [@Jelenkee](https://github.com/Jelenkee)! - Prefetch CSS files once
+
 ## 0.0.8
 
 ### Patch Changes

diff --git a/packages/integrations/prefetch/package.json b/packages/integrations/prefetch/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/prefetch",
   "description": "Faster page navigations by prefetching links when the browser is idle.",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",

diff --git a/packages/integrations/prefetch/src/client.ts b/packages/integrations/prefetch/src/client.ts
@@ -5,6 +5,7 @@ import requestIdleCallback from './requestIdleCallback.js';
 const events = ['mouseenter', 'touchstart', 'focus'];
 
 const preloaded = new Set<string>();
+const loadedStyles = new Set<string>();
 
 function shouldPreload({ href }: { href: string }) {
 	try {
@@ -53,7 +54,14 @@ async function preloadHref(link: HTMLAnchorElement) {
 		const html = parser.parseFromString(contents, 'text/html');
 		const styles = Array.from(html.querySelectorAll<HTMLLinkElement>('link[rel="stylesheet"]'));
 
-		await Promise.all(styles.map((el) => fetch(el.href)));
+		await Promise.all(
+			styles
+				.filter((el) => !loadedStyles.has(el.href))
+				.map((el) => {
+					loadedStyles.add(el.href);
+					return fetch(el.href);
+				})
+		);
 	} catch {}
 }
 

diff --git a/packages/integrations/prefetch/test/fixtures/style-prefetch/astro.config.mjs b/packages/integrations/prefetch/test/fixtures/style-prefetch/astro.config.mjs
@@ -0,0 +1,7 @@
+import { defineConfig } from 'astro/config';
+import prefetch from '@astrojs/prefetch';
+
+// https://astro.build/config
+export default defineConfig({
+	integrations: [prefetch()],
+});
diff --git a/packages/integrations/prefetch/test/fixtures/style-prefetch/package.json b/packages/integrations/prefetch/test/fixtures/style-prefetch/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/astro-prefetch",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/prefetch": "workspace:*",
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/integrations/prefetch/test/fixtures/style-prefetch/src/pages/index.astro b/packages/integrations/prefetch/test/fixtures/style-prefetch/src/pages/index.astro
@@ -0,0 +1,18 @@
+---
+---
+
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Home</title>
+</head>
+<body>
+    <h1>Home</h1>
+    <ul>
+        <li><a href="/style1" rel="prefetch">1</a></li>
+        <li><a href="/style2" rel="prefetch">2</a></li>
+    </ul>
+</body>
+</html>
diff --git a/packages/integrations/prefetch/test/fixtures/style-prefetch/src/pages/style1.astro b/packages/integrations/prefetch/test/fixtures/style-prefetch/src/pages/style1.astro
@@ -0,0 +1,15 @@
+---
+---
+
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Style1</title>
+    <link rel="stylesheet" href="/main.css">
+</head>
+<body>
+    <h1>Style1</h1>
+</body>
+</html>
diff --git a/packages/integrations/prefetch/test/fixtures/style-prefetch/src/pages/style2.astro b/packages/integrations/prefetch/test/fixtures/style-prefetch/src/pages/style2.astro
@@ -0,0 +1,15 @@
+---
+---
+
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Style2</title>
+    <link rel="stylesheet" href="/main.css">
+</head>
+<body>
+    <h1>Style2</h1>
+</body>
+</html>