Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
arnfinn committed Sep 17, 2024
2 parents bec80de + 3651360 commit 80add73
Show file tree
Hide file tree
Showing 70 changed files with 6,352 additions and 4,924 deletions.
1 change: 1 addition & 0 deletions .github/workflows/aws_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ jobs:
if: github.ref == 'refs/heads/main'
env:
NEXT_PUBLIC_API_HOST: https://verify-mong-api.skde.org
NEXT_PUBLIC_VERIFY: "true"
run: |
yarn run export
aws s3 sync apps/skde/out s3://verify.skde.org \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- run: corepack enable && yarn install
- run: yarn workspace skde run build
- name: Cypress run
uses: cypress-io/github-action@v6.7.5
uses: cypress-io/github-action@v6.7.6
with:
working-directory: ./apps/skde
build: yarn export
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dead_links.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Find dead links
on:
schedule:
- cron: "0 5 * * 1-5"
- cron: "0 5 * * 1"

jobs:
find_dead_links:
Expand Down
8 changes: 4 additions & 4 deletions apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,25 @@
"dependencies": {
"compression": "1.7.4",
"cors": "2.8.5",
"express": "4.19.2",
"express": "4.21.0",
"express-rate-limit": "7.4.0",
"helmet": "7.1.0",
"knex": "3.1.0",
"mysql": "2.18.1",
"simple-oauth2": "5.1.0",
"typescript": "5.5.4"
"typescript": "5.6.2"
},
"devDependencies": {
"@types/compression": "1.7.5",
"@types/cors": "2.8.17",
"@types/express": "4.17.21",
"@types/simple-oauth2": "5.0.7",
"dotenv": "16.4.5",
"eslint": "9.9.1",
"eslint": "9.10.0",
"prettier": "3.3.3",
"ts-node-dev": "2.0.0",
"types": "*",
"typescript": "5.5.4"
"typescript": "5.6.2"
},
"packageManager": "yarn@4.4.1"
}
2 changes: 1 addition & 1 deletion apps/skde/next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
31 changes: 16 additions & 15 deletions apps/skde/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,17 @@
"start-server": "npx serve out/"
},
"dependencies": {
"@iframe-resizer/react": "5.2.6",
"@iframe-resizer/react": "5.3.0",
"@mui/base": "5.0.0-beta.40",
"@mui/icons-material": "5.16.7",
"@mui/material": "5.16.7",
"@sentry/browser": "8.27.0",
"@sentry/react": "8.27.0",
"@tanstack/react-query": "5.53.1",
"@tanstack/react-query-devtools": "5.53.1",
"@mui/icons-material": "6.1.0",
"@mui/material": "6.1.0",
"@sentry/browser": "8.30.0",
"@sentry/react": "8.30.0",
"@tanstack/react-query": "5.56.0",
"@tanstack/react-query-devtools": "5.56.0",
"@visx/axis": "3.10.1",
"@visx/group": "3.3.0",
"@visx/responsive": "3.10.2",
"@visx/scale": "3.5.0",
"@visx/xychart": "3.11.0",
"d3-array": "3.2.4",
Expand All @@ -43,7 +44,7 @@
"decap-cms-core": "3.4.2",
"gray-matter": "4.0.3",
"lodash": "4.17.21",
"next": "14.2.7",
"next": "14.2.10",
"next-query-params": "5.0.1",
"qmongjs": "*",
"react": "18.3.1",
Expand All @@ -57,27 +58,27 @@
"use-query-params": "2.2.1"
},
"devDependencies": {
"@cypress/code-coverage": "3.12.46",
"@cypress/code-coverage": "3.12.48",
"@testing-library/react": "16.0.1",
"@types/d3-array": "3.2.1",
"@types/d3-geo": "3.1.0",
"@types/d3-scale": "4.0.8",
"@types/d3-shape": "3.1.6",
"@types/d3-time-format": "4.0.3",
"@types/node": "20.16.3",
"@types/node": "20.16.5",
"@types/react": "18.3.5",
"@vitejs/plugin-react": "4.3.1",
"@vitest/coverage-v8": "2.0.5",
"cypress": "13.14.1",
"eslint": "9.9.1",
"husky": "9.1.5",
"cypress": "13.14.2",
"eslint": "9.10.0",
"husky": "9.1.6",
"jsdom": "25.0.0",
"next-router-mock": "0.9.13",
"prettier": "3.3.3",
"react-markdown": "9.0.1",
"serve": "14.2.3",
"start-server-and-test": "2.0.5",
"typescript": "5.5.4",
"start-server-and-test": "2.0.7",
"typescript": "5.6.2",
"vitest": "2.0.5"
},
"packageManager": "yarn@4.4.1"
Expand Down
Loading

0 comments on commit 80add73

Please sign in to comment.