From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Mon, 20 Jul 2020 20:20:33 +0000 (+0200)
Subject: Merge commit '28bd06265e88454b061810578919d891909a83ad'
X-Git-Tag: v0.74.3~10
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=673e622fa9000c535397fba2b210273cc7d60705;p=brevno-suite%2Fhugo

Merge commit '28bd06265e88454b061810578919d891909a83ad'
---

673e622fa9000c535397fba2b210273cc7d60705
diff --cc docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/single.html
index 8cd28962,00000000..48c015c5
mode 100644,000000..100644
--- a/docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/single.html
+++ b/docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/single.html
@@@ -1,31 -1,0 +1,31 @@@
 +{{ define "main" }}
-   <article class="w-100 ph4 pb5 pb6-ns pt1 pt5-ns">
-     <div class="flex-l">
++<article class="w-100 ph4 pb5 pb6-ns pt1 pt5-ns">
++  <div class="flex-l">
 +
-       <div class="order-2 w-100 w-20-l ph5-m ph0-l mb4 sticky">
++    <div class="order-2 w-100 w-20-l ph5-m ph0-l mb4 sticky">
 +      {{- partial "toc.html" . -}}
-       </div>
++    </div>
 +
-       <div class="order-1 w-60-l mw7 ph0 ph5-ns mid-gray nested-copy-line-height no-underline nested-links nested-img nested-copy-seperator nested-blockquote mt0-ns" style="flex-grow:1;">
-         <div class="documentation-copy center measure-wide-l">
-           <div id="readout" class="fixed right-0 bottom-0">
-           </div>
-           {{ .Render "page" }}
-           {{ partial "related.html" . }}
++    <div class="order-1 w-60-l mw7 ph0 ph5-ns mid-gray nested-copy-line-height no-underline nested-links nested-img nested-copy-seperator nested-blockquote mt0-ns" style="flex-grow:1;">
++      <div class="documentation-copy center measure-wide-l">
++        <div id="readout" class="fixed right-0 bottom-0">
 +        </div>
++        {{ .Render "page" }}
++        {{ partial "related.html" . }}
 +      </div>
-       <div class="order-0 w-20 dn db-l">
-         {{ partial "nav-links-docs.html" . }}
-       </div>
- 
 +    </div>
-   </article>
- 
-   <div class="w-100 bg-light-gray">
-     <div class="mw7 pa4 center nested-lh-copy lh-copy">
-       {{ partial "docs/page-meta-data.html" . }}
-       {{ partial "page-edit.html" . }}
-       {{ partial "tags.html" . }}
++    <div class="order-0 w-20 dn db-l">
++      {{ partial "nav-links-docs.html" . }}
 +    </div>
++
++  </div>
++</article>
++
++<div class="w-100 bg-light-gray">
++  <div class="mw7 pa4 center nested-lh-copy lh-copy">
++    {{ partial "docs/page-meta-data.html" . }}
++    {{ partial "page-edit.html" . }}
++    {{ partial "tags.html" . }}
 +  </div>
- {{ end }}
++</div>
++{{ end }}
diff --cc docs/content/en/hugo-pipes/babel.md
index e34faec4,00000000..5fb5e11e
mode 100755,000000..100755
--- a/docs/content/en/hugo-pipes/babel.md
+++ b/docs/content/en/hugo-pipes/babel.md
@@@ -1,55 -1,0 +1,55 @@@
 +---
 +title: Babel
 +description: Hugo Pipes can process JS files with Babel.
 +date: 2019-03-21
 +publishdate: 2019-03-21
 +lastmod: 2019-03-21
 +categories: [asset management]
 +keywords: []
 +menu:
 +  docs:
 +    parent: "pipes"
-     weight: 49
- weight: 49
- sections_weight: 49
++    weight: 48
++weight: 48
++sections_weight: 48
 +draft: false
 +---
 +
 +Any JavaScript resource file can be transpiled to another JavaScript version using `resources.Babel` which takes for argument the resource object and an optional dict of options listed below. Babel uses the [babel cli](https://babeljs.io/docs/en/babel-cli).
 +
 +
 +{{% note %}}
 +Hugo Pipe's Babel requires the `@babel/cli` and `@babel/core` JavaScript packages to be installed in the project or globally (`npm install -g @babel/cli @babel/core`) along with any Babel plugin(s) or preset(s) used (e.g., `npm install @babel/preset-env --save-dev`).
 +
 +If you are using the Hugo Snap package, Babel and plugin(s) need to be installed locally within your Hugo site directory, e.g., `npm install @babel/cli @babel/core --save-dev` without the `-g` flag.
 +{{% /note %}}
 +
 +### Options
 +
 +config [string]
 +: Path to the Babel configuration file. Hugo will, by default, look for a `babel.config.js` in your project. More information on these configuration files can be found here: [babel configuration](https://babeljs.io/docs/en/configuration).
 +
 +minified [bool]
 +: Save as much bytes as possible when printing
 +
 +noComments [bool]
 +: Write comments to generated output (true by default)
 +
 +compact [bool]
 +: Do not include superfluous whitespace characters and line terminators. Defaults to `auto` if not set.
 +
 +verbose [bool]
 +: Log everything
 +
 +### Examples
 +
 +```go-html-template
 +{{- $transpiled := resources.Get "scripts/main.js" | babel  -}}
 +```
 +
 +Or with options:
 +
 +```go-html-template
 +{{ $opts := dict "noComments" true }}
 +{{- $transpiled := resources.Get "scripts/main.js" | babel $opts -}}
 +```
diff --cc docs/content/en/hugo-pipes/js.md
index 00000000,00000000..b66778eb
new file mode 100644
--- /dev/null
+++ b/docs/content/en/hugo-pipes/js.md
@@@ -1,0 -1,0 +1,63 @@@
++---
++title: JavaScript Building
++description: Hugo Pipes can process JavaScript files with [ESBuild](https://github.com/evanw/esbuild).
++date: 2020-07-20
++publishdate: 2020-07-20
++lastmod: 2020-07-20
++categories: [asset management]
++keywords: []
++menu:
++  docs:
++    parent: "pipes"
++    weight: 45
++weight: 45
++sections_weight: 45
++draft: false
++---
++
++Any JavaScript resource file can be transpiled and "tree shaken" using `js.Build` which takes for argument either a string for the filepath or a dict of options listed below.
++
++### Options
++
++targetPath [string]
++: If not set, the source path will be used as the base target path. 
++Note that the target path's extension may change if the target MIME type is different, e.g. when the source is TypeScript.
++
++minify [bool]
++: Let `js.Build` handle the minification.
++
++target [string]
++: The language target.
++  One of: `es2015`, `es2016`, `es2017`, `es2018`, `es2019`, `es2020` or `esnext`.
++  Default is `esnext`.
++
++externals [slice]
++: External dependencies. If a dependency should not be included in the bundle (Ex. library loaded from a CDN.), it should be listed here.
++
++```go-html-template
++{{ $externals := slice "react" "react-dom" }}
++```
++
++defines [map]
++: Allow to define a set of string replacement to be performed when building. Should be a map where each key is to be replaced by its value.
++
++```go-html-template
++{{ $defines := dict "process.env.NODE_ENV" `"development"` }}
++```
++
++### Examples
++
++```go-html-template
++{{ $built := resources.Get "js/index.js" | js.Build "main.js" }}
++```
++
++Or with options:
++
++```go-html-template
++{{ $externals := slice "react" "react-dom" }}
++{{ $defines := dict "process.env.NODE_ENV" `"development"` }}
++
++{{ $opts := dict "targetPath" "main.js" "externals" $externals "defines" $defines }}
++{{ $built := resources.Get "scripts/main.js" | js.Build $opts }}
++<script type="text/javascript" src="{{ $built.RelPermalink }}" defer></script>
++```
diff --cc docs/content/en/news/0.74.0-relnotes/featured.png
index 00000000,00000000..34f28849
new file mode 100644
Binary files differ
diff --cc docs/content/en/news/0.74.0-relnotes/index.md
index f36421ac,00000000..d793f488
mode 100644,000000..100644
--- a/docs/content/en/news/0.74.0-relnotes/index.md
+++ b/docs/content/en/news/0.74.0-relnotes/index.md
@@@ -1,81 -1,0 +1,85 @@@
 +
 +---
 +date: 2020-07-13
- title: "0.74.0"
- description: "0.74.0"
++title: "Native JS Bundler, Open API Support, Inline Partials"
++description: "Hugo 0.74.0 brings blazingly fast native JavaScript bundling, with minification, tree shaking, scope hoisting for ES6 modules, and transpilation of JSX and newer JS syntax down to ES6. And more."
 +categories: ["Releases"]
 +---
 +
- 	**Note:** The documentation site isn't updated with all of the main new things below. We will get to it soon.
++**Note:** The documentation site isn't updated with all of the main new things below. We will get to it soon. See https://github.com/gohugoio/hugoDocs/issues/1171
 +
- This release comes with native JavaScript bundling (and minifier), with [import](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import) support (from `node_modules` etc.), tree shaking, scope hoisting for ES6 modules, transpilation of JSX and newer JS syntax down to ES6, JavaScript/JSX and TypeScript/TSX support. And it's _very fast_. [Benchmarks](https://github.com/evanw/esbuild#benchmarks) rates it at least 100x faster than the other JavaScript bundlers included. This new feature is backed by the very impressive [ESBuild](https://github.com/evanw/esbuild) project by [@evanw](https://github.com/evanw). Many thanks to [@remko](https://github.com/remko) for the integration work.
++This release comes with native JavaScript bundling (and minifier), with [import](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import) support (from `node_modules` etc.), tree shaking, scope hoisting for ES6 modules, transpilation of JSX and newer JS syntax down to ES6, JavaScript/JSX and TypeScript/TSX support. And it's _very fast_. [Benchmarks](https://github.com/evanw/esbuild#benchmarks) rates it **at least 100x faster** than the other JavaScript bundlers included. This new feature is backed by the very impressive [ESBuild](https://github.com/evanw/esbuild) project by [@evanw](https://github.com/evanw). Many thanks to [@remko](https://github.com/remko) for the integration work.
 +
++A very simple example building a TypeScript file:
++
++```go-html-template
++{{ $js := resources.Get "js/main.ts" | js.Build }}
++```
 +This release also comes with Open API 3-support. This makes it much easier to create "Swagger styled" API-documentation. The below will unmarshal your YAML file into [this object graph](https://godoc.org/github.com/getkin/kin-openapi/openapi3#Swagger):
 +
- ````go-html-template
++```go-html-template
 +{{ $api := resources.Get "api/openapi.yaml" | openapi3.Unmarshal }}
 +```
 +
 +Hugo's Asciidoc integration has also gotten a face lift. A big shoutout to [@muenchhausen](https://github.com/muenchhausen) and [@bwklein](https://github.com/bwklein) for their work on this.
 +
++And finally, [partials](https://gohugo.io/templates/partials/#inline-partials) can now be defined inline -- and that is way more useful than it sounds.
++ 
 +
- This release represents **23 contributions by 9 contributors** to the main Hugo code base.[@bep](https://github.com/bep) leads the Hugo development with a significant amount of contributions, but also a big shoutout to [@niklasfasching](https://github.com/niklasfasching), [@bwklein](https://github.com/bwklein, and [@muenchhausen](https://github.com/muenchhausen) for their ongoing contributions.
++This release represents **23 contributions by 9 contributors** to the main Hugo code base. [@bep](https://github.com/bep) leads the Hugo development with a significant amount of contributions, but also a big shoutout to [@niklasfasching](https://github.com/niklasfasching), [@bwklein](https://github.com/bwklein), and [@muenchhausen](https://github.com/muenchhausen) for their ongoing contributions.
 +
 +And a big thanks to [@digitalcraftsman](https://github.com/digitalcraftsman) for his relentless work on keeping the themes site in pristine condition and to [@davidsneighbour](https://github.com/davidsneighbour), [@coliff](https://github.com/coliff) and [@kaushalmodi](https://github.com/kaushalmodi) for all the great work on the documentation site.
 +
 +Many have also been busy writing and fixing the documentation in [hugoDocs](https://github.com/gohugoio/hugoDocs), 
 +which has received **8 contributions by 7 contributors**. A special thanks to [@OmarEmaraDev](https://github.com/OmarEmaraDev), [@regisphilibert](https://github.com/regisphilibert), [@coliff](https://github.com/coliff), and [@jessicahuynh](https://github.com/jessicahuynh) for their work on the documentation site.
 +
 +
 +Hugo now has:
 +
 +* 45377+ [stars](https://github.com/gohugoio/hugo/stargazers)
 +* 438+ [contributors](https://github.com/gohugoio/hugo/graphs/contributors)
 +* 331+ [themes](http://themes.gohugo.io/)
 +
 +## Enhancements
 +
 +### Templates
 +
 +* Add strings.Count [028b3567](https://github.com/gohugoio/hugo/commit/028b356787426dbc190ce9868fbc9a6400c2996e) [@bep](https://github.com/bep) [#7453](https://github.com/gohugoio/hugo/issues/7453)
 +* Add debug.Dump [defd7106](https://github.com/gohugoio/hugo/commit/defd7106bf79a502418ec373bdb82742b16f777f) [@bep](https://github.com/bep) [#3957](https://github.com/gohugoio/hugo/issues/3957)
 +
 +### Output
 +
 +* Add proper Media Type handling in js.Build [9df98ec4](https://github.com/gohugoio/hugo/commit/9df98ec49ca9fa326125ccfee626b6e46c6ab14b) [@bep](https://github.com/bep) [#732](https://github.com/gohugoio/hugo/issues/732)
 +
 +### Core
 +
 +* Add missing zero check on file [ccfaeb67](https://github.com/gohugoio/hugo/commit/ccfaeb678b312535928af3451324a54f2c7cb199) [@bep](https://github.com/bep) 
 +
 +### Other
 +
 +* Regenerate docs helper [25e3da33](https://github.com/gohugoio/hugo/commit/25e3da3343b5cd4bbcd11fa76b382fb089971840) [@bep](https://github.com/bep) 
 +* Add js.Build asset bundling [2fc33807](https://github.com/gohugoio/hugo/commit/2fc33807077cd25bf91f2298bf1a8ace126881a7) [@remko](https://github.com/remko) [#7321](https://github.com/gohugoio/hugo/issues/7321)
 +* Add openapi3.Unmarshal [12a65e76](https://github.com/gohugoio/hugo/commit/12a65e76df9470d9563b91a22969ddb41b7c19aa) [@bep](https://github.com/bep) [#7442](https://github.com/gohugoio/hugo/issues/7442)[#7443](https://github.com/gohugoio/hugo/issues/7443)
 +* Remove trailing hyphen from auto heading ID [58c0f5e6](https://github.com/gohugoio/hugo/commit/58c0f5e6171cbf8e3ed8d73ac95a7b85168c5b2f) [@jmooring](https://github.com/jmooring) [#6798](https://github.com/gohugoio/hugo/issues/6798)
 +* Ensure that non-trivial default flag values are passed through. [a1c3e3c1](https://github.com/gohugoio/hugo/commit/a1c3e3c1f32bcbc3b3aa6921bdee98a9f795a2da) [@vangent](https://github.com/vangent) 
 +* Update formats.md doc for new allowed extensions. [e9f87c4e](https://github.com/gohugoio/hugo/commit/e9f87c4e3feee937d05504763935805fec26213c) [@bwklein](https://github.com/bwklein) 
 +* Update config.go to add two Asciidoctor extensions [beb6c03b](https://github.com/gohugoio/hugo/commit/beb6c03bc8f476b753e5f3e3bc7a4a2e3f8ad355) [@bwklein](https://github.com/bwklein) 
 +* Add support for inline partials [4a3efea7](https://github.com/gohugoio/hugo/commit/4a3efea7efe59cd3de7d0eb352836ab395a2b6b3) [@bep](https://github.com/bep) [#7444](https://github.com/gohugoio/hugo/issues/7444)
 +* Add support for native Org dates in frontmatter [c66dc6c7](https://github.com/gohugoio/hugo/commit/c66dc6c74fa3bbe308ccaade8c76071b49908129) [@sometimesfood](https://github.com/sometimesfood) 
 +* Update go-org to v1.3.0 [127d5feb](https://github.com/gohugoio/hugo/commit/127d5feb32b466c4a0035e81f86684920dd88cfe) [@niklasfasching](https://github.com/niklasfasching) 
 +* Update go-org to v1.2.0 [2d42ba91](https://github.com/gohugoio/hugo/commit/2d42ba912ba945230aa0be23c3c8256cba40ce99) [@niklasfasching](https://github.com/niklasfasching) 
 +* Update bug_report.md [5b7b5dea](https://github.com/gohugoio/hugo/commit/5b7b5dea1fe3494995c6a9c3368087abf47cdc12) [@bep](https://github.com/bep) 
 +* Remove some unused code [057b1377](https://github.com/gohugoio/hugo/commit/057b1377c5f4d0d80ee299293db06384a475ad19) [@bep](https://github.com/bep) 
 +* Add an option to print memory usage at intervals [48dbb593](https://github.com/gohugoio/hugo/commit/48dbb593f7cc0dceb55d232ac198e82f3df1c964) [@bep](https://github.com/bep) 
 +* Rework external asciidoctor integration [f0266e2e](https://github.com/gohugoio/hugo/commit/f0266e2ef3487bc57dd05402002fc816e3b40195) [@muenchhausen](https://github.com/muenchhausen) 
 +* Enable the embedded template test when race detector is off [77aa385b](https://github.com/gohugoio/hugo/commit/77aa385b84dbc1805ff7e34dafeadb181905c689) [@bep](https://github.com/bep) [#5926](https://github.com/gohugoio/hugo/issues/5926)
 +* Merge branch 'release-0.73.0' [545a1c1c](https://github.com/gohugoio/hugo/commit/545a1c1cedc93d091050bae07c02fc2435ad2d20) [@bep](https://github.com/bep) 
 +* Updated installation instruction about Sass/SCSS support [0b579db8](https://github.com/gohugoio/hugo/commit/0b579db80fba1bde7dab07ea92d622dd6214dcfb) [@mateusz-szczyrzyca](https://github.com/mateusz-szczyrzyca) 
 +
 +## Fixes
 +
 +### Other
 +
 +* Fix server reload when non-HTML shortcode changes [42e150fb](https://github.com/gohugoio/hugo/commit/42e150fbfac736bd49bc7e50cb8cdf9f81386f59) [@bep](https://github.com/bep) [#7448](https://github.com/gohugoio/hugo/issues/7448)
 +
 +
- 
- 
- 
diff --cc docs/content/en/news/0.74.1-relnotes/index.md
index 8ab97f10,00000000..7419296a
mode 100644,000000..100644
--- a/docs/content/en/news/0.74.1-relnotes/index.md
+++ b/docs/content/en/news/0.74.1-relnotes/index.md
@@@ -1,19 -1,0 +1,19 @@@
 +
 +---
 +date: 2020-07-13
 +title: "Hugo 0.74.1: A couple of Bug Fixes"
- description: "This version fixes a couple of bugs introduced in 0.74.0."
++description: "This version fixes one issue introduced in 0.74.0."
 +categories: ["Releases"]
 +images:
 +- images/blog/hugo-bug-poster.png
 +
 +---
 +
 +	
 +
 +This is a bug-fix release with one important fix.
 +
 +* Fix baseof block regression [c91dbe4c](https://github.com/gohugoio/hugo/commit/c91dbe4ce9c30623ba6e686fd17efae935aa0cc5) [@bep](https://github.com/bep) [#7478](https://github.com/gohugoio/hugo/issues/7478)
 +
 +
 +
diff --cc docs/content/en/news/0.74.2-relnotes/index.md
index 0f77133e,00000000..e78d8564
mode 100644,000000..100644
--- a/docs/content/en/news/0.74.2-relnotes/index.md
+++ b/docs/content/en/news/0.74.2-relnotes/index.md
@@@ -1,19 -1,0 +1,24 @@@
 +
 +---
 +date: 2020-07-17
 +title: "Hugo 0.74.2: A couple of Bug Fixes"
 +description: "This version fixes a couple of bugs introduced in 0.74.0."
 +categories: ["Releases"]
 +images:
 +- images/blog/hugo-bug-poster.png
 +
 +---
 +
 +	
 +
- This is a bug-fix release with one important fix.
++Add .Defines to js.Build options [35011bcb](https://github.com/gohugoio/hugo/commit/35011bcb26b6fcfcbd77dc05aa8246ca45b2c2ba) [@bep](https://github.com/bep) [#7489](https://github.com/gohugoio/hugo/issues/7489)
 +
- * Add .Defines to js.Build options [35011bcb](https://github.com/gohugoio/hugo/commit/35011bcb26b6fcfcbd77dc05aa8246ca45b2c2ba) [@bep](https://github.com/bep) [#7489](https://github.com/gohugoio/hugo/issues/7489)
++This is needed to import `react` as a library, e.g.:
 +
++```
++{{ $jsx := resources.Get "index.jsx" }}
++{{ $options := dict "defines" (dict "process.env.NODE_ENV" "\"development\"") }}
++{{ $js := $jsx | js.Build $options }}
++```
 +
 +
diff --cc docs/netlify.toml
index f02fdbf7,00000000..3ca9763f
mode 100644,000000..100644
--- a/docs/netlify.toml
+++ b/docs/netlify.toml
@@@ -1,31 -1,0 +1,31 @@@
 +[build]
 +publish = "public"
 +command = "hugo --gc --minify"
 +
 +[context.production.environment]
- HUGO_VERSION = "0.73.0"
++HUGO_VERSION = "0.74.2"
 +HUGO_ENV = "production"
 +HUGO_ENABLEGITINFO = "true"
 +
 +[context.split1]
 +command = "hugo --gc --minify --enableGitInfo"
 +
 +[context.split1.environment]
- HUGO_VERSION = "0.73.0"
++HUGO_VERSION = "0.74.2"
 +HUGO_ENV = "production"
 +
 +[context.deploy-preview]
 +command = "hugo --gc --minify --buildFuture -b $DEPLOY_PRIME_URL"
 +
 +[context.deploy-preview.environment]
- HUGO_VERSION = "0.73.0"
++HUGO_VERSION = "0.74.2"
 +
 +[context.branch-deploy]
 +command = "hugo --gc --minify -b $DEPLOY_PRIME_URL"
 +
 +[context.branch-deploy.environment]
- HUGO_VERSION = "0.73.0"
++HUGO_VERSION = "0.74.2"
 +
 +[context.next.environment]
 +HUGO_ENABLEGITINFO = "true"
 +
diff --cc docs/resources/_gen/images/news/0.74.0-relnotes/featured_hu7ff75a56a54dd46c9d2c16ab503af3cf_56047_480x0_resize_catmullrom_2.png
index 00000000,00000000..5b616efa
new file mode 100644
Binary files differ
diff --cc docs/resources/_gen/images/news/0.74.0-relnotes/featured_hu7ff75a56a54dd46c9d2c16ab503af3cf_56047_640x0_resize_catmullrom_2.png
index 00000000,00000000..449b7b30
new file mode 100644
Binary files differ