From b53a6f5ed24ab04e8628a652b1f67a66caa9d311 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Sat, 22 Jun 2024 16:57:28 +0100 Subject: [PATCH] chore: version bump --- package.json | 4 +-- pnpm-lock.yaml | 47 +++++++++++++-------------------- src/utils/interface/electron.ts | 2 +- 3 files changed, 21 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index c3a1a767..b362db6f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "productName": "FTB Electron App", "name": "ftb-app", - "version": "1.25.13", + "version": "1.25.14", "private": true, "main": "background.js", "email": "admin@feed-the-beast.com", @@ -45,7 +45,7 @@ "markdown-it": "^13.0.1", "mitt": "^3.0.0", "object-inspect": "^1.13.1", - "semver": "^7.3.2", + "semver": "^7.6.2", "tailwindcss": "^1.9.6", "vue": "^2.7.14", "vue-native-websocket": "^2.0.14", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b372f4b4..18537b6d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,8 +54,8 @@ importers: specifier: ^1.13.1 version: 1.13.1 semver: - specifier: ^7.3.2 - version: 7.3.8 + specifier: ^7.6.2 + version: 7.6.2 tailwindcss: specifier: ^1.9.6 version: 1.9.6 @@ -6352,13 +6352,8 @@ packages: resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==} hasBin: true - semver@7.3.8: - resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==} - engines: {node: '>=10'} - hasBin: true - - semver@7.5.4: - resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} + semver@7.6.2: + resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==} engines: {node: '>=10'} hasBin: true @@ -8633,7 +8628,7 @@ snapshots: lodash.merge: 4.6.2 portfinder: 1.0.32(supports-color@6.1.0) pumpify: 2.0.1 - semver: 7.5.4 + semver: 7.6.2 shebang-loader: 0.0.1 split2: 4.2.0 terser-webpack-plugin: 4.2.3(webpack@4.46.0(patch_hash=5tqvhjaav36iaibwqtacb3tnim)) @@ -9058,7 +9053,7 @@ snapshots: '@npmcli/fs@1.1.1': dependencies: '@gar/promisify': 1.1.3 - semver: 7.5.4 + semver: 7.6.2 '@npmcli/move-file@1.1.2': dependencies: @@ -9092,7 +9087,7 @@ snapshots: minimatch: 5.1.6 read-config-file: 6.3.2 sanitize-filename: 1.6.3 - semver: 7.5.4 + semver: 7.6.2 tar: 6.2.0 temp-file: 3.4.0 transitivePeerDependencies: @@ -9838,7 +9833,7 @@ snapshots: open: 8.4.2 ora: 5.4.1 read-pkg: 5.2.0 - semver: 7.5.4 + semver: 7.6.2 strip-ansi: 6.0.1 transitivePeerDependencies: - encoding @@ -10250,7 +10245,7 @@ snapshots: minimatch: 5.1.6 read-config-file: 6.3.2 sanitize-filename: 1.6.3 - semver: 7.5.4 + semver: 7.6.2 tar: 6.2.0 temp-file: 3.4.0 transitivePeerDependencies: @@ -11818,7 +11813,7 @@ snapshots: electron-devtools-installer@3.2.0: dependencies: rimraf: 3.0.2 - semver: 7.3.8 + semver: 7.6.2 tslib: 2.5.0 unzip-crx-3: 0.2.0 @@ -11852,7 +11847,7 @@ snapshots: lazy-val: 1.0.5 lodash.escaperegexp: 4.1.2 lodash.isequal: 4.5.0 - semver: 7.5.4 + semver: 7.6.2 tiny-typed-emitter: 2.1.0 transitivePeerDependencies: - supports-color @@ -12397,7 +12392,7 @@ snapshots: memfs: 3.4.13 minimatch: 3.1.2 schema-utils: 2.7.0 - semver: 7.5.4 + semver: 7.6.2 tapable: 1.1.3 typescript: 4.9.5 webpack: 4.46.0(patch_hash=5tqvhjaav36iaibwqtacb3tnim) @@ -12583,7 +12578,7 @@ snapshots: es6-error: 4.1.1 matcher: 3.0.0 roarr: 2.15.4 - semver: 7.5.4 + semver: 7.6.2 serialize-error: 7.0.1 optional: true @@ -13845,7 +13840,7 @@ snapshots: jest-util: 29.5.0 natural-compare: 1.4.0 pretty-format: 29.5.0 - semver: 7.5.4 + semver: 7.6.2 transitivePeerDependencies: - supports-color @@ -15735,7 +15730,7 @@ snapshots: loader-utils: 2.0.4 neo-async: 2.6.2 schema-utils: 3.1.1 - semver: 7.3.8 + semver: 7.6.2 webpack: 4.46.0(patch_hash=5tqvhjaav36iaibwqtacb3tnim) optionalDependencies: sass: 1.58.3 @@ -15792,13 +15787,7 @@ snapshots: semver@6.3.0: {} - semver@7.3.8: - dependencies: - lru-cache: 6.0.0 - - semver@7.5.4: - dependencies: - lru-cache: 6.0.0 + semver@7.6.2: {} send@0.18.0(supports-color@6.1.0): dependencies: @@ -15908,7 +15897,7 @@ snapshots: simple-update-notifier@2.0.0: dependencies: - semver: 7.5.4 + semver: 7.6.2 sisteransi@1.0.5: {} @@ -16568,7 +16557,7 @@ snapshots: json5: 2.2.3 lodash.memoize: 4.1.2 make-error: 1.3.6 - semver: 7.3.8 + semver: 7.6.2 typescript: 4.9.5 yargs-parser: 21.1.1 optionalDependencies: diff --git a/src/utils/interface/electron.ts b/src/utils/interface/electron.ts index 9654c7b9..bf39614b 100644 --- a/src/utils/interface/electron.ts +++ b/src/utils/interface/electron.ts @@ -227,7 +227,7 @@ const Electron: ElectronOverwolfInterface = { app: { async appSettings() { - const settingsPath = appHome + "/bin/settings.json"; + const settingsPath = path.join(appHome, "bin", "settings.json"); if (!fs.existsSync(settingsPath)) { return null }