From 53e8ba1b7be26262f6835bf53f5631a815af3ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 14 Sep 2021 22:28:49 +0200
Subject: [PATCH] demos: move shiki to worker

---
 demos/preview/Shiki.vue       | 99 ++++-------------------------------
 demos/preview/shiki.worker.js | 92 ++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+), 89 deletions(-)
 create mode 100644 demos/preview/shiki.worker.js

diff --git a/demos/preview/Shiki.vue b/demos/preview/Shiki.vue
index e7ea95082..7c8354d3f 100644
--- a/demos/preview/Shiki.vue
+++ b/demos/preview/Shiki.vue
@@ -4,18 +4,7 @@
 </template>
 
 <script>
-import * as shiki from 'shiki'
-import onigasm from 'shiki/dist/onigasm.wasm?url'
-import theme from 'shiki/themes/material-darker.json'
-import langHTML from 'shiki/languages/html.tmLanguage.json'
-import langJS from 'shiki/languages/javascript.tmLanguage.json'
-import langJSX from 'shiki/languages/jsx.tmLanguage.json'
-import langTS from 'shiki/languages/typescript.tmLanguage.json'
-import langTSX from 'shiki/languages/tsx.tmLanguage.json'
-import langVueHTML from 'shiki/languages/vue-html.tmLanguage.json'
-import langVue from 'shiki/languages/vue.tmLanguage.json'
-import langCSS from 'shiki/languages/css.tmLanguage.json'
-import langSCSS from 'shiki/languages/scss.tmLanguage.json'
+import Worker from './shiki.worker?worker'
 
 export default {
   props: {
@@ -32,6 +21,7 @@ export default {
 
   data() {
     return {
+      worker: new Worker(),
       html: null,
       highlighter: window?.highlighter,
     }
@@ -55,88 +45,19 @@ export default {
 
   methods: {
     render() {
-      try {
-        requestAnimationFrame(() => {
-          this.html = this.highlighter?.codeToHtml(this.code, this.language)
-        })
-      } catch {
-        console.warn(`[shiki]: missing language: ${this.language}`)
-      }
-    },
-
-    async initHighlighter() {
-      if (window.highlighter) {
-        return
-      }
-
-      const arrayBuffer = await fetch(onigasm).then(response => response.arrayBuffer())
-
-      shiki.setOnigasmWASM(arrayBuffer)
-
-      const highlighter = await shiki.getHighlighter({
-        theme,
-        langs: [
-          {
-            id: 'html',
-            scopeName: langHTML.scopeName,
-            grammar: langHTML,
-            embeddedLangs: ['javascript', 'css'],
-          },
-          {
-            id: 'javascript',
-            scopeName: langJS.scopeName,
-            grammar: langJS,
-            aliases: ['js'],
-          },
-          {
-            id: 'jsx',
-            scopeName: langJSX.scopeName,
-            grammar: langJSX,
-          },
-          {
-            id: 'typescript',
-            scopeName: langTS.scopeName,
-            grammar: langTS,
-            aliases: ['ts'],
-          },
-          {
-            id: 'tsx',
-            scopeName: langTSX.scopeName,
-            grammar: langTSX,
-          },
-          {
-            id: 'vue-html',
-            scopeName: langVueHTML.scopeName,
-            grammar: langVueHTML,
-            embeddedLangs: ['vue', 'javascript'],
-          },
-          {
-            id: 'vue',
-            scopeName: langVue.scopeName,
-            grammar: langVue,
-            embeddedLangs: ['json', 'markdown', 'pug', 'haml', 'vue-html', 'sass', 'scss', 'less', 'stylus', 'postcss', 'css', 'typescript', 'coffee', 'javascript'],
-          },
-          {
-            id: 'css',
-            scopeName: langCSS.scopeName,
-            grammar: langCSS,
-          },
-          {
-            id: 'scss',
-            scopeName: langSCSS.scopeName,
-            grammar: langSCSS,
-            embeddedLangs: ['css'],
-          },
-        ],
+      this.worker.postMessage({
+        code: this.code,
+        language: this.language,
       })
-
-      window.highlighter = highlighter
-      this.highlighter = highlighter
     },
   },
 
   created() {
-    this.initHighlighter()
+    this.worker.addEventListener('message', event => {
+      const { html } = event.data
+
+      this.html = html
+    })
   },
 }
 </script>
diff --git a/demos/preview/shiki.worker.js b/demos/preview/shiki.worker.js
new file mode 100644
index 000000000..f14bef2c8
--- /dev/null
+++ b/demos/preview/shiki.worker.js
@@ -0,0 +1,92 @@
+import * as shiki from 'shiki'
+import onigasm from 'shiki/dist/onigasm.wasm?url'
+import theme from 'shiki/themes/material-darker.json'
+import langHTML from 'shiki/languages/html.tmLanguage.json'
+import langJS from 'shiki/languages/javascript.tmLanguage.json'
+import langJSX from 'shiki/languages/jsx.tmLanguage.json'
+import langTS from 'shiki/languages/typescript.tmLanguage.json'
+import langTSX from 'shiki/languages/tsx.tmLanguage.json'
+import langVueHTML from 'shiki/languages/vue-html.tmLanguage.json'
+import langVue from 'shiki/languages/vue.tmLanguage.json'
+import langCSS from 'shiki/languages/css.tmLanguage.json'
+import langSCSS from 'shiki/languages/scss.tmLanguage.json'
+
+let highlighter = null
+
+async function init() {
+  if (highlighter) {
+    return highlighter
+  }
+
+  const arrayBuffer = await fetch(onigasm).then(response => response.arrayBuffer())
+
+  shiki.setOnigasmWASM(arrayBuffer)
+
+  highlighter = await shiki.getHighlighter({
+    theme,
+    langs: [
+      {
+        id: 'html',
+        scopeName: langHTML.scopeName,
+        grammar: langHTML,
+        embeddedLangs: ['javascript', 'css'],
+      },
+      {
+        id: 'javascript',
+        scopeName: langJS.scopeName,
+        grammar: langJS,
+        aliases: ['js'],
+      },
+      {
+        id: 'jsx',
+        scopeName: langJSX.scopeName,
+        grammar: langJSX,
+      },
+      {
+        id: 'typescript',
+        scopeName: langTS.scopeName,
+        grammar: langTS,
+        aliases: ['ts'],
+      },
+      {
+        id: 'tsx',
+        scopeName: langTSX.scopeName,
+        grammar: langTSX,
+      },
+      {
+        id: 'vue-html',
+        scopeName: langVueHTML.scopeName,
+        grammar: langVueHTML,
+        embeddedLangs: ['vue', 'javascript'],
+      },
+      {
+        id: 'vue',
+        scopeName: langVue.scopeName,
+        grammar: langVue,
+        embeddedLangs: ['json', 'markdown', 'pug', 'haml', 'vue-html', 'sass', 'scss', 'less', 'stylus', 'postcss', 'css', 'typescript', 'coffee', 'javascript'],
+      },
+      {
+        id: 'css',
+        scopeName: langCSS.scopeName,
+        grammar: langCSS,
+      },
+      {
+        id: 'scss',
+        scopeName: langSCSS.scopeName,
+        grammar: langSCSS,
+        embeddedLangs: ['css'],
+      },
+    ],
+  })
+
+  return highlighter
+}
+
+self.addEventListener('message', async event => {
+  init().then(() => {
+    const { code, language } = event.data
+    const html = highlighter.codeToHtml(code, language)
+
+    self.postMessage({ code, language, html })
+  })
+})