Merge pull request #19275 from dvdksn/upgrade-dependencies

upgrade build and dev dependencies

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
+WORKDIR /tmp/hugo
-RUN go install github.com/gohugoio/hugo@v${HUGO_VERSION}
+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

@@ -1,61 +0,0 @@
-import mermaid from 'mermaid'
-
-const theme = window.localStorage.getItem('theme-preference')
-let mermaidTheme = theme === "dark" ? "dark" : "default";
-
-let mermaidConfig = {
-  theme: mermaidTheme,
-  logLevel: "fatal",
-  securityLevel: "strict",
-  startOnLoad: true,
-  arrowMarkerAbsolute: false,
-
-  er: {
-    diagramPadding: 20,
-    layoutDirection: "TB",
-    minEntityWidth: 100,
-    minEntityHeight: 75,
-    entityPadding: 15,
-    stroke: "gray",
-    fill: "honeydew",
-    fontSize: 12,
-    useMaxWidth: true,
-  },
-  flowchart: {
-    diagramPadding: 8,
-    htmlLabels: true,
-    curve: "basis",
-  },
-  sequence: {
-    diagramMarginX: 50,
-    diagramMarginY: 10,
-    actorMargin: 50,
-    width: 150,
-    height: 65,
-    boxMargin: 10,
-    boxTextMargin: 5,
-    noteMargin: 10,
-    messageMargin: 35,
-    messageAlign: "center",
-    mirrorActors: true,
-    bottomMarginAdj: 1,
-    useMaxWidth: true,
-    rightAngles: false,
-    showSequenceNumbers: false,
-  },
-  gantt: {
-    titleTopMargin: 25,
-    barHeight: 20,
-    barGap: 4,
-    topPadding: 50,
-    leftPadding: 75,
-    gridLineStartPadding: 35,
-    fontSize: 11,
-    fontFamily: 'Roboto, sans-serif',
-    numberSectionStyles: 4,
-    axisFormat: "%Y-%m-%d",
-    topAxis: false,
-  },
-};
-
-mermaid.initialize(mermaidConfig);

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

@@ -1,4 +0,0 @@
-<div class="mermaid not-prose">
-  {{- .Inner | safeHTML }}
-</div>
-{{ .Page.Store.Set "hasMermaid" true }}

layouts/partials/head.html

@@ -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" . }}

netlify.toml

@@ -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"
 

package.json

@@ -13,21 +13,22 @@
     "url": "https://github.com/docker/docs/issues"
   },
   "homepage": "https://docs.docker.com/",
-  "devDependencies": {
+  "dependencies": {
-    "@alpinejs/collapse": "^3.11.1",
+    "@alpinejs/collapse": "^3.13.5",
     "@docsearch/js": "^3.5.2",
     "@material-symbols/svg-400": "^0.14.6",
     "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
-    "@tailwindcss/typography": "^0.5.8",
+    "@tailwindcss/typography": "^0.5.10",
-    "alpinejs": "^3.12.3",
+    "alpinejs": "^3.13.5",
-    "autoprefixer": "^10.4.14",
+    "autoprefixer": "^10.4.17",
-    "markdownlint": "^0.27.0",
+    "postcss": "^8.4.33",
-    "mermaid": "^10.3.1",
+    "postcss-cli": "^11.0.0",
-    "postcss": "^8.4.19",
+    "postcss-import": "^16.0.0",
-    "postcss-cli": "^10.1.0",
+    "tailwindcss": "^3.4.1"
-    "postcss-import": "^15.1.0",
+  },
-    "prettier": "^3.0.0",
+  "devDependencies": {
-    "prettier-plugin-tailwindcss": "^0.5.3",
+    "markdownlint": "^0.33.0",
-    "tailwindcss": "^3.2.4"
+    "prettier": "^3.2.4",
+    "prettier-plugin-tailwindcss": "^0.5.11"
   }
 }