Merge branch '1.x' into di/custom-actor

flarum · Oct 22, 2024 · 6612ae0 · 6612ae0
2 parents 80e0c4c + 0694651
commit 6612ae0
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/REUSABLE_frontend.yml b/.github/workflows/REUSABLE_frontend.yml
@@ -74,7 +74,7 @@ on:
         description: The node version to use for the workflow.
         type: number
         required: false
-        default: 16
+        default: 20
 
       js_package_manager:
         description: "Enable TypeScript?"
@@ -117,6 +117,7 @@ env:
   ci_script: ${{ inputs.js_package_manager == 'yarn' && 'yarn install --immutable' || 'npm ci' }}
   cache_dependency_path: ${{ inputs.cache_dependency_path || format(inputs.js_package_manager == 'yarn' && '{0}/yarn.lock' || '{0}/package-lock.json', inputs.frontend_directory) }}
   COMPOSER_AUTH: ${{ secrets.composer_auth }}
+  DISABLE_V8_COMPILE_CACHE: 1
 
 jobs:
   build:
@@ -131,12 +132,12 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.git_actor_token != '' && secrets.git_actor_token || secrets.GITHUB_TOKEN }}
 
       - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ inputs.node_version }}
           cache: ${{ inputs.js_package_manager }}
@@ -159,7 +160,7 @@ jobs:
         working-directory: ${{ inputs.frontend_directory }}
 
       - name: JS Checks & Production Build
-        uses: flarum/action-build@v3
+        uses: flarum/action-build@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           build_script: ${{ inputs.build_script }}

diff --git a/extensions/flags/js/dist-typings/forum/extend.d.ts b/extensions/flags/js/dist-typings/forum/extend.d.ts
diff --git a/extensions/package-manager/js/dist-typings/models/Task.d.ts b/extensions/package-manager/js/dist-typings/models/Task.d.ts
diff --git a/extensions/tags/js/dist-typings/forum/extend.d.ts b/extensions/tags/js/dist-typings/forum/extend.d.ts
diff --git a/framework/core/js/dist-typings/admin/components/SessionDropdown.d.ts b/framework/core/js/dist-typings/admin/components/SessionDropdown.d.ts
diff --git a/framework/core/js/dist-typings/forum/components/SessionDropdown.d.ts b/framework/core/js/dist-typings/forum/components/SessionDropdown.d.ts
diff --git a/framework/core/js/dist/forum.js b/framework/core/js/dist/forum.js
diff --git a/framework/core/js/dist/forum.js.map b/framework/core/js/dist/forum.js.map
diff --git a/framework/core/js/src/forum/components/DiscussionsSearchSource.tsx b/framework/core/js/src/forum/components/DiscussionsSearchSource.tsx
@@ -35,6 +35,8 @@ export default class DiscussionsSearchSource implements SearchSource {
   view(query: string): Array<Mithril.Vnode> {
     query = query.toLowerCase();
 
+    this.setQueryString(query);
+
     const results = (this.results.get(query) || []).map((discussion) => {
       const mostRelevantPost = discussion.mostRelevantPost();
 

diff --git a/framework/core/js/src/forum/components/Post.tsx b/framework/core/js/src/forum/components/Post.tsx
@@ -90,7 +90,7 @@ export default abstract class Post<CustomAttrs extends IPostAttrs = IPostAttrs>
       90
     );
 
-    items.add('footer', <footer className="Post-footer">{footerItems.length > 0 ? <ul>{listItems(footerItems)}</ul> : <ul></ul>}</footer>, 80);
+    items.add('footer', <footer className="Post-footer">{footerItems.length > 0 ? <ul>{listItems(footerItems)}</ul> : null}</footer>, 80);
 
     return items;
   }

diff --git a/framework/core/src/Foundation/Application.php b/framework/core/src/Foundation/Application.php
@@ -21,7 +21,7 @@ class Application
      *
      * @var string
      */
-    const VERSION = '1.8.7';
+    const VERSION = '1.8.8';
 
     /**
      * The IoC container for the Flarum application.

diff --git a/js-packages/tsconfig/tsconfig.json b/js-packages/tsconfig/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "skipLibCheck": true,
     "allowUmdGlobalAccess": true,
     "sourceMap": true,
     "strict": true,