Skip to content

Commit 99e45de

Browse files
node 22 and macOS Compatibility
1 parent cec5109 commit 99e45de

File tree

33 files changed

+2044
-1936
lines changed

33 files changed

+2044
-1936
lines changed

api

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"bbcode-to-react": "^0.2.9",
2626
"big.js": "^5.2.2",
2727
"bluebird": "^3.7.2",
28-
"bootstrap-sass": "^3.4.1",
28+
"bootstrap": "^4.6.1",
2929
"classnames": "^2.5.1",
3030
"commander": "^4.0.1",
3131
"content-disposition": "^0.5.3",

app/yarn.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5915,8 +5915,8 @@ events@^3.2.0:
59155915
integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
59165916

59175917
exe-version@Nexus-Mods/node-exe-version#master:
5918-
version "2.2.0"
5919-
resolved "https://codeload.github.com/Nexus-Mods/node-exe-version/tar.gz/893a394c9e113f9b5c797acb32f93e172829ae00"
5918+
version "2.3.0"
5919+
resolved "git+ssh://git@github.com/Nexus-Mods/node-exe-version.git#eded60fc0a0f3c234e1d586d2eb9952401945406"
59205920
dependencies:
59215921
winapi-bindings Nexus-Mods/node-winapi-bindings
59225922

@@ -9659,8 +9659,8 @@ performance-now@^2.1.0:
96599659
integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
96609660

96619661
permissions@Nexus-Mods/node-permissions#master:
9662-
version "2.0.0"
9663-
resolved "https://codeload.github.com/Nexus-Mods/node-permissions/tar.gz/f2b77e2b85a17d47032fc00e893d810bf4f1ecc6"
9662+
version "2.1.0"
9663+
resolved "git+ssh://git@github.com/Nexus-Mods/node-permissions.git#7c1b6f1d6437f2238be51316de823b0fbd63e4c0"
96649664
dependencies:
96659665
winapi-bindings Nexus-Mods/node-winapi-bindings
96669666

@@ -12173,8 +12173,8 @@ tunnel-agent@^0.6.0:
1217312173
safe-buffer "^5.0.1"
1217412174

1217512175
turbowalk@Nexus-Mods/node-turbowalk:
12176-
version "3.0.3"
12177-
resolved "https://codeload.github.com/Nexus-Mods/node-turbowalk/tar.gz/314f2cdb904a9a075c35261e8a1de10b0af20295"
12176+
version "3.1.0"
12177+
resolved "git+ssh://git@github.com/Nexus-Mods/node-turbowalk.git#cf4238a4d192763c8133500ce9b366a71b262a33"
1217812178
dependencies:
1217912179
fs-extra "^8.1.0"
1218012180
winapi-bindings Nexus-Mods/node-winapi-bindings
@@ -12636,8 +12636,8 @@ vortex-api@Nexus-Mods/vortex-api:
1263612636
resolved "https://codeload.github.com/Nexus-Mods/vortex-api/tar.gz/db5e5585b7492d7a0e07c76d4cf33e3d0dfbf3fb"
1263712637

1263812638
vortex-parse-ini@Nexus-Mods/vortex-parse-ini:
12639-
version "0.3.0"
12640-
resolved "https://codeload.github.com/Nexus-Mods/vortex-parse-ini/tar.gz/46f17dc0ee8f7b74a7034ed883981d8a5fa37d24"
12639+
version "0.4.0"
12640+
resolved "git+ssh://git@github.com/Nexus-Mods/vortex-parse-ini.git#2425af99d1cff2331ccf3aacfa892c314e99e18d"
1264112641
dependencies:
1264212642
lodash "^4.17.21"
1264312643
winapi-bindings Nexus-Mods/node-winapi-bindings
@@ -12886,8 +12886,8 @@ wildcard@^2.0.0:
1288612886
integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
1288712887

1288812888
winapi-bindings@Nexus-Mods/node-winapi-bindings:
12889-
version "2.6.1"
12890-
resolved "https://codeload.github.com/Nexus-Mods/node-winapi-bindings/tar.gz/3935f9603e5e8d2f18336ce0398043fd4a231d6c"
12889+
version "2.7.0"
12890+
resolved "git+ssh://git@github.com/Nexus-Mods/node-winapi-bindings.git#2e278fe19e8e7105b9e5baf445449f1aed495c72"
1289112891
dependencies:
1289212892
autogypi "^0.2.2"
1289312893
node-addon-api "^3.1.0"

assets/css/functions.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use 'sass:math';
2+
13
@function strip-unit($num) {
2-
@return $num / ($num * 0 + 1);
4+
@return math.div($num, ($num * 0 + 1));
35
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
"bbcode-to-react": "^0.2.9",
212212
"big.js": "^5.2.2",
213213
"bluebird": "^3.7.2",
214-
"bootstrap-sass": "^3.4.1",
214+
"bootstrap": "^4.6.1",
215215
"bsdiff-node": "file:./vendor/bsdiff-node-js",
216216
"cheerio": "1.0.0-rc.12",
217217
"classnames": "^2.5.1",

src/extensions/extension_manager/installExtension.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ async function installExtensionDependencies(api: IExtensionApi, extPath: string)
169169
},
170170
registerPreview: (priority: number, component: any) => {
171171
context.registerPreview(priority, component);
172+
},
173+
once: (callback: () => void) => {
174+
context.once(callback);
172175
}
173176
};
174177

@@ -186,13 +189,15 @@ async function installExtensionDependencies(api: IExtensionApi, extPath: string)
186189
// If the extension still fails, try passing vortexExt directly as a fallback
187190
const errorMessage = err.message || err.toString();
188191
if (errorMessage.includes('registerGame is not a function') ||
189-
errorMessage.includes('context.registerGame is not a function')) {
192+
errorMessage.includes('context.registerGame is not a function') ||
193+
errorMessage.includes('once is not a function') ||
194+
errorMessage.includes('context.once is not a function')) {
190195
try {
191196
// Some extensions might expect vortexExt as a parameter
192197
extension.default(vortexExt);
193198
resolve();
194199
} catch (fallbackErr) {
195-
// If vortexExt also fails, it means registerGame is not available yet
200+
// If vortexExt also fails, it means the required methods are not available yet
196201
// This can happen if gamemode_management hasn't initialized yet
197202
reject(new Error(`Extension failed to load: ${errorMessage}. ` +
198203
`This may be due to gamemode_management not being initialized yet. ` +

src/extensions/firststeps_dashlet/todos.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ import { IToDo } from './IToDo';
1111
import { TFunction } from 'i18next';
1212
import * as React from 'react';
1313

14-
import * as winapiT from 'winapi-bindings';
1514
import { isWindows } from '../../util/platform';
16-
const winapi: typeof winapiT = isWindows() ? require('winapi-bindings') : null;
15+
const winapi = isWindows() ? require('winapi-bindings') : null;
1716

1817
// Platform detection utilities
1918

src/extensions/gamemode_management/util/ProcessMonitor.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ import { BrowserWindow } from 'electron';
1212
import * as path from 'path';
1313
import * as Redux from 'redux';
1414

15-
import * as winapiT from 'winapi-bindings';
1615
import { isWindows } from '../../../util/platform';
17-
const winapi: typeof winapiT = isWindows() ? require('winapi-bindings') : null;
16+
const winapi = isWindows() ? require('winapi-bindings') : null;
1817

1918
// Platform detection utilities
2019

src/extensions/hardlink_activator/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ import turbowalk from 'turbowalk';
1717
import * as util from 'util';
1818
import { setSettingsPage } from '../../actions/session';
1919

20-
import * as winapiT from 'winapi-bindings';
2120
import { isWindows } from '../../util/platform';
22-
const winapi: typeof winapiT = isWindows() ? require('winapi-bindings') : null;
21+
const winapi = isWindows() ? require('winapi-bindings') : null;
2322

2423
// Platform detection utilities
2524

src/extensions/mod_management/stagingDirectory.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ import { setInstallPath } from './actions/settings';
1919
import { fallbackPurge } from './util/activationStore';
2020
import { resolveInstallPath } from './util/getInstallPath';
2121

22-
import * as winapiT from 'winapi-bindings';
2322
import { isWindows } from '../../util/platform';
24-
const winapi: typeof winapiT = isWindows() ? require('winapi-bindings') : null;
23+
const winapi = isWindows() ? require('winapi-bindings') : null;
2524

2625
// Platform detection utilities
2726

0 commit comments

Comments
 (0)