Skip to content

Commit

Permalink
Merge branch 'main' into human-readable
Browse files Browse the repository at this point in the history
  • Loading branch information
Gavinok authored Nov 12, 2024
2 parents ce01fc7 + 7a1edbd commit e79b965
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 125 deletions.
25 changes: 15 additions & 10 deletions demo/vue/app/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions demo/vue/app/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@bcgov/bc-sans": "^2.1.0",
"@vue/eslint-config-prettier": "^10.1.0",
"axios": "^1.7.7",
"core-js": "^3.38.1",
"core-js": "^3.39.0",
"eslint": "^8.57.0",
"eslint-plugin-prettier": "^5.2.1",
"keycloak-js": "^15.1.1",
Expand All @@ -43,7 +43,7 @@
"eslint-plugin-vuetify": "^1.1.0",
"lodash": "^4.17.21",
"prettier": "^3.3.3",
"sass": "^1.80.5",
"sass": "^1.80.6",
"sass-loader": "^14.2.1",
"vue-cli-plugin-vuetify": "^2.5.8",
"vue-template-compiler": "^2.7.16",
Expand Down
145 changes: 48 additions & 97 deletions demo/vue/app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions demo/vue/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"axios": "^1.7.7",
"axios-oauth-client": "^2.2.0",
"axios-token-interceptor": "^0.2.0",
"compression": "^1.7.4",
"compression": "^1.7.5",
"config": "^3.3.12",
"crypto": "^1.0.1",
"express": "^4.21.1",
Expand All @@ -44,8 +44,8 @@
"fs-extra": "^11.2.0",
"js-yaml": "^4.1.0",
"jsonwebtoken": "^9.0.2",
"keycloak-connect": "^26.0.2",
"winston": "^3.15.0",
"keycloak-connect": "^26.0.5",
"winston": "^3.16.0",
"winston-transport": "^4.8.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion docker/oidc-controller/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12 as main
FROM python:3.12 AS main

WORKDIR /app

Expand Down
Loading

0 comments on commit e79b965

Please sign in to comment.