Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth

Merge branch 'renovate/nightwatch-2.x' into 'develop'
Update dependency nightwatch to v2.6.19 See merge request pleroma/pleroma-fe!1796
2023-03-28 20:29:50 +02:00 · 2023-03-25 21:08:17 +00:00 · 2023-03-25 21:07:58 +00:00 · 2023-03-25 20:57:53 +00:00 · 2023-03-24 09:09:09 +00:00 · 2023-03-24 09:08:46 +00:00
2 changed files with 3944 additions and 3966 deletions
--- a/package.json
+++ b/package.json
@ -52,7 +52,7 @@
    "@babel/plugin-transform-runtime": "7.21.0",
    "@babel/preset-env": "7.20.2",
    "@babel/register": "7.21.0",
-    "@intlify/vue-i18n-loader": "5.0.0",
+    "@intlify/vue-i18n-loader": "5.0.1",
    "@ungap/event-target": "0.2.3",
    "@vue/babel-helper-vue-jsx-merge-props": "1.4.0",
    "@vue/babel-plugin-jsx": "1.1.1",
@ -97,14 +97,14 @@
    "lodash": "4.17.21",
    "mini-css-extract-plugin": "2.7.2",
    "mocha": "10.2.0",
-    "nightwatch": "2.6.11",
+    "nightwatch": "2.6.19",
    "opn": "5.5.0",
    "ora": "0.4.1",
    "postcss": "8.4.20",
    "postcss-html": "^1.5.0",
    "postcss-loader": "7.0.2",
    "postcss-scss": "^4.0.6",
-    "sass": "1.57.1",
+    "sass": "1.60.0",
    "sass-loader": "13.2.0",
    "selenium-server": "2.53.1",
    "semver": "7.3.8",
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Sam Therapy	f1f5839197	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth continuous-integration/drone/push Build is passing Details	2023-03-28 20:29:50 +02:00
tusooa	cfb390ee8b	Merge branch 'renovate/nightwatch-2.x' into 'develop' Update dependency nightwatch to v2.6.19 See merge request pleroma/pleroma-fe!1796	2023-03-25 21:08:17 +00:00
tusooa	e64011ecf4	Merge branch 'renovate/intlify-vue-i18n-loader-5.x' into 'develop' Update dependency @intlify/vue-i18n-loader to v5.0.1 See merge request pleroma/pleroma-fe!1795	2023-03-25 21:07:58 +00:00
tusooa	06b41eaf1c	Merge branch 'renovate/sass-1.x' into 'develop' Update dependency sass to v1.60.0 See merge request pleroma/pleroma-fe!1784	2023-03-25 20:57:53 +00:00
Pleroma Renovate Bot	bd7f437df4	Update dependency sass to v1.60.0	2023-03-24 09:09:09 +00:00
Pleroma Renovate Bot	cd0ee7e332	Update dependency nightwatch to v2.6.19	2023-03-24 09:08:46 +00:00
Pleroma Renovate Bot	d4ce0a3a52	Update dependency @intlify/vue-i18n-loader to v5.0.1	2023-03-03 09:05:49 +00:00