Merge branch '2.x' into sm/FA-6

flarum · Sep 19, 2024 · 3292810 · 3292810
2 parents 8e8ed19 + 3a8e8ec
commit 3292810
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/framework/core/js/dist/admin.js b/framework/core/js/dist/admin.js
diff --git a/framework/core/js/dist/admin.js.map b/framework/core/js/dist/admin.js.map
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/dist/forum/components/DiscussionsUserPage.js b/framework/core/js/dist/forum/components/DiscussionsUserPage.js
diff --git a/framework/core/js/dist/forum/components/SearchModal.js b/framework/core/js/dist/forum/components/SearchModal.js
diff --git a/framework/core/js/dist/forum/components/SearchModal.js.map b/framework/core/js/dist/forum/components/SearchModal.js.map
diff --git a/js-packages/webpack-config/src/RegisterAsyncChunksPlugin.cjs b/js-packages/webpack-config/src/RegisterAsyncChunksPlugin.cjs
@@ -112,7 +112,7 @@ class RegisterAsyncChunksPlugin {
 
                   // This is a chunk with many modules, we need to register all of them.
                   modules?.forEach((module) => {
-                    if (!module.resource.includes(`${path.sep}src${path.sep}`)) {
+                    if (!module.resource?.includes(`${path.sep}src${path.sep}`)) {
                       return;
                     }