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

Fix build with updated dependencies #19

Merged
merged 10 commits into from
Jul 5, 2021
Merged

Fix build with updated dependencies #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c509581
Bump axios from 0.19.2 to 0.21.1
dependabot[bot] Jan 6, 2021
e4f53ab
Bump elliptic from 6.5.3 to 6.5.4
dependabot[bot] Mar 10, 2021
95d715b
Bump y18n from 4.0.0 to 4.0.1
dependabot[bot] Apr 1, 2021
2af998a
Bump ssri from 6.0.1 to 6.0.2
dependabot[bot] Apr 30, 2021
0b81a3e
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/axios-0.…
myoung-ukcloud May 6, 2021
03436db
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/elliptic…
myoung-ukcloud May 6, 2021
31bb101
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/y18n-4.0.1'
myoung-ukcloud May 6, 2021
9e9c256
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/ssri-6.0.2'
myoung-ukcloud May 6, 2021
1d4ee5b
Updated rust to fix build and merged in dependabot PRs
myoung-ukcloud May 6, 2021
a957b41
Updated to rust 1.52
myoung-ukcloud May 7, 2021
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ COPY tsconfig.json webpack.config.js /app/
COPY src /app/src
RUN npx webpack --mode production

FROM rust:1.41 AS server-compiler
FROM rust:1.52 AS server-compiler
WORKDIR /app/server
RUN mkdir /app/dist && touch --date "1 Jan 1970" /app/dist/index.html /app/dist/main.js
COPY server /app/server
Expand Down
51 changes: 29 additions & 22 deletions package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"dependencies": {
"@ccouzens/ukcloud-portal-api": "file:generated/portal-api/",
"@ccouzens/vcloud-rest": "file:generated/vcloud-rest/",
"axios": "^0.19.2"
"axios": "^0.21.1"
},
"devDependencies": {
"@openapitools/openapi-generator-cli": "^1.0.10-4.3.1",
Expand Down