Merge pull request #1521 from ebkr/develop

Develop - 3.1.52

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           # The talk on the street says this might be a good version for building.
-          node-version: 14.20.1
+          node-version: 19.2.0
           cache: yarn
 
       - name: Install Yarn dependencies

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           # The talk on the street says this might be a good version for building.
-          node-version: 14.20.1
+          node-version: 19.2.0
           cache: yarn
 
       - name: Install Yarn dependencies

.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
               uses: actions/setup-node@v3
               with:
                   # The talk on the street says this might be a good version for building.
-                  node-version: 14.20.1
+                  node-version: 19.2.0
                   cache: yarn
 
             - name: Install Yarn dependencies

BUILDING.md

@@ -1,10 +1,15 @@
 # Setting Up
 ### Prerequisites
-- Node.js (Built on 13.2.0)
+- Node.js (>=18.0.0)
 - Yarn
 - Quasar CLI (Install using `yarn global add @quasar/cli`)
+- Python2 (EOL for 4 years. Goodluck!)
+
+#### Linux Build
+- rpm builder
 
 ### Setting up
 1. Navigate to the root directory, and run `yarn install`.
-2. To run: `quasar dev -m electron`
-3. To build: `yarn build-{platform}`
+2. Navigate to the root directory, and run `yarn upgrade`.
+3. To run quick dev build: `quasar dev -m electron`
+4. To fully build: `yarn build-{platform}`

CHANGELOG.md

@@ -1,3 +1,11 @@
+### 3.1.52
+#### Small quality of life changes
+- Upgraded from Electron v11 to v24
+  - Credit to (@JonathanSteininger)
+- Mods imported from a profile keep the same order they were exported in
+- Fixed sorting by download count
+- Reduced time taken to install when a mod has a large number of dependencies
+
 ### 3.1.51
 #### Memory and performance improvements
 The TS team have been working hard to improve the following:

package.json

@@ -1,7 +1,7 @@
 {
     "name": "r2modman",
-    "version": "3.1.51",
-    "description": "A simple and easy to use mod manager for several games using Thunderstore.",
+    "version": "3.1.52",
+    "description": "A simple and easy to use mod manager for many games using Thunderstore.",
     "productName": "r2modman",
     "author": "ebkr",
     "private": true,
@@ -89,8 +89,8 @@
         "babel-jest": "^27.0.2",
         "chai": "^4.2.0",
         "devtron": "^1.4.0",
-        "electron": "^11.1.1",
-        "electron-builder": "22.10.5",
+        "electron": "^24.0.0",
+        "electron-builder": "^24.10.5",
         "electron-debug": "^3.0.1",
         "electron-devtools-installer": "^3.0.0",
         "electron-packager": "14.1.1",
@@ -104,7 +104,7 @@
         "minimist": "^1.2.2",
         "mocha": "^8.0.1",
         "mock-require": "^3.0.3",
-        "node-sass": "^4.13.1",
+        "sass": "^1.70.0",
         "sass-loader": "^10.2.1",
         "sinon": "^11.1.1",
         "ts-node": "^8.10.2",
@@ -124,8 +124,8 @@
         "last 5 Opera versions"
     ],
     "engines": {
-        "node": ">= 10.18.1",
-        "npm": ">= 6.13.4",
+        "node": ">= 18.0.0",
+        "npm": ">= 10.0.0",
         "yarn": ">= 1.21.1"
     }
 }

src/_managerinf/ManagerInformation.ts

@@ -1,7 +1,7 @@
 import VersionNumber from '../model/VersionNumber';
 
 export default class ManagerInformation {
-    public static VERSION: VersionNumber = new VersionNumber('3.1.51');
+    public static VERSION: VersionNumber = new VersionNumber('3.1.52');
     public static IS_PORTABLE: boolean = false;
     public static APP_NAME: string = "r2modman";
 }

src/components/mixins/ProfilesMixin.vue

@@ -4,6 +4,8 @@ import Component from 'vue-class-component';
 
 import sanitize from "sanitize-filename";
 
+const VALID_PROFILE_CODE_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
 @Component
 export default class ProfilesMixin extends Vue {
 
@@ -33,5 +35,9 @@ export default class ProfilesMixin extends Vue {
         return sanitize(nameToSanitize);
     }
 
+    isProfileCodeValid(profileImportCode: string): boolean {
+        return VALID_PROFILE_CODE_REGEX.test(profileImportCode);
+    }
+
 }
 </script>