From c1ade8d91aafde7fd753a9c7d74765921953f449 Mon Sep 17 00:00:00 2001 From: Istio Automation Date: Mon, 9 Dec 2024 03:26:44 -0500 Subject: [PATCH] [release-1.24] move sass to Hugo pipes (#16037) * move sass to Hugo pipes * update hugo version to match new build container --------- Co-authored-by: Craig Box --- {src => assets}/sass/_all.scss | 0 {src => assets}/sass/base/_base.scss | 0 {src => assets}/sass/base/_constants.scss | 0 {src => assets}/sass/base/_reset.scss | 0 {src => assets}/sass/misc/_about.scss | 0 {src => assets}/sass/misc/_analysis-message.scss | 0 {src => assets}/sass/misc/_article.scss | 0 {src => assets}/sass/misc/_banners.scss | 0 {src => assets}/sass/misc/_blog.scss | 0 {src => assets}/sass/misc/_breadcrumbs.scss | 0 {src => assets}/sass/misc/_button.scss | 0 {src => assets}/sass/misc/_call-to-action.scss | 0 {src => assets}/sass/misc/_callout.scss | 0 {src => assets}/sass/misc/_case-study.scss | 0 {src => assets}/sass/misc/_code-blocks.scss | 0 {src => assets}/sass/misc/_command-flags.scss | 0 {src => assets}/sass/misc/_community.scss | 0 {src => assets}/sass/misc/_docs.scss | 0 {src => assets}/sass/misc/_endnotes.scss | 0 {src => assets}/sass/misc/_faq-block.scss | 0 {src => assets}/sass/misc/_faq-landing.scss | 0 {src => assets}/sass/misc/_faq.scss | 0 {src => assets}/sass/misc/_feature-block.scss | 0 {src => assets}/sass/misc/_feedback.scss | 0 {src => assets}/sass/misc/_figure.scss | 0 {src => assets}/sass/misc/_floaters.scss | 0 {src => assets}/sass/misc/_footer.scss | 0 {src => assets}/sass/misc/_get-involved.scss | 0 {src => assets}/sass/misc/_glossary.scss | 0 {src => assets}/sass/misc/_header.scss | 0 {src => assets}/sass/misc/_involve-block.scss | 0 {src => assets}/sass/misc/_landing.scss | 0 {src => assets}/sass/misc/_logo-gallery.scss | 0 {src => assets}/sass/misc/_menu.scss | 0 {src => assets}/sass/misc/_modal.scss | 0 {src => assets}/sass/misc/_multi-block.scss | 0 {src => assets}/sass/misc/_notfound.scss | 0 {src => assets}/sass/misc/_pagenav.scss | 0 {src => assets}/sass/misc/_panel.scss | 0 {src => assets}/sass/misc/_partner-component.scss | 0 {src => assets}/sass/misc/_popover.scss | 0 {src => assets}/sass/misc/_primary.scss | 0 {src => assets}/sass/misc/_relnote-actions.scss | 0 {src => assets}/sass/misc/_search-results.scss | 0 {src => assets}/sass/misc/_section-index.scss | 0 {src => assets}/sass/misc/_security-grid.scss | 0 {src => assets}/sass/misc/_see-also.scss | 0 {src => assets}/sass/misc/_sidebar.scss | 0 {src => assets}/sass/misc/_solutions.scss | 0 {src => assets}/sass/misc/_stickers.scss | 0 {src => assets}/sass/misc/_tabset.scss | 0 {src => assets}/sass/misc/_toc.scss | 0 {src => assets}/sass/themes/_brand.scss | 0 {src => assets}/sass/themes/_dark-theme-syntax.scss | 0 {src => assets}/sass/themes/_dark-theme.scss | 0 {src => assets}/sass/themes/_light-theme-syntax.scss | 0 {src => assets}/sass/themes/_light-theme.scss | 0 {src => assets}/sass/themes/_vars.scss | 0 layouts/_default/baseof.html | 6 +++++- netlify.toml | 2 +- scripts/gen_site.sh | 4 +--- 61 files changed, 7 insertions(+), 5 deletions(-) rename {src => assets}/sass/_all.scss (100%) rename {src => assets}/sass/base/_base.scss (100%) rename {src => assets}/sass/base/_constants.scss (100%) rename {src => assets}/sass/base/_reset.scss (100%) rename {src => assets}/sass/misc/_about.scss (100%) rename {src => assets}/sass/misc/_analysis-message.scss (100%) rename {src => assets}/sass/misc/_article.scss (100%) rename {src => assets}/sass/misc/_banners.scss (100%) rename {src => assets}/sass/misc/_blog.scss (100%) rename {src => assets}/sass/misc/_breadcrumbs.scss (100%) rename {src => assets}/sass/misc/_button.scss (100%) rename {src => assets}/sass/misc/_call-to-action.scss (100%) rename {src => assets}/sass/misc/_callout.scss (100%) rename {src => assets}/sass/misc/_case-study.scss (100%) rename {src => assets}/sass/misc/_code-blocks.scss (100%) rename {src => assets}/sass/misc/_command-flags.scss (100%) rename {src => assets}/sass/misc/_community.scss (100%) rename {src => assets}/sass/misc/_docs.scss (100%) rename {src => assets}/sass/misc/_endnotes.scss (100%) rename {src => assets}/sass/misc/_faq-block.scss (100%) rename {src => assets}/sass/misc/_faq-landing.scss (100%) rename {src => assets}/sass/misc/_faq.scss (100%) rename {src => assets}/sass/misc/_feature-block.scss (100%) rename {src => assets}/sass/misc/_feedback.scss (100%) rename {src => assets}/sass/misc/_figure.scss (100%) rename {src => assets}/sass/misc/_floaters.scss (100%) rename {src => assets}/sass/misc/_footer.scss (100%) rename {src => assets}/sass/misc/_get-involved.scss (100%) rename {src => assets}/sass/misc/_glossary.scss (100%) rename {src => assets}/sass/misc/_header.scss (100%) rename {src => assets}/sass/misc/_involve-block.scss (100%) rename {src => assets}/sass/misc/_landing.scss (100%) rename {src => assets}/sass/misc/_logo-gallery.scss (100%) rename {src => assets}/sass/misc/_menu.scss (100%) rename {src => assets}/sass/misc/_modal.scss (100%) rename {src => assets}/sass/misc/_multi-block.scss (100%) rename {src => assets}/sass/misc/_notfound.scss (100%) rename {src => assets}/sass/misc/_pagenav.scss (100%) rename {src => assets}/sass/misc/_panel.scss (100%) rename {src => assets}/sass/misc/_partner-component.scss (100%) rename {src => assets}/sass/misc/_popover.scss (100%) rename {src => assets}/sass/misc/_primary.scss (100%) rename {src => assets}/sass/misc/_relnote-actions.scss (100%) rename {src => assets}/sass/misc/_search-results.scss (100%) rename {src => assets}/sass/misc/_section-index.scss (100%) rename {src => assets}/sass/misc/_security-grid.scss (100%) rename {src => assets}/sass/misc/_see-also.scss (100%) rename {src => assets}/sass/misc/_sidebar.scss (100%) rename {src => assets}/sass/misc/_solutions.scss (100%) rename {src => assets}/sass/misc/_stickers.scss (100%) rename {src => assets}/sass/misc/_tabset.scss (100%) rename {src => assets}/sass/misc/_toc.scss (100%) rename {src => assets}/sass/themes/_brand.scss (100%) rename {src => assets}/sass/themes/_dark-theme-syntax.scss (100%) rename {src => assets}/sass/themes/_dark-theme.scss (100%) rename {src => assets}/sass/themes/_light-theme-syntax.scss (100%) rename {src => assets}/sass/themes/_light-theme.scss (100%) rename {src => assets}/sass/themes/_vars.scss (100%) diff --git a/src/sass/_all.scss b/assets/sass/_all.scss similarity index 100% rename from src/sass/_all.scss rename to assets/sass/_all.scss diff --git a/src/sass/base/_base.scss b/assets/sass/base/_base.scss similarity index 100% rename from src/sass/base/_base.scss rename to assets/sass/base/_base.scss diff --git a/src/sass/base/_constants.scss b/assets/sass/base/_constants.scss similarity index 100% rename from src/sass/base/_constants.scss rename to assets/sass/base/_constants.scss diff --git a/src/sass/base/_reset.scss b/assets/sass/base/_reset.scss similarity index 100% rename from src/sass/base/_reset.scss rename to assets/sass/base/_reset.scss diff --git a/src/sass/misc/_about.scss b/assets/sass/misc/_about.scss similarity index 100% rename from src/sass/misc/_about.scss rename to assets/sass/misc/_about.scss diff --git a/src/sass/misc/_analysis-message.scss b/assets/sass/misc/_analysis-message.scss similarity index 100% rename from src/sass/misc/_analysis-message.scss rename to assets/sass/misc/_analysis-message.scss diff --git a/src/sass/misc/_article.scss b/assets/sass/misc/_article.scss similarity index 100% rename from src/sass/misc/_article.scss rename to assets/sass/misc/_article.scss diff --git a/src/sass/misc/_banners.scss b/assets/sass/misc/_banners.scss similarity index 100% rename from src/sass/misc/_banners.scss rename to assets/sass/misc/_banners.scss diff --git a/src/sass/misc/_blog.scss b/assets/sass/misc/_blog.scss similarity index 100% rename from src/sass/misc/_blog.scss rename to assets/sass/misc/_blog.scss diff --git a/src/sass/misc/_breadcrumbs.scss b/assets/sass/misc/_breadcrumbs.scss similarity index 100% rename from src/sass/misc/_breadcrumbs.scss rename to assets/sass/misc/_breadcrumbs.scss diff --git a/src/sass/misc/_button.scss b/assets/sass/misc/_button.scss similarity index 100% rename from src/sass/misc/_button.scss rename to assets/sass/misc/_button.scss diff --git a/src/sass/misc/_call-to-action.scss b/assets/sass/misc/_call-to-action.scss similarity index 100% rename from src/sass/misc/_call-to-action.scss rename to assets/sass/misc/_call-to-action.scss diff --git a/src/sass/misc/_callout.scss b/assets/sass/misc/_callout.scss similarity index 100% rename from src/sass/misc/_callout.scss rename to assets/sass/misc/_callout.scss diff --git a/src/sass/misc/_case-study.scss b/assets/sass/misc/_case-study.scss similarity index 100% rename from src/sass/misc/_case-study.scss rename to assets/sass/misc/_case-study.scss diff --git a/src/sass/misc/_code-blocks.scss b/assets/sass/misc/_code-blocks.scss similarity index 100% rename from src/sass/misc/_code-blocks.scss rename to assets/sass/misc/_code-blocks.scss diff --git a/src/sass/misc/_command-flags.scss b/assets/sass/misc/_command-flags.scss similarity index 100% rename from src/sass/misc/_command-flags.scss rename to assets/sass/misc/_command-flags.scss diff --git a/src/sass/misc/_community.scss b/assets/sass/misc/_community.scss similarity index 100% rename from src/sass/misc/_community.scss rename to assets/sass/misc/_community.scss diff --git a/src/sass/misc/_docs.scss b/assets/sass/misc/_docs.scss similarity index 100% rename from src/sass/misc/_docs.scss rename to assets/sass/misc/_docs.scss diff --git a/src/sass/misc/_endnotes.scss b/assets/sass/misc/_endnotes.scss similarity index 100% rename from src/sass/misc/_endnotes.scss rename to assets/sass/misc/_endnotes.scss diff --git a/src/sass/misc/_faq-block.scss b/assets/sass/misc/_faq-block.scss similarity index 100% rename from src/sass/misc/_faq-block.scss rename to assets/sass/misc/_faq-block.scss diff --git a/src/sass/misc/_faq-landing.scss b/assets/sass/misc/_faq-landing.scss similarity index 100% rename from src/sass/misc/_faq-landing.scss rename to assets/sass/misc/_faq-landing.scss diff --git a/src/sass/misc/_faq.scss b/assets/sass/misc/_faq.scss similarity index 100% rename from src/sass/misc/_faq.scss rename to assets/sass/misc/_faq.scss diff --git a/src/sass/misc/_feature-block.scss b/assets/sass/misc/_feature-block.scss similarity index 100% rename from src/sass/misc/_feature-block.scss rename to assets/sass/misc/_feature-block.scss diff --git a/src/sass/misc/_feedback.scss b/assets/sass/misc/_feedback.scss similarity index 100% rename from src/sass/misc/_feedback.scss rename to assets/sass/misc/_feedback.scss diff --git a/src/sass/misc/_figure.scss b/assets/sass/misc/_figure.scss similarity index 100% rename from src/sass/misc/_figure.scss rename to assets/sass/misc/_figure.scss diff --git a/src/sass/misc/_floaters.scss b/assets/sass/misc/_floaters.scss similarity index 100% rename from src/sass/misc/_floaters.scss rename to assets/sass/misc/_floaters.scss diff --git a/src/sass/misc/_footer.scss b/assets/sass/misc/_footer.scss similarity index 100% rename from src/sass/misc/_footer.scss rename to assets/sass/misc/_footer.scss diff --git a/src/sass/misc/_get-involved.scss b/assets/sass/misc/_get-involved.scss similarity index 100% rename from src/sass/misc/_get-involved.scss rename to assets/sass/misc/_get-involved.scss diff --git a/src/sass/misc/_glossary.scss b/assets/sass/misc/_glossary.scss similarity index 100% rename from src/sass/misc/_glossary.scss rename to assets/sass/misc/_glossary.scss diff --git a/src/sass/misc/_header.scss b/assets/sass/misc/_header.scss similarity index 100% rename from src/sass/misc/_header.scss rename to assets/sass/misc/_header.scss diff --git a/src/sass/misc/_involve-block.scss b/assets/sass/misc/_involve-block.scss similarity index 100% rename from src/sass/misc/_involve-block.scss rename to assets/sass/misc/_involve-block.scss diff --git a/src/sass/misc/_landing.scss b/assets/sass/misc/_landing.scss similarity index 100% rename from src/sass/misc/_landing.scss rename to assets/sass/misc/_landing.scss diff --git a/src/sass/misc/_logo-gallery.scss b/assets/sass/misc/_logo-gallery.scss similarity index 100% rename from src/sass/misc/_logo-gallery.scss rename to assets/sass/misc/_logo-gallery.scss diff --git a/src/sass/misc/_menu.scss b/assets/sass/misc/_menu.scss similarity index 100% rename from src/sass/misc/_menu.scss rename to assets/sass/misc/_menu.scss diff --git a/src/sass/misc/_modal.scss b/assets/sass/misc/_modal.scss similarity index 100% rename from src/sass/misc/_modal.scss rename to assets/sass/misc/_modal.scss diff --git a/src/sass/misc/_multi-block.scss b/assets/sass/misc/_multi-block.scss similarity index 100% rename from src/sass/misc/_multi-block.scss rename to assets/sass/misc/_multi-block.scss diff --git a/src/sass/misc/_notfound.scss b/assets/sass/misc/_notfound.scss similarity index 100% rename from src/sass/misc/_notfound.scss rename to assets/sass/misc/_notfound.scss diff --git a/src/sass/misc/_pagenav.scss b/assets/sass/misc/_pagenav.scss similarity index 100% rename from src/sass/misc/_pagenav.scss rename to assets/sass/misc/_pagenav.scss diff --git a/src/sass/misc/_panel.scss b/assets/sass/misc/_panel.scss similarity index 100% rename from src/sass/misc/_panel.scss rename to assets/sass/misc/_panel.scss diff --git a/src/sass/misc/_partner-component.scss b/assets/sass/misc/_partner-component.scss similarity index 100% rename from src/sass/misc/_partner-component.scss rename to assets/sass/misc/_partner-component.scss diff --git a/src/sass/misc/_popover.scss b/assets/sass/misc/_popover.scss similarity index 100% rename from src/sass/misc/_popover.scss rename to assets/sass/misc/_popover.scss diff --git a/src/sass/misc/_primary.scss b/assets/sass/misc/_primary.scss similarity index 100% rename from src/sass/misc/_primary.scss rename to assets/sass/misc/_primary.scss diff --git a/src/sass/misc/_relnote-actions.scss b/assets/sass/misc/_relnote-actions.scss similarity index 100% rename from src/sass/misc/_relnote-actions.scss rename to assets/sass/misc/_relnote-actions.scss diff --git a/src/sass/misc/_search-results.scss b/assets/sass/misc/_search-results.scss similarity index 100% rename from src/sass/misc/_search-results.scss rename to assets/sass/misc/_search-results.scss diff --git a/src/sass/misc/_section-index.scss b/assets/sass/misc/_section-index.scss similarity index 100% rename from src/sass/misc/_section-index.scss rename to assets/sass/misc/_section-index.scss diff --git a/src/sass/misc/_security-grid.scss b/assets/sass/misc/_security-grid.scss similarity index 100% rename from src/sass/misc/_security-grid.scss rename to assets/sass/misc/_security-grid.scss diff --git a/src/sass/misc/_see-also.scss b/assets/sass/misc/_see-also.scss similarity index 100% rename from src/sass/misc/_see-also.scss rename to assets/sass/misc/_see-also.scss diff --git a/src/sass/misc/_sidebar.scss b/assets/sass/misc/_sidebar.scss similarity index 100% rename from src/sass/misc/_sidebar.scss rename to assets/sass/misc/_sidebar.scss diff --git a/src/sass/misc/_solutions.scss b/assets/sass/misc/_solutions.scss similarity index 100% rename from src/sass/misc/_solutions.scss rename to assets/sass/misc/_solutions.scss diff --git a/src/sass/misc/_stickers.scss b/assets/sass/misc/_stickers.scss similarity index 100% rename from src/sass/misc/_stickers.scss rename to assets/sass/misc/_stickers.scss diff --git a/src/sass/misc/_tabset.scss b/assets/sass/misc/_tabset.scss similarity index 100% rename from src/sass/misc/_tabset.scss rename to assets/sass/misc/_tabset.scss diff --git a/src/sass/misc/_toc.scss b/assets/sass/misc/_toc.scss similarity index 100% rename from src/sass/misc/_toc.scss rename to assets/sass/misc/_toc.scss diff --git a/src/sass/themes/_brand.scss b/assets/sass/themes/_brand.scss similarity index 100% rename from src/sass/themes/_brand.scss rename to assets/sass/themes/_brand.scss diff --git a/src/sass/themes/_dark-theme-syntax.scss b/assets/sass/themes/_dark-theme-syntax.scss similarity index 100% rename from src/sass/themes/_dark-theme-syntax.scss rename to assets/sass/themes/_dark-theme-syntax.scss diff --git a/src/sass/themes/_dark-theme.scss b/assets/sass/themes/_dark-theme.scss similarity index 100% rename from src/sass/themes/_dark-theme.scss rename to assets/sass/themes/_dark-theme.scss diff --git a/src/sass/themes/_light-theme-syntax.scss b/assets/sass/themes/_light-theme-syntax.scss similarity index 100% rename from src/sass/themes/_light-theme-syntax.scss rename to assets/sass/themes/_light-theme-syntax.scss diff --git a/src/sass/themes/_light-theme.scss b/assets/sass/themes/_light-theme.scss similarity index 100% rename from src/sass/themes/_light-theme.scss rename to assets/sass/themes/_light-theme.scss diff --git a/src/sass/themes/_vars.scss b/assets/sass/themes/_vars.scss similarity index 100% rename from src/sass/themes/_vars.scss rename to assets/sass/themes/_vars.scss diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 083a1fa954..8a81333ddf 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -117,7 +117,11 @@ - + + {{- $opts := dict "transpiler" "libsass" "targetPath" "css/style.css" -}} + {{- with resources.Get "sass/_all.scss" | toCSS $opts | minify | fingerprint -}} + + {{- end -}} diff --git a/netlify.toml b/netlify.toml index 2e54824f1b..9458eae5cf 100644 --- a/netlify.toml +++ b/netlify.toml @@ -2,7 +2,7 @@ publish = "public" [build.environment] - HUGO_VERSION = "0.133.0" + HUGO_VERSION = "0.139.3" NODE_VERSION = "18.18.2" BUILD_WITH_CONTAINER = "0" GO_VERSION = "1.21.3" diff --git a/scripts/gen_site.sh b/scripts/gen_site.sh index dedfe00d5c..ea3e4f8b08 100755 --- a/scripts/gen_site.sh +++ b/scripts/gen_site.sh @@ -16,10 +16,8 @@ set -e -mkdir -p generated/css generated/js generated/img tmp/js +mkdir -p generated/js generated/img tmp/js -sass src/sass/_all.scss all.css -s compressed --no-source-map -mv all.css* generated/css tsc babel --source-maps --minified --no-comments --presets minify \