chore: maintenance (#41)

* Webpack5 * Default settings extender * Provide settings placeholder * Set user bio priority to -100 so it appears last in the UserCard
FriendsOfFlarum · May 20, 2022 · ee44cb6 · ee44cb6
1 parent c470810
commit ee44cb6
Show file tree

Hide file tree

Showing 7 changed files with 2,249 additions and 7,217 deletions.
diff --git a/composer.json b/composer.json
@@ -20,14 +20,19 @@
         }
       ],
     "require": {
-        "flarum/core": "^1.0.0"
+        "flarum/core": "^1.2.0"
     },
     "authors": [
         {
             "name": "Charlie K",
             "email": "[email protected]",
             "homepage": "https://redevs.org",
             "role": "Developer"
+        },
+        {
+            "name": "IanM",
+            "email": "[email protected]",
+            "role": "Developer"
         }
     ],
     "autoload": {

diff --git a/extend.php b/extend.php
@@ -38,5 +38,6 @@
         ->modelPolicy(User::class, Access\UserPolicy::class),
 
     (new Extend\Settings())
-        ->serializeToForum('fof-user-bio.maxLength', 'fof-user-bio.maxLength', 'intVal'),
+        ->serializeToForum('fof-user-bio.maxLength', 'fof-user-bio.maxLength', 'intVal')
+        ->default('fof-user-bio.maxLength', 200),
 ];
diff --git a/js/package-lock.json b/js/package-lock.json
diff --git a/js/package.json b/js/package.json
@@ -6,12 +6,12 @@
         "autolink-js": "1.0.2",
         "@flarum/prettier-config": "^1.0.0",
         "flarum-tsconfig": "^1.0.2",
-        "flarum-webpack-config": "^1.0.0",
-        "webpack": "^4.44.2",
-        "webpack-cli": "^4.9.1"
+        "flarum-webpack-config": "^2.0.0",
+        "webpack": "^5.72.1",
+        "webpack-cli": "^4.9.2"
     },
     "devDependencies": {
-        "prettier": "^2.4.1"
+        "prettier": "^2.6.2"
     },
     "scripts": {
         "dev": "webpack --mode development --watch",

diff --git a/js/src/admin/index.ts b/js/src/admin/index.ts
@@ -32,5 +32,6 @@ app.initializers.add('fof-user-bio', () => {
       label: app.translator.trans('fof-user-bio.admin.setting.bioLimit'),
       setting: 'fof-user-bio.maxLength',
       type: 'number',
+      placeholder: 200
     });
 });
diff --git a/js/src/forum/index.js b/js/src/forum/index.js
@@ -22,6 +22,6 @@ app.initializers.add('fof-user-bio', () => {
       return;
     }
 
-    items.add('bio', <UserBio user={user} />);
+    items.add('bio', <UserBio user={user} />, -100);
   });
 });
diff --git a/migrations/2021_01_17_000000_set_default_bio_length.php b/migrations/2021_01_17_000000_set_default_bio_length.php
@@ -13,14 +13,10 @@
 
 return [
     'up' => function (Builder $schema) {
-        /**
-         * @var \Flarum\Settings\SettingsRepositoryInterface
-         */
-        $settings = resolve('flarum.settings');
-
-        $settings->set('fof-user-bio.maxLength', 200);
+        // nothing required here.
     },
     'down' => function (Builder $schema) {
+        // remove the settings, if any were saved.
         /**
          * @var \Flarum\Settings\SettingsRepositoryInterface
          */
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,6 @@ app.initializers.add('fof-user-bio', () => { @@
           return;
         }
-        items.add('bio', <UserBio user={user} />);
+        items.add('bio', <UserBio user={user} />, -100);
       });
     });