chore: optimize code

Jevon617 · Dec 4, 2024 · e047040 · e047040
1 parent d122e37
commit e047040
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/core/generator.ts b/src/core/generator.ts
@@ -8,7 +8,7 @@ import { replace, transformStyleStrToObject } from './utils'
 import { LOAD_EVENT } from './constants'
 import createSvgSprite from './sprite'
 
-export async function genSpriteWidthDts(options: Options, isBuild: boolean) {
+export async function genSpriteAndDts(options: Options, isBuild: boolean) {
   const spriteInfo = await createSvgSprite(options, isBuild)
   if (!isBuild && options?.dts)
     genDts(spriteInfo.symbolIds, options)
@@ -17,7 +17,7 @@ export async function genSpriteWidthDts(options: Options, isBuild: boolean) {
 }
 
 export async function genCode(options: Options, isDev = false) {
-  const spriteInfo = await genSpriteWidthDts(options, !isDev)
+  const spriteInfo = await genSpriteAndDts(options, !isDev)
   const { svgSpriteDomId } = options
   const { symbolIds, sprite } = spriteInfo
 

diff --git a/src/core/index.ts b/src/core/index.ts
@@ -4,7 +4,7 @@ import genEtag from 'etag'
 import { createUnplugin } from 'unplugin'
 import type { ViteDevServer } from 'vite'
 import type { Options } from '../types'
-import { genCode, genSpriteWidthDts } from './generator'
+import { genCode, genSpriteAndDts } from './generator'
 import { MODULE_NAME, PLUGIN_NAME } from './constants'
 import { resolveOptions } from './utils'
 import watchIconDir from './watcher'
@@ -32,11 +32,9 @@ const unplugin = createUnplugin<Options>(options => ({
     return id === MODULE_NAME
   },
   async load() {
-    return isBuild
+    return isBuild || isWebpack
       ? (await genCode(options))
-      : isWebpack
-        ? (await genCode(options, true))
-        : ''
+      : ''
   },
   webpack(compiler) {
     isWebpack = true
@@ -48,7 +46,7 @@ const unplugin = createUnplugin<Options>(options => ({
     compiler.hooks.emit.tapAsync(PLUGIN_NAME, async (compilation, callback) => {
       const assets = compilation.assets as any
       const originHtml = assets['index.html']._value
-      const { sprite } = await genSpriteWidthDts(options, isBuild)
+      const { sprite } = await genSpriteAndDts(options, isBuild)
       const transformedHtml = originHtml.replace(/<\/body>/, `${sprite}</body>`)
       assets['index.html'] = {
         source() {
@@ -112,7 +110,7 @@ const unplugin = createUnplugin<Options>(options => ({
         return html
       }
       else {
-        const { sprite } = await genSpriteWidthDts(options, isBuild)
+        const { sprite } = await genSpriteAndDts(options, isBuild)
         return html.replace(/<\/body>/, `${sprite}</body>`)
       }
     },

diff --git a/src/core/watcher.ts b/src/core/watcher.ts
@@ -3,7 +3,7 @@ import type { ViteDevServer } from 'vite'
 import colors from 'picocolors'
 import type { Options } from '../types'
 import { debounce } from './utils'
-import { genSpriteWidthDts, genDts as updateDts } from './generator'
+import { genSpriteAndDts, genDts as updateDts } from './generator'
 import { LOAD_EVENT } from './constants'
 
 export default function watchIconDir(
@@ -31,7 +31,7 @@ export default function watchIconDir(
   async function handleIconFilesChange(path: string) {
     if (!isSvgFile(path))
       return
-    const { symbolIds, sprite } = await genSpriteWidthDts(options, false)
+    const { symbolIds, sprite } = await genSpriteAndDts(options, false)
 
     if (dts)
       updateDts(symbolIds, options)