Skip to content

Commit b453380

Browse files
chore(deps): bump (#5035)
1 parent 975c719 commit b453380

39 files changed

+4834
-2991
lines changed

.github/workflows/nodejs.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@ jobs:
9090
- name: Install dependencies
9191
run: npm ci
9292

93+
- name: Install dependencies for Node.js@18
94+
run: |
95+
npm i p-retry@^4.5.0 open@^8.0.9
96+
node ./scripts/prepare-test-for-old-node.js
97+
if: matrix.node-version == '18.x'
98+
9399
- name: Setup firefox
94100
if: matrix.os != 'windows-latest'
95101
uses: browser-actions/setup-firefox@latest
@@ -99,13 +105,18 @@ jobs:
99105
- name: Link webpack-dev-server
100106
run: |
101107
cp -R client tmp-client
102-
npm link --ignore-scripts
103-
npm link webpack-dev-server --ignore-scripts
108+
npm link --ignore-scripts || true
109+
npm link webpack-dev-server --ignore-scripts || true
104110
rm -r client
105111
cp -R tmp-client client
106112
113+
- name: Run tests for webpack version ${{ matrix.webpack-version }}
114+
run: node_modules/.bin/jest --coverage --ci --shard=${{ matrix.shard }}
115+
if: matrix.node-version == '18.x'
116+
107117
- name: Run tests for webpack version ${{ matrix.webpack-version }}
108118
run: npm run test:coverage -- --ci --shard=${{ matrix.shard }}
119+
if: matrix.node-version != '18.x'
109120

110121
- name: Submit coverage data to codecov
111122
uses: codecov/codecov-action@v3

.husky/commit-msg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
#!/bin/sh
2-
. "$(dirname "$0")/_/husky.sh"
3-
41
npx --no-install commitlint --edit $1

.husky/pre-commit

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
#!/bin/sh
2-
. "$(dirname "$0")/_/husky.sh"
3-
41
npx lint-staged

lib/Server.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ class Server {
356356
static async internalIP(family) {
357357
try {
358358
const { gateway } = await require("default-gateway")[family]();
359+
359360
return Server.findIp(gateway);
360361
} catch {
361362
// ignore
@@ -369,6 +370,7 @@ class Server {
369370
static internalIPSync(family) {
370371
try {
371372
const { gateway } = require("default-gateway")[family].sync();
373+
372374
return Server.findIp(gateway);
373375
} catch {
374376
// ignore
@@ -405,7 +407,7 @@ class Server {
405407
return port;
406408
}
407409

408-
const pRetry = require("p-retry");
410+
const pRetry = (await import("p-retry")).default;
409411
const getPort = require("./getPort");
410412
const basePort =
411413
typeof process.env.WEBPACK_DEV_SERVER_BASE_PORT !== "undefined"
@@ -1115,15 +1117,13 @@ class Server {
11151117

11161118
// cert is more than 30 days old, kill it with fire
11171119
if ((now - Number(certificateStat.ctime)) / certificateTtl > 30) {
1118-
const { promisify } = require("util");
1119-
const rimraf = require("rimraf");
1120-
const del = promisify(rimraf);
1120+
const { rimraf } = require("rimraf");
11211121

11221122
this.logger.info(
11231123
"SSL certificate is more than 30 days old. Removing...",
11241124
);
11251125

1126-
await del(certificatePath);
1126+
await rimraf(certificatePath);
11271127

11281128
certificateExists = false;
11291129
}
@@ -2480,10 +2480,10 @@ class Server {
24802480
/**
24812481
* @private
24822482
* @param {string} defaultOpenTarget
2483-
* @returns {void}
2483+
* @returns {Promise<void>}
24842484
*/
2485-
openBrowser(defaultOpenTarget) {
2486-
const open = require("open");
2485+
async openBrowser(defaultOpenTarget) {
2486+
const open = (await import("open")).default;
24872487

24882488
Promise.all(
24892489
/** @type {NormalizedOpen[]} */
@@ -2568,9 +2568,9 @@ class Server {
25682568

25692569
/**
25702570
* @private
2571-
* @returns {void}
2571+
* @returns {Promise<void>}
25722572
*/
2573-
logStatus() {
2573+
async logStatus() {
25742574
const { isColorSupported, cyan, red } = require("colorette");
25752575

25762576
/**
@@ -2680,13 +2680,13 @@ class Server {
26802680
if (parsedIP.range() === "unspecified") {
26812681
localhost = prettyPrintURL("localhost");
26822682

2683-
const networkIPv4 = Server.internalIPSync("v4");
2683+
const networkIPv4 = await Server.internalIP("v4");
26842684

26852685
if (networkIPv4) {
26862686
networkUrlIPv4 = prettyPrintURL(networkIPv4);
26872687
}
26882688

2689-
const networkIPv6 = Server.internalIPSync("v6");
2689+
const networkIPv6 = await Server.internalIP("v6");
26902690

26912691
if (networkIPv6) {
26922692
networkUrlIPv6 = prettyPrintURL(networkIPv6);
@@ -2758,7 +2758,7 @@ class Server {
27582758
: this.options.host,
27592759
);
27602760

2761-
this.openBrowser(openTarget);
2761+
await this.openBrowser(openTarget);
27622762
}
27632763
}
27642764

@@ -3139,7 +3139,7 @@ class Server {
31393139
this.runBonjour();
31403140
}
31413141

3142-
this.logStatus();
3142+
await this.logStatus();
31433143

31443144
if (typeof this.options.onListening === "function") {
31453145
this.options.onListening(this);

0 commit comments

Comments
 (0)