Merge pull request #135 from BUTR/dev

Release 1.1.1
BUTR · Jun 30, 2024 · 7588454 · 7588454
2 parents 0bfebeb + b2db753
commit 7588454
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,7 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.1.1
+* Fixed collection creation
+---------------------------------------------------------------------------------------------------
 Version: 1.1.0
 * Added back collection support
 * Old collections will now set the Load Order on install

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "game-mount-and-blade-ii-bannerlord-butr",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A Vortex extension for Mount and Blade II: Bannerlord mod management.",
   "author": "BUTR Team & Nexus Mods",
   "license": "GPL-3.0+",
@@ -68,7 +68,8 @@
   },
   "resolutions": {
     "@types/react": "^16.14.34",
-    "**/dir-compare/minimatch": "3.0.5"
+    "**/dir-compare/minimatch": "3.0.5",
+    "braces": "3.0.3"
   },
   "packageManager": "yarn@1.22.19"
 }
diff --git a/src/views/CollectionGeneralData/pages/GeneralDataPage.tsx b/src/views/CollectionGeneralData/pages/GeneralDataPage.tsx
@@ -27,9 +27,12 @@ export const BannerlordGeneralDataPage = (props: BannerlordGeneralDataPageProps)
   const context = useContext(MainContext);
 
   useEffect(() => {
-    const data = genCollectionGeneralData(context.api, Object.keys(mods));
-    setHasBLSE(data.hasBLSE);
-    setPersistentLoadOrder(data.suggestedLoadOrder);
+    async function setData(): Promise<void> {
+      const data = await genCollectionGeneralData(context.api, Object.keys(mods));
+      setHasBLSE(data.hasBLSE);
+      setPersistentLoadOrder(data.suggestedLoadOrder);
+    }
+    setData().catch(() => {});
   }, [context.api, mods]);
 
   const { localize: t } = useLocalization();

diff --git a/yarn.lock b/yarn.lock
@@ -920,12 +920,12 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+braces@3.0.3, braces@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browserslist@^4.21.10:
   version "4.23.0"
@@ -1758,10 +1758,10 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"