Skip to content

Commit

Permalink
Merge pull request #994 from aaronreed708/update-dependencies-2
Browse files Browse the repository at this point in the history
#988: Update dependencies to latest levels
  • Loading branch information
aaronreed708 authored Aug 12, 2024
2 parents 8b1c6fb + 3d69c05 commit 2dd2c5b
Show file tree
Hide file tree
Showing 8 changed files with 242 additions and 137 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
branches:
- 'main'
- 'dev'
- 'update-dependencies-2'
paths:
- 'code/src/**'
- 'code/package.json'
Expand All @@ -18,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: docker-practice/actions-setup-docker@321477a1e481dd60b05f9b489cf4b9be467aa15c
- uses: docker-practice/actions-setup-docker@ccc771627519a0dc44b99c63f3ccf5fab1b1b9b8
- name: Build
run: docker build -f Dockerfile -t user/app:latest .
working-directory: code
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
format: 'HTML'
out: '${{ matrix.module-folder }}-reports'
args: >
# --suppression .github/node-cve-ignore-list.xml
--suppression .github/node-cve-ignore-list.xml
--nodeAuditSkipDevDependencies
--nodePackageSkipDevDependencies
--failOnCVSS 5
Expand All @@ -57,11 +57,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: docker-practice/actions-setup-docker@321477a1e481dd60b05f9b489cf4b9be467aa15c
- uses: docker-practice/actions-setup-docker@ccc771627519a0dc44b99c63f3ccf5fab1b1b9b8
- name: Build
run: docker build -f Dockerfile -t user/app:latest .
working-directory: code
- name: Scan for vulnerabilities
uses: crazy-max/ghaction-container-scan@dfa7e54dc32045120f06d0bc8d7724860f5db0ad
uses: crazy-max/ghaction-container-scan@f17494a3e47d86fb17c2c1f89b25049492a82d1d
with:
image: user/app:latest
2 changes: 1 addition & 1 deletion code/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.19-bookworm-slim
FROM node:20.16.0-bullseye-slim
RUN node -v
# Copy source
RUN mkdir $HOME/code
Expand Down
57 changes: 29 additions & 28 deletions code/package-lock.json

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

8 changes: 4 additions & 4 deletions code/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"@types/express": "^4.17.21",
"@types/express-session": "^1.18.0",
"@types/jsonwebtoken": "^9.0.2",
"@types/node": "^20.12.7",
"@types/nodemailer": "^6.4.14",
"axios": "^1.6.8",
"@types/node": "^20.14.15",
"@types/nodemailer": "^6.4.15",
"axios": "^1.7.3",
"axios-debug-log": "^1.0.0",
"body-parser": "^1.20.2",
"cookie-parser": "^1.4.6",
Expand All @@ -52,7 +52,7 @@
"@typescript-eslint/parser": "^7.8.0",
"eslint": "^8.57.0",
"eslint-plugin-header": "^3.1.1",
"nodemon": "^3.1.0",
"nodemon": "^3.1.4",
"prettier": "^3.3.2"
}
}
3 changes: 3 additions & 0 deletions code/src/data/themes
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@
{"k":"0000000080","o":"0000001607","v":"001"}
{"_id":32,"_uid":32,"_dt":1721104931853,"_s":"59d55d83a70f3e7a03579508a447161b"}
{"atoms":{"colorPalette":{"colors":[]},"colorThemes":{"themes":{}},"fontsSettings":{"fontWeights":[null,null,null,null,null]},"displayAndHeaderStyles":{"percentChangeInHeaderDisplaySizes":{"min":0,"max":100},"displayStyles":[{},{}],"headerStyles":[{},{},{},{},{},{}]},"bodyStyles":{"body1":{},"body1Bold":{},"body2":{},"body2Bold":{},"body3":{},"body3Bold":{}},"smallTextStyles":{"subtitle1":{},"subtitle2":{},"caption":{},"captionBold":{},"overline":{},"overlineLarge":{},"overlineExtraLarge":{},"label1":{},"label1AllCaps":{},"label2":{},"label2AllCaps":{},"labelSmall":{},"callToAction":{},"callToActionSmall":{},"small":{},"smallSemibold":{}},"statStyles":{"stat":{}},"gridSettings":{},"minimumTarget":{},"stateSettings":{},"chartColors":{},"borderSettings":{},"focusStates":{},"hotlinks":{},"inputBackground":{"whiteBackground":{"shade":{"hex":"#FFFFFF","opacity":1}}},"elevationSettings":{},"bevelSettings":{"standard":{},"inverse":{}},"glowSettings":{},"animationSettings":{},"colorBlind":{}},"molecules":{"avatars":{},"standardButtons":{},"chartDonut":{"cutoutThickness":{"min":0,"max":100}},"chartPie":{},"chartLine":{},"chartProgress":{"cutoutThickness":{"min":0,"max":100}},"chips":{},"spacing":{},"dropdowns":{},"images":{},"modal":{},"popovers":{},"sliders":{},"toasts":{}},"organisms":{"dataTables":{},"hero":{},"primaryNav":{},"secondaryNav":{},"footerAndCopyright":{}},"layers":{},"metadata":{"sample":false,"time":{"createdInMs":1721104931817,"lastUpdateInMs":1721104931817},"colors":{"primary":"","secondary":"","tertiary":"","background":""}},"id":"newtest","_id":{"$wrap":"$oid","v":32}}
{"k":"0000000080","o":"0000001618","v":"001"}
{"_id":33,"_uid":33,"_dt":1723219880238,"_s":"0c1982d5f08068526d7b53f8ed94916a"}
{"atoms":{"colorPalette":{"colors":[]},"colorThemes":{"themes":{}},"fontsSettings":{"fontWeights":[null,null,null,null,null]},"displayAndHeaderStyles":{"percentChangeInHeaderDisplaySizes":{"min":0,"max":100},"displayStyles":[{},{}],"headerStyles":[{},{},{},{},{},{}]},"bodyStyles":{"body1":{},"body1Bold":{},"body2":{},"body2Bold":{},"body3":{},"body3Bold":{}},"smallTextStyles":{"subtitle1":{},"subtitle2":{},"caption":{},"captionBold":{},"overline":{},"overlineLarge":{},"overlineExtraLarge":{},"label1":{},"label1AllCaps":{},"label2":{},"label2AllCaps":{},"labelSmall":{},"callToAction":{},"callToActionSmall":{},"small":{},"smallSemibold":{}},"statStyles":{"stat":{}},"gridSettings":{},"minimumTarget":{},"stateSettings":{},"chartColors":{},"borderSettings":{},"focusStates":{},"hotlinks":{},"inputBackground":{"whiteBackground":{"shade":{"hex":"#FFFFFF","opacity":1}}},"elevationSettings":{},"bevelSettings":{"standard":{},"inverse":{}},"glowSettings":{},"animationSettings":{},"colorBlind":{}},"molecules":{"avatars":{},"standardButtons":{},"chartDonut":{"cutoutThickness":{"min":0,"max":100}},"chartPie":{},"chartLine":{},"chartProgress":{"cutoutThickness":{"min":0,"max":100}},"chips":{},"spacing":{},"dropdowns":{},"images":{},"modal":{},"popovers":{},"sliders":{},"toasts":{}},"organisms":{"dataTables":{},"hero":{},"primaryNav":{},"secondaryNav":{},"footerAndCopyright":{}},"layers":{},"metadata":{"sample":false,"time":{"createdInMs":1723219880208,"lastUpdateInMs":1723219880208},"colors":{"primary":"","secondary":"","tertiary":"","background":""}},"id":"Aaron Second Theme","_id":{"$wrap":"$oid","v":33}}
Loading

0 comments on commit 2dd2c5b

Please sign in to comment.