logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 4e5ff036dcc79c3ba4f0db692864694ff7a9b806
parent 12b563170fbcbff2acd1f3d1ad1fcf12e0fe6c85
Author: tusooa <tusooa@kazv.moe>
Date:   Sat, 23 Jul 2022 18:18:45 +0000

Merge branch 'renovate/vue-router-4.x' into 'develop'

Update dependency vue-router to v4.1.2

See merge request pleroma/pleroma-fe!1553

Diffstat:

Mbuild/webpack.base.conf.js7++++++-
Mpackage.json2+-
Myarn.lock14+++++++-------
3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js @@ -30,7 +30,7 @@ module.exports = { } }, resolve: { - extensions: ['.js', '.jsx', '.vue'], + extensions: ['.mjs', '.js', '.jsx', '.vue'], modules: [ path.join(__dirname, '../node_modules') ], @@ -108,6 +108,11 @@ module.exports = { } } }, + { + test: /\.mjs$/, + include: /node_modules/, + type: 'javascript/auto' + } ] }, plugins: [ diff --git a/package.json b/package.json @@ -41,7 +41,7 @@ "utf8": "^3.0.0", "vue": "^3.2.31", "vue-i18n": "9.2.0-beta.40", - "vue-router": "4.0.14", + "vue-router": "4.1.2", "vue-template-compiler": "2.6.11", "vuex": "4.0.2" }, diff --git a/yarn.lock b/yarn.lock @@ -1667,12 +1667,12 @@ "@vue/compiler-dom" "3.2.31" "@vue/shared" "3.2.31" -"@vue/devtools-api@^6.0.0", "@vue/devtools-api@^6.0.0-beta.11": +"@vue/devtools-api@^6.0.0-beta.11": version "6.1.3" resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.1.3.tgz#a44c52e8fa6d22f84db3abdcdd0be5135b7dd7cf" integrity sha512-79InfO2xHv+WHIrH1bHXQUiQD/wMls9qBk6WVwGCbdwP7/3zINtvqPNMtmSHXsIKjvUAHc8L0ouOj6ZQQRmcXg== -"@vue/devtools-api@^6.2.1": +"@vue/devtools-api@^6.1.4", "@vue/devtools-api@^6.2.1": version "6.2.1" resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.2.1.tgz#6f2948ff002ec46df01420dfeff91de16c5b4092" integrity sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ== @@ -10377,12 +10377,12 @@ vue-loader@^16.0.0: hash-sum "^2.0.0" loader-utils "^2.0.0" -vue-router@4.0.14: - version "4.0.14" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.14.tgz#ce2028c1c5c33e30c7287950c973f397fce1bd65" - integrity sha512-wAO6zF9zxA3u+7AkMPqw9LjoUCjSxfFvINQj3E/DceTt6uEz1XZLraDhdg2EYmvVwTBSGlLYsUw8bDmx0754Mw== +vue-router@4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.1.2.tgz#ae08f63c9610afa6bff6743e8f128b7054d4c9f5" + integrity sha512-5BP1qXFncVRwgV/XnqzsKApdMjQPqWIpoUBdL1ynz8HyLxIX/UDAx7Ql2BjmA5CXT/p61JfZvkpiFWFpaqcfag== dependencies: - "@vue/devtools-api" "^6.0.0" + "@vue/devtools-api" "^6.1.4" vue-style-loader@4.1.2: version "4.1.2"