Skip to content

Commit

Permalink
Merge branch 'develop' into renovate/okta
Browse files Browse the repository at this point in the history
  • Loading branch information
jennifer-shehane authored Feb 7, 2024
2 parents c552a88 + 36edbd5 commit 1ca3f67
Show file tree
Hide file tree
Showing 6 changed files with 406 additions and 616 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
options: --user 1001
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cypress install
uses: cypress-io/github-action@v6
Expand All @@ -29,7 +29,7 @@ jobs:
- run: yarn build:ci

- name: Save build folder
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build
if-no-files-found: error
Expand All @@ -53,10 +53,10 @@ jobs:
containers: [1, 2, 3, 4, 5]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download the build folders
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build
path: build
Expand Down Expand Up @@ -106,18 +106,18 @@ jobs:
containers: [1, 2, 3, 4, 5]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download the build folders
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build
path: build

- name: "UI Tests - Chrome - Mobile"
uses: cypress-io/github-action@v6
with:
config: "'{"e2e":{"viewportWidth":375,"viewportHeight":667}}"
config: '{"e2e":{"viewportWidth":375,"viewportHeight":667}}'
start: yarn start:ci
wait-on: "http://localhost:3000"
wait-on-timeout: 120
Expand Down Expand Up @@ -152,10 +152,10 @@ jobs:
containers: [1, 2, 3, 4, 5]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download the build folders
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build
path: build
Expand Down Expand Up @@ -197,18 +197,18 @@ jobs:
containers: [1, 2, 3, 4, 5]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download the build folders
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build
path: build

- name: "UI Tests - Firefox - Mobile"
uses: cypress-io/github-action@v6
with:
config: "'{"e2e":{"viewportWidth":375,"viewportHeight":667}}"
config: '{"e2e":{"viewportWidth":375,"viewportHeight":667}}'
start: yarn start:ci
wait-on: "http://localhost:3000"
wait-on-timeout: 120
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/merge-develop-into-flake-demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set committer info
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
run: git push origin ${{ steps.gen-names.outputs.branch_name }}
if: ${{ steps.check-conflict.outputs.merge_conflict }}
- name: Create Pull Request
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const pull = await github.pulls.create({
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.16.1
20.11.0
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.16.1
20.11.0
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"@auth0/auth0-react": "2.1.1",
"@aws-amplify/ui-react": "^5.0.4",
"@babel/core": "7.0.1",
"@babel/core": "7.23.9",
"@babel/plugin-syntax-flow": "^7.14.5",
"@babel/plugin-transform-react-jsx": "^7.14.9",
"@graphql-tools/graphql-file-loader": "7.3.10",
Expand All @@ -27,14 +27,14 @@
"@okta/okta-auth-js": "^7.3.0",
"@okta/okta-react": "^6.7.0",
"@types/detect-port": "^1.3.2",
"@xstate/react": "3.0.0",
"@xstate/react": "3.2.2",
"aws-amplify": "^5.3.3",
"axios": "0.26.1",
"clsx": "1.1.1",
"date-fns": "2.28.0",
"axios": "0.27.2",
"clsx": "1.2.1",
"date-fns": "2.30.0",
"detect-port": "^1.5.1",
"dinero.js": "1.9.1",
"formik": "2.2.9",
"formik": "2.4.5",
"history": "4.10.1",
"postinstall-postinstall": "^2.1.0",
"react": "18.2.0",
Expand All @@ -47,7 +47,7 @@
"shortid": "2.2.16",
"uuid": "8.3.2",
"webpack": "5",
"xstate": "4.35.4",
"xstate": "4.38.3",
"yup": "0.32.11"
},
"devDependencies": {
Expand Down Expand Up @@ -103,12 +103,12 @@
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-cypress": "2.15.1",
"eslint-plugin-prettier": "^5.0.0",
"express": "4.17.3",
"express": "4.18.2",
"express-graphql": "0.12.0",
"express-jwt": "6.1.1",
"express-jwt": "6.1.2",
"express-paginate": "1.0.2",
"express-session": "1.17.2",
"express-validator": "6.14.0",
"express-session": "1.18.0",
"express-validator": "6.15.0",
"fuse.js": "6.5.3",
"graphql": "16.8.1",
"graphql-tools": "8.2.7",
Expand All @@ -121,16 +121,16 @@
"lowdb": "1.0.0",
"morgan": "1.10.0",
"ncp": "2.0.0",
"nodemon": "2.0.15",
"nodemon": "2.0.22",
"npm": "^9.8.0",
"nyc": "15.1.0",
"passport": "0.6.0",
"passport-local": "1.0.0",
"patch-package": "^7.0.0",
"prettier": "^3.0.0",
"start-server-and-test": "1.14.0",
"ts-node": "10.7.0",
"typescript": "4.6.3",
"ts-node": "10.9.2",
"typescript": "4.9.5",
"vite": "^4.4.2",
"vite-plugin-eslint": "^1.8.1",
"vite-plugin-istanbul": "^4.1.0",
Expand Down
Loading

0 comments on commit 1ca3f67

Please sign in to comment.