@varlet/cli 3.2.0 → 3.2.2

package/README.md

@@ -272,8 +272,8 @@ varlet-cli create
 
 ### Note before publish
 
-- 1.`npm` repository registry must set to `npm` official mirror
-- 2.Execute `npm login` to log in
+1. `npm` repository registry must set to `npm` official mirror
+2. Execute `npm login` to log in
 
 ### Q & A
 

package/README.zh-CN.md

@@ -271,8 +271,8 @@ varlet-cli create
 
 ### 发布前注意
 
-- 1.`npm` 的仓库源必须指向 `npm` 官方镜像
-- 2.执行 `npm login` 进行登录
+1. `npm` 的仓库源必须指向 `npm` 官方镜像
+2. 执行 `npm login` 进行登录
 
 ### 问答
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -64,8 +64,8 @@
     "sharp": "0.31.1",
     "slash": "^3.0.0",
     "typescript": "^5.1.5",
-    "@varlet/vite-plugins": "3.2.0",
-    "@varlet/shared": "3.2.0"
+    "@varlet/shared": "3.2.2",
+    "@varlet/vite-plugins": "3.2.2"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.1",
@@ -80,9 +80,9 @@
     "@types/semver": "^7.3.9",
     "@types/sharp": "0.31.1",
     "rimraf": "^5.0.1",
-    "@varlet/touch-emulator": "3.2.0",
-    "@varlet/ui": "3.2.0",
-    "@varlet/icons": "3.2.0"
+    "@varlet/icons": "3.2.2",
+    "@varlet/touch-emulator": "3.2.2",
+    "@varlet/ui": "3.2.2"
   },
   "peerDependencies": {
     "@vue/runtime-core": "3.4.21",
@@ -95,9 +95,9 @@
     "lodash-es": "^4.17.21",
     "vue": "3.4.21",
     "vue-router": "4.2.0",
-    "@varlet/icons": "3.2.0",
-    "@varlet/touch-emulator": "3.2.0",
-    "@varlet/ui": "3.2.0"
+    "@varlet/icons": "3.2.2",
+    "@varlet/ui": "3.2.2",
+    "@varlet/touch-emulator": "3.2.2"
   },
   "scripts": {
     "dev": "tsc --watch",

package/template/create/example/index.vue.ejs

@@ -1,11 +1,11 @@
 <script setup>
-import <%- bigCamelizeNamespace + bigCamelizeName %> from '../index'
+import <%- bigCamelizeNamespace + bigCamelizeName %> from '..'
 <% if (!locale) { -%>
 import { AppType } from '@varlet/cli/client'
 <% } -%>
 <% if (locale) { -%>
 import { watchLang, AppType } from '@varlet/cli/client'
-import { use, pack } from './locale'
+import { use, t } from './locale'
 
 watchLang(use)
 <% } -%>

package/template/generators/config/i18n/sfc/src/button/Button.vue

@@ -1,6 +1,6 @@
 <template>
   <button class="va-button" :style="{ background: color }" @click="handleClick">
-    {{ pack.button }}
+    {{ t('button') }}
     <slot />
   </button>
 </template>
@@ -9,7 +9,7 @@
 import { defineComponent, PropType } from 'vue'
 
 // i18n for component's internal
-import { pack } from '../locale'
+import { t } from '../locale'
 
 export default defineComponent({
   name: 'VaButton',
@@ -27,7 +27,7 @@ export default defineComponent({
     }
 
     return {
-      pack,
+      t,
       handleClick,
     }
   },

package/template/generators/config/i18n/sfc/src/locale/en-US.ts

@@ -1,7 +1,7 @@
-import { Pack } from './index'
+import { Message } from './index'
 
 // for component's internal
 export default {
   // Button component
   button: 'Button',
-} as Pack
+} as Message

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

@@ -1,6 +1,7 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import zhCN from './zh-CN'
+import { hasOwn } from '@varlet/shared'
 
 export type Message = {
   // Button component
@@ -41,7 +42,7 @@ function useLocale<T = Message>() {
   }
 
   const t = (id: string) => {
-    if (Object.prototype.hasOwnProperty.call(currentMessage.value, id)) {
+    if (hasOwn(currentMessage.value, id)) {
       return currentMessage.value[id]
     }
 
@@ -58,14 +59,14 @@ function useLocale<T = Message>() {
   }
 }
 
-const { messages, currentMessage, add, use, merge } = useLocale()
+const { messages, currentMessage, add, use, merge, t } = useLocale()
 
 add('zh-CN', zhCN)
 use('zh-CN')
 
-export { messages, currentMessage, add, use, merge, useLocale }
+export { messages, currentMessage, add, use, merge, t, useLocale }
 
-export const _LocaleComponent = { messages, currentMessage, add, use, merge, useLocale }
+export const _LocaleComponent = { messages, currentMessage, add, use, merge, t, useLocale }
 
 export default {
   messages,
@@ -73,5 +74,6 @@ export default {
   add,
   use,
   merge,
+  t,
   useLocale,
 }

package/template/generators/config/i18n/sfc/src/locale/zh-CN.ts

@@ -1,7 +1,7 @@
-import { Pack } from './index'
+import { Message } from './index'
 
 // for component's internal
 export default {
   // Button component
   button: '按钮',
-} as Pack
+} as Message

package/template/generators/config/i18n/tsx/src/button/Button.tsx

@@ -2,7 +2,7 @@ import { defineComponent, PropType } from 'vue'
 import './button.less'
 
 // i18n for component's internal
-import { pack } from '../locale'
+import { t } from '../locale'
 
 export default defineComponent({
   name: 'VaButton',
@@ -24,7 +24,7 @@ export default defineComponent({
 
       return (
         <button class="va-button" style={{ background: color }} onClick={handleClick}>
-          {pack.value.button}
+          {t('button')}
           {slots.default?.()}
         </button>
       )

package/template/generators/config/i18n/tsx/src/locale/en-US.ts

@@ -1,7 +1,7 @@
-import { Pack } from './index'
+import { Message } from './index'
 
 // for component's internal
 export default {
   // Button component
   button: 'Button',
-} as Pack
+} as Message

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

@@ -1,6 +1,7 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import zhCN from './zh-CN'
+import { hasOwn } from '@varlet/shared'
 
 export type Message = {
   // Button component
@@ -8,7 +9,6 @@ export type Message = {
 
   // internal
   lang?: string
-
   [key: PropertyKey]: any
 }
 
@@ -42,7 +42,7 @@ function useLocale<T = Message>() {
   }
 
   const t = (id: string) => {
-    if (Object.prototype.hasOwnProperty.call(currentMessage.value, id)) {
+    if (hasOwn(currentMessage.value, id)) {
       return currentMessage.value[id]
     }
 
@@ -59,14 +59,14 @@ function useLocale<T = Message>() {
   }
 }
 
-const { messages, currentMessage, t, add, use, merge } = useLocale()
+const { messages, currentMessage, add, use, merge, t } = useLocale()
 
 add('zh-CN', zhCN)
 use('zh-CN')
 
-export { messages, currentMessage, t, add, use, merge, useLocale }
+export { messages, currentMessage, add, use, merge, t, useLocale }
 
-export const _LocaleComponent = { messages, currentMessage, t, add, use, merge, useLocale }
+export const _LocaleComponent = { messages, currentMessage, add, use, merge, t, useLocale }
 
 export default {
   messages,

package/template/generators/config/i18n/tsx/src/locale/zh-CN.ts

@@ -1,7 +1,7 @@
-import { Pack } from './index'
+import { Message } from './index'
 
 // for component's internal
 export default {
   // Button component
   button: '按钮',
-} as Pack
+} as Message