Merge pull request #4158 from traPtitech/fix/gen-mplus.js

データのurl変更に対応するために、gen-fontsのスクリプトを修正
traPtitech · Dec 2, 2023 · 4c3688d · 4c3688d
2 parents 972dd4c + 10e6a03
commit 4c3688d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/build/gen-mplus.js b/build/gen-mplus.js
@@ -75,11 +75,14 @@ const getUrlFromSrc = src => {
 }
 
 const generateFilename = font => {
-  const i = getUrlFromSrc(font.src).match(/\/v\d+\/[^.]+\.(\d+)\.woff2/)
-  if (!i) throw new Error(`Unexpected: ${getUrlFromSrc(font.src)}`)
   const family = font['font-family'].replace(/[' ]/g, '')
   const weight = font['font-weight'].replace(/[' ]/g, '')
-  return `${family}.${weight}.${i[1]}.woff2`
+
+  const fontSrcWithId = getUrlFromSrc(font.src).match(/\/v\d+\/([^/]+)\.woff2/)
+  if (!fontSrcWithId) {
+    throw new Error(`Unexpected URL: ${getUrlFromSrc(font.src)}`)
+  }
+  return `${family}.${weight}.${fontSrcWithId[1]}.woff2`
 }
 
 const downloadAndtransform = async (url, filename) => {