fix: 2.0 bugs (#4011)

2025-08-06 08:27:42 +02:00 · 2024-08-02 12:49:34 +01:00
parent 2b56129d70
commit 770f9370af
40 changed files with 78 additions and 74 deletions
--- a/extensions/akismet/js/package.json
+++ b/extensions/akismet/js/package.json
@@ -19,7 +19,7 @@
        "@flarum/prettier-config": "^1.0.0",
        "flarum-tsconfig": "^1.0.2",
        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1",
        "typescript": "^4.5.4",
--- a/extensions/approval/js/package.json
+++ b/extensions/approval/js/package.json
@@ -5,7 +5,7 @@
    "prettier": "@flarum/prettier-config",
    "devDependencies": {
        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1",
        "@flarum/prettier-config": "^1.0.0"
--- a/extensions/embed/js/package.json
+++ b/extensions/embed/js/package.json
@@ -8,7 +8,7 @@
    },
    "devDependencies": {
        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1",
        "@flarum/prettier-config": "^1.0.0"
--- a/extensions/emoji/js/package.json
+++ b/extensions/emoji/js/package.json
@@ -10,7 +10,7 @@
    "devDependencies": {
        "@flarum/prettier-config": "^1.0.0",
        "flarum-tsconfig": "^1.0.2",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "prettier": "^2.5.1",
        "typescript": "^4.5.4",
        "typescript-coverage-report": "^0.6.1",
--- a/extensions/flags/js/package.json
+++ b/extensions/flags/js/package.json
@@ -6,7 +6,7 @@
    "devDependencies": {
        "@types/mithril": "^2.0.8",
        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1",
        "@flarum/prettier-config": "^1.0.0",
--- a/extensions/likes/js/package.json
+++ b/extensions/likes/js/package.json
@@ -5,7 +5,7 @@
    "prettier": "@flarum/prettier-config",
    "devDependencies": {
        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1",
        "@flarum/prettier-config": "^1.0.0"
--- a/extensions/lock/js/package.json
+++ b/extensions/lock/js/package.json
@@ -5,7 +5,7 @@
    "prettier": "@flarum/prettier-config",
    "devDependencies": {
        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1",
        "@flarum/prettier-config": "^1.0.0",
--- a/extensions/markdown/js/package.json
+++ b/extensions/markdown/js/package.json
@@ -4,7 +4,7 @@
    "version": "0.0.0",
    "prettier": "@flarum/prettier-config",
    "dependencies": {
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1"
    },
@@ -19,7 +19,7 @@
        "@flarum/prettier-config": "^1.0.0",
        "flarum-tsconfig": "^1.0.2",
        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1"
    }
--- a/extensions/mentions/js/package.json
+++ b/extensions/mentions/js/package.json
@@ -5,7 +5,7 @@
    "prettier": "@flarum/prettier-config",
    "devDependencies": {
        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1",
        "@flarum/prettier-config": "^1.0.0"
--- a/extensions/nicknames/js/package.json
+++ b/extensions/nicknames/js/package.json
@@ -5,7 +5,7 @@
    "prettier": "@flarum/prettier-config",
    "devDependencies": {
        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1",
        "@flarum/prettier-config": "^1.0.0"
--- a/extensions/nicknames/js/src/forum/components/NicknameModal.js
+++ b/extensions/nicknames/js/src/forum/components/NicknameModal.js
@@ -2,7 +2,7 @@ import app from 'flarum/forum/app';
 import FormModal from 'flarum/common/components/FormModal';
 import Button from 'flarum/common/components/Button';
 import Stream from 'flarum/common/utils/Stream';
-import Form from '@flarum/core/src/common/components/Form';
+import Form from 'flarum/common/components/Form';

 export default class NicknameModal extends FormModal {
  oninit(vnode) {
--- a/extensions/package-manager/js/package.json
+++ b/extensions/package-manager/js/package.json
@@ -6,7 +6,7 @@
    "devDependencies": {
        "@flarum/prettier-config": "^1.0.0",
        "flarum-tsconfig": "^1.0.2",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "prettier": "^2.5.1",
        "typescript": "^4.5.4",
        "typescript-coverage-report": "^0.6.1",
--- a/extensions/pusher/js/package.json
+++ b/extensions/pusher/js/package.json
@@ -19,7 +19,7 @@
        "@flarum/prettier-config": "^1.0.0",
        "@types/pusher-js": "^5.1.0",
        "flarum-tsconfig": "^1.0.2",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "prettier": "^2.5.1",
        "typescript": "^4.5.4",
        "typescript-coverage-report": "^0.6.1",
--- a/extensions/statistics/js/package.json
+++ b/extensions/statistics/js/package.json
@@ -10,7 +10,7 @@
        "@flarum/prettier-config": "^1.0.0",
        "@types/mithril": "^2.0.11",
        "flarum-tsconfig": "^1.0.2",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "prettier": "^2.7.1",
        "typescript": "^4.7.4",
        "typescript-coverage-report": "^0.6.4",
--- a/extensions/sticky/js/package.json
+++ b/extensions/sticky/js/package.json
@@ -5,7 +5,7 @@
    "prettier": "@flarum/prettier-config",
    "devDependencies": {
        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1",
        "@flarum/prettier-config": "^1.0.0"
--- a/extensions/subscriptions/js/package.json
+++ b/extensions/subscriptions/js/package.json
@@ -5,7 +5,7 @@
    "prettier": "@flarum/prettier-config",
    "devDependencies": {
        "@flarum/prettier-config": "^1.0.0",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "prettier": "^2.7.1",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.10.0",
--- a/extensions/suspend/js/package.json
+++ b/extensions/suspend/js/package.json
@@ -13,7 +13,7 @@
    "devDependencies": {
        "@flarum/prettier-config": "^1.0.0",
        "flarum-tsconfig": "^1.0.0",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "prettier": "^2.5.1",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1"
--- a/extensions/suspend/js/src/forum/components/SuspendUserModal.js
+++ b/extensions/suspend/js/src/forum/components/SuspendUserModal.js
@@ -4,10 +4,10 @@ import Button from 'flarum/common/components/Button';
 import Stream from 'flarum/common/utils/Stream';
 import withAttr from 'flarum/common/utils/withAttr';
 import ItemList from 'flarum/common/utils/ItemList';
+import Form from 'flarum/common/components/Form';
+import FieldSet from 'flarum/common/components/FieldSet';

 import { getPermanentSuspensionDate } from '../helpers/suspensionHelper';
-import Form from '@flarum/core/src/common/components/Form';
-import FieldSet from '@flarum/core/src/common/components/FieldSet';

 export default class SuspendUserModal extends FormModal {
  oninit(vnode) {
--- a/extensions/suspend/js/src/forum/components/SuspensionInfoModal.js
+++ b/extensions/suspend/js/src/forum/components/SuspensionInfoModal.js
@@ -2,8 +2,8 @@ import app from 'flarum/forum/app';
 import Modal from 'flarum/common/components/Modal';
 import Button from 'flarum/common/components/Button';
 import fullTime from 'flarum/common/helpers/fullTime';
+import Form from 'flarum/common/components/Form';
 import { isPermanentSuspensionDate, localStorageKey } from '../helpers/suspensionHelper';
-import Form from '@flarum/core/src/common/components/Form';

 export default class SuspensionInfoModal extends Modal {
  oninit(vnode) {
--- a/extensions/tags/js/package.json
+++ b/extensions/tags/js/package.json
@@ -20,7 +20,7 @@
    },
    "devDependencies": {
        "flarum-tsconfig": "^1.0.2",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "prettier": "^2.7.1",
        "typescript": "^4.5.4",
        "typescript-coverage-report": "^0.6.1",
--- a/extensions/tags/js/src/admin/components/TagsPage.js
+++ b/extensions/tags/js/src/admin/components/TagsPage.js
@@ -6,11 +6,12 @@ import Button from 'flarum/common/components/Button';
 import LoadingIndicator from 'flarum/common/components/LoadingIndicator';
 import withAttr from 'flarum/common/utils/withAttr';
 import Form from 'flarum/common/components/Form';
+import FormSectionGroup from 'flarum/admin/components/FormSectionGroup';
+import FormSection from 'flarum/admin/components/FormSection';

 import EditTagModal from './EditTagModal';
 import tagIcon from '../../common/helpers/tagIcon';
 import sortTags from '../../common/utils/sortTags';
-import FormSectionGroup, { FormSection } from '@flarum/core/src/admin/components/FormSectionGroup';

 function tagItem(tag) {
  return (
--- a/extensions/tags/src/Api/DiscussionResourceFields.php
+++ b/extensions/tags/src/Api/DiscussionResourceFields.php
@@ -37,7 +37,7 @@ class DiscussionResourceFields
            Schema\Relationship\ToMany::make('tags')
                ->includable()
                ->writable()
-                ->required(fn (Context $context, Discussion $discussion) => ! $context->getActor()->can('bypassTagCounts', $discussion))
+                ->required(fn (Context $context, Discussion $discussion) => $context->creating() && ! $context->getActor()->can('bypassTagCounts', $discussion))
                ->set(function (Discussion $discussion, array $newTags, Context $context) {
                    $actor = $context->getActor();