Skip to content

Commit 4c12730

Browse files
committed
Merge remote-tracking branch 'origin/main' into 1.38-releases
2 parents d2e542f + 631bf28 commit 4c12730

File tree

101 files changed

+67382
-96043
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+67382
-96043
lines changed

.depalignrc.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545
"^8.1.0",
4646
"^9.1.0"
4747
],
48-
"webpack": [
49-
"^5.85.0"
50-
],
5148
"numeral": [
5249
"^1.5.6"
5350
],

.depcheckrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ ignores:
55
# around weird npm workspace hoising issues caused by outdated transient
66
# dependencies. This can go away when we update webpack and leafygreen to the
77
# same version everywhere.
8-
- '@webpack-cli/serve'
98
- '@testing-library/dom'
109
# TODO: To work around https://github.com/depcheck/depcheck/issues/688 we keep
1110
# some babel dependencies at the root to guarantee that their version is not

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,4 @@ jess-sig <[email protected]>
7373
7474
Ewan Higgs <[email protected]>
7575
76+
Prashant Thakur <[email protected]>

THIRD-PARTY-NOTICES.md

Lines changed: 589 additions & 3146 deletions
Large diffs are not rendered by default.

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: 6 additions & 6 deletions
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",
@@ -84,10 +84,10 @@
8484
"postcss-preset-env": "^6.7.0",
8585
"react-refresh": "^0.10.0",
8686
"style-loader": "^3.2.1",
87-
"webpack": "^5.85.0",
88-
"webpack-bundle-analyzer": "^4.4.2",
89-
"webpack-cli": "^4.9.2",
90-
"webpack-dev-server": "^4.9.0",
91-
"webpack-merge": "^5.8.0"
87+
"webpack": "^5.86.0",
88+
"webpack-bundle-analyzer": "^4.9.0",
89+
"webpack-cli": "^5.1.4",
90+
"webpack-dev-server": "^4.15.0",
91+
"webpack-merge": "^5.9.0"
9292
}
9393
}

0 commit comments

Comments
 (0)