Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): security upgrade axios from 1.5.1 to 1.6.0 #3384

Closed
wants to merge 2 commits into from
Closed

chore(deps): security upgrade axios from 1.5.1 to 1.6.0 #3384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b1b26f
fix: package.json & yarn.lock to reduce vulnerabilities
snyk-bot Oct 28, 2023
617e6ce
bump to axios 1.6.2 and use yarn instead of npm prune
chrisns Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ RUN npm_config_build_from_source=true npm rebuild @serialport/bindings-cpp
# Build back and frontend only when not existing
RUN [ -d 'dist' ] && echo "Skipping build" || npm run build

RUN npm prune --production && \
RUN yarn workspaces focus --production && \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you added this change in the wrong branch :) could you create a new pr?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, was on purpose. Npm couldn't reconcile the deps. This is yarn equivalent

Copy link
Member

@robertsLando robertsLando Nov 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I replaced yarn on purpose because the previous yarn command was throwing Could't allocate enough memory in arm32 builds... Anyway I can try to merge this to see how it goes and revert in case...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤞

rm -rf \
package-lock.json \
build \
package.sh \
src \
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@
"@zwave-js/winston-daily-rotate-file": "^4.5.6-1",
"ansi_up": "^6.0.2",
"archiver": "^6.0.1",
"axios": "^1.5.1",
"axios": "^1.6.2",
"axios-progress-bar": "^1.2.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have dropped this dep

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. Must have been a merge conflict. I'll update.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏼

"connect-history-api-fallback": "2.0.0",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
Expand Down
14 changes: 12 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3798,6 +3798,15 @@ __metadata:
languageName: node
linkType: hard

"axios-progress-bar@npm:^1.2.0":
version: 1.2.0
resolution: "axios-progress-bar@npm:1.2.0"
peerDependencies:
axios: 0.x
checksum: b0ef52ed5649ef4efe0e50f8bddc920b9d38dfafe59417db5062a7ee2c92d18811776e89c9b132b292b9742d94e7c48d654bfd68cb86410bf93e58ec6e239a47
languageName: node
linkType: hard

"axios@npm:^0.27.2":
version: 0.27.2
resolution: "axios@npm:0.27.2"
Expand All @@ -3808,7 +3817,7 @@ __metadata:
languageName: node
linkType: hard

"axios@npm:^1.5.1":
"axios@npm:^1.6.2":
version: 1.6.2
resolution: "axios@npm:1.6.2"
dependencies:
Expand Down Expand Up @@ -14306,7 +14315,8 @@ __metadata:
"@zwave-js/winston-daily-rotate-file": "npm:^4.5.6-1"
ansi_up: "npm:^6.0.2"
archiver: "npm:^6.0.1"
axios: "npm:^1.5.1"
axios: "npm:^1.6.2"
axios-progress-bar: "npm:^1.2.0"
c8: "npm:^8.0.1"
chai: "npm:^4.3.10"
chai-as-promised: "npm:^7.1.1"
Expand Down
Loading