Skip to content

Commit

Permalink
Merge branch 'develop' into demo-test-replay
Browse files Browse the repository at this point in the history
  • Loading branch information
mjhenkes committed Aug 11, 2023
2 parents ddee430 + 605e879 commit 7fb6493
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 253 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2.1
orbs:
cypress: cypress-io/cypress@3.1.2
cypress: cypress-io/cypress@3.1.3
codecov: codecov/codecov@1.2.3 #
win: circleci/windows@5.0.0

Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
# which has some compatibility issues with openSSL inside this windows job.
# Node 18 updated with OpenSSL provider which causes this compatibility issue
# downgrading node to v16 to use the openssl-legacy-provider by default to prevent this issue
node-version: '16'
node-version: '16.16.0'

- name: Cypress install
uses: cypress-io/github-action@v5
Expand Down Expand Up @@ -275,6 +275,9 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16.16.0'

- name: Download the build folders
uses: actions/download-artifact@v3
Expand Down
45 changes: 0 additions & 45 deletions .github/workflows/sync-bitbucket.yml

This file was deleted.

74 changes: 0 additions & 74 deletions .gitlab-ci.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ TypeScript will be added as a local dependency to the project, so no need to ins
yarn
```

#### Mac M1 chip users will need to prepend `PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true`.
#### Mac users with M-series chips will need to prepend `PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true`.

```shell
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true yarn install
Expand Down
110 changes: 0 additions & 110 deletions bitbucket-pipelines.yml

This file was deleted.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"node": "^16.16.0"
},
"dependencies": {
"@auth0/auth0-react": "2.1.0",
"@auth0/auth0-react": "2.1.1",
"@aws-amplify/ui-react": "1.2.26",
"@graphql-tools/graphql-file-loader": "7.3.10",
"@graphql-tools/load": "7.5.9",
Expand Down Expand Up @@ -49,6 +49,7 @@
"yup": "0.32.11"
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "7.21.11",
"@cypress/code-coverage": "^3.10.0-dev.1",
"@cypress/instrument-cra": "1.4.0",
"@cypress/webpack-dev-server": "^1.6.0",
Expand Down
56 changes: 36 additions & 20 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@
tslib "^2.3.0"
zen-observable-ts "^1.2.0"

"@auth0/auth0-react@2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@auth0/auth0-react/-/auth0-react-2.1.0.tgz#cadb561fb3994fd3e63040da1bfc714947ac07ea"
integrity sha512-+86qLx97BcSwL/ZwIzGq9jFa5SaV5z7goLU5gi+4R9KhzDg9vhmmZ+iQWW0GMiuwjJ8vcfX4hRTD6iF0DbGZWw==
"@auth0/auth0-react@2.1.1":
version "2.1.1"
resolved "https://registry.yarnpkg.com/@auth0/auth0-react/-/auth0-react-2.1.1.tgz#69caec80ddcde6f7312677e9522997441419e8ec"
integrity sha512-KOFdTaFvashPX1o3h3ARYSCtR0qMya1ia57rSL2q7yggKv7PijHI/cKoG/gDvLA2G0M1qoCR3eACGDgHxstO3Q==
dependencies:
"@auth0/auth0-spa-js" "^2.0.4"
"@auth0/auth0-spa-js" "^2.0.8"

"@auth0/auth0-spa-js@^2.0.4":
version "2.0.7"
resolved "https://registry.yarnpkg.com/@auth0/auth0-spa-js/-/auth0-spa-js-2.0.7.tgz#9da04e610223267cd96f93c46129847a8a53aaf2"
integrity sha512-iQ22AZCqOMG0q8/YPkvT4lGe2gsaopZ2kZb2cIBa7w+0hhGJhl6ANpFI6FzAKMzGRGmVocKxYdHha7lxAhbyPA==
"@auth0/auth0-spa-js@^2.0.8":
version "2.0.8"
resolved "https://registry.yarnpkg.com/@auth0/auth0-spa-js/-/auth0-spa-js-2.0.8.tgz#42a8e5aad043e66dbba2a8fadc086a46bf0d021f"
integrity sha512-qCgWZS58S69WCg2ybd+SDiaw3ahBVJ4/tSFWMtIpc//Fq8kRHGwMOmgpNKVAFrpHG0ck2oWFGrpylxoto8Z0mA==

"@aws-amplify/analytics@5.2.31":
version "5.2.31"
Expand Down Expand Up @@ -2517,6 +2517,16 @@
"@babel/helper-create-class-features-plugin" "^7.18.6"
"@babel/helper-plugin-utils" "^7.18.6"

"@babel/plugin-proposal-private-property-in-object@7.21.11":
version "7.21.11"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
dependencies:
"@babel/helper-annotate-as-pure" "^7.18.6"
"@babel/helper-create-class-features-plugin" "^7.21.0"
"@babel/helper-plugin-utils" "^7.20.2"
"@babel/plugin-syntax-private-property-in-object" "^7.14.5"

"@babel/plugin-proposal-private-property-in-object@^7.21.0":
version "7.21.10"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.10.tgz#861ab9c7d152291c47d27838867f27c560f562c4"
Expand Down Expand Up @@ -3362,13 +3372,13 @@
integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==

"@cypress/code-coverage@^3.10.0-dev.1":
version "3.10.7"
resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.10.7.tgz#7c281c5c058988e414190fd92871b62f9f6e78bd"
integrity sha512-kQFB8GemDAAk6JBINsR9MLEgCw2AKb3FcdHQjIJ3KV4ZER6ZF0NGdO8SRj5oTVp28oqfOab4cgoBdecRiOE3qA==
version "3.10.8"
resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.10.8.tgz#f6849e5dfe3badb4c4534cd7ecc8a8b571c4ce2c"
integrity sha512-9KZvQKYjoz09ocZEGC0a0+uVFSMe6gOblqGpWoTGi8HYSbKFAuOJkjJB5vJ1fb1u52GOgW2b1JqhhtJJyA/ksg==
dependencies:
"@cypress/webpack-preprocessor" "^5.11.0"
chalk "4.1.2"
dayjs "1.10.7"
dayjs "1.11.8"
debug "4.3.4"
execa "4.1.0"
globby "11.0.4"
Expand Down Expand Up @@ -7725,12 +7735,7 @@ date-fns@^2.16.1:
dependencies:
"@babel/runtime" "^7.21.0"

dayjs@1.10.7:
version "1.10.7"
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==

dayjs@^1.10.4:
dayjs@1.11.8, dayjs@^1.10.4:
version "1.11.8"
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.8.tgz#4282f139c8c19dd6d0c7bd571e30c2d0ba7698ea"
integrity sha512-LcgxzFoWMEPO7ggRv1Y2N31hUf2R0Vj7fuy/m+Bg1K8rr+KAs1AEy4y9jd5DXe8pbHgX+srkHNS7TH6Q6ZhYeQ==
Expand Down Expand Up @@ -9161,7 +9166,7 @@ fast-diff@^1.1.2:
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==

fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.9:
fast-glob@^3.0.3, fast-glob@^3.2.9:
version "3.2.12"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
Expand All @@ -9172,6 +9177,17 @@ fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.9:
merge2 "^1.3.0"
micromatch "^4.0.4"

fast-glob@^3.1.1:
version "3.3.0"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.0.tgz#7c40cb491e1e2ed5664749e87bfb516dbe8727c0"
integrity sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==
dependencies:
"@nodelib/fs.stat" "^2.0.2"
"@nodelib/fs.walk" "^1.2.3"
glob-parent "^5.1.2"
merge2 "^1.3.0"
micromatch "^4.0.4"

fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
Expand Down

0 comments on commit 7fb6493

Please sign in to comment.