chore: fix conflicts

webpack · Oct 23, 2024 · 93070c2 · 93070c2
2 parents 49a2823 + 0807d47
commit 93070c2
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 336 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -62,13 +62,6 @@ jobs:
         shard: ["1/4", "2/4", "3/4", "4/4"]
         webpack-version: [latest]
         dev-server-version: [latest]
-        include:
-          - node-version: 18.x
-            os: ubuntu-latest
-            dev-server-version: 4
-          - node-version: 20.x
-            os: ubuntu-latest
-            dev-server-version: 4
 
     steps:
       - uses: actions/checkout@v4
@@ -89,10 +82,6 @@ jobs:
       - name: Install dependencies
         run: yarn --frozen-lockfile --ignore-engines --ignore-scripts
 
-      - name: Install webpack-dev-server ${{ matrix.dev-server-version }}
-        if: matrix.dev-server-version == '4'
-        run: yarn add -W -D webpack-dev-server@${{ matrix.dev-server-version }} --ignore-engines --ignore-scripts
-
       - name: Prepare environment for tests
         run: yarn build:ci
 

diff --git a/test/serve/basic/__snapshots__/serve-basic.test.js.snap.devServer4.webpack5 b/test/serve/basic/__snapshots__/serve-basic.test.js.snap.devServer4.webpack5
diff --git a/test/serve/invalid-schema/__snapshots__/invalid-schema.test.js.snap.devServer4.webpack5 b/test/serve/invalid-schema/__snapshots__/invalid-schema.test.js.snap.devServer4.webpack5
diff --git a/test/serve/serve-variable/__snapshots__/serve-variable.test.js.snap.devServer4.webpack5 b/test/serve/serve-variable/__snapshots__/serve-variable.test.js.snap.devServer4.webpack5
diff --git a/...serve/with-custom-port/__snapshots__/serve-custom-config.test.js.snap.devServer4.webpack5 b/...serve/with-custom-port/__snapshots__/serve-custom-config.test.js.snap.devServer4.webpack5