Merge develop

Merge branch 'renovate/postcss-8.x' into 'develop'
Update dependency postcss to v8.4.23 See merge request pleroma/pleroma-fe!1750
2023-05-02 20:11:37 +02:00 · 2023-05-02 12:22:05 +00:00 · 2023-05-02 12:19:50 +00:00 · 2023-05-02 12:18:32 +00:00 · 2023-05-02 12:17:18 +00:00 · 2023-04-21 09:05:46 +00:00
3 changed files with 2706 additions and 797 deletions
--- a/package.json
+++ b/package.json
@ -81,7 +81,7 @@
    "eventsource-polyfill": "0.9.6",
    "express": "4.18.2",
    "function-bind": "1.1.1",
-    "html-webpack-plugin": "5.5.0",
+    "html-webpack-plugin": "5.5.1",
    "http-proxy-middleware": "2.0.6",
    "iso-639-1": "2.1.15",
    "json-loader": "0.5.7",
@ -95,17 +95,17 @@
    "karma-spec-reporter": "0.0.36",
    "karma-webpack": "5.0.0",
    "lodash": "4.17.21",
-    "mini-css-extract-plugin": "2.7.2",
+    "mini-css-extract-plugin": "2.7.5",
    "mocha": "10.2.0",
    "nightwatch": "2.6.19",
    "opn": "5.5.0",
    "ora": "0.4.1",
-    "postcss": "8.4.20",
+    "postcss": "8.4.23",
    "postcss-html": "^1.5.0",
    "postcss-loader": "7.0.2",
    "postcss-scss": "^4.0.6",
    "sass": "1.60.0",
-    "sass-loader": "13.2.0",
+    "sass-loader": "13.2.2",
    "selenium-server": "2.53.1",
    "semver": "7.3.8",
    "serviceworker-webpack5-plugin": "2.0.0",
--- a/src/main.js
+++ b/src/main.js
@ -44,7 +44,7 @@ const i18n = createI18n({
  messages: messages.default
 })

-messages.setLanguage(i18n, currentLocale)
+messages.setLanguage(i18n.global, currentLocale)

 const persistedStateOptions = {
  paths: [
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Sam Therapy	f5b0b2baa2	Merge develop continuous-integration/drone/push Build is passing Details	2023-05-02 20:11:37 +02:00
tusooa	670ff6e940	Merge branch 'renovate/postcss-8.x' into 'develop' Update dependency postcss to v8.4.23 See merge request pleroma/pleroma-fe!1750	2023-05-02 12:22:05 +00:00
tusooa	1364e56437	Merge branch 'renovate/sass-loader-13.x' into 'develop' Update dependency sass-loader to v13.2.2 See merge request pleroma/pleroma-fe!1811	2023-05-02 12:19:50 +00:00
tusooa	ebad6a17d2	Merge branch 'renovate/mini-css-extract-plugin-2.x' into 'develop' Update dependency mini-css-extract-plugin to v2.7.5 See merge request pleroma/pleroma-fe!1810	2023-05-02 12:18:32 +00:00
tusooa	2d9ee02c12	Merge branch 'renovate/html-webpack-plugin-5.x' into 'develop' Update dependency html-webpack-plugin to v5.5.1 See merge request pleroma/pleroma-fe!1815	2023-05-02 12:17:18 +00:00
Pleroma Renovate Bot	17e7df9da3	Update dependency html-webpack-plugin to v5.5.1	2023-04-21 09:05:46 +00:00
Pleroma Renovate Bot	e1d5add046	Update dependency postcss to v8.4.23	2023-04-20 09:07:46 +00:00
HJ	80eddb1099	Merge branch 'develop' into 'develop' Fix i18n See merge request pleroma/pleroma-fe!1814	2023-04-12 20:04:46 +00:00
XYenon	01758a28ea	Fix i18n	2023-04-13 00:06:32 +08:00
Pleroma Renovate Bot	034ed86312	Update dependency sass-loader to v13.2.2	2023-04-07 09:08:33 +00:00
Pleroma Renovate Bot	0bcfde4c2e	Update dependency mini-css-extract-plugin to v2.7.5	2023-04-07 09:08:13 +00:00