Skip to content

Commit

Permalink
Merge pull request #2265 from bcgov/chore/fix-audit-deps
Browse files Browse the repository at this point in the history
Chore/fix audit deps
  • Loading branch information
dleard authored Nov 22, 2023
2 parents b211d67 + 45374a7 commit d082bce
Show file tree
Hide file tree
Showing 9 changed files with 576 additions and 146 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ jobs:
echo "PRE_COMMIT_HOME=$GITHUB_WORKSPACE/.pre-commit-cache" >> $GITHUB_ENV
- name: set PY
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- name: show python version
run: python -VV
- name: show pre-commit version
run: pre-commit -V
- name: create commitlint COMMIT_EDITMSG if not exists
run: |
if test -f ".git/COMMIT_EDITMSG"; then
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:
files: \.(j|t)sx?$
entry: ./.bin/format.sh
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
rev: v4.5.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
Expand All @@ -27,7 +27,7 @@ repos:
- id: trailing-whitespace
exclude: .*/tests/.*
- repo: https://github.com/Yelp/detect-secrets
rev: v0.12.7
rev: v1.4.0
hooks:
- id: detect-secrets
args: ['--baseline', '.secrets.baseline']
Expand Down
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
nodejs 14.21.1
nodejs 20.9.0
yarn 1.22.19
postgres 14.0
python 3.9.2
python 3.9.11
2 changes: 1 addition & 1 deletion app/cypress/plugins/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const happoTask = require("happo-cypress/task");

module.exports = (on) => {
on("task", happoTask);
happoTask.register(on);
};
11 changes: 6 additions & 5 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"pretest": "npm run build:relay",
"test": "NODE_OPTIONS=\"--unhandled-rejections=strict\" jest",
"pretest:e2e-snapshots": "node cypress/support/listAuthenticatedPages.js",
"test:e2e-snapshots": "yarn happo-cypress -- -- cypress run",
"test:e2e-snapshots": "yarn happo-e2e -- -- cypress run",
"pretest:e2e": "node cypress/support/listAuthenticatedPages.js",
"test:e2e": "cypress run",
"test:e2e-with-mocks": "cypress run --config integrationFolder=cypress/integration_mocks",
Expand All @@ -27,7 +27,7 @@
"lint": "eslint --ext .js,.jsx,.ts,.tsx ."
},
"engines": {
"node": "14.21.1",
"node": "20.9.0",
"yarn": "1.22.19"
},
"author": "",
Expand All @@ -43,7 +43,7 @@
"@rjsf/core": "^3.2.1",
"@sentry/nextjs": "^6.16.0",
"@sentry/react": "^6.16.0",
"axios": "^1.3.2",
"axios": "^1.6.2",
"body-parser": "^1.19.0",
"bowser": "^2.11.0",
"connect-pg-simple": "^6.2.1",
Expand Down Expand Up @@ -127,7 +127,8 @@
"eslint-plugin-relay": "^1.8.2",
"graphql-query-test-mock": "^0.12.0",
"graphql-tag-pluck": "^0.8.5",
"happo-cypress": "^1.20.0",
"happo-cypress": "^4.1.1",
"happo-e2e": "^2.2.5",
"happo.io": "^8.3.1",
"identity-obj-proxy": "^3.0.0",
"improved-yarn-audit": "^3.0.0",
Expand All @@ -147,7 +148,7 @@
"require-context.macro": "^1.2.2",
"standard-version": "^9.3.1",
"typescript": "~4.4.0",
"wait-on": "^6.0.1",
"wait-on": "^7.2.0",
"webpack": "^5.76.0"
},
"resolutions": {
Expand Down
2 changes: 1 addition & 1 deletion app/tests/unit/server/deleteFileMiddleware.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe("The attachment delete router", () => {

it("calls next() with the error if an exception is thrown", async () => {
const error = new TypeError(
"Cannot read property 'attachmentId' of undefined"
"Cannot read properties of undefined (reading 'attachmentId')"
);
const next = jest.fn();
const handlerUnderTest = handleDelete;
Expand Down
Loading

0 comments on commit d082bce

Please sign in to comment.