@varlet/cli 2.13.1-alpha.1689619056304 → 2.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "2.13.1-alpha.1689619056304",
+  "version": "2.13.1",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -70,8 +70,8 @@
     "vite": "4.3.5",
     "vue": "3.3.4",
     "webfont": "^9.0.0",
-    "@varlet/shared": "2.13.1-alpha.1689619056304",
-    "@varlet/vite-plugins": "2.13.1-alpha.1689619056304"
+    "@varlet/shared": "2.13.1",
+    "@varlet/vite-plugins": "2.13.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.1",
@@ -86,8 +86,8 @@
     "@types/semver": "^7.3.9",
     "@types/sharp": "0.31.1",
     "rimraf": "^5.0.1",
-    "@varlet/icons": "2.13.1-alpha.1689619056304",
-    "@varlet/touch-emulator": "2.13.1-alpha.1689619056304"
+    "@varlet/icons": "2.13.1",
+    "@varlet/touch-emulator": "2.13.1"
   },
   "peerDependencies": {
     "@vue/runtime-core": "3.3.4",
@@ -97,8 +97,8 @@
     "lodash-es": "^4.17.21",
     "vue": "3.3.4",
     "vue-router": "4.2.0",
-    "@varlet/icons": "2.13.1-alpha.1689619056304",
-    "@varlet/touch-emulator": "2.13.1-alpha.1689619056304"
+    "@varlet/icons": "2.13.1",
+    "@varlet/touch-emulator": "2.13.1"
   },
   "scripts": {
     "dev": "tsc --watch",

package/template/create/index.ts.ejs

@@ -1,10 +1,7 @@
-// Component entry, the folder where the file exists will be exposed to the user
 import <%- bigCamelizeName %> from './<%- bigCamelizeName %><%- style === 'vue' ? '.vue' : '' %>'
-import type { App } from 'vue'
+import { withInstall } from '../utils/components'
 
-<%- bigCamelizeName %>.install = function(app: App) {
-  app.component(<%- bigCamelizeName %>.name, <%- bigCamelizeName %>)
-}
+withInstall(<%- bigCamelizeName %>)
 
 export const _<%- bigCamelizeName %>Component = <%- bigCamelizeName %>
 

package/template/generators/config/default/sfc/src/button/index.ts

@@ -1,9 +1,7 @@
-import type { App } from 'vue'
 import Button from './Button.vue'
+import { withInstall } from '../utils/components'
 
-Button.install = function (app: App) {
-  app.component(Button.name, Button)
-}
+withInstall(Button)
 
 export const _ButtonComponent = Button
 

package/template/generators/config/default/sfc/src/utils/components.ts

@@ -0,0 +1,17 @@
+import type { Component, Plugin, App } from 'vue'
+
+export type ComponentWithInstall<T> = T & Plugin
+
+export function withInstall<T = Component>(component: Component, target?: T): ComponentWithInstall<T> {
+  const componentWithInstall = target ?? component
+
+  ;(componentWithInstall as ComponentWithInstall<T>).install = function (app: App) {
+    const { name } = component
+
+    if (name) {
+      app.component(name, component)
+    }
+  }
+
+  return componentWithInstall as ComponentWithInstall<T>
+}

package/template/generators/config/default/tsx/src/button/index.ts

@@ -1,10 +1,8 @@
-import type { App } from 'vue'
 import Button from './Button'
+import { withInstall } from '../utils/components'
 
-Button.install = function (app: App) {
-  app.component(Button.name, Button)
-}
+withInstall(Button)
 
 export const _ButtonComponent = Button
 
-export default Button
+export default Button

package/template/generators/config/default/tsx/src/utils/components.ts

@@ -0,0 +1,17 @@
+import type { Component, Plugin, App } from 'vue'
+
+export type ComponentWithInstall<T> = T & Plugin
+
+export function withInstall<T = Component>(component: Component, target?: T): ComponentWithInstall<T> {
+  const componentWithInstall = target ?? component
+
+  ;(componentWithInstall as ComponentWithInstall<T>).install = function (app: App) {
+    const { name } = component
+
+    if (name) {
+      app.component(name, component)
+    }
+  }
+
+  return componentWithInstall as ComponentWithInstall<T>
+}

package/template/generators/config/i18n/sfc/src/button/index.ts

@@ -1,9 +1,7 @@
-import type { App } from 'vue'
 import Button from './Button.vue'
+import { withInstall } from '../utils/components'
 
-Button.install = function (app: App) {
-  app.component(Button.name, Button)
-}
+withInstall(Button)
 
 export const _ButtonComponent = Button
 

package/template/generators/config/i18n/sfc/src/utils/components.ts

@@ -0,0 +1,17 @@
+import type { Component, Plugin, App } from 'vue'
+
+export type ComponentWithInstall<T> = T & Plugin
+
+export function withInstall<T = Component>(component: Component, target?: T): ComponentWithInstall<T> {
+  const componentWithInstall = target ?? component
+
+  ;(componentWithInstall as ComponentWithInstall<T>).install = function (app: App) {
+    const { name } = component
+
+    if (name) {
+      app.component(name, component)
+    }
+  }
+
+  return componentWithInstall as ComponentWithInstall<T>
+}

package/template/generators/config/i18n/tsx/src/button/index.ts

@@ -1,9 +1,7 @@
-import type { App } from 'vue'
 import Button from './Button'
+import { withInstall } from '../utils/components'
 
-Button.install = function (app: App) {
-  app.component(Button.name, Button)
-}
+withInstall(Button)
 
 export const _ButtonComponent = Button
 

package/template/generators/config/i18n/tsx/src/utils/components.ts

@@ -0,0 +1,17 @@
+import type { Component, Plugin, App } from 'vue'
+
+export type ComponentWithInstall<T> = T & Plugin
+
+export function withInstall<T = Component>(component: Component, target?: T): ComponentWithInstall<T> {
+  const componentWithInstall = target ?? component
+
+  ;(componentWithInstall as ComponentWithInstall<T>).install = function (app: App) {
+    const { name } = component
+
+    if (name) {
+      app.component(name, component)
+    }
+  }
+
+  return componentWithInstall as ComponentWithInstall<T>
+}