Merge branch 'main' into disallow-use-of-vercel-static-on-output-server

withastro · Oct 28, 2022 · 1e0b73f · 1e0b73f
2 parents 87f4ffc + 83fd265
commit 1e0b73f
Showing 62 changed files with 289 additions and 187 deletions.
diff --git a/.changeset/empty-feet-brush.md b/.changeset/empty-feet-brush.md
@@ -0,0 +1,5 @@
+---
+'create-astro': patch
+---
+
+Allow Windows users to pass `--fancy` to enable full unicode support
diff --git a/.changeset/new-pumas-begin.md b/.changeset/new-pumas-begin.md
diff --git a/.changeset/olive-tomatoes-jog.md b/.changeset/olive-tomatoes-jog.md
diff --git a/.changeset/silly-mirrors-give.md b/.changeset/silly-mirrors-give.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/webapi': patch
+---
+
+Fix CustomElementRegistry for Node SSR Adapter
diff --git a/.changeset/tasty-mugs-approve.md b/.changeset/tasty-mugs-approve.md
diff --git a/.changeset/tasty-rules-sleep.md b/.changeset/tasty-rules-sleep.md
diff --git a/.changeset/ten-cheetahs-perform.md b/.changeset/ten-cheetahs-perform.md
diff --git a/.changeset/wicked-pans-wait.md b/.changeset/wicked-pans-wait.md
diff --git a/.github/workflows/check-merge.yml b/.github/workflows/check-merge.yml
@@ -9,19 +9,23 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - name: Retrieve existing PR reviews
-        id: set-reviews
-        run: |
-          echo ::set-output name=reviews::$(curl --request GET \
-            --url https://api.github.com/repos/${{github.repository}}/pulls/${{github.event.number}}/reviews \
-            --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}')
-
       - name: Check if there is already a block on this PR
         id: set-blocks
-        run: |
-          echo ::set-output name=blocks::$(echo '${{ steps.set-reviews.outputs.reviews }}' \
-            | jq '.[] | select(.user.id == 41898282 and .state == "CHANGES_REQUESTED") | length' \
-            | uniq)
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const url = 'https://api.github.com/repos/' + context.repo.owner + '/' + context.repo.repo + '/pulls/' + context.issue.number + '/reviews';
+            console.log('reviews URL', url);
+            const result = await github.request(url);
+            console.log(result);
+            const reviews = result.data;
+            for(const review of reviews) {
+              if(review.user.id === 41898282 && review.state === 'CHANGES_REQUESTED') {
+                return 'block';
+              }
+            }
+            return '';
+          result-encoding: string
 
       - uses: actions/checkout@v3
         if: steps.set-blocks.outputs.blocks == ''

diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.6.0"
+    "astro": "^1.6.1"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.6.0",
+    "astro": "^1.6.1",
     "@astrojs/mdx": "^0.11.5",
     "@astrojs/rss": "^1.0.3",
     "@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.6.0"
+    "astro": "^1.6.1"
   },
   "peerDependencies": {
-    "astro": "^1.6.0"
+    "astro": "^1.6.1"
   }
 }
diff --git a/examples/deno/package.json b/examples/deno/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.6.0"
+    "astro": "^1.6.1"
   },
   "devDependencies": {
     "@astrojs/deno": "^1.2.0"

diff --git a/examples/docs/package.json b/examples/docs/package.json
@@ -12,11 +12,11 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.6.0",
+    "astro": "^1.6.1",
     "preact": "^10.7.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
-    "@astrojs/react": "^1.2.1",
+    "@astrojs/react": "^1.2.2",
     "@astrojs/preact": "^1.2.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
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.6.0",
+    "astro": "^1.6.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
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.6.0",
+    "astro": "^1.6.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
@@ -11,16 +11,16 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.6.0",
+    "astro": "^1.6.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.2.0",
-    "@astrojs/react": "^1.2.1",
-    "@astrojs/solid-js": "^1.2.1",
+    "@astrojs/react": "^1.2.2",
+    "@astrojs/solid-js": "^1.2.2",
     "@astrojs/svelte": "^1.0.2",
     "@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.6.0",
+    "astro": "^1.6.1",
     "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,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.6.0",
+    "astro": "^1.6.1",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
-    "@astrojs/react": "^1.2.1",
+    "@astrojs/react": "^1.2.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
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.6.0",
+    "astro": "^1.6.1",
     "solid-js": "^1.4.3",
-    "@astrojs/solid-js": "^1.2.1"
+    "@astrojs/solid-js": "^1.2.2"
   }
 }
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.6.0"
+    "astro": "^1.6.1"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.6.0",
+    "astro": "^1.6.1",
     "vue": "^3.2.37",
     "@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.6.0"
+    "astro": "^1.6.1"
   },
   "peerDependencies": {
-    "astro": "^1.6.0"
+    "astro": "^1.6.1"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.6.0"
+    "astro": "^1.6.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": "^1.6.0"
+    "astro": "^1.6.1"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.6.0"
+    "astro": "^1.6.1"
   }
 }
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.6.0",
+    "astro": "^1.6.1",
     "svelte": "^3.48.0",
     "@astrojs/svelte": "^1.0.2",
     "@astrojs/node": "^2.0.2",

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.6.0",
+    "astro": "^1.6.1",
     "@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.6.0"
+    "astro": "^1.6.1"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.6.0",
+    "astro": "^1.6.1",
     "preact": "^10.6.5",
     "@astrojs/preact": "^1.2.0",
     "@astrojs/mdx": "^0.11.5"

diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.6.0",
+    "astro": "^1.6.1",
     "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.5",
     "@astrojs/tailwind": "^2.1.1",
     "@types/canvas-confetti": "^1.4.3",
-    "astro": "^1.6.0",
+    "astro": "^1.6.1",
     "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.6.0",
+    "astro": "^1.6.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.6.0",
+    "astro": "^1.6.1",
     "vitest": "^0.20.3"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,21 @@
 # astro
 
+## 1.6.1
+
+### Patch Changes
+
+- [#5233](https://github.com/withastro/astro/pull/5233) [`7f8987085`](https://github.com/withastro/astro/commit/7f8987085c9c5bdcd39b9a6700303e9b9f76b9f2) Thanks [@bluwy](https://github.com/bluwy)! - Support rendering `@motionone/solid` components
+
+- [#5238](https://github.com/withastro/astro/pull/5238) [`26ff42905`](https://github.com/withastro/astro/commit/26ff429058c6244767276b9fa20ef58987be13ee) Thanks [@MoustaphaDev](https://github.com/MoustaphaDev)! - Fix not included file extension in `url` metadata for newly added markdown files
+
+- [#5217](https://github.com/withastro/astro/pull/5217) [`8c83359e3`](https://github.com/withastro/astro/commit/8c83359e385b47fb6e453c023aeac2e01a579f38) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix missing types.d.ts in npm package
+
+- [#5212](https://github.com/withastro/astro/pull/5212) [`a609a8937`](https://github.com/withastro/astro/commit/a609a8937f9f35c46f3c934d38b83c445da425b9) Thanks [@bluwy](https://github.com/bluwy)! - Upgrade Vite to 3.2
+
+- [#5206](https://github.com/withastro/astro/pull/5206) [`d64d5b9b5`](https://github.com/withastro/astro/commit/d64d5b9b52c66ac0b3435b85c92a877f374fb100) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Improve error messages related to CSS and compiler errors
+
+- [#5212](https://github.com/withastro/astro/pull/5212) [`a609a8937`](https://github.com/withastro/astro/commit/a609a8937f9f35c46f3c934d38b83c445da425b9) Thanks [@bluwy](https://github.com/bluwy)! - Allow importing public files in SSR
+
 ## 1.6.0
 
 ### Minor Changes

diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "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/astro/src/runtime/server/render/astro.ts b/packages/astro/src/runtime/server/render/astro.ts
@@ -57,7 +57,7 @@ export function isAstroComponent(obj: any): obj is AstroComponent {
 }
 
 export function isAstroComponentFactory(obj: any): obj is AstroComponentFactory {
-	return obj == null ? false : !!obj.isAstroComponentFactory;
+	return obj == null ? false : obj.isAstroComponentFactory === true;
 }
 
 export async function* renderAstroComponent(

diff --git a/packages/astro/src/runtime/server/render/component.ts b/packages/astro/src/runtime/server/render/component.ts
@@ -56,7 +56,7 @@ export async function renderComponent(
 	_props: Record<string | number, any>,
 	slots: any = {}
 ): Promise<ComponentIterable> {
-	Component = await Component;
+	Component = (await Component) ?? Component;
 
 	switch (getComponentType(Component)) {
 		case 'fragment': {
@@ -133,7 +133,14 @@ Did you mean to add ${formatList(probableRendererNames.map((r) => '`' + r + '`')
 		// If this component ran through `__astro_tag_component__`, we already know
 		// which renderer to match to and can skip the usual `check` calls.
 		// This will help us throw most relevant error message for modules with runtime errors
-		if (Component && (Component as any)[Renderer]) {
+		let isTagged = false;
+		try {
+			isTagged = Component && (Component as any)[Renderer];
+		} catch {
+			// Accessing `Component[Renderer]` may throw if `Component` is a Proxy that doesn't
+			// return the actual read-only value. In this case, ignore.
+		}
+		if (isTagged) {
 			const rendererName = (Component as any)[Renderer];
 			renderer = renderers.find(({ name }) => name === rendererName);
 		}