Merge pull request #19275 from dvdksn/upgrade-dependencies

upgrade build and dev dependencies

Author: dvdksn

Dockerfile

@@ -5,20 +5,22 @@ ARG HTMLTEST_VERSION=0.17.0
 
 FROM golang:${GO_VERSION}-alpine as base
 WORKDIR /src
-RUN apk --update add nodejs npm git
+RUN apk --update add nodejs npm git gcompat
 
 FROM base as node
 COPY package*.json .
-RUN npm install && npm cache clean --force
+ENV NODE_ENV=production
+RUN npm install
 
 FROM base as hugo
-ARG HUGO_VERSION=0.116.1
+ARG HUGO_VERSION=0.122.0
 ARG TARGETARCH
-WORKDIR /bin
-RUN go install github.com/gohugoio/hugo@v${HUGO_VERSION}
+WORKDIR /tmp/hugo
+RUN wget -O "hugo.tar.gz" "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-${TARGETARCH}.tar.gz"
+RUN tar -xf "hugo.tar.gz" hugo
 
 FROM base as build-base
-COPY --from=hugo $GOPATH/bin/hugo /bin/hugo
+COPY --from=hugo /tmp/hugo/hugo /bin/hugo
 COPY --from=node /src/node_modules /src/node_modules
 COPY . .
 
@@ -32,7 +34,7 @@ RUN hugo --gc --minify -d /out -e $HUGO_ENV -b $DOCS_URL
 FROM scratch as release
 COPY --from=build /out /
 
-FROM davidanson/markdownlint-cli2:v0.10.0 as lint
+FROM davidanson/markdownlint-cli2:v0.12.1 as lint
 USER root
 RUN --mount=type=bind,target=. \
     /usr/local/bin/markdownlint-cli2 \

assets/js/mermaid.js

@@ -56,8 +56,4 @@
 }}
 <script defer src="{{ $js.Permalink }}"></script>
 <link rel="preconnect" href="https://{{ site.Params.algolia.appid }}-dsn.algolia.net" crossorigin />
-{{ if .Page.Store.Get "hasMermaid" }}
-{{ $mermaid := resources.Get "js/mermaid.js" | js.Build (dict "minify" true) }}
-<script>{{ $mermaid.Content | safeJS }}</script>
-{{ end }}
 {{ partialCached "utils/resources.html" . }}

layouts/_default/_markup/render-codeblock-mermaid.html

@@ -2,7 +2,9 @@
 publish = "public"
 
 [context.deploy-preview.environment]
-HUGO_VERSION = "0.116.1"
+NODE_VERSION = "20"
+NODE_ENV = "production"
+HUGO_VERSION = "0.122.0"
 HUGO_ENABLEGITINFO = "true"
 HUGO_ENVIRONMENT = "preview"