Merge branch 'master' into Copy_Mods_Fix

Author: budak7273

.envrc

@@ -0,0 +1 @@
+use_nix

.github/actions/setup/action.yml

@@ -18,17 +18,17 @@ runs:
   steps:
     - uses: actions/setup-go@v5
       with:
-        go-version: 1.22
+        go-version: 1.25
 
     - uses: pnpm/action-setup@v3
       if: ${{ inputs.frontend == 'true' }}
       with:
-        version: 8.6.1
+        version: 10
 
     - uses: actions/setup-node@v4
       if: ${{ inputs.frontend == 'true' }}
       with:
-        node-version: 18
+        node-version: 22
         cache: 'pnpm'
         cache-dependency-path: frontend
 

.github/workflows/push.yml

@@ -31,12 +31,10 @@ jobs:
           mkdir -p frontend/build
           echo "" > frontend/build/.gitkeep
 
-      - uses: golangci/golangci-lint-action@v4
+      - uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.61
+          version: v2.6
           only-new-issues: true
-          skip-pkg-cache: true
-          skip-build-cache: true
 
   lint-frontend:
     runs-on: ubuntu-latest

.gitignore

@@ -7,6 +7,9 @@ dist
 # Specifically allow the provided code workspace with the multi-root workaround
 !.vscode/SatisfactoryModManager.code-workspace
 
+# Devtools downloaded by direnv
+.direnv
+
 # Created by https://www.toptal.com/developers/gitignore/api/goland+all,go,visualstudiocode
 # Edit at https://www.toptal.com/developers/gitignore?templates=goland+all,go,visualstudiocode
 

.golangci.yml

@@ -1,62 +1,70 @@
-linters-settings:
-  wrapcheck:
-    ignorePackageGlobs:
-      - github.com/satisfactorymodding/SatisfactoryModManager/*
-
-  govet:
-    enable-all: true
-    disable:
-      - shadow
-      - fieldalignment
-
-  gocritic:
-    disabled-checks:
-      - ifElseChain
-
-  gci:
-    custom-order: true
-    sections:
-      - standard
-      - default
-      - prefix(github.com/satisfactorymodding/SatisfactoryModManager)
-      - blank
-      - dot
-
-issues:
-  exclude-rules:
-    - linters:
-        - typecheck
-      text: "no matching files found"
-  exclude-dirs:
-    - frontend
-
+version: "2"
 run:
-  timeout: 5m
   build-tags:
     - webkit2_41
-
 linters:
-  disable-all: true
+  default: none
   enable:
-    - errcheck
-    - gosimple
-    - govet
-    - ineffassign
-    - staticcheck
-    - typecheck
-    - unused
     - bidichk
     - contextcheck
     - durationcheck
+    - errcheck
     - errorlint
     - goconst
-    - goimports
-    - revive
+    - gocritic
+    - govet
+    - ineffassign
     - misspell
+    - nonamedreturns
     - prealloc
+    - revive
+    - staticcheck
+    - unused
     - whitespace
     - wrapcheck
+  settings:
+    gocritic:
+      disabled-checks:
+        - ifElseChain
+    govet:
+      disable:
+        - shadow
+        - fieldalignment
+      enable-all: true
+    wrapcheck:
+      ignore-package-globs:
+        - github.com/satisfactorymodding/SatisfactoryModManager/*
+    revive:
+      rules:
+        - name: var-naming
+          arguments:
+            - [ ] # AllowList
+            - [ ] # DenyList
+            - - skip-package-name-checks: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - frontend
+formatters:
+  enable:
     - gci
-    - gocritic
     - gofumpt
-    - nonamedreturns
+    - goimports
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/satisfactorymodding/SatisfactoryModManager)
+        - blank
+        - dot
+      custom-order: true
+  exclusions:
+    generated: lax
+    paths:
+      - frontend

.goreleaser.yml

@@ -36,6 +36,7 @@ builds:
       - -- # Marker for task to interpret remaining arguments as CLI_ARGS
       - -s
       - -skipbindings
+      - -devtools
 
     overrides:
       - goos: linux
@@ -65,6 +66,7 @@ builds:
       - -- # Marker for task to interpret remaining arguments as CLI_ARGS
       - -s
       - -skipbindings
+      - -devtools
 
     tags:
       - webkit2_41
@@ -90,6 +92,7 @@ builds:
       - -s
       - -skipbindings
       - -nsis
+      - -devtools
 
 ### Package
 

README.md

@@ -38,10 +38,10 @@ for common issues and their solutions.
 
 ### Dependencies
 
-* [Go 1.22](https://go.dev/doc/install)
+* [Go](https://go.dev/doc/install) (the version in [the Setup CI action `go-version`](./.github/actions/setup/action.yml))
 * [pnpm](https://pnpm.io/installation)
-* [nodejs](https://nodejs.org/en/download/)
-* Wails (`go install github.com/wailsapp/wails/v2/cmd/wails@latest`) (or the version in [the Setup CI action](./.github/actions/setup/action.yml))
+* [nodejs](https://nodejs.org/en/download/) (the version in [the Setup CI action `node-version`](./.github/actions/setup/action.yml))
+* Wails (to install, execute the `run` command from [the Setup CI action's `Install Wails` step](./.github/actions/setup/action.yml))
 * IDE of Choice. Goland or VSCode suggested.
 
 ### Configuration
@@ -105,6 +105,13 @@ You may also need to manually run the frontend linter. First, navigate to the `f
 pnpm run format
 ```
 
+### Assorted Development Helpers
+
+* Browser dev tools should automatically open when running `wails dev`.
+* You can open the URL the frontend is being served on in a browser to use browser extensions like the Svelte Devtools.
+  Check the logs for `Using DevServer URL:` to find the correct URL.
+* You can manually trigger an error popup for testing purposes by running `debugCauseErrorMessage("your message here")` in the devtools console.
+
 ### Localization
 
 If you'd like to help translate and localize SMM to different languages, join our [discord server](https://discord.ficsit.app/).

Taskfile.yml

@@ -65,7 +65,7 @@ tasks:
   lint:
     silent: true
     preconditions:
-      - golangci-lint --version | grep -q 1.61
+      - golangci-lint --version | grep -q 2.6
     cmds:
       - GOOS=windows  golangci-lint run
       - GOOS=linux    golangci-lint run

backend/installfinders/launchers/crossover/crossover_darwin.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/common"
 	"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/launchers"
+	"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/launchers/epic"
 	"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/launchers/steam"
 )
 
@@ -44,11 +45,15 @@ func crossover() ([]*common.Installation, []error) {
 			continue
 		}
 		bottleRoot := filepath.Join(bottlesPath, bottle.Name())
-		bottleInstalls, bottleErrs := steam.FindInstallationsWine(bottleRoot, "CrossOver", nil)
-		installations = append(installations, bottleInstalls...)
-		if bottleErrs != nil {
-			errors = append(errors, bottleErrs...)
+		search := func(finder func(winePrefix string, launcher string, launchPath []string) ([]*common.Installation, []error)) {
+			bottleInstalls, bottleErrs := finder(bottleRoot, "CrossOver", nil)
+			installations = append(installations, bottleInstalls...)
+			if bottleErrs != nil {
+				errors = append(errors, bottleErrs...)
+			}
 		}
+		search(steam.FindInstallationsWine)
+		search(epic.FindInstallationsWine)
 	}
 
 	return installations, errors

backend/installfinders/launchers/epic/epic_wine_unix.go

@@ -16,7 +16,7 @@ func FindInstallationsWine(winePrefix string, launcher string, launchPath []stri
 	platform := common.WineLauncherPlatform(winePrefix)
 
 	if _, err := os.Stat(platform.ProcessPath(epicWineManifestPath)); os.IsNotExist(err) {
-		return nil, []error{fmt.Errorf("Epic is not installed in %s", winePrefix)}
+		return nil, []error{fmt.Errorf("epic is not installed in %s", winePrefix)}
 	}
 
 	return FindInstallationsEpic(