Skip to content

Commit

Permalink
ci(834): rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnTParsons authored and JohnTParsons committed Apr 28, 2023
1 parent af670b3 commit bf80431
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@ jobs:
yarn add [email protected]
yarn add @emotion/react
yarn add @emotion/styled
yarn add -D cypress@12.10.0
yarn add -D cypress@12.11.0
- run:
name: Serve and test app with Cypress
command: |
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ install:

# When changing the version, make sure it matches the one used in the `test_newskit_in_nextjs_app` CircleCI's job.
install_cypress:
yarn add -D cypress@12.10.0;
yarn add -D cypress@12.11.0;

build_icons:
yarn build:icons
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
"build": "yarn build:clean && yarn build:icons && yarn build:comps && yarn build:storybook && yarn build:docs && yarn postbuild:docs",
"e2e:build": "yarn e2e:generate:a11ytests:comps && webpack --config webpack.e2e.config.js --mode=production",
"e2e:serve": "http-server e2e/dist -p 8080",
"e2e:comps:run": "ELECTRON_EXTRA_LAUNCH_ARGS=--disable-gpu cypress run --config-file cypress.components.config.ts",
"e2e:comps:open": "ELECTRON_EXTRA_LAUNCH_ARGS=--disable-gpu cypress open --config-file cypress.components.config.ts",
"e2e:comps:parallel": "ELECTRON_EXTRA_LAUNCH_ARGS=--disable-gpu cypress-parallel -s e2e:comps:run -t 4 -d cypress/components/**/*.cy.{js,jsx,ts,tsx}",
"e2e:comps:run": "cypress run --config-file cypress.components.config.ts",
"e2e:comps:open": "cypress open --config-file cypress.components.config.ts",
"e2e:comps:parallel": "yarn e2e:comps:run --spec $(circleci tests glob \"cypress/components/**/*.cy.{js,jsx,ts,tsx}\" | circleci tests split | paste -sd ',')",
"e2e:docs:run": "cypress run --config-file cypress.docs.config.ts",
"e2e:docs:open": "cypress open --config-file cypress.docs.config.ts",
"e2e:docs:parallel": "yarn e2e:docs:run --spec $(circleci tests glob \"cypress/site/functional/**/*.cy.{js,jsx,ts,tsx}\" | circleci tests split | paste -sd ',')",
Expand Down
33 changes: 14 additions & 19 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9159,11 +9159,6 @@ commander@^4.1.1:
resolved "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"
integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==

commander@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==

commander@^6.2.1:
version "6.2.1"
resolved "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz"
Expand Down Expand Up @@ -9881,18 +9876,18 @@ cypress-axe@^1.2.0:
resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.2.0.tgz#224936a3346055f6c22636e645746cc903aaa947"
integrity sha512-mK7rxc8+e0IM519efgkzVBQRYLapy55TOVNbWZsbX3495xFzf8NnkMddUaHAGgAnF+kcyJU7zNPu3lTiOD58WQ==

cypress-multi-reporters@^1.6.2:
version "1.6.2"
resolved "https://registry.yarnpkg.com/cypress-multi-reporters/-/cypress-multi-reporters-1.6.2.tgz#129dfeffa00d4deca3e9f58d84570b9962c28c2b"
integrity sha512-lvwGwHqZG5CwGxBJ6UJXWaxlWGkJgxBjP0h+IVLrrwRlJpT4coSwwt+UzMdeqEMrzT4IDfhbtmUNOiDleisOYA==
cypress-multi-reporters@^1.6.3:
version "1.6.3"
resolved "https://registry.yarnpkg.com/cypress-multi-reporters/-/cypress-multi-reporters-1.6.3.tgz#0f0da8db4caf8d7a21f94e5209148348416d7c71"
integrity sha512-klb9pf6oAF4WCLHotu9gdB8ukYBdeTzbEMuESKB3KT54HhrZj65vQxubAgrULV5H2NWqxHdUhlntPbKZChNvEw==
dependencies:
debug "^4.1.1"
lodash "^4.17.15"
debug "^4.3.4"
lodash "^4.17.21"

cypress@^12.3.0:
version "12.3.0"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.3.0.tgz#ae3fb0540aef4b5eab1ef2bcd0760caf2992b8bf"
integrity sha512-ZQNebibi6NBt51TRxRMYKeFvIiQZ01t50HSy7z/JMgRVqBUey3cdjog5MYEbzG6Ktti5ckDt1tfcC47lmFwXkw==
cypress@^12.11.0:
version "12.11.0"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.11.0.tgz#b46dc6a1d0387f59a4b5c6a18cc03884fd61876e"
integrity sha512-TJE+CCWI26Hwr5Msb9GpQhFLubdYooW0fmlPwTsfiyxmngqc7+SZGLPeIkj2dTSSZSEtpQVzOzvcnzH0o8G7Vw==
dependencies:
"@cypress/request" "^2.88.10"
"@cypress/xvfb" "^1.2.4"
Expand All @@ -9908,10 +9903,10 @@ cypress@^12.3.0:
check-more-types "^2.24.0"
cli-cursor "^3.1.0"
cli-table3 "~0.6.1"
commander "^5.1.0"
commander "^6.2.1"
common-tags "^1.8.0"
dayjs "^1.10.4"
debug "^4.3.2"
debug "^4.3.4"
enquirer "^2.3.6"
eventemitter2 "6.4.7"
execa "4.1.0"
Expand All @@ -9926,7 +9921,7 @@ cypress@^12.3.0:
listr2 "^3.8.3"
lodash "^4.17.21"
log-symbols "^4.0.0"
minimist "^1.2.6"
minimist "^1.2.8"
ospath "^1.2.2"
pretty-bytes "^5.6.0"
proxy-from-env "1.0.0"
Expand Down Expand Up @@ -16872,7 +16867,7 @@ minimist-options@^3.0.1:
arrify "^1.0.1"
is-plain-obj "^1.1.0"

minimist@^0.2.1, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, "minimist@~ 1.2.0":
minimist@^0.2.1, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8, "minimist@~ 1.2.0":
version "0.2.4"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.4.tgz#0085d5501e29033748a2f2a4da0180142697a475"
integrity sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ==
Expand Down

0 comments on commit bf80431

Please sign in to comment.