merge

Author: kazupon

examples/backend/package.json

@@ -23,7 +23,7 @@
     "@types/express": "^4.17.13",
     "@types/body-parser": "^1.19.2",
     "express": "^4.19.2",
-    "body-parser": "^1.19.1",
+    "body-parser": "^1.20.3",
     "jiti": "^1.19.3",
     "ofetch": "^1.1.1",
     "@intlify/unplugin-vue-i18n": "^0.12.0",

examples/frameworks/nuxt3/package-lock.json

@@ -21,7 +21,7 @@
     "vue-i18n": "^9.2.0-beta.40"
   },
   "devDependencies": {
-    "vite": "^4.5.3",
+    "vite": "^4.5.5",
     "@vitejs/plugin-vue": "^4.2.3",
     "@vitejs/plugin-vue-jsx": "^2.0.0",
     "dep-import-type": "link:./dep-import-type",

examples/ssr/vite/package.json

@@ -2153,10 +2153,10 @@ vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
-vite@^4.5.3:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.3.tgz#d88a4529ea58bae97294c7e2e6f0eab39a50fb1a"
-  integrity sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==
+vite@^4.5.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.5.tgz#639b9feca5c0a3bfe3c60cb630ef28bf219d742e"
+  integrity sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==
   dependencies:
     esbuild "^0.18.10"
     postcss "^8.4.27"

examples/ssr/vite/yarn.lock

@@ -107,7 +107,7 @@
     "listhen": "^1.7.2",
     "minimist": "^1.2.6",
     "mlly": "^1.6.1",
-    "npm-run-all2": "^6.1.2",
+    "npm-run-all2": "^7.0.0",
     "opener": "^1.5.2",
     "pathe": "^1.1.2",
     "picocolors": "^1.0.0",

package.json

@@ -8,7 +8,6 @@ import type {
   NumberOptions,
   IsNever,
   IsEmptyObject,
-  PickupKeys,
   PickupFormatPathKeys
 } from '@intlify/core-base'
 import type {
@@ -1107,8 +1106,14 @@ declare module 'vue' {
      */
     $tm<
       Key extends string,
-      Messages extends object = {},
-      ResourceKeys extends PickupKeys<Messages> = PickupKeys<Messages>
+      DefinedLocaleMessage extends
+        RemovedIndexResources<DefineLocaleMessage> = RemovedIndexResources<DefineLocaleMessage>,
+      Keys = IsEmptyObject<DefinedLocaleMessage> extends false
+        ? JsonPaths<{
+            [K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]
+          }>
+        : never,
+      ResourceKeys extends Keys = IsNever<Keys> extends false ? Keys : never
     >(
       key: Key | ResourceKeys
     ): LocaleMessageValue<VueMessageType> | {}