feat(whiskers): update catppuccin to v2 & add flavorName var (#137)

catppuccin · Mar 5, 2024 · 8e60740 · 8e60740
1 parent e8e23b0
commit 8e60740
Show file tree

Hide file tree

Showing 14 changed files with 108 additions and 96 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/whiskers/Cargo.toml b/whiskers/Cargo.toml
@@ -14,23 +14,23 @@ name = "whiskers"
 path = "src/main.rs"
 
 [dependencies]
-base64 = "0.21"
-catppuccin = { version = "1.4", features = ["css"] }
-indexmap = { version = "2.2.3", features = ["serde"] }
+base64 = "0.22"
+catppuccin = { version = "2.0", features = ["css-colors"] }
+indexmap = { version = "2.2", features = ["serde"] }
 clap = { version = "4.5", features = ["derive"] }
-clap-stdin = "0.4.0"
+clap-stdin = "0.4"
 color-eyre = { version = "0.6", default-features = false }
 css-colors = "1.0"
-handlebars = "4.5"
+handlebars = "5.1"
 regex = "1.10"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }
 serde_yaml = "0.9"
 tempfile = "3.10"
 thiserror = "1.0"
 titlecase = "2.2"
-json-patch = "1.2.0"
+json-patch = "1.2"
 
 [dev-dependencies]
 assert_cmd = "2.0"
-predicates = "3.1.0"
+predicates = "3.1"
diff --git a/whiskers/README.md b/whiskers/README.md
@@ -180,7 +180,7 @@ overrides:
 
 When running `whiskers example.yml {latte, frappe, macchiato, mocha}`, we see that:
 
-- Frappe & Macchiato will have the accent `mauve` hex code.
+- Frappé & Macchiato will have the accent `mauve` hex code.
 - Latte will have the accent `pink` hex code.
 - Mocha will have the accent `blue` hex code.
 
@@ -340,7 +340,7 @@ This allows us to define a template file like the following:
 # Single File
 
 {{#each flavors}}
-## {{titlecase flavor}}
+## {{flavorName}}
 Accent: #{{mauve}}
 {{/each}}
 ```
@@ -354,7 +354,7 @@ and after running `whiskers input.md all -o README.md`, we get the following out
 
 ## Latte
 Accent: #8839ef
-## Frappe
+## Frappé
 Accent: #ca9ee6
 ## Macchiato
 Accent: #c6a0f6

diff --git a/whiskers/examples/demo/input.hbs b/whiskers/examples/demo/input.hbs
@@ -1,6 +1,6 @@
 ## Demo
 
-**flavor:** {{ titlecase flavor }}
+**flavor:** {{ flavorName }}
 
 ### Colours
 

diff --git a/whiskers/examples/demo/output/frappe.md b/whiskers/examples/demo/output/frappe.md
@@ -1,6 +1,6 @@
 ## Demo
 
-**flavor:** Frappe
+**flavor:** Frappé
 
 ### Colours
 
@@ -20,4 +20,4 @@ this is a dark theme
 
 ### Misc
 
-unquote this: false
+unquote this: false
diff --git a/whiskers/examples/frontmatter/input.hbs b/whiskers/examples/frontmatter/input.hbs
@@ -7,7 +7,7 @@ accent: "{{ #if isLight }}{{ pink }}{{ ^ }}{{ mauve }}{{ /if }}"
 
 ## Demo With Frontmatter
 
-**flavor:** {{ titlecase flavor }}
+**flavor:** {{ flavorName }}
 
 This file also contains variables that have been defined in the frontmatter, as shown below:
 

diff --git a/whiskers/examples/frontmatter/output/frappe.md b/whiskers/examples/frontmatter/output/frappe.md
@@ -1,6 +1,6 @@
 ## Demo With Frontmatter
 
-**flavor:** Frappe
+**flavor:** Frappé
 
 This file also contains variables that have been defined in the frontmatter, as shown below:
 
@@ -27,4 +27,4 @@ this is a dark theme
 
 ### Misc
 
-unquote this: false
+unquote this: false
diff --git a/whiskers/examples/single-file/overrides/input.hbs b/whiskers/examples/single-file/overrides/input.hbs
@@ -25,7 +25,7 @@ overrides:
 # Single File With Overrides
 
 {{#each flavors}}
-## {{emoji}} {{titlecase flavor}}
+## {{emoji}} {{flavorName}}
 
 {{user}}'s favourite hex code is #{{accent}}
 

diff --git a/whiskers/examples/single-file/simple/input.hbs b/whiskers/examples/single-file/simple/input.hbs
@@ -2,7 +2,7 @@
 
 {{#each flavors}}
 <details open>
-<summary>{{titlecase flavor}}</summary>
+<summary>{{flavorName}}</summary>
 <table>
 	<tr>
 		<th></th>
@@ -22,4 +22,4 @@
     {{/each}}
 </table>
 </details>
-{{/each}}
+{{/each}}
diff --git a/whiskers/examples/single-file/simple/output.md b/whiskers/examples/single-file/simple/output.md
@@ -195,7 +195,7 @@
 </table>
 </details>
 <details open>
-<summary>Frappe</summary>
+<summary>Frappé</summary>
 <table>
 	<tr>
 		<th></th>