Merge arrays deeper into source

stevebauman · Dec 28, 2023 · ed97380 · ed97380
1 parent c61e910
commit ed97380
Showing 1 changed file with 17 additions and 21 deletions.
diff --git a/plugins/shiki.js b/plugins/shiki.js
@@ -10,28 +10,20 @@ import collect from 'collect.js';
 setCDN('/shiki/');
 setWasm('/shiki/dist/onig.wasm');
 
-const preloadedThemes = ['github-light'];
-const preloadedLangs = [
-    'html',
-    'html-derivative',
-    'xml',
-    'sql',
-    'javascript',
-    'json',
-    'css',
-    'php',
-    'php-html',
-];
-
-const customThemes = ['bluloco-light', 'bluloco-dark', 'rajoyish'];
-
-const langAliases = ['bash', 'shell'];
-const excludedLangs = ['php-html', 'html-derivative'];
-
 export default async (context, inject) => {
     const highlighter = await getHighlighter({
-        themes: preloadedThemes,
-        langs: preloadedLangs,
+        themes: ['github-light'],
+        langs: [
+            'html',
+            'html-derivative',
+            'xml',
+            'sql',
+            'javascript',
+            'json',
+            'css',
+            'php',
+            'php-html',
+        ],
     });
 
     const shiki = {
@@ -60,10 +52,14 @@ export default async (context, inject) => {
         },
 
         languages() {
+            const excludedLangs = ['php-html', 'html-derivative'];
+
             const langs = BUNDLED_LANGUAGES.filter((lang) => !excludedLangs.includes(lang.id)).map(
                 (lang) => lang.id
             );
 
+            const langAliases = ['bash', 'shell'];
+
             return [...langs, ...langAliases];
         },
 
@@ -78,7 +74,7 @@ export default async (context, inject) => {
         themes() {
             return collect(BUNDLED_THEMES)
                 .filter((theme) => !['slack-ochin', 'css-variables'].some((t) => theme.includes(t)))
-                .merge(customThemes)
+                .merge(['bluloco-light', 'bluloco-dark', 'rajoyish'])
                 .sort()
                 .toArray();
         },