Skip to content

Commit a3810de

Browse files
use node v18
1 parent f48b181 commit a3810de

File tree

6 files changed

+17
-14
lines changed

6 files changed

+17
-14
lines changed

.github/workflows/nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ${{matrix.os}}
1414
strategy:
1515
matrix:
16-
node-version: [16.x]
16+
node-version: [18.x]
1717
os:
1818
- macos-12
1919
- ubuntu-20.04

app/config/init.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import _ from 'lodash';
66

77
const _extract = (script?: vm.Script): Record<string, any> => {
88
const module: Record<string, any> = {};
9-
script?.runInNewContext({module});
9+
script?.runInNewContext({module}, {displayErrors: true});
1010
if (!module.exports) {
1111
throw new Error('Error reading configuration: `module.exports` not set');
1212
}
@@ -16,7 +16,7 @@ const _extract = (script?: vm.Script): Record<string, any> => {
1616

1717
const _syntaxValidation = (cfg: string) => {
1818
try {
19-
return new vm.Script(cfg, {filename: '.hyper.js', displayErrors: true});
19+
return new vm.Script(cfg, {filename: '.hyper.js'});
2020
} catch (_err) {
2121
const err = _err as {name: string};
2222
notify(`Error loading config: ${err.name}`, `${err}`, {error: err});

app/index.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,13 @@ async function installDevExtensions(isDev_: boolean) {
7474
if (!isDev_) {
7575
return [];
7676
}
77-
const installer = await import('electron-devtools-installer');
77+
const {default: installer, REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS} = await import('electron-devtools-installer');
7878

79-
const extensions = ['REACT_DEVELOPER_TOOLS', 'REDUX_DEVTOOLS'] as const;
79+
const extensions = [REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS];
8080
const forceDownload = Boolean(process.env.UPGRADE_EXTENSIONS);
8181

8282
return Promise.all(
83-
extensions.map((name) =>
84-
installer.default(installer[name], {forceDownload, loadExtensionOptions: {allowFileAccess: true}})
85-
)
83+
extensions.map((extension) => installer(extension, {forceDownload, loadExtensionOptions: {allowFileAccess: true}}))
8684
);
8785
}
8886

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"@types/lodash": "^4.14.195",
8787
"@types/mousetrap": "1.6.11",
8888
"@types/ms": "0.7.31",
89-
"@types/node": "16.18.25",
89+
"@types/node": "18.16.16",
9090
"@types/plist": "3.0.2",
9191
"@types/react": "^17.0.43",
9292
"@types/react-dom": "^17.0.14",

tsconfig.base.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"resolveJsonModule": true,
1313
"sourceMap": true,
1414
"strict": true,
15-
"target": "ES2021",
15+
"target": "ES2022",
1616
"typeRoots": [
1717
"./node_modules/@types"
1818
]

yarn.lock

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,7 +1097,12 @@
10971097
resolved "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz#b3b790f09cb1696cffcec605de025b088fa4225f"
10981098
integrity sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==
10991099

1100-
"@types/[email protected]", "@types/node@^16.9.2":
1100+
1101+
version "18.16.16"
1102+
resolved "https://registry.npmjs.org/@types/node/-/node-18.16.16.tgz#3b64862856c7874ccf7439e6bab872d245c86d8e"
1103+
integrity sha512-NpaM49IGQQAUlBhHMF82QH80J08os4ZmyF9MkpCzWAGuOHqE4gTEbhzd7L3l5LmWuZ6E0OiC1FweQ4tsiW35+g==
1104+
1105+
"@types/node@^16.9.2":
11011106
version "16.18.25"
11021107
resolved "https://registry.npmjs.org/@types/node/-/node-16.18.25.tgz#8863940fefa1234d3fcac7a4b7a48a6c992d67af"
11031108
integrity sha512-rUDO6s9Q/El1R1I21HG4qw/LstTHCPO/oQNAwI/4b2f9EWvMnqt4d3HJwPMawfZ3UvodB8516Yg+VAq54YM+eA==
@@ -1188,9 +1193,9 @@
11881193
integrity sha512-rFT3ak0/2trgvp4yYZo5iKFEPsET7vKydKF+VRCxlQ9bpheehyAJH89dAkaLEq/j/RZXJIqcgsmPJKUP1Z28HA==
11891194

11901195
"@types/verror@^1.10.3":
1191-
version "1.10.4"
1192-
resolved "https://registry.npmjs.org/@types/verror/-/verror-1.10.4.tgz#805c0612b3a0c124cf99f517364142946b74ba3b"
1193-
integrity sha512-OjJdqx6QlbyZw9LShPwRW+Kmiegeg3eWNI41MQQKaG3vjdU2L9SRElntM51HmHBY1cu7izxQJ1lMYioQh3XMBg==
1196+
version "1.10.6"
1197+
resolved "https://registry.npmjs.org/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb"
1198+
integrity sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ==
11941199

11951200
"@types/yauzl@^2.9.1":
11961201
version "2.9.1"

0 commit comments

Comments
 (0)