From b701c7e74b645abdcb4ca1cff721e1a024e9af9f Mon Sep 17 00:00:00 2001
From: Niek van der Maas <mail@niekvandermaas.nl>
Date: Wed, 22 Mar 2023 11:33:25 +0100
Subject: [PATCH] Re-enable `flourite` with Safari/FF fix, bump deps, fixes #64

---
 package-lock.json   | 20 ++++++++++----------
 package.json        |  2 +-
 src/lib/Code.svelte |  5 ++---
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b5d9299..f41cabe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "copy-to-clipboard": "^3.3.3",
         "eslint-config-standard-with-typescript": "^34.0.1",
         "eslint-plugin-svelte3": "^4.0.0",
-        "flourite": "^1.2.2",
+        "flourite": "^1.2.3",
         "postcss": "^8.4.21",
         "sass": "^1.59.2",
         "svelte": "^3.55.1",
@@ -2210,9 +2210,9 @@
       "peer": true
     },
     "node_modules/flourite": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/flourite/-/flourite-1.2.2.tgz",
-      "integrity": "sha512-eSRUyfKaJ0dyyas8GOQEqwYCcBymfjS+bMgzQAq2rA6jCbkeCm7upT8o5HmBT3SILzslzeUqEvjak1MjJY+NrA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/flourite/-/flourite-1.2.3.tgz",
+      "integrity": "sha512-iGoOmc4EcfYpWSY71LGMf+3BbQ2xbeIXoKbafGqghuEOK7PCZ0i8oxcMYFBIdM+vtgPmAV0ktA3b492yXjwyQA==",
       "dev": true,
       "funding": {
         "url": "https://saweria.co/teknologiumum"
@@ -2884,9 +2884,9 @@
       "peer": true
     },
     "node_modules/js-sdsl": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
-      "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz",
+      "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==",
       "dev": true,
       "peer": true,
       "funding": {
@@ -3005,9 +3005,9 @@
       }
     },
     "node_modules/marked": {
-      "version": "4.2.12",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.12.tgz",
-      "integrity": "sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
+      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
       "dev": true,
       "bin": {
         "marked": "bin/marked.js"
diff --git a/package.json b/package.json
index b797e42..1050031 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "copy-to-clipboard": "^3.3.3",
     "eslint-config-standard-with-typescript": "^34.0.1",
     "eslint-plugin-svelte3": "^4.0.0",
-    "flourite": "^1.2.2",
+    "flourite": "^1.2.3",
     "postcss": "^8.4.21",
     "sass": "^1.59.2",
     "svelte": "^3.55.1",
diff --git a/src/lib/Code.svelte b/src/lib/Code.svelte
index 67670c0..4ad936a 100644
--- a/src/lib/Code.svelte
+++ b/src/lib/Code.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Highlight } from 'svelte-highlight'
-  // import flourite from 'flourite'
+  import flourite from 'flourite'
 
   // Import both dark and light styles
   import { github, githubDark } from 'svelte-highlight/styles'
@@ -38,8 +38,7 @@
 
   // If no language is set, try to detect it using flourite
   if (!lang) {
-    // lang = flourite(text, { shiki: true }).language
-    // TODO: re-enable this once https://github.com/teknologi-umum/flourite/pull/75 is merged
+    lang = flourite(text, { shiki: true }).language
   }
 
   switch (lang) {