Merge branch 'main' into pr/1923

HiDeoo · Sep 6, 2024 · 3f57de0 · 3f57de0
2 parents 915bc6b + ccf8d79
commit 3f57de0
Show file tree

Hide file tree

Showing 10 changed files with 500 additions and 820 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -18,7 +18,7 @@
     "@astrojs/starlight": "workspace:*",
     "@lunariajs/core": "^0.1.1",
     "@types/culori": "^2.1.1",
-    "astro": "^4.10.2",
+    "astro": "^4.15.3",
     "culori": "^4.0.1",
     "sharp": "^0.32.5",
     "starlight-custom-plugin": "workspace:*"

diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/starlight": "^0.26.3",
-    "astro": "^4.10.2",
+    "@astrojs/starlight": "^0.26.4",
+    "astro": "^4.15.3",
     "sharp": "^0.32.5"
   }
 }
diff --git a/examples/tailwind/package.json b/examples/tailwind/package.json
@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/starlight": "^0.26.3",
+    "@astrojs/starlight": "^0.26.4",
     "@astrojs/starlight-tailwind": "^2.0.3",
     "@astrojs/tailwind": "^5.1.0",
-    "astro": "^4.10.2",
+    "astro": "^4.15.3",
     "sharp": "^0.32.5",
     "tailwindcss": "^3.4.4"
   }

diff --git a/package.json b/package.json
@@ -8,15 +8,15 @@
     "size": "size-limit",
     "version": "pnpm changeset version && pnpm i --no-frozen-lockfile",
     "format": "prettier -w --cache --plugin prettier-plugin-astro .",
-    "typecheck": "astro check --minimumSeverity warning"
+    "typecheck": "astro check --minimumSeverity warning --noSync"
   },
   "license": "MIT",
   "devDependencies": {
     "@astrojs/check": "^0.7.0",
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.5",
     "@size-limit/file": "^11.1.4",
-    "astro": "^4.10.2",
+    "astro": "^4.15.3",
     "prettier": "^3.3.2",
     "prettier-plugin-astro": "^0.14.0",
     "size-limit": "^11.1.4",

diff --git a/packages/starlight/CHANGELOG.md b/packages/starlight/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @astrojs/starlight
 
+## 0.26.4
+
+### Patch Changes
+
+- [#2288](https://github.com/withastro/starlight/pull/2288) [`b15f725`](https://github.com/withastro/starlight/commit/b15f725ead981387f80f089d0523d9c2748b184e) Thanks [@matthewp](https://github.com/matthewp)! - Safely handle Zod errors
+
+  Prevents bugs where errors without the `.received` props would through and cause builds to fail unnecessarily.
+
 ## 0.26.3
 
 ### Patch Changes

diff --git a/packages/starlight/__e2e__/fixtures/basics/package.json b/packages/starlight/__e2e__/fixtures/basics/package.json
@@ -4,6 +4,6 @@
   "private": true,
   "dependencies": {
     "@astrojs/starlight": "workspace:*",
-    "astro": "^4.10.2"
+    "astro": "^4.15.3"
   }
 }
diff --git a/packages/starlight/__e2e__/fixtures/custom src-dir/package.json b/packages/starlight/__e2e__/fixtures/custom src-dir/package.json
@@ -4,6 +4,6 @@
   "private": true,
   "dependencies": {
     "@astrojs/starlight": "workspace:*",
-    "astro": "^4.10.2"
+    "astro": "^4.15.3"
   }
 }
diff --git a/packages/starlight/package.json b/packages/starlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/starlight",
-  "version": "0.26.3",
+  "version": "0.26.4",
   "description": "Build beautiful, high-performance documentation websites with Astro",
   "scripts": {
     "test": "vitest",
@@ -183,7 +183,7 @@
     "@playwright/test": "^1.45.0",
     "@types/node": "^18.16.19",
     "@vitest/coverage-v8": "^1.6.0",
-    "astro": "^4.10.2",
+    "astro": "^4.15.3",
     "vitest": "^1.6.0"
   },
   "dependencies": {

diff --git a/packages/starlight/utils/error-map.ts b/packages/starlight/utils/error-map.ts
@@ -143,7 +143,8 @@ const errorMap: z.ZodErrorMap = (baseError, ctx) => {
 };
 
 const getTypeOrLiteralMsg = (error: TypeOrLiteralErrByPathEntry): string => {
-	if (error.received === 'undefined') return 'Required';
+	// received could be `undefined` or the string `'undefined'`
+	if (typeof error.received === 'undefined' || error.received === 'undefined') return 'Required';
 	const expectedDeduped = new Set(error.expected);
 	switch (error.code) {
 		case 'invalid_type':