fix: hmr error, peerDependencies error

Jevon617 · Jun 28, 2023 · 5a37bf4 · 5a37bf4
1 parent 828cc62
commit 5a37bf4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
     "test:e2e": "pnpm -C playground test"
   },
   "peerDependencies": {
-    "@vue/compiler-sfc": ">=2.7.0 <=3.2.47"
+    "@vue/compiler-sfc": ">=2.7.0"
   },
   "dependencies": {
     "cors": "^2.8.5",
@@ -99,20 +99,20 @@
     "unplugin": "^0.10.2"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.38.5",
+    "@antfu/eslint-config": "^0.39.5",
     "@types/cors": "^2.8.13",
-    "@types/debug": "^4.1.7",
+    "@types/debug": "^4.1.8",
     "@types/etag": "^1.8.1",
-    "@types/node": "^18.16.4",
+    "@types/node": "^18.16.18",
     "@types/svgo": "^2.6.4",
-    "@vue/compiler-sfc": "^3.2.47",
+    "@vue/compiler-sfc": "^3.3.4",
     "bumpp": "^8.2.1",
     "debug": "^4.3.4",
-    "eslint": "^8.39.0",
+    "eslint": "^8.43.0",
     "esno": "^0.16.3",
     "tsup": "^6.7.0",
     "typescript": "^4.9.5",
-    "vitest": "^0.31.0",
-    "vue": "^3.2.47"
+    "vitest": "^0.32.2",
+    "vue": "^3.3.4"
   }
 }
diff --git a/src/core/generator.ts b/src/core/generator.ts
@@ -8,8 +8,8 @@ import createSvgSprite from './sprite'
 import { LOAD_EVENT, UPDATE_EVENT, XMLNS, XMLNS_LINK } from './constants'
 
 export async function genCode(options: Options, usedSvgNames: string[] | string, hmr: boolean) {
-  const isVueProject = detectProjectType(options)
-  const componentCode = await genComponent(options, isVueProject)
+  const isVue = isVueProject(options)
+  const componentCode = await genComponent(options)
   const { svgSpriteDomId } = options
 
   const { symbolIds, symbols, symbolCache } = await createSvgSprite(options, usedSvgNames)
@@ -21,7 +21,7 @@ export async function genCode(options: Options, usedSvgNames: string[] | string,
 
   // only generate dts in serve
   if (options?.dts && !Array.isArray(usedSvgNames))
-    genDts(symbolIds, options, isVueProject)
+    genDts(symbolIds, options)
 
   const hmrCode = `
 if (import.meta.hot) {
@@ -69,8 +69,9 @@ export const svgNames = ["${[...symbolIds].join('","')}"]
   }
 }
 
-export function genDts(symbolIds: Set<string>, options: Options, isVueProject: boolean) {
-  if (isVueProject) {
+export function genDts(symbolIds: Set<string>, options: Options) {
+  const isVue = isVueProject(options)
+  if (isVue) {
     fs.writeFile(
       path.resolve(options.dtsDir!, './svg-component.d.ts'),
       replace(dts, symbolIds, options.componentName!),
@@ -88,9 +89,10 @@ export function genDts(symbolIds: Set<string>, options: Options, isVueProject: b
   }
 }
 
-async function genComponent(options: Options, isVueProject: boolean) {
+async function genComponent(options: Options) {
+  const isVue = isVueProject(options)
   const { componentStyle, componentName, vueVersion } = options
-  if (!isVueProject) {
+  if (!isVue) {
     return reactTemplate.replace(/\$component_name/, componentName!)
       .replace(/\$component_style/, JSON.stringify(transformStyleStrToObject(componentStyle!)))
   }
@@ -153,7 +155,7 @@ async function getVueVersion(vueVerison: VueVersion): Promise<'vue2' | 'vue3' |
   }
 }
 
-function detectProjectType(options: Options) {
+function isVueProject(options: Options) {
   if (options.projectType === 'auto') {
     try {
       if (isPackageExists('vue'))