refactor: 不再打包 emot.js 而是将它内置评论系统中

Author: lete114

rollup.config.js

@@ -85,15 +85,5 @@ export default [
       file: production ? 'dist/discuss.admin.js' : 'public/dist/discuss.admin.js'
     },
     plugins
-  },
-  {
-    input: 'src/client/emot.js',
-    output: {
-      sourcemap: true,
-      format: 'iife',
-      name: 'discussEmot',
-      file: production ? 'dist/emot.js' : 'public/dist/emot.js'
-    },
-    plugins
   }
 ]

src/client/emot.js src/client/lib/emot.jssrc/client/emot.js renamed to src/client/lib/emot.js

@@ -1,4 +1,4 @@
-import { version } from '../../package.json'
+import { version } from '../../../package.json'
 
 const key = [
   '应援',
@@ -133,7 +133,7 @@ const key = [
   '偷偷看'
 ]
 
-export default window.DiscussEmot = (emotCDN) => {
+export default (emotCDN) => {
   emotCDN = (emotCDN || 'https://unpkg.com').replace(/\/$/, '') + `/discuss@${version}/assets/emot/`
   const items = {}
   for (const i of key) items[i] = emotCDN + i + '.png'
@@ -176,7 +176,7 @@ export default window.DiscussEmot = (emotCDN) => {
         太可怕了: 'ヽ(*。>Д<)o゜'
       }
     },
-    ['<img src="' + items['鼓掌'] + '">']: {
+    [`<img src=${items['鼓掌']}>`]: {
       type: 'image',
       items: items
     }

src/client/lib/import.js

@@ -11,7 +11,7 @@ scriptUrl = scriptUrl
   .replace(/\/[^/]+$/, '/') // 去除文件名
 
 window.DChunk = []
-const map = { emot: 'emot.js', admin: 'discuss.admin.js' }
+const map = { admin: 'discuss.admin.js' }
 const loadScript = (chunk, callback) => {
   if (window.DChunk.includes(chunk)) return callback()
   window.DChunk.push(chunk)

src/client/view/submit.svelte

@@ -2,7 +2,7 @@
   import { onMount, afterUpdate, createEventDispatcher } from 'svelte'
   import { options, msg, lazy } from '../lib/stores'
   import request from '../lib/request'
-  import loadScript from '../lib/import'
+  import emotFn from '../lib/emot'
   import Emotion from '../../../assets/svg/Emotion.svg'
   import Loading from '../../../assets/svg/Loading.svg'
   import Setting from '../../../assets/svg/Setting.svg'
@@ -93,9 +93,7 @@
     if (/\.json$/.test(emot)) {
       emotMaps = await request({ url: emot, method: 'GET' })
     } else if (!emot) {
-      loadScript('emot', () => {
-        emotMaps = window.discussEmot(D.emotCDN)
-      })
+      emotMaps = emotFn(D.emotCDN)
     } else {
       emotMaps = emot
     }
@@ -117,12 +115,10 @@
   function ParseEmot() {
     getEmotAll()
     let content = metas.content.value
-    const reg = /\[(?<emot>.*?)\]/g
     const emots = []
-    const arr = content.matchAll(reg)
-    for (const item of arr) {
-      emots.push(item.groups.emot)
-    }
+    content.replace(/\[(.*?)\]/g, ($0, $1) => {
+      emots.push($1)
+    })
 
     for (const emot of emots) {
       const link = emotAll[emot]