Upgrade to Hugo 0.55.5 (#4095)

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: gcr.io/istio-testing/website-builder:2019-03-31
+      - image: gcr.io/istio-testing/website-builder:2019-05-03
 
     working_directory: ~/site
 

Makefile

@@ -1,7 +1,7 @@
 ISTIO_SERVE_DOMAIN ?= localhost
 export ISTIO_SERVE_DOMAIN
 
-img := gcr.io/istio-testing/website-builder:2019-03-31
+img := gcr.io/istio-testing/website-builder:2019-05-03
 docker := docker run -e INTERNAL_ONLY=true -t -i --sig-proxy=true --rm -v $(shell pwd):/site -w /site $(img)
 
 ifeq ($(INTERNAL_ONLY),)

layouts/partials/header.html

@@ -99,14 +99,14 @@
                     {{ $current := .Site.Data.versions.main }}
 
                     {{ if or .Site.Data.args.archive .Site.Data.args.archive_landing }}
-                        <a tabindex="-1" role="menuitem" onclick="navigateToUrlOrRoot('https://istio.io/{{.Dir}}');return false;">{{ printf (i18n "current_release") $current }}</a>
-                        <a tabindex="-1" role="menuitem" onclick="navigateToUrlOrRoot('https://preliminary.istio.io/{{.Dir}}');return false;">{{ printf (i18n "next_release") $next }}</a>
+                        <a tabindex="-1" role="menuitem" onclick="navigateToUrlOrRoot('https://istio.io/{{.File.Dir}}');return false;">{{ printf (i18n "current_release") $current }}</a>
+                        <a tabindex="-1" role="menuitem" onclick="navigateToUrlOrRoot('https://preliminary.istio.io/{{.File.Dir}}');return false;">{{ printf (i18n "next_release") $next }}</a>
                         <a tabindex="-1" role="menuitem" href="https://archive.istio.io">{{ i18n "archived_releases" }}</a>
                     {{ else if .Site.Data.args.preliminary }}
-                        <a tabindex="-1" role="menuitem" onclick="navigateToUrlOrRoot('https://istio.io/{{.Dir}}');return false;">{{ printf (i18n "current_release") $current }}</a>
+                        <a tabindex="-1" role="menuitem" onclick="navigateToUrlOrRoot('https://istio.io/{{.File.Dir}}');return false;">{{ printf (i18n "current_release") $current }}</a>
                         <a tabindex="-1" role="menuitem" href="https://archive.istio.io">{{ i18n "archived_releases" }}</a>
                     {{ else }}
-                        <a tabindex="-1" role="menuitem" onclick="navigateToUrlOrRoot('https://preliminary.istio.io/{{.Dir}}');return false;">{{ printf (i18n "next_release") $next }}</a>
+                        <a tabindex="-1" role="menuitem" onclick="navigateToUrlOrRoot('https://preliminary.istio.io/{{.File.Dir}}');return false;">{{ printf (i18n "next_release") $next }}</a>
                         <a tabindex="-1" role="menuitem" href="https://archive.istio.io">{{ i18n "archived_releases" }}</a>
                     {{ end }}
                 </div>

layouts/partials/sidebar_multicard.html

@@ -25,7 +25,7 @@
         {{ end }}
 
         {{ if not .Site.Data.args.archive }}
-            {{ if strings.HasSuffix $section.Dir "blog/" }}
+            {{ if strings.HasSuffix $section.File.Dir "blog/" }}
                 <div id="subscribe" >
                     <a href="/feed.xml" target="_blank">
                         {{ partial "large_icon.html" "rss" }}{{ i18n "subscribe" }}

layouts/shortcodes/image.html

@@ -54,9 +54,9 @@ omit this value and it will be computed automatically.
     {{- if (ne $prefix "https://") -}}
         {{- $prefix := slicestr $link 0 3 -}}
         {{- if (eq $prefix "../") -}}
-            {{- $link = printf "/%s%s" .Page.Dir (slicestr $link 3) -}}
+            {{- $link = printf "/%s%s" .Page.File.Dir (slicestr $link 3) -}}
         {{- else -}}
-            {{- $link = printf "/%s%s" .Page.Dir $link -}}
+            {{- $link = printf "/%s%s" .Page.File.Dir $link -}}
         {{- end -}}
     {{- end -}}
 {{- end -}}

layouts/shortcodes/relnote.html

@@ -17,7 +17,7 @@
 {{/* establish latest corresponding patch release */}}
 {{ $latest_patch := 0 }}
 {{ range $page := .Site.RegularPages }}
-    {{ if hasPrefix $page.Dir "about/notes" }}
+    {{ if hasPrefix $page.File.Dir "about/notes" }}
         {{ $release := $page.Params.release }}
         {{ if $release }}
             {{ $parts := split $release "." }}

layouts/shortcodes/template_table.html

@@ -14,11 +14,11 @@
                 <td><a title="{{ .Description }}" href="{{ .Permalink }}">{{- .Title -}}</a></td>
 
                 <td>
-                    {{ $current_template := path.Base .Dir }}
+                    {{ $current_template := path.Base .File.Dir }}
 
                     {{ $adapters := "" }}
                     {{ range $a := $adapterPages }}
-                        {{ $adapter_name := path.Base $a.Dir }}
+                        {{ $adapter_name := path.Base $a.File.Dir }}
 
                         {{ $templates := split .Params.supported_templates "," }}
                         {{ $templates = sort $templates }}

netlify.toml

@@ -2,4 +2,4 @@
     publish = "public"
 
 [build.environment]
-    HUGO_VERSION = "0.54.0"
+    HUGO_VERSION = "0.55.5"

scripts/Dockerfile

@@ -17,7 +17,7 @@ RUN apk add --no-cache \
     bash \
     && apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted
 
-ENV HUGO_VERSION=0.54.0
+ENV HUGO_VERSION=0.55.5
 ADD https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.tar.gz /tmp
 RUN tar -xf /tmp/hugo_${HUGO_VERSION}_Linux-64bit.tar.gz -C /tmp \
     && mkdir -p /usr/local/sbin \

src/ts/codeBlocks.ts

@@ -253,6 +253,7 @@ function handleCodeBlocks() {
                     cmd += "$ " + Prism.highlight(tmp, Prism.languages.bash, "bash") + "\n";
                 } else {
                     cmd += "$ " + tmp + "\n";
+                    cmd = cmd.replace(/</g, "&lt;").replace(/>/g, "&gt;");
                 }
             }