Merge branch 'main'

Conflicts: src/routes/components/components.json
svelte-society · Nov 22, 2023 · 5de04aa · 5de04aa
2 parents fbb4805 + b8d5d62
commit 5de04aa
Show file tree

Hide file tree

Showing 11 changed files with 168 additions and 246 deletions.
diff --git a/package.json b/package.json
@@ -31,6 +31,7 @@
 		"itemsjs": "^2.1.20",
 		"lint-staged": "^13.2.3",
 		"mdsvex": "^0.11.0",
+		"package-name-regex": "^3.0.0",
 		"prettier": "^2.8.8",
 		"prettier-plugin-svelte": "^2.10.1",
 		"rehype-slug": "^5.1.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/lib/components/ComponentIndex/ArrowButton.svelte b/src/lib/components/ComponentIndex/ArrowButton.svelte
diff --git a/src/lib/schemas.js b/src/lib/schemas.js
@@ -1,12 +1,10 @@
 import { z } from 'zod';
+import packageNameRegex from 'package-name-regex';
 
 export const componentsSchema = z.array(
 	z.object({
 		title: z.string(),
-		npm: z
-			.string()
-			.regex(/(@[\w-]+\/)?[\w-]+/)
-			.optional(),
+		npm: z.string().regex(packageNameRegex),
 		url: z.string().url().optional(),
 		repository: z.string().url(),
 		description: z.string(),
@@ -46,10 +44,7 @@ export const templatesSchema = z.array(
 export const toolsSchema = z.array(
 	z.object({
 		title: z.string(),
-		npm: z
-			.string()
-			.regex(/(@[\w-]+\/)?[\w-]+/)
-			.optional(),
+		npm: z.string().regex(packageNameRegex).optional(),
 		url: z.string().url().optional(),
 		repository: z.string().url(),
 		description: z.string(),