Skip to content

Commit 3a2b2d3

Browse files
fix(vite-dev-server): do not use incremental esbuild option with Vite v4.2.0+ (#26139)
* fix: do not use `incremental` esbuild option with Vite v4.2.0+ * fix(vite-dev-server): do not use `incremental` esbuild option with Vite v4.2.0+ * feedback * add changelog entry * update changelog entry * remove system test * invert config logic * Update cli/CHANGELOG.md Co-authored-by: Mike Plummer <mike-plummer@users.noreply.github.com> --------- Co-authored-by: Mike Plummer <mike-plummer@users.noreply.github.com>
1 parent a63a474 commit 3a2b2d3

File tree

10 files changed

+182
-155
lines changed

10 files changed

+182
-155
lines changed

cli/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
<!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
2+
## 12.9.0
3+
4+
_Released 03/28/2023 (PENDING)_
5+
6+
**Bugfixes:**
7+
8+
- Fixed a compatibility issue so that component test projects can use [Vite](https://vitejs.dev/) version 4.2.0 and greater. Fixes [#26138](https://github.com/cypress-io/cypress/issues/26138).
9+
210
## 12.8.1
311

412
_Released 03/15/2023_

npm/react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"react-router-dom": "6.0.0-alpha.1",
2929
"semver": "^7.3.2",
3030
"typescript": "^4.7.4",
31-
"vite": "4.0.1",
31+
"vite": "4.2.0",
3232
"vite-plugin-require-transform": "1.0.3"
3333
},
3434
"peerDependencies": {

npm/vite-dev-server/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,16 @@
1818
"dependencies": {
1919
"debug": "^4.3.4",
2020
"find-up": "6.3.0",
21-
"node-html-parser": "5.3.3"
21+
"node-html-parser": "5.3.3",
22+
"semver": "^7.3.2"
2223
},
2324
"devDependencies": {
2425
"chai": "^4.3.6",
2526
"dedent": "^0.7.0",
2627
"mocha": "^9.2.2",
2728
"sinon": "^13.0.1",
2829
"ts-node": "^10.9.1",
29-
"vite": "4.0.1",
30+
"vite": "4.2.0",
3031
"vite-plugin-inspect": "0.4.3"
3132
},
3233
"files": [

npm/vite-dev-server/src/resolveConfig.ts

+12-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import debugFn from 'debug'
77
import type { InlineConfig } from 'vite'
88
import path from 'path'
9+
import semverGte from 'semver/functions/gte'
910

1011
import { configFiles } from './constants'
1112
import type { ViteDevServerConfig } from './devServer'
@@ -79,11 +80,13 @@ function makeCypressViteConfig (config: ViteDevServerConfig, vite: Vite): Inline
7980
paths: [projectRoot],
8081
})))
8182

82-
return {
83+
const viteConfig: InlineConfig = {
8384
root: projectRoot,
8485
base: `${devServerPublicPathRoute}/`,
8586
optimizeDeps: {
8687
esbuildOptions: {
88+
// We are using Vite 4.2.0+, so `incremental` doesn't exist in the types
89+
// @ts-expect-error
8790
incremental: true,
8891
plugins: [
8992
{
@@ -128,4 +131,12 @@ function makeCypressViteConfig (config: ViteDevServerConfig, vite: Vite): Inline
128131
CypressSourcemap(config, vite),
129132
],
130133
}
134+
135+
if (vite.version && semverGte(vite.version, '4.2.0')) {
136+
// We are using Vite 4.2.0+, so `incremental` doesn't exist in the types
137+
// @ts-expect-error
138+
delete viteConfig.optimizeDeps?.esbuildOptions?.incremental
139+
}
140+
141+
return viteConfig
131142
}

npm/vue/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"globby": "^11.0.1",
2828
"tailwindcss": "1.1.4",
2929
"typescript": "^4.7.4",
30-
"vite": "4.0.1",
30+
"vite": "4.2.0",
3131
"vue": "3.2.31",
3232
"vue-i18n": "9.0.0-rc.6",
3333
"vue-router": "^4.0.0",

packages/app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"rollup-plugin-polyfill-node": "^0.7.0",
6666
"unplugin-icons": "0.13.2",
6767
"unplugin-vue-components": "^0.15.2",
68-
"vite": "4.0.1",
68+
"vite": "4.2.0",
6969
"vite-plugin-components": "0.11.3",
7070
"vite-plugin-pages": "0.18.1",
7171
"vite-plugin-vue-layouts": "0.6.0",

packages/driver/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"unfetch": "4.1.0",
8383
"url-parse": "1.5.9",
8484
"vanilla-text-mask": "5.1.1",
85-
"vite": "4.0.1",
85+
"vite": "4.2.0",
8686
"webpack": "^4.44.2",
8787
"zone.js": "0.9.0"
8888
},

packages/frontend-shared/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"shiki": "^0.9.12",
6969
"unplugin-icons": "0.13.2",
7070
"unplugin-vue-components": "^0.15.4",
71-
"vite": "4.0.1",
71+
"vite": "4.2.0",
7272
"vite-plugin-components": "0.11.3",
7373
"vite-svg-loader": "3.1.2",
7474
"vue": "3.2.31",

packages/launchpad/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"rimraf": "3.0.2",
6464
"rollup-plugin-polyfill-node": "^0.7.0",
6565
"type-fest": "^2.3.4",
66-
"vite": "4.0.1",
66+
"vite": "4.2.0",
6767
"vite-plugin-components": "0.11.3",
6868
"vite-plugin-optimize-persist": "0.0.5",
6969
"vite-plugin-package-config": "0.0.3",

0 commit comments

Comments
 (0)