Skip to content

Commit b924d08

Browse files
ZachJW34ZachJW34
committed
chore: prep npm packages for use with Cypress v10
BREAKING CHANGE: new version of packages for Cypress v10
1 parent 36d82f9 commit b924d08

18 files changed

+220
-21
lines changed

‎npm/create-cypress-tests/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "create-cypress-tests",
33
"version": "0.0.0-development",
44
"description": "Cypress smart installation wizard",
5-
"private": true,
65
"main": "dist/src/main.js",
76
"scripts": {
87
"build": "yarn prepare-example && tsc -p ./tsconfig.json && node scripts/example copy-to ./dist/initial-template && yarn prepare-copy-templates",

‎npm/mount-utils/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "@cypress/mount-utils",
33
"version": "0.0.0-development",
44
"description": "Shared utilities for the various component testing adapters",
5-
"private": true,
65
"main": "dist/index.js",
76
"scripts": {
87
"build": "tsc || echo 'built, with type errors'",

‎npm/react/package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "@cypress/react",
33
"version": "0.0.0-development",
44
"description": "Test React components using Cypress",
5-
"private": true,
65
"main": "dist/cypress-react.cjs.js",
76
"scripts": {
87
"build": "rimraf dist && rollup -c rollup.config.js",
@@ -44,8 +43,7 @@
4443
"react-dom": "^=16.x || ^=17.x"
4544
},
4645
"files": [
47-
"dist",
48-
"support"
46+
"dist"
4947
],
5048
"types": "dist/index.d.ts",
5149
"license": "MIT",

‎npm/vite-dev-server/cypress/e2e/react.cy.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference types="cypress" />
21
/// <reference path="../support/e2e.ts" />
32
import type { fixtureDirs } from '@tooling/system-tests'
43
import dedent from 'dedent'

‎npm/vite-dev-server/cypress/e2e/vite-dev-server.cy.ts

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference types="Cypress" />
21
/// <reference path="../support/e2e.ts" />
32

43
describe('Config options', () => {
@@ -48,4 +47,15 @@ describe('Config options', () => {
4847
cy.contains(specWithWhitespace).click()
4948
cy.get('.passed > .num').should('contain', 1)
5049
})
50+
51+
it('supports @cypress/vite-dev-server', () => {
52+
cy.scaffoldProject('vite2.9.1-react')
53+
cy.openProject('vite2.9.1-react', ['--config-file', 'cypress-vite-dev-server-function.config.ts'])
54+
cy.startAppServer('component')
55+
56+
cy.visitApp()
57+
cy.contains('App.cy.jsx').click()
58+
cy.waitForSpecToFinish()
59+
cy.get('.passed > .num').should('contain', 1)
60+
})
5161
})

‎npm/vite-dev-server/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "@cypress/vite-dev-server",
33
"version": "0.0.0-development",
44
"description": "Launches Vite Dev Server for Component Testing",
5-
"private": true,
65
"main": "index.js",
76
"scripts": {
87
"build": "tsc || echo 'built, with type errors'",

‎npm/vue/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "@cypress/vue",
33
"version": "0.0.0-development",
44
"description": "Browser-based Component Testing for Vue.js with Cypress.io ✌️🌲",
5-
"private": true,
65
"main": "dist/cypress-vue.cjs.js",
76
"scripts": {
87
"build-prod": "yarn build",

‎npm/vue2/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "@cypress/vue2",
33
"version": "0.0.0-development",
44
"description": "Browser-based Component Testing for Vue.js@2 with Cypress.io ✌️🌲",
5-
"private": true,
65
"main": "dist/cypress-vue2.cjs.js",
76
"scripts": {
87
"typecheck": "tsc --noEmit",

‎npm/webpack-dev-server/CHANGELOG.md

+188
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
1+
# [@cypress/webpack-dev-server-v1.8.4](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.8.3...@cypress/webpack-dev-server-v1.8.4) (2022-03-29)
2+
3+
4+
### Bug Fixes
5+
6+
* **deps:** add 'lodash' to webpack-dev-server plugin dependencies ([#20815](https://github.com/cypress-io/cypress/issues/20815)) ([a472427](https://github.com/cypress-io/cypress/commit/a4724271601aff110c68ae4364e68764f22cd12c))
7+
8+
# [@cypress/webpack-dev-server-v1.8.3](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.8.2...@cypress/webpack-dev-server-v1.8.3) (2022-03-15)
9+
10+
11+
### Bug Fixes
12+
13+
* **webpack-dev-server:** do not encodeUri in loader ([#20575](https://github.com/cypress-io/cypress/issues/20575)) ([1b152fc](https://github.com/cypress-io/cypress/commit/1b152fca1b9ed9894cf7a5b2a964c856f73fc685)), closes [#20593](https://github.com/cypress-io/cypress/issues/20593)
14+
15+
# [@cypress/webpack-dev-server-v1.8.2](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.8.1...@cypress/webpack-dev-server-v1.8.2) (2022-03-03)
16+
17+
18+
### Bug Fixes
19+
20+
* avoid nextjs unsafeCache and watchOptions ([#20440](https://github.com/cypress-io/cypress/issues/20440)) ([9f60901](https://github.com/cypress-io/cypress/commit/9f6090170b0675d25b26b98cd0f987a5e395ab78))
21+
* error regression - strip ansi colors out of cy.fixture() error message ([#20335](https://github.com/cypress-io/cypress/issues/20335)) ([e0bd6ac](https://github.com/cypress-io/cypress/commit/e0bd6ac2aaf8d00b9233fffefed8f6ed2484bf45))
22+
23+
# [@cypress/webpack-dev-server-v1.8.1](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.8.0...@cypress/webpack-dev-server-v1.8.1) (2022-02-08)
24+
25+
26+
### Bug Fixes
27+
28+
* detect newly added specs in dev-server compilation ([#17950](https://github.com/cypress-io/cypress/issues/17950)) ([f9ce67c](https://github.com/cypress-io/cypress/commit/f9ce67cfb6fed74a3549e7aff7ce0a5b217d9a13))
29+
30+
# [@cypress/webpack-dev-server-v1.8.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.7.0...@cypress/webpack-dev-server-v1.8.0) (2021-12-16)
31+
32+
33+
### Features
34+
35+
* use hoisted yarn install in binary build ([#17285](https://github.com/cypress-io/cypress/issues/17285)) ([e4f5b10](https://github.com/cypress-io/cypress/commit/e4f5b106d49d6ac0857c5fdac886f83b99558c88))
36+
37+
# [@cypress/webpack-dev-server-v1.7.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.6.0...@cypress/webpack-dev-server-v1.7.0) (2021-10-15)
38+
39+
40+
### Features
41+
42+
* normalized signatures webpack & vite servers ([#18379](https://github.com/cypress-io/cypress/issues/18379)) ([8f5308f](https://github.com/cypress-io/cypress/commit/8f5308f7068b80fb877da539ce34fb67ba497c4f))
43+
44+
# [@cypress/webpack-dev-server-v1.6.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.5.0...@cypress/webpack-dev-server-v1.6.0) (2021-09-10)
45+
46+
47+
### Features
48+
49+
* allow usage of @react/plugins with cypress.config.js ([#17738](https://github.com/cypress-io/cypress/issues/17738)) ([da4b1e0](https://github.com/cypress-io/cypress/commit/da4b1e06ce33945aabddda0e6e175dc0e1b488a5))
50+
51+
# [@cypress/webpack-dev-server-v1.5.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.4.0...@cypress/webpack-dev-server-v1.5.0) (2021-08-30)
52+
53+
54+
### Features
55+
56+
* support webpack-dev-server v4 ([#17918](https://github.com/cypress-io/cypress/issues/17918)) ([16e4759](https://github.com/cypress-io/cypress/commit/16e4759e0196f68c5f0525efb020211337748f94))
57+
58+
# [@cypress/webpack-dev-server-v1.4.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.3.1...@cypress/webpack-dev-server-v1.4.0) (2021-06-17)
59+
60+
61+
### Features
62+
63+
* **npm/webpack-dev-server,runner-ct:** Normalize webpack errors + general React/TS improvements ([#16613](https://github.com/cypress-io/cypress/issues/16613)) ([c0fc23a](https://github.com/cypress-io/cypress/commit/c0fc23a052e53354a8300dd3f783cb161ae161e1))
64+
65+
# [@cypress/webpack-dev-server-v1.3.1](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.3.0...@cypress/webpack-dev-server-v1.3.1) (2021-05-26)
66+
67+
68+
### Bug Fixes
69+
70+
* encodeURI to correctly load specs with white space ([#16416](https://github.com/cypress-io/cypress/issues/16416)) ([116fe64](https://github.com/cypress-io/cypress/commit/116fe649d74e54da9dd84bf126f08f4b9162c5d3))
71+
* Properly typecheck webpack-dev-server and fix several undefined issues ([#16503](https://github.com/cypress-io/cypress/issues/16503)) ([4bb1ecd](https://github.com/cypress-io/cypress/commit/4bb1ecd077fc3724e6c127982f98e1e6b0f1bb98))
72+
73+
# [@cypress/webpack-dev-server-v1.3.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.2.0...@cypress/webpack-dev-server-v1.3.0) (2021-05-13)
74+
75+
76+
### Features
77+
78+
* support webpack dev server v4 ([#16414](https://github.com/cypress-io/cypress/issues/16414)) ([0cea625](https://github.com/cypress-io/cypress/commit/0cea625f359ef554e87600ef7e7c3afa4e36da4d))
79+
80+
# [@cypress/webpack-dev-server-v1.2.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.1.6...@cypress/webpack-dev-server-v1.2.0) (2021-05-11)
81+
82+
83+
### Features
84+
85+
* exclude html pwa plugin in webpack dev server ([#16388](https://github.com/cypress-io/cypress/issues/16388)) ([14c2292](https://github.com/cypress-io/cypress/commit/14c22929badfe56385260a49336cf29e10902470))
86+
87+
# [@cypress/webpack-dev-server-v1.1.6](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.1.5...@cypress/webpack-dev-server-v1.1.6) (2021-04-30)
88+
89+
90+
### Bug Fixes
91+
92+
* update docs ([#16266](https://github.com/cypress-io/cypress/issues/16266)) ([72e064b](https://github.com/cypress-io/cypress/commit/72e064bd0705ae39830a2be2052534699862551a))
93+
94+
# [@cypress/webpack-dev-server-v1.1.5](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.1.4...@cypress/webpack-dev-server-v1.1.5) (2021-04-26)
95+
96+
97+
### Bug Fixes
98+
99+
* **component-testing:** correct imports for relative paths in cypress.json ([#16056](https://github.com/cypress-io/cypress/issues/16056)) ([10b89f8](https://github.com/cypress-io/cypress/commit/10b89f8d587d331256549c3ab7662f119df7a0f1))
100+
* **webpack-dev-server:** remove hard dependency on html-webpack-plugin v4 ([#16108](https://github.com/cypress-io/cypress/issues/16108)) ([4cfe4b1](https://github.com/cypress-io/cypress/commit/4cfe4b1971c615d615c05ce35b9f7dd5ef8315fc))
101+
* remove lazy-compile-webpack-plugin, make html-webpack-plugin a dependency ([#15954](https://github.com/cypress-io/cypress/issues/15954)) ([19136b6](https://github.com/cypress-io/cypress/commit/19136b6a131cffc31899c754cccce64ce1b4fb87))
102+
* run-ct does not hang on windows anymore ([#16022](https://github.com/cypress-io/cypress/issues/16022)) ([6c12a6c](https://github.com/cypress-io/cypress/commit/6c12a6c7b706ee4f708a9d19c62f18cd0838a433))
103+
104+
# [@cypress/webpack-dev-server-v1.1.4](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.1.3...@cypress/webpack-dev-server-v1.1.4) (2021-04-21)
105+
106+
107+
### Bug Fixes
108+
109+
* **webpack:** allow load custom asset on windows ([#16099](https://github.com/cypress-io/cypress/issues/16099)) ([7340851](https://github.com/cypress-io/cypress/commit/7340851097c792ca0d8d3157c3d803dccdd905d2)), closes [#16097](https://github.com/cypress-io/cypress/issues/16097)
110+
111+
# [@cypress/webpack-dev-server-v1.1.3](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.1.2...@cypress/webpack-dev-server-v1.1.3) (2021-04-13)
112+
113+
114+
### Bug Fixes
115+
116+
* ensure root el mounting exists, remove userland html webpack plugin ([#15870](https://github.com/cypress-io/cypress/issues/15870)) ([726120d](https://github.com/cypress-io/cypress/commit/726120da183cb6d89c83181761d21f09844a9fc2))
117+
* make component testing windows compatible ([#15889](https://github.com/cypress-io/cypress/issues/15889)) ([602c762](https://github.com/cypress-io/cypress/commit/602c762cfd707ae497273ac38206d7f9d8545439))
118+
* remove lazy-compile-webpack-plugin ([#15964](https://github.com/cypress-io/cypress/issues/15964)) ([dcf3b14](https://github.com/cypress-io/cypress/commit/dcf3b14f3668cba8e19cf4eecd80db0c726f4248))
119+
* **webpack-dev-server:** remove output.publicPath from webpack-dev-server ([#15839](https://github.com/cypress-io/cypress/issues/15839)) ([8e894a0](https://github.com/cypress-io/cypress/commit/8e894a0fdb899be8dd8993319c9297ea73c10321))
120+
121+
122+
### Reverts
123+
124+
* Revert "fix: ensure root el mounting exists, remove userland html webpack plugin (#15870)" (#15949) ([1d271ea](https://github.com/cypress-io/cypress/commit/1d271ea209c9d5116d61ed9b147a75eda6a61210)), closes [#15870](https://github.com/cypress-io/cypress/issues/15870) [#15949](https://github.com/cypress-io/cypress/issues/15949)
125+
126+
# [@cypress/webpack-dev-server-v1.1.2](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.1.1...@cypress/webpack-dev-server-v1.1.2) (2021-04-06)
127+
128+
129+
### Bug Fixes
130+
131+
* **component-testing:** Correctly specify @cypress/webpack-dev-server peerDependencies ([#15820](https://github.com/cypress-io/cypress/issues/15820)) ([519b29c](https://github.com/cypress-io/cypress/commit/519b29cb897af59b84dc2f35752f785985348f2d))
132+
133+
# [@cypress/webpack-dev-server-v1.1.1](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.1.0...@cypress/webpack-dev-server-v1.1.1) (2021-04-05)
134+
135+
136+
### Bug Fixes
137+
138+
* **@cypress/react:** Devtools unpredictable resets ([#15612](https://github.com/cypress-io/cypress/issues/15612)) ([b1f831a](https://github.com/cypress-io/cypress/commit/b1f831a86a8bcc6646067bc8a9e67871026ff575)), closes [#15634](https://github.com/cypress-io/cypress/issues/15634)
139+
* **component-testing:** Fix webpack-dev-server deps validation crash ([#15708](https://github.com/cypress-io/cypress/issues/15708)) ([254eb47](https://github.com/cypress-io/cypress/commit/254eb47d91c75a9f56162e7493ab83e5be169935))
140+
141+
# [@cypress/webpack-dev-server-v1.1.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.0.4...@cypress/webpack-dev-server-v1.1.0) (2021-03-15)
142+
143+
144+
### Bug Fixes
145+
146+
* **@cypress/react:** Correctly unmount react components ([#15250](https://github.com/cypress-io/cypress/issues/15250)) ([6b515c7](https://github.com/cypress-io/cypress/commit/6b515c777ca2fa599f21dc47d181fd28a7eb6db0))
147+
148+
149+
### Features
150+
151+
* Use lazy compilation for webpack-dev-server by default ([#15158](https://github.com/cypress-io/cypress/issues/15158)) ([f237050](https://github.com/cypress-io/cypress/commit/f237050fdb49e4e59c07a70bb178d88d0e7387a8))
152+
* webpack stop early when error in run mode ([4ec655b](https://github.com/cypress-io/cypress/commit/4ec655b784ff5f961f1d7ce371c5953d9116c576))
153+
154+
# [@cypress/webpack-dev-server-v1.0.4](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.0.3...@cypress/webpack-dev-server-v1.0.4) (2021-03-10)
155+
156+
157+
### Bug Fixes
158+
159+
* trigger release of the packages ([#15405](https://github.com/cypress-io/cypress/issues/15405)) ([1ce5755](https://github.com/cypress-io/cypress/commit/1ce57554e260850472cf753de68858f47b3f7b3d))
160+
161+
# [@cypress/webpack-dev-server-v1.0.3](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.0.2...@cypress/webpack-dev-server-v1.0.3) (2021-02-18)
162+
163+
164+
### Bug Fixes
165+
166+
* missing index-template.html from package.json deps for webpack-dev-server ([#15151](https://github.com/cypress-io/cypress/issues/15151)) ([36b0440](https://github.com/cypress-io/cypress/commit/36b0440b663c6a0075d23d8d23ae14d47de297c8))
167+
168+
# [@cypress/webpack-dev-server-v1.0.2](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.0.1...@cypress/webpack-dev-server-v1.0.2) (2021-02-18)
169+
170+
171+
### Bug Fixes
172+
173+
* add webpack-dev-server to peerDependencies, improve peerDependency error handling, fix index-template.html path ([#15149](https://github.com/cypress-io/cypress/issues/15149)) ([2863e33](https://github.com/cypress-io/cypress/commit/2863e338920362cbb1ecf20c2fab28fbd3a52c33))
174+
175+
# [@cypress/webpack-dev-server-v1.0.1](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.0.0...@cypress/webpack-dev-server-v1.0.1) (2021-02-17)
176+
177+
178+
### Bug Fixes
179+
180+
* add a trivial change to trigger semantic release ([#15127](https://github.com/cypress-io/cypress/issues/15127)) ([fb7540e](https://github.com/cypress-io/cypress/commit/fb7540e99d56e0cff89aaf2fe76065b9815bdbec))
181+
* trigger semantic release ([#15128](https://github.com/cypress-io/cypress/issues/15128)) ([3a6f3b1](https://github.com/cypress-io/cypress/commit/3a6f3b1928277f7086062b1107f424e5a0247e00))
182+
183+
# @cypress/webpack-dev-server-v1.0.0 (2021-02-16)
184+
185+
186+
### Features
187+
188+
* component testing ([#14479](https://github.com/cypress-io/cypress/issues/14479)) ([af26fbe](https://github.com/cypress-io/cypress/commit/af26fbebe6bc609132013a0493a116cc78bb1bd4))

‎npm/webpack-dev-server/cypress/e2e/create-react-app.cy.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// <reference types="cypress" />
21
/// <reference path="../support/e2e.ts" />
32
import type { ProjectFixtureDir } from '@tooling/system-tests/lib/fixtureDirs'
43

‎npm/webpack-dev-server/cypress/e2e/next.cy.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// <reference types="cypress" />
21
/// <reference path="../support/e2e.ts" />
32
import type { ProjectFixtureDir } from '@tooling/system-tests/lib/fixtureDirs'
43

‎npm/webpack-dev-server/cypress/e2e/nuxt.cy.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// <reference types="cypress" />
21
/// <reference path="../support/e2e.ts" />
32
import type { ProjectFixtureDir } from '@tooling/system-tests/lib/fixtureDirs'
43

‎npm/webpack-dev-server/cypress/e2e/react.cy.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference types="cypress" />
21
/// <reference path="../support/e2e.ts" />
32
import type { fixtureDirs } from '@tooling/system-tests'
43
import dedent from 'dedent'

‎npm/webpack-dev-server/cypress/e2e/vue-cli.cy.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// <reference types="cypress" />
21
/// <reference path="../support/e2e.ts" />
32
import type { ProjectFixtureDir } from '@tooling/system-tests/lib/fixtureDirs'
43

‎npm/webpack-dev-server/cypress/e2e/webpack-dev-server.cy.ts

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/// <reference path="../support/e2e.ts" />
2+
13
describe('Config options', () => {
24
it('supports supportFile = false', () => {
35
cy.scaffoldProject('webpack5_wds4-react')
@@ -9,4 +11,15 @@ describe('Config options', () => {
911
cy.waitForSpecToFinish()
1012
cy.get('.passed > .num').should('contain', 1)
1113
})
14+
15+
it('supports @cypress/webpack-dev-server', () => {
16+
cy.scaffoldProject('webpack5_wds4-react')
17+
cy.openProject('webpack5_wds4-react', ['--config-file', 'cypress-webpack-dev-server-function.config.ts'])
18+
cy.startAppServer('component')
19+
20+
cy.visitApp()
21+
cy.contains('App.cy.jsx').click()
22+
cy.waitForSpecToFinish()
23+
cy.get('.passed > .num').should('contain', 1)
24+
})
1225
})

‎npm/webpack-dev-server/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "@cypress/webpack-dev-server",
33
"version": "0.0.0-development",
44
"description": "Launches Webpack Dev Server for Component Testing",
5-
"private": true,
65
"main": "dist/index.js",
76
"scripts": {
87
"prebuild": "rimraf dist",

‎npm/webpack-dev-server/src/helpers/nextHandler.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ function sourceNextWebpack (devServerConfig: WebpackDevServerConfig, framework:
232232
// Next with webpack@4 doesn't ship certain dependencies that HtmlWebpackPlugin requires, so we patch the resolution through to our bundled version
233233
if ((request === 'webpack' || request.startsWith('webpack/')) && webpack.majorVersion === 4) {
234234
const resolvePath = require.resolve(request, {
235-
paths: [cypressWebpackPath],
235+
paths: [cypressWebpackPath(devServerConfig)],
236236
})
237237

238238
debug('NextWebpack: Module._load for webpack@4 - %s', resolvePath)

‎npm/webpack-dev-server/src/helpers/sourceRelativeWebpackModules.ts

+6-4
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@ const originalModuleResolveFilename = (Module as ModuleClass)._resolveFilename
5050

5151
// We ship webpack@4 as part of '@cypress/webpack-batteries-included-preprocessor'. The path to this module
5252
// serves as our fallback.
53-
export const cypressWebpackPath = require.resolve('@cypress/webpack-batteries-included-preprocessor', {
54-
paths: [__dirname],
55-
})
53+
export const cypressWebpackPath = (config: WebpackDevServerConfig) => {
54+
return require.resolve('@cypress/webpack-batteries-included-preprocessor', {
55+
paths: [config.cypressConfig.cypressBinaryRoot],
56+
})
57+
}
5658

5759
// Source the users framework from the provided projectRoot. The framework, if available, will server
5860
// as the resolve base for webpack dependency resolution.
@@ -113,7 +115,7 @@ export function sourceWebpack (config: WebpackDevServerConfig, framework: Source
113115
debug('Webpack: Falling back to bundled version')
114116

115117
webpackJsonPath = require.resolve('webpack/package.json', {
116-
paths: [cypressWebpackPath],
118+
paths: [cypressWebpackPath(config)],
117119
})
118120
}
119121

0 commit comments

Comments
 (0)