pleroma-fe

commit: d07e8fd5d6da29b74aba745dc2b5d83a18581205
parent 649ae09585ec6cb01d56407860c3bbb25e3ed3a3
Author: tusooa <tusooa@kazv.moe>
Date:   Fri, 26 Aug 2022 15:35:12 +0000

Merge branch 'renovate/vue-babel-helper-vue-jsx-merge-props-1.x' into 'develop'

Update dependency @vue/babel-helper-vue-jsx-merge-props to v1.4.0

See merge request pleroma/pleroma-fe!1625
Diffstat:
M
package.json
2
+-
M
yarn.lock
8
++++----

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "@babel/register": "7.18.9",
     "@intlify/vue-i18n-loader": "5.0.0",
     "@ungap/event-target": "0.2.3",
-    "@vue/babel-helper-vue-jsx-merge-props": "1.2.1",
+    "@vue/babel-helper-vue-jsx-merge-props": "1.4.0",
     "@vue/babel-plugin-jsx": "1.1.1",
     "@vue/compiler-sfc": "3.2.37",
     "@vue/test-utils": "2.0.2",
diff --git a/yarn.lock b/yarn.lock
@@ -1764,10 +1764,10 @@
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
   integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
 
-"@vue/babel-helper-vue-jsx-merge-props@1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz#31624a7a505fb14da1d58023725a4c5f270e6a81"
-  integrity sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA==
+"@vue/babel-helper-vue-jsx-merge-props@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz#8d53a1e21347db8edbe54d339902583176de09f2"
+  integrity sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA==
 
 "@vue/babel-helper-vue-transform-on@^1.0.2":
   version "1.0.2"