Skip to content

Commit 1ca3f67

Browse files
Merge branch 'develop' into renovate/okta
2 parents c552a88 + 36edbd5 commit 1ca3f67

File tree

6 files changed

+406
-616
lines changed

6 files changed

+406
-616
lines changed

.github/workflows/main.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
options: --user 1001
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717

1818
- name: Cypress install
1919
uses: cypress-io/github-action@v6
@@ -29,7 +29,7 @@ jobs:
2929
- run: yarn build:ci
3030

3131
- name: Save build folder
32-
uses: actions/upload-artifact@v3
32+
uses: actions/upload-artifact@v4
3333
with:
3434
name: build
3535
if-no-files-found: error
@@ -53,10 +53,10 @@ jobs:
5353
containers: [1, 2, 3, 4, 5]
5454
steps:
5555
- name: Checkout
56-
uses: actions/checkout@v3
56+
uses: actions/checkout@v4
5757

5858
- name: Download the build folders
59-
uses: actions/download-artifact@v3
59+
uses: actions/download-artifact@v4
6060
with:
6161
name: build
6262
path: build
@@ -106,18 +106,18 @@ jobs:
106106
containers: [1, 2, 3, 4, 5]
107107
steps:
108108
- name: Checkout
109-
uses: actions/checkout@v3
109+
uses: actions/checkout@v4
110110

111111
- name: Download the build folders
112-
uses: actions/download-artifact@v3
112+
uses: actions/download-artifact@v4
113113
with:
114114
name: build
115115
path: build
116116

117117
- name: "UI Tests - Chrome - Mobile"
118118
uses: cypress-io/github-action@v6
119119
with:
120-
config: "'{"e2e":{"viewportWidth":375,"viewportHeight":667}}"
120+
config: '{"e2e":{"viewportWidth":375,"viewportHeight":667}}'
121121
start: yarn start:ci
122122
wait-on: "http://localhost:3000"
123123
wait-on-timeout: 120
@@ -152,10 +152,10 @@ jobs:
152152
containers: [1, 2, 3, 4, 5]
153153
steps:
154154
- name: Checkout
155-
uses: actions/checkout@v3
155+
uses: actions/checkout@v4
156156

157157
- name: Download the build folders
158-
uses: actions/download-artifact@v3
158+
uses: actions/download-artifact@v4
159159
with:
160160
name: build
161161
path: build
@@ -197,18 +197,18 @@ jobs:
197197
containers: [1, 2, 3, 4, 5]
198198
steps:
199199
- name: Checkout
200-
uses: actions/checkout@v3
200+
uses: actions/checkout@v4
201201

202202
- name: Download the build folders
203-
uses: actions/download-artifact@v3
203+
uses: actions/download-artifact@v4
204204
with:
205205
name: build
206206
path: build
207207

208208
- name: "UI Tests - Firefox - Mobile"
209209
uses: cypress-io/github-action@v6
210210
with:
211-
config: "'{"e2e":{"viewportWidth":375,"viewportHeight":667}}"
211+
config: '{"e2e":{"viewportWidth":375,"viewportHeight":667}}'
212212
start: yarn start:ci
213213
wait-on: "http://localhost:3000"
214214
wait-on-timeout: 120

.github/workflows/merge-develop-into-flake-demo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1212
with:
1313
fetch-depth: 0
1414
- name: Set committer info
@@ -42,7 +42,7 @@ jobs:
4242
run: git push origin ${{ steps.gen-names.outputs.branch_name }}
4343
if: ${{ steps.check-conflict.outputs.merge_conflict }}
4444
- name: Create Pull Request
45-
uses: actions/github-script@v6
45+
uses: actions/github-script@v7
4646
with:
4747
script: |
4848
const pull = await github.pulls.create({

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.16.1
1+
20.11.0

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.16.1
1+
20.11.0

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"dependencies": {
1515
"@auth0/auth0-react": "2.1.1",
1616
"@aws-amplify/ui-react": "^5.0.4",
17-
"@babel/core": "7.0.1",
17+
"@babel/core": "7.23.9",
1818
"@babel/plugin-syntax-flow": "^7.14.5",
1919
"@babel/plugin-transform-react-jsx": "^7.14.9",
2020
"@graphql-tools/graphql-file-loader": "7.3.10",
@@ -27,14 +27,14 @@
2727
"@okta/okta-auth-js": "^7.3.0",
2828
"@okta/okta-react": "^6.7.0",
2929
"@types/detect-port": "^1.3.2",
30-
"@xstate/react": "3.0.0",
30+
"@xstate/react": "3.2.2",
3131
"aws-amplify": "^5.3.3",
32-
"axios": "0.26.1",
33-
"clsx": "1.1.1",
34-
"date-fns": "2.28.0",
32+
"axios": "0.27.2",
33+
"clsx": "1.2.1",
34+
"date-fns": "2.30.0",
3535
"detect-port": "^1.5.1",
3636
"dinero.js": "1.9.1",
37-
"formik": "2.2.9",
37+
"formik": "2.4.5",
3838
"history": "4.10.1",
3939
"postinstall-postinstall": "^2.1.0",
4040
"react": "18.2.0",
@@ -47,7 +47,7 @@
4747
"shortid": "2.2.16",
4848
"uuid": "8.3.2",
4949
"webpack": "5",
50-
"xstate": "4.35.4",
50+
"xstate": "4.38.3",
5151
"yup": "0.32.11"
5252
},
5353
"devDependencies": {
@@ -103,12 +103,12 @@
103103
"eslint-config-react-app": "^7.0.1",
104104
"eslint-plugin-cypress": "2.15.1",
105105
"eslint-plugin-prettier": "^5.0.0",
106-
"express": "4.17.3",
106+
"express": "4.18.2",
107107
"express-graphql": "0.12.0",
108-
"express-jwt": "6.1.1",
108+
"express-jwt": "6.1.2",
109109
"express-paginate": "1.0.2",
110-
"express-session": "1.17.2",
111-
"express-validator": "6.14.0",
110+
"express-session": "1.18.0",
111+
"express-validator": "6.15.0",
112112
"fuse.js": "6.5.3",
113113
"graphql": "16.8.1",
114114
"graphql-tools": "8.2.7",
@@ -121,16 +121,16 @@
121121
"lowdb": "1.0.0",
122122
"morgan": "1.10.0",
123123
"ncp": "2.0.0",
124-
"nodemon": "2.0.15",
124+
"nodemon": "2.0.22",
125125
"npm": "^9.8.0",
126126
"nyc": "15.1.0",
127127
"passport": "0.6.0",
128128
"passport-local": "1.0.0",
129129
"patch-package": "^7.0.0",
130130
"prettier": "^3.0.0",
131131
"start-server-and-test": "1.14.0",
132-
"ts-node": "10.7.0",
133-
"typescript": "4.6.3",
132+
"ts-node": "10.9.2",
133+
"typescript": "4.9.5",
134134
"vite": "^4.4.2",
135135
"vite-plugin-eslint": "^1.8.1",
136136
"vite-plugin-istanbul": "^4.1.0",

0 commit comments

Comments
 (0)