Skip to content

Commit 196d05c

Browse files
committed
chore: use shipped @cypress/vite-dev-server with the cypress binary
1 parent 6f96b25 commit 196d05c

File tree

3 files changed

+21
-137
lines changed

3 files changed

+21
-137
lines changed

cypress.config.ts

+21-23
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import axios from "axios";
44
import dotenv from "dotenv";
55
import Promise from "bluebird";
66
import codeCoverageTask from "@cypress/code-coverage/task";
7-
import { devServer } from "@cypress/vite-dev-server";
87
import { defineConfig } from "cypress";
98
import { mergeConfig, loadEnv } from "vite";
109

@@ -60,28 +59,27 @@ module.exports = defineConfig({
6059
googleClientSecret: process.env.VITE_GOOGLE_CLIENT_SECRET,
6160
},
6261
component: {
63-
devServer(devServerConfig) {
64-
const viteConfig = require("./vite.config.ts");
65-
const conf = {
66-
define: {
67-
"process.env": loadEnv("development", process.cwd(), "VITE"),
68-
},
69-
server: {
70-
/**
71-
* start the CT dev server on a different port than the full RWA
72-
* so users can switch between CT and E2E testing without having to
73-
* stop/start the RWA dev server.
74-
*/
75-
port: 3002,
76-
},
77-
};
78-
79-
const resolvedViteConfig = mergeConfig(viteConfig, conf);
80-
return devServer({
81-
...devServerConfig,
82-
framework: "react",
83-
viteConfig: resolvedViteConfig,
84-
});
62+
devServer: {
63+
framework: "react",
64+
bundler: "vite",
65+
viteConfig: () => {
66+
const viteConfig = require("./vite.config.ts");
67+
const conf = {
68+
define: {
69+
"process.env": loadEnv("development", process.cwd(), "VITE"),
70+
},
71+
server: {
72+
/**
73+
* start the CT dev server on a different port than the full RWA
74+
* so users can switch between CT and E2E testing without having to
75+
* stop/start the RWA dev server.
76+
*/
77+
port: 3002,
78+
},
79+
};
80+
const resolvedViteConfig = mergeConfig(viteConfig, conf);
81+
return resolvedViteConfig;
82+
},
8583
},
8684
specPattern: "src/**/*.cy.{js,jsx,ts,tsx}",
8785
supportFile: "cypress/support/component.ts",

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
"@babel/plugin-proposal-private-property-in-object": "7.21.11",
5656
"@cypress/code-coverage": "^3.10.0-dev.1",
5757
"@cypress/instrument-cra": "1.4.0",
58-
"@cypress/vite-dev-server": "^5.0.7",
5958
"@faker-js/faker": "6.1.2",
6059
"@percy/cli": "^1.27.4",
6160
"@percy/cypress": "3.1.2",

yarn.lock

-113
Original file line numberDiff line numberDiff line change
@@ -1813,16 +1813,6 @@
18131813
tunnel-agent "^0.6.0"
18141814
uuid "^8.3.2"
18151815

1816-
"@cypress/vite-dev-server@^5.0.7":
1817-
version "5.2.1"
1818-
resolved "https://registry.yarnpkg.com/@cypress/vite-dev-server/-/vite-dev-server-5.2.1.tgz#7c0c109b8b450c935ab887ff488828f07d1e7d3e"
1819-
integrity sha512-5HEUpB2UjpoBByOPAdTBfeJWHlvyDv3Qz5GuGovoiZnzsZyF9eivWfFiYadFdjXXX8i8kVzibo8heWZg+jigGg==
1820-
dependencies:
1821-
debug "^4.3.4"
1822-
find-up "6.3.0"
1823-
node-html-parser "5.3.3"
1824-
semver "^7.5.3"
1825-
18261816
"@cypress/webpack-preprocessor@^6.0.0":
18271817
version "6.0.2"
18281818
resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-6.0.2.tgz#58a96aa4dbff7433dd37d24ed47e413aa3d3fabb"
@@ -5061,11 +5051,6 @@ [email protected]:
50615051
type-is "~1.6.18"
50625052
unpipe "1.0.0"
50635053

5064-
boolbase@^1.0.0:
5065-
version "1.0.0"
5066-
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
5067-
integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
5068-
50695054
bowser@^2.11.0:
50705055
version "2.11.0"
50715056
resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz#5ca3c35757a7aa5771500c70a73a9f91ef420a8f"
@@ -5732,22 +5717,6 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
57325717
shebang-command "^2.0.0"
57335718
which "^2.0.1"
57345719

5735-
css-select@^4.2.1:
5736-
version "4.3.0"
5737-
resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
5738-
integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
5739-
dependencies:
5740-
boolbase "^1.0.0"
5741-
css-what "^6.0.1"
5742-
domhandler "^4.3.1"
5743-
domutils "^2.8.0"
5744-
nth-check "^2.0.1"
5745-
5746-
css-what@^6.0.1:
5747-
version "6.1.0"
5748-
resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
5749-
integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
5750-
57515720
css.escape@^1.5.1:
57525721
version "1.5.1"
57535722
resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
@@ -6130,43 +6099,13 @@ dom-helpers@^5.0.1, dom-helpers@^5.1.3:
61306099
"@babel/runtime" "^7.8.7"
61316100
csstype "^3.0.2"
61326101

6133-
dom-serializer@^1.0.1:
6134-
version "1.4.1"
6135-
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
6136-
integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
6137-
dependencies:
6138-
domelementtype "^2.0.1"
6139-
domhandler "^4.2.0"
6140-
entities "^2.0.0"
6141-
6142-
domelementtype@^2.0.1, domelementtype@^2.2.0:
6143-
version "2.3.0"
6144-
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
6145-
integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
6146-
61476102
domexception@^4.0.0:
61486103
version "4.0.0"
61496104
resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
61506105
integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
61516106
dependencies:
61526107
webidl-conversions "^7.0.0"
61536108

6154-
domhandler@^4.2.0, domhandler@^4.3.1:
6155-
version "4.3.1"
6156-
resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
6157-
integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
6158-
dependencies:
6159-
domelementtype "^2.2.0"
6160-
6161-
domutils@^2.8.0:
6162-
version "2.8.0"
6163-
resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
6164-
integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
6165-
dependencies:
6166-
dom-serializer "^1.0.1"
6167-
domelementtype "^2.2.0"
6168-
domhandler "^4.2.0"
6169-
61706109
61716110
version "16.0.0"
61726111
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.0.tgz#c619001253be89ebb638d027b609c75c26e47411"
@@ -6266,11 +6205,6 @@ enquirer@^2.3.6:
62666205
ansi-colors "^4.1.1"
62676206
strip-ansi "^6.0.1"
62686207

6269-
entities@^2.0.0:
6270-
version "2.2.0"
6271-
resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
6272-
integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
6273-
62746208
entities@^4.5.0:
62756209
version "4.5.0"
62766210
resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
@@ -7147,14 +7081,6 @@ find-root@^1.1.0:
71477081
resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
71487082
integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
71497083

7150-
7151-
version "6.3.0"
7152-
resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790"
7153-
integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==
7154-
dependencies:
7155-
locate-path "^7.1.0"
7156-
path-exists "^5.0.0"
7157-
71587084
find-up@^4.0.0, find-up@^4.1.0:
71597085
version "4.1.0"
71607086
resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -7690,11 +7616,6 @@ hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
76907616
dependencies:
76917617
function-bind "^1.1.2"
76927618

7693-
7694-
version "1.2.0"
7695-
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
7696-
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
7697-
76987619
[email protected], history@^4.9.0:
76997620
version "4.10.1"
77007621
resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
@@ -8969,13 +8890,6 @@ locate-path@^6.0.0:
89698890
dependencies:
89708891
p-locate "^5.0.0"
89718892

8972-
locate-path@^7.1.0:
8973-
version "7.2.0"
8974-
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a"
8975-
integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==
8976-
dependencies:
8977-
p-locate "^6.0.0"
8978-
89798893
lodash-es@^4.17.21:
89808894
version "4.17.21"
89818895
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
@@ -9579,14 +9493,6 @@ node-gyp@^9.0.0, node-gyp@^9.4.1:
95799493
tar "^6.1.2"
95809494
which "^2.0.2"
95819495

9582-
9583-
version "5.3.3"
9584-
resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-5.3.3.tgz#2845704f3a7331a610e0e551bf5fa02b266341b6"
9585-
integrity sha512-ncg1033CaX9UexbyA7e1N0aAoAYRDiV8jkTvzEnfd1GDvzFdrsXLzR4p4ik8mwLgnaKP/jyUFWDy9q3jvRT2Jw==
9586-
dependencies:
9587-
css-select "^4.2.1"
9588-
he "1.2.0"
9589-
95909496
node-preload@^0.2.1:
95919497
version "0.2.1"
95929498
resolved "https://registry.yarnpkg.com/node-preload/-/node-preload-0.2.1.tgz#c03043bb327f417a18fee7ab7ee57b408a144301"
@@ -9831,13 +9737,6 @@ npmlog@^7.0.1:
98319737
gauge "^5.0.0"
98329738
set-blocking "^2.0.0"
98339739

9834-
nth-check@^2.0.1:
9835-
version "2.1.1"
9836-
resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
9837-
integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
9838-
dependencies:
9839-
boolbase "^1.0.0"
9840-
98419740
nwsapi@^2.2.4:
98429741
version "2.2.16"
98439742
resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.16.tgz#177760bba02c351df1d2644e220c31dfec8cdb43"
@@ -10090,13 +9989,6 @@ p-locate@^5.0.0:
100909989
dependencies:
100919990
p-limit "^3.0.2"
100929991

10093-
p-locate@^6.0.0:
10094-
version "6.0.0"
10095-
resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f"
10096-
integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==
10097-
dependencies:
10098-
p-limit "^4.0.0"
10099-
101009992
p-map@^3.0.0:
101019993
version "3.0.0"
101029994
resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
@@ -10263,11 +10155,6 @@ path-exists@^4.0.0:
1026310155
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
1026410156
integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
1026510157

10266-
path-exists@^5.0.0:
10267-
version "5.0.0"
10268-
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7"
10269-
integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==
10270-
1027110158
path-is-absolute@^1.0.0:
1027210159
version "1.0.1"
1027310160
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"

0 commit comments

Comments
 (0)