Skip to content

Commit

Permalink
Merge branch 'main' into stick-to-team
Browse files Browse the repository at this point in the history
  • Loading branch information
jvogt23 authored Nov 2, 2024
2 parents 365ca45 + cb4d46f commit c8b98e3
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 65 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN set -euxo pipefail && \
/root/.local/bin/poetry install --no-interaction && \
/root/.local/bin/poetry run sphinx-build -M dirhtml "." "_build"

FROM node:22.10.0 AS docs-minification
FROM node:22.11.0 AS docs-minification

COPY --link --from=docs-source /docs/_build/dirhtml/ /docs/

Expand Down Expand Up @@ -42,7 +42,7 @@ COPY --link package.json package-lock.json webpack.mix.js artisan /app/
COPY --link resources/ /app/resources/
COPY --link public/ /app/public/

FROM node:22.10.0 AS nova-components
FROM node:22.11.0 AS nova-components

COPY --link /nova-components/ /nova-components/

Expand All @@ -60,7 +60,7 @@ RUN set -eux && \
npm install --no-progress && \
npm run production --no-progress

FROM node:22.10.0 AS frontend
FROM node:22.11.0 AS frontend

COPY --link --from=frontend-source /app/ /app/

Expand Down
120 changes: 60 additions & 60 deletions 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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"vue-loader": "15.11.1"
},
"dependencies": {
"@sentry/vue": "8.35.0",
"@sentry/vue": "8.36.0",
"axios": "1.7.7",
"caniuse-lite": "1.0.30001675",
"caniuse-lite": "1.0.30001676",
"chartist": "0.11.4",
"chartist-plugin-legend": "0.6.2",
"chartist-plugin-pointlabels": "0.0.6",
Expand Down

0 comments on commit c8b98e3

Please sign in to comment.