Skip to content

Commit e0c32ff

Browse files
chore(deps): bump webpack-dev-middleware from 4.3.0 to 5.3.4 (#39106)
* chore(deps): bump webpack-dev-middleware from 4.3.0 to 5.3.4 Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 4.3.0 to 5.3.4. - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases) - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md) - [Commits](webpack/webpack-dev-middleware@v4.3.0...v5.3.4) --- updated-dependencies: - dependency-name: webpack-dev-middleware dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * types: update types for webpack-dev-middleware@5 * chore(lockfile): re-bump webpack-dev-middleware I have no idea why but this fixes tests. I must have resolved yarn.lock conflicts incorrectly at some point (even though I just let `yarn` handle it...) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Philippe Serhal <[email protected]> Co-authored-by: Philippe Serhal <[email protected]>
1 parent ffada73 commit e0c32ff

File tree

5 files changed

+33
-90
lines changed

5 files changed

+33
-90
lines changed

Diff for: packages/gatsby/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
"url-loader": "^4.1.1",
172172
"uuid": "^8.3.2",
173173
"webpack": "^5.88.1",
174-
"webpack-dev-middleware": "^4.3.0",
174+
"webpack-dev-middleware": "^5.3.4",
175175
"webpack-merge": "^5.9.0",
176176
"webpack-stats-plugin": "^1.1.3",
177177
"webpack-virtual-modules": "^0.5.0",

Diff for: packages/gatsby/src/services/start-webpack-server.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
import { showExperimentNotices } from "../utils/show-experiment-notice"
1313
import { printInstructions } from "../utils/print-instructions"
1414
import { prepareUrls } from "../utils/prepare-urls"
15-
import { startServer, IWebpackWatchingPauseResume } from "../utils/start-server"
15+
import { startServer, WebpackWatching } from "../utils/start-server"
1616
import { WebsocketManager } from "../utils/websocket-manager"
1717
import { IBuildContext } from "./"
1818
import {
@@ -29,7 +29,7 @@ export async function startWebpackServer({
2929
}: Partial<IBuildContext>): Promise<{
3030
compiler: Compiler
3131
websocketManager: WebsocketManager
32-
webpackWatching: IWebpackWatchingPauseResume
32+
webpackWatching: WebpackWatching
3333
}> {
3434
if (!program || !app || !store) {
3535
report.panic(`Missing required params`)

Diff for: packages/gatsby/src/services/types.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type { GatsbyWorkerPool } from "../utils/worker/pool"
1010
import { Actor, AnyEventObject } from "xstate"
1111
import { Compiler } from "webpack"
1212
import { WebsocketManager } from "../utils/websocket-manager"
13-
import { IWebpackWatchingPauseResume } from "../utils/start-server"
13+
import { type WebpackWatching } from "../utils/start-server"
1414

1515
type Reporter = typeof reporter
1616

@@ -46,7 +46,7 @@ export interface IBuildContext {
4646
nodeMutationBatch?: Array<IMutationAction>
4747
compiler?: Compiler
4848
websocketManager?: WebsocketManager
49-
webpackWatching?: IWebpackWatchingPauseResume
49+
webpackWatching?: WebpackWatching
5050
webpackListener?: Actor<unknown, AnyEventObject>
5151
queryFilesDirty?: boolean
5252
sourceFilesDirty?: boolean

Diff for: packages/gatsby/src/utils/start-server.ts

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import webpackHotMiddleware from "@gatsbyjs/webpack-hot-middleware"
2-
import webpackDevMiddleware from "webpack-dev-middleware"
2+
import webpackDevMiddleware, { type Watching } from "webpack-dev-middleware"
33
import got, { Method } from "got"
44
import webpack, { Compilation } from "webpack"
55
import express from "express"
@@ -54,18 +54,15 @@ import { isFileInsideCompilations } from "./webpack/utils/is-file-inside-compila
5454

5555
type ActivityTracker = any // TODO: Replace this with proper type once reporter is typed
5656

57+
export type WebpackWatching = NonNullable<Watching>
58+
5759
interface IServer {
5860
compiler: webpack.Compiler
5961
listener: http.Server | https.Server
6062
webpackActivity: ActivityTracker
6163
websocketManager: WebsocketManager
6264
workerPool: WorkerPool.GatsbyWorkerPool
63-
webpackWatching: IWebpackWatchingPauseResume
64-
}
65-
66-
export interface IWebpackWatchingPauseResume {
67-
suspend: () => void
68-
resume: () => void
65+
webpackWatching: WebpackWatching
6966
}
7067

7168
export async function startServer(
@@ -895,6 +892,7 @@ export async function startServer(
895892
webpackActivity,
896893
websocketManager,
897894
workerPool,
898-
webpackWatching: webpackDevMiddlewareInstance.context.watching,
895+
webpackWatching: webpackDevMiddlewareInstance.context
896+
.watching as WebpackWatching,
899897
}
900898
}

Diff for: yarn.lock

+22-77
Original file line numberDiff line numberDiff line change
@@ -8158,16 +8158,11 @@ color@^4.2.3:
81588158
color-convert "^2.0.1"
81598159
color-string "^1.9.0"
81608160

8161-
[email protected], colorette@^2.0.14:
8161+
[email protected], colorette@^2.0.10, colorette@^2.0.14:
81628162
version "2.0.20"
81638163
resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
81648164
integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
81658165

8166-
colorette@^1.2.2:
8167-
version "1.3.0"
8168-
resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af"
8169-
integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==
8170-
81718166
colors@^1.1.2, colors@^1.4.0:
81728167
version "1.4.0"
81738168
resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
@@ -12178,10 +12173,10 @@ fs-mkdirp-stream@^1.0.0:
1217812173
graceful-fs "^4.1.11"
1217912174
through2 "^2.0.3"
1218012175

12181-
12182-
version "1.0.3"
12183-
resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
12184-
integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
12176+
fs-monkey@^1.0.4:
12177+
version "1.0.6"
12178+
resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.6.tgz#8ead082953e88d992cf3ff844faa907b26756da2"
12179+
integrity sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==
1218512180

1218612181
fs-readdir-recursive@^1.1.0:
1218712182
version "1.1.0"
@@ -16452,13 +16447,6 @@ [email protected]:
1645216447
dependencies:
1645316448
tmpl "1.0.5"
1645416449

16455-
map-age-cleaner@^0.1.3:
16456-
version "0.1.3"
16457-
resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
16458-
integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
16459-
dependencies:
16460-
p-defer "^1.0.0"
16461-
1646216450
map-cache@^0.2.0, map-cache@^0.2.2:
1646316451
version "0.2.2"
1646416452
resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -16880,25 +16868,17 @@ [email protected]:
1688016868
version "0.3.0"
1688116869
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
1688216870

16883-
mem@^8.1.1:
16884-
version "8.1.1"
16885-
resolved "https://registry.yarnpkg.com/mem/-/mem-8.1.1.tgz#cf118b357c65ab7b7e0817bdf00c8062297c0122"
16886-
integrity sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==
16887-
dependencies:
16888-
map-age-cleaner "^0.1.3"
16889-
mimic-fn "^3.1.0"
16890-
1689116871
memfs-or-file-map-to-github-branch@^1.1.0:
1689216872
version "1.1.2"
1689316873
resolved "https://registry.yarnpkg.com/memfs-or-file-map-to-github-branch/-/memfs-or-file-map-to-github-branch-1.1.2.tgz#9d46c02481b7eca8e5ee8a94f170b7e0138cad67"
1689416874
integrity sha512-D2JKK2DTuVYQqquBWco3K6UfSVyVwmd58dgNqh+TgxHOZdTmR8I130gjMbVCkemDl/EzqDA62417cJxKL3/FFA==
1689516875

16896-
memfs@^3.1.2, memfs@^3.2.2:
16897-
version "3.4.1"
16898-
resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305"
16899-
integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==
16876+
memfs@^3.1.2, memfs@^3.4.3:
16877+
version "3.6.0"
16878+
resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
16879+
integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
1690016880
dependencies:
16901-
fs-monkey "1.0.3"
16881+
fs-monkey "^1.0.4"
1690216882

1690316883
memfs@^4.6.0:
1690416884
version "4.6.0"
@@ -17499,7 +17479,7 @@ [email protected]:
1749917479
dependencies:
1750017480
mime-db "~1.25.0"
1750117481

17502-
mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.30, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
17482+
mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
1750317483
version "2.1.35"
1750417484
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
1750517485
integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -17529,11 +17509,6 @@ mimic-fn@^2.1.0:
1752917509
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
1753017510
integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
1753117511

17532-
mimic-fn@^3.1.0:
17533-
version "3.1.0"
17534-
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74"
17535-
integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==
17536-
1753717512
mimic-fn@^4.0.0:
1753817513
version "4.0.0"
1753917514
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
@@ -18705,10 +18680,6 @@ p-cancelable@^3.0.0:
1870518680
resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-3.0.0.tgz#63826694b54d61ca1c20ebcb6d3ecf5e14cd8050"
1870618681
integrity sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==
1870718682

18708-
p-defer@^1.0.0:
18709-
version "1.0.0"
18710-
resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
18711-
1871218683
p-defer@^3.0.0:
1871318684
version "3.0.0"
1871418685
resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83"
@@ -23097,7 +23068,7 @@ string-template@~0.2.1:
2309723068
version "0.2.1"
2309823069
resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
2309923070

23100-
"string-width-cjs@npm:string-width@^4.2.0":
23071+
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
2310123072
version "4.2.3"
2310223073
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
2310323074
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -23129,15 +23100,6 @@ string-width@^3.0.0, string-width@^3.1.0:
2312923100
is-fullwidth-code-point "^2.0.0"
2313023101
strip-ansi "^5.1.0"
2313123102

23132-
string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
23133-
version "4.2.3"
23134-
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
23135-
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
23136-
dependencies:
23137-
emoji-regex "^8.0.0"
23138-
is-fullwidth-code-point "^3.0.0"
23139-
strip-ansi "^6.0.1"
23140-
2314123103
string-width@^5.0.1, string-width@^5.1.2:
2314223104
version "5.1.2"
2314323105
resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -23249,7 +23211,7 @@ stringify-package@^1.0.1:
2324923211
resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
2325023212
integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
2325123213

23252-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
23214+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
2325323215
version "6.0.1"
2325423216
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
2325523217
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -23274,13 +23236,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
2327423236
dependencies:
2327523237
ansi-regex "^4.1.0"
2327623238

23277-
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
23278-
version "6.0.1"
23279-
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
23280-
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
23281-
dependencies:
23282-
ansi-regex "^5.0.1"
23283-
2328423239
strip-ansi@^7.0.1:
2328523240
version "7.1.0"
2328623241
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -25554,17 +25509,16 @@ webpack-cli@^5.1.4:
2555425509
rechoir "^0.8.0"
2555525510
webpack-merge "^5.7.3"
2555625511

25557-
webpack-dev-middleware@^4.3.0:
25558-
version "4.3.0"
25559-
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-4.3.0.tgz#179cc40795882cae510b1aa7f3710cbe93c9333e"
25560-
integrity sha512-PjwyVY95/bhBh6VUqt6z4THplYcsvQ8YNNBTBM873xLVmw8FLeALn0qurHbs9EmcfhzQis/eoqypSnZeuUz26w==
25512+
webpack-dev-middleware@^5.3.4:
25513+
version "5.3.4"
25514+
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
25515+
integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
2556125516
dependencies:
25562-
colorette "^1.2.2"
25563-
mem "^8.1.1"
25564-
memfs "^3.2.2"
25565-
mime-types "^2.1.30"
25517+
colorette "^2.0.10"
25518+
memfs "^3.4.3"
25519+
mime-types "^2.1.31"
2556625520
range-parser "^1.2.1"
25567-
schema-utils "^3.0.0"
25521+
schema-utils "^4.0.0"
2556825522

2556925523
webpack-merge@^5.7.3, webpack-merge@^5.9.0:
2557025524
version "5.9.0"
@@ -25962,7 +25916,7 @@ workbox-window@^4.3.1:
2596225916
dependencies:
2596325917
workbox-core "^4.3.1"
2596425918

25965-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
25919+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
2596625920
version "7.0.0"
2596725921
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
2596825922
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -25989,15 +25943,6 @@ wrap-ansi@^6.2.0:
2598925943
string-width "^4.1.0"
2599025944
strip-ansi "^6.0.0"
2599125945

25992-
wrap-ansi@^7.0.0:
25993-
version "7.0.0"
25994-
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
25995-
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
25996-
dependencies:
25997-
ansi-styles "^4.0.0"
25998-
string-width "^4.1.0"
25999-
strip-ansi "^6.0.0"
26000-
2600125946
wrap-ansi@^8.1.0:
2600225947
version "8.1.0"
2600325948
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

0 commit comments

Comments
 (0)