Merge branch 'main' into ci/gen-import

.github/labels.yml

@@ -84,7 +84,7 @@
   description: Libreddit
   color: '#f5a97f'
 - name: lichess
-  description: lichess
+  description: Lichess
   color: '#7dc4e4'
 - name: linkedin
   description: LinkedIn
@@ -156,7 +156,7 @@
   description: WhatsApp Web
   color: '#8aadf4'
 - name: wikiwand
-  description: WikiWand
+  description: Wikiwand
   color: '#8aadf4'
 - name: youtube
   description: YouTube

README.md

@@ -123,7 +123,7 @@ See [CONTRIBUTING.md](docs/CONTRIBUTING.md).
 - [Stylus](styles/stylus)
 - [Syncthing](styles/syncthing)
 - [Tuta](styles/tuta)
-- [WikiWand](styles/wikiwand)
+- [Wikiwand](styles/wikiwand)
 
 </details>
 <details open>
@@ -159,7 +159,7 @@ See [CONTRIBUTING.md](docs/CONTRIBUTING.md).
 - [Advent Of Code](styles/advent-of-code)
 - [bStats](styles/bstats)
 - [Chess.com](styles/chess.com)
-- [lichess](styles/lichess)
+- [Lichess](styles/lichess)
 - [Modrinth](styles/modrinth)
 - [Planet Minecraft](styles/planet-minecraft)
 

deno.json

@@ -6,6 +6,7 @@
     "@actions/core": "npm:@actions/[email protected]",
     "@octokit/rest": "npm:@octokit/[email protected]",
     "ajv": "npm:[email protected]",
+    "type-fest/": "https://esm.sh/v135/[email protected]/",
     "handlebars": "npm:[email protected]",
     "less": "npm:[email protected]",
     "usercss-meta": "npm:[email protected]"

scripts/lint/main.ts

@@ -28,7 +28,7 @@ for await (const entry of stylesheets) {
   const content = await Deno.readTextFile(entry.path);
 
   // verify the usercss metadata
-  const { globalVars, isLess } = verifyMetadata(entry, content, repo);
+  const { globalVars, isLess } = await verifyMetadata(entry, content, repo);
   // don't attempt to compile or lint non-less files
   if (!isLess) continue;
 

scripts/lint/metadata.ts

@@ -1,18 +1,20 @@
 // @deno-types="@/types/usercss-meta.d.ts";
 import usercssMeta from "usercss-meta";
-import { log } from "@/lint/logger.ts";
 import * as color from "std/fmt/colors.ts";
 import { sprintf } from "std/fmt/printf.ts";
 import type { WalkEntry } from "std/fs/walk.ts";
 import { relative } from "std/path/mod.ts";
+
 import { REPO_ROOT } from "@/deps.ts";
+import { log } from "@/lint/logger.ts";
+import { getUserstylesData } from "@/utils.ts";
 
-export const verifyMetadata = (
+export const verifyMetadata = async (
   entry: WalkEntry,
   content: string,
   repo: string,
 ) => {
-  const assert = assertions(repo);
+  const assert = await assertions(repo);
   const file = relative(REPO_ROOT, entry.path);
 
   const { metadata, errors: parsingErrors } = usercssMeta.parse(content, {
@@ -67,9 +69,20 @@ export const verifyMetadata = (
   };
 };
 
-const assertions = (repo: string) => {
+const assertions = async (repo: string) => {
   const prefix = "https://github.com/catppuccin/userstyles";
+
+  const { userstyles } = await getUserstylesData().catch((err) => {
+    console.error(err);
+    Deno.exit(1);
+  });
+
   return {
+    name: `${
+      Array.isArray(userstyles[repo].name)
+        ? (userstyles[repo].name as string[]).join("/")
+        : userstyles[repo].name
+    } Catppuccin`,
     namespace: `github.com/catppuccin/userstyles/styles/${repo}`,
     author: "Catppuccin",
     license: "MIT",

scripts/sync-maintainers/main.ts

@@ -1,23 +1,17 @@
 #!/usr/bin/env -S deno run -A
 import * as assert from "std/assert/mod.ts";
-import * as path from "std/path/mod.ts";
 import { Octokit } from "@octokit/rest";
 
-import { REPO_ROOT, userStylesSchema } from "@/deps.ts";
 import type { UserStylesSchema } from "@/types/mod.ts";
-import { validateYaml } from "@/utils.ts";
-import { UserstylesSchema } from "@/types/userstyles.d.ts";
+import { getUserstylesData } from "@/utils.ts";
 
 const octokit = new Octokit({ auth: Deno.env.get("GITHUB_TOKEN") });
 const team = { org: "catppuccin", team_slug: "userstyles-maintainers" };
 
-const userstylesData = await validateYaml<UserstylesSchema>(
-  Deno.readTextFileSync(path.join(REPO_ROOT, "scripts/userstyles.yml")),
-  userStylesSchema,
-);
-if (userstylesData.userstyles === undefined) {
+const userstylesData = await getUserstylesData().catch((err) => {
+  console.error(err);
   Deno.exit(1);
-}
+});
 
 // lowercase usernames of all the "current-maintainers" in the file
 const maintainers = [

scripts/userstyles.yml

@@ -299,11 +299,11 @@ userstyles:
       current-maintainers: [*isabelroses]
       past-maintainers: [*andreasgrafen]
   lichess:
-    name: lichess
+    name: Lichess
     category: game
     color: sapphire
     readme:
-      usage: "Switch to a default lichess light/dark theme via **Username** > **Background** for the best experience!"
+      usage: "Switch to a default Lichess light/dark theme via **Username** > **Background** for the best experience!"
       app-link: "https://lichess.org/"
       current-maintainers: [*coopw1]
   linkedin:
@@ -495,7 +495,7 @@ userstyles:
       app-link: "https://web.whatsapp.com"
       current-maintainers: [*francorav]
   wikiwand:
-    name: WikiWand
+    name: Wikiwand
     category: productivity
     icon: wikipedia
     readme:

scripts/utils.ts

@@ -1,5 +1,10 @@
 import Ajv, { Schema } from "ajv";
 import { parse } from "std/yaml/parse.ts";
+import { join } from "std/path/join.ts";
+import { SetRequired } from "type-fest/source/set-required.d.ts";
+
+import { REPO_ROOT, userStylesSchema } from "@/deps.ts";
+import { UserstylesSchema } from "@/types/userstyles.d.ts";
 
 /**
  * @param content A string of YAML content
@@ -20,3 +25,23 @@ export const validateYaml = <T>(
     return resolve(data);
   });
 };
+
+/**
+ * Utility function that calls {@link validateYaml} on the userstyles.yml file.
+ * Fails when data.userstyles is undefined.
+ */
+export const getUserstylesData = (): Promise<Userstyles> => {
+  return new Promise((resolve, reject) => {
+    validateYaml<UserstylesSchema>(
+      Deno.readTextFileSync(join(REPO_ROOT, "scripts/userstyles.yml")),
+      userStylesSchema,
+    ).then((data) => {
+      if (data.userstyles === undefined || data.collaborators === undefined) {
+        return reject("userstyles.yml is missing required fields");
+      }
+      return resolve(data as Userstyles);
+    });
+  });
+};
+
+type Userstyles = SetRequired<UserstylesSchema, "userstyles" | "collaborators">;

styles/anilist/catppuccin.user.css

@@ -1,5 +1,5 @@
 /* ==UserStyle==
-@name AniList Catppuccin
+@name AniList/AniChart Catppuccin
 @namespace github.com/catppuccin/userstyles/styles/anilist
 @homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/anilist
 @version 2.1.1

styles/hacker-news/catppuccin.user.css

@@ -1,5 +1,5 @@
 /* ==UserStyle==
-@name HackerNews Catppuccin
+@name Hacker News Catppuccin
 @namespace github.com/catppuccin/userstyles/styles/hacker-news
 @homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/hacker-news
 @version 0.1.1

styles/hoppscotch/catppuccin.user.css

@@ -1,5 +1,5 @@
 /* ==UserStyle==
-@name Hoppscotch.io Catppuccin
+@name Hoppscotch Catppuccin
 @namespace github.com/catppuccin/userstyles/styles/hoppscotch
 @homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/hoppscotch
 @version 1.0.0

styles/lichess/README.md

@@ -4,7 +4,7 @@
 <h3 align="center">
 	<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/logos/exports/1544x1544_circle.png" width="100" alt="Logo"/><br/>
 	<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/misc/transparent.png" height="30" width="0px"/>
-  Catppuccin for <a href="https://lichess.org/">lichess</a>
+  Catppuccin for <a href="https://lichess.org/">Lichess</a>
 	<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/misc/transparent.png" height="30" width="0px"/>
 </h3>
 
@@ -37,7 +37,7 @@
 </details>
 
 ## Usage
-Switch to a default lichess light/dark theme via **Username** > **Background** for the best experience!
+Switch to a default Lichess light/dark theme via **Username** > **Background** for the best experience!
 
 
 ## 💝 Current Maintainer

styles/reddit/catppuccin.user.css

@@ -1133,10 +1133,6 @@
     .snoo-cls-11 {
       fill: @sky;
     }
-
-    .snoo-cls-11 {
-      fill: @sky;
-    }
   }
 }
 

styles/whatsapp-web/catppuccin.user.css

@@ -1,5 +1,5 @@
 /* ==UserStyle==
-@name WhatsApp Web  Catppuccin
+@name WhatsApp Web Catppuccin
 @namespace github.com/catppuccin/userstyles/styles/whatsapp-web
 @homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/whatsapp-web
 @version 0.0.4

styles/wikiwand/README.md

@@ -4,7 +4,7 @@
 <h3 align="center">
 	<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/logos/exports/1544x1544_circle.png" width="100" alt="Logo"/><br/>
 	<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/misc/transparent.png" height="30" width="0px"/>
-  Catppuccin for <a href="https://www.wikiwand.com">WikiWand</a>
+  Catppuccin for <a href="https://www.wikiwand.com">Wikiwand</a>
 	<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/misc/transparent.png" height="30" width="0px"/>
 </h3>