Merge branch 'main' into http-proxy-for-fetch

withastro · Sep 12, 2022 · c76e465 · c76e465
2 parents 946a9c7 + 562147a
commit c76e465
Show file tree

Hide file tree

Showing 106 changed files with 1,482 additions and 716 deletions.
diff --git a/.changeset/fuzzy-rats-remain.md b/.changeset/fuzzy-rats-remain.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Properly show an error message when a renderer is not properly configured
diff --git a/.changeset/green-pillows-hammer.md b/.changeset/green-pillows-hammer.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/vue': patch
+---
+
+Fix Vue `script setup` with other renderers applied
diff --git a/.changeset/orange-llamas-play.md b/.changeset/orange-llamas-play.md
diff --git a/.changeset/tasty-owls-watch.md b/.changeset/tasty-owls-watch.md
diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7"
+    "astro": "^1.2.1"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7",
+    "astro": "^1.2.1",
     "@astrojs/mdx": "^0.11.1",
     "@astrojs/rss": "^1.0.0",
     "@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.1.7"
+    "astro": "^1.2.1"
   },
   "peerDependencies": {
-    "astro": "^1.1.7"
+    "astro": "^1.2.1"
   }
 }
diff --git a/examples/docs/README.md b/examples/docs/README.md
@@ -47,14 +47,14 @@ Welcome! Check out [our documentation](https://docs.astro.build) or jump into ou
 
 ### CSS styling
 
-The theme's look and feel is controlled by a few key variables that you can customize yourself. You'll find them in the `public/theme.css` CSS file.
+The theme's look and feel is controlled by a few key variables that you can customize yourself. You'll find them in the `src/styles/theme.css` CSS file.
 
 If you've never worked with CSS variables before, give [MDN's guide on CSS variables](https://developer.mozilla.org/en-US/docs/Web/CSS/Using_CSS_custom_properties) a quick read.
 
 This theme uses a "cool blue" accent color by default. To customize this for your project, change the `--theme-accent` variable to whatever color you'd like:
 
 ```diff
-/* public/theme.css */
+/* src/styles/theme.css */
 :root {
   color-scheme: light;
 -  --theme-accent: hsla(var(--color-blue), 1);

diff --git a/examples/docs/package.json b/examples/docs/package.json
@@ -11,11 +11,11 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7",
+    "astro": "^1.2.1",
     "preact": "^10.7.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
-    "@astrojs/react": "^1.1.0",
+    "@astrojs/react": "^1.1.2",
     "@astrojs/preact": "^1.1.0",
     "@algolia/client-search": "^4.13.1",
     "@docsearch/css": "^3.1.0",

diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7",
+    "astro": "^1.2.1",
     "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
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7",
+    "astro": "^1.2.1",
     "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
@@ -10,15 +10,15 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7",
+    "astro": "^1.2.1",
     "preact": "^10.7.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "solid-js": "^1.4.3",
     "svelte": "^3.48.0",
     "vue": "^3.2.37",
     "@astrojs/preact": "^1.1.0",
-    "@astrojs/react": "^1.1.0",
+    "@astrojs/react": "^1.1.2",
     "@astrojs/solid-js": "^1.1.0",
     "@astrojs/svelte": "^1.0.0",
     "@astrojs/vue": "^1.0.1"

diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7",
+    "astro": "^1.2.1",
     "preact": "^10.7.3",
     "@astrojs/preact": "^1.1.0"
   }

diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -10,10 +10,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7",
+    "astro": "^1.2.1",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
-    "@astrojs/react": "^1.1.0",
+    "@astrojs/react": "^1.1.2",
     "@types/react": "^18.0.10",
     "@types/react-dom": "^18.0.5"
   }

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

diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -12,6 +12,6 @@
   "dependencies": {
     "svelte": "^3.48.0",
     "@astrojs/svelte": "^1.0.0",
-    "astro": "^1.1.7"
+    "astro": "^1.2.1"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7",
+    "astro": "^1.2.1",
     "vue": "^3.2.37",
     "@astrojs/vue": "^1.0.1"
   }

diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7"
+    "astro": "^1.2.1"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7"
+    "astro": "^1.2.1"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7"
+    "astro": "^1.2.1"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -12,7 +12,7 @@
   },
   "devDependencies": {},
   "dependencies": {
-    "astro": "^1.1.7",
+    "astro": "^1.2.1",
     "svelte": "^3.48.0",
     "@astrojs/svelte": "^1.0.0",
     "@astrojs/node": "^1.0.1",

diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7",
+    "astro": "^1.2.1",
     "@astrojs/markdown-remark": "^1.1.0",
     "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
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7"
+    "astro": "^1.2.1"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7",
+    "astro": "^1.2.1",
     "preact": "^10.6.5",
     "@astrojs/preact": "^1.1.0",
     "@astrojs/mdx": "^0.11.1"

diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7",
+    "astro": "^1.2.1",
     "preact": "^10.7.3",
     "@astrojs/preact": "^1.1.0",
     "nanostores": "^0.5.12",

diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7",
+    "astro": "^1.2.1",
     "@astrojs/tailwind": "^1.0.0",
     "autoprefixer": "^10.4.7",
     "canvas-confetti": "^1.5.1",

diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.7",
+    "astro": "^1.2.1",
     "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.1.7",
+    "astro": "^1.2.1",
     "vitest": "^0.20.3"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,39 @@
 # astro
 
+## 1.2.1
+
+### Patch Changes
+
+- [#4703](https://github.com/withastro/astro/pull/4703) [`d28f7013c`](https://github.com/withastro/astro/commit/d28f7013c2b415cbf6b640f17c9678ef0ac53253) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix: [astro add] Apply fetch polyfill before running
+
+## 1.2.0
+
+### Minor Changes
+
+- [#4682](https://github.com/withastro/astro/pull/4682) [`d1e695914`](https://github.com/withastro/astro/commit/d1e69591479741022eecc122c43afb05985a94fd) Thanks [@bholmesdev](https://github.com/bholmesdev)! - astro add - move configuration updates to final step
+
+- [#4549](https://github.com/withastro/astro/pull/4549) [`255636cc7`](https://github.com/withastro/astro/commit/255636cc7b4ed5f72045f75a2411ebd84a2bdb0d) Thanks [@altano](https://github.com/altano)! - Allow specifying custom encoding when using a non-html route. Only option before was 'utf-8' and now that is just the default.
+
+- [#4578](https://github.com/withastro/astro/pull/4578) [`c706d845e`](https://github.com/withastro/astro/commit/c706d845ebf4786c33d2295954a98df8c5a7f183) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Restart dev server when config file is added, updated, or removed
+
+### Patch Changes
+
+- [#4699](https://github.com/withastro/astro/pull/4699) [`b85d05a84`](https://github.com/withastro/astro/commit/b85d05a841538b6a995808b6422b234f3e746804) Thanks [@matthewp](https://github.com/matthewp)! - Fix missing CSS in client:only in child packages
+
+## 1.1.8
+
+### Patch Changes
+
+- [#4675](https://github.com/withastro/astro/pull/4675) [`63e49c3b6`](https://github.com/withastro/astro/commit/63e49c3b642274835cf99e2c0816a5bb655971c9) Thanks [@matthewp](https://github.com/matthewp)! - Prevent locking up when encountering invalid CSS
+
+- [#4684](https://github.com/withastro/astro/pull/4684) [`919df13b9`](https://github.com/withastro/astro/commit/919df13b91eb561ae939e9be51e5a76ca97d8512) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Fixes regression introduced in [#4646](https://github.com/withastro/astro/pull/4646) with better cyclic reference detection
+
+- [#4683](https://github.com/withastro/astro/pull/4683) [`cc242d3af`](https://github.com/withastro/astro/commit/cc242d3af2cc39731cc40b07ac0aa1db687b2920) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix `tsc` compilation errors when `skipLibCheck` wasn't enabled
+
+- [#4667](https://github.com/withastro/astro/pull/4667) [`9290b2414`](https://github.com/withastro/astro/commit/9290b24143d753edd3daf25945990c25a58e5bde) Thanks [@Holben888](https://github.com/Holben888)! - Fix framework components on Vercel Edge
+
+- [#4645](https://github.com/withastro/astro/pull/4645) [`f27ca6ab3`](https://github.com/withastro/astro/commit/f27ca6ab3edbf0ef55e213ffd09aac454ce07995) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix client-side scripts reloads on dev server in windows
+
 ## 1.1.7
 
 ### Patch Changes

diff --git a/packages/astro/e2e/astro-component.test.js b/packages/astro/e2e/astro-component.test.js
@@ -36,10 +36,7 @@ test.describe('Astro component HMR', () => {
 		);
 	});
 
-	// TODO: Re-enable this test on windows when #3424 is fixed
-	// https://github.com/withastro/astro/issues/3424
-	const it = os.platform() === 'win32' ? test.skip : test;
-	it('hoisted scripts', async ({ page, astro }) => {
+	test('hoisted scripts', async ({ page, astro }) => {
 		const initialLog = page.waitForEvent(
 			'console',
 			(message) => message.text() === 'Hello, Astro!'
@@ -60,4 +57,26 @@ test.describe('Astro component HMR', () => {
 
 		await updatedLog;
 	});
+
+	test('inline scripts', async ({ page, astro }) => {
+		const initialLog = page.waitForEvent(
+			'console',
+			(message) => message.text() === 'Hello, inline Astro!'
+		);
+
+		await page.goto(astro.resolveUrl('/'));
+		await initialLog;
+
+		const updatedLog = page.waitForEvent(
+			'console',
+			(message) => message.text() === 'Hello, updated inline Astro!'
+		);
+
+		// Edit the inline script on the page
+		await astro.editFile('./src/pages/index.astro', (content) =>
+			content.replace('Hello, inline Astro!', 'Hello, updated inline Astro!')
+		);
+
+		await updatedLog;
+	});
 });
diff --git a/packages/astro/e2e/fixtures/astro-component/src/pages/index.astro b/packages/astro/e2e/fixtures/astro-component/src/pages/index.astro
@@ -18,3 +18,7 @@ import Hero from '../components/Hero.astro';
 <script>
 	console.log('Hello, Astro!');
 </script>
+
+<script is:inline>
+	console.log('Hello, inline Astro!');
+</script>