Skip to content

Commit 80a9e17

Browse files
authored
chore: Electron 23 COMPASS-6897 (#4509)
* electron 23 * workaround for ipv6 localhost resolution * better error message when the shell cannot connect * also alter dns result order for the shell * also set dns default result order in tests
1 parent 707fe01 commit 80a9e17

File tree

22 files changed

+107
-66
lines changed

22 files changed

+107
-66
lines changed

configs/mocha-config-compass/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ module.exports = {
2525
path.resolve(__dirname, 'register', 'tsnode-register.js'),
2626
path.resolve(__dirname, 'register', 'sinon-chai-register.js'),
2727
path.resolve(__dirname, 'register', 'unhandled-rejections.js'),
28+
path.resolve(__dirname, 'register', 'dns-config-register.js'),
2829
],
2930
// Allows to run tests against a particular set of specs instead of all of them
3031
spec: specs.length > 0 ? specs : defaultSpecs,
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
const dns = require('dns');
2+
3+
// https://github.com/nodejs/node/issues/40537
4+
// TODO(NODE-4926): This is so that tests that try and connect to localhost will
5+
// connect to 127.0.0.1 in node v18 and later.
6+
dns.setDefaultResultOrder('ipv4first');

configs/webpack-config-compass/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"cli-progress": "^3.9.1",
7575
"core-js": "^3.17.3",
7676
"css-loader": "^4.3.0",
77-
"electron": "^22.3.12",
77+
"electron": "^23.3.6",
7878
"html-webpack-plugin": "^5.3.2",
7979
"less-loader": "^10.0.1",
8080
"mini-css-extract-plugin": "^2.3.0",

package-lock.json

Lines changed: 48 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)