Add Dart Sass support

But note that the Dart Sass Embedded Protocol is still in beta (beta 5), a main release scheduled for Q1 2021.

Fixes gohugoio#7380
Fixes gohugoio#8102

.github/workflows/test.yml

@@ -0,0 +1,74 @@
+on: [push, pull_request]
+name: Test
+jobs:
+  test:
+    env:
+      GOPROXY: https://proxy.golang.org
+      HUGO_BUILD_TAGS: extended
+      GO111MODULE: on
+      HUGO_TIMEOUT: 31000 
+    strategy:
+      matrix:
+        go-version: [1.15.x]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Install Go
+      uses: actions/setup-go@37335c7bb261b353407cff977110895fa0b4f7d8
+      with:
+        go-version: ${{ matrix.go-version }}
+    - name: Install Ruby
+      uses: actions/setup-ruby@5f29a1cd8dfebf420691c4c9a0e832e2fae5a526
+      with:
+        ruby-version: '2.7'
+    - name: Install Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    - name: Install Mage
+      run: go get github.com/magefile/mage@07afc7d24f4d6d6442305d49552f04fbda5ccb3e
+    - name: Install asciidoctor
+      uses: reitzig/actions-asciidoctor@7570212ae20b63653481675fb1ff62d1073632b0
+    - name: Checkout code
+      uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+    - run: pip install docutils
+    - run: rst2html.py --version
+    - if: matrix.os == 'ubuntu-latest'
+      run: |
+        sudo apt-get update -y
+        sudo apt-get install -y pandoc
+    - if: matrix.os == 'macos-latest'
+      run: |
+        brew install pandoc
+    - if: matrix.os == 'windows-latest'
+      run: |
+        choco install pandoc
+    - run: pandoc -v
+    - name: Install dart-sass-embedded Linux
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.5/sass_embedded-1.0.0-beta.5-linux-x64.tar.gz;
+        echo "642738beaea4ef1b9168446bc105267a2948a5e939537f5bd5afb48159140a44  sass_embedded-1.0.0-beta.5-linux-x64.tar.gz" | sha256sum -c;
+        tar -xvf sass_embedded-1.0.0-beta.5-linux-x64.tar.gz;
+        echo "$GITHUB_WORKSPACE/sass_embedded/" >> $GITHUB_PATH
+    - name: Install dart-sass-embedded MacOS
+      if: matrix.os == 'macos-latest'
+      run: |
+        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.5/sass_embedded-1.0.0-beta.5-macos-x64.tar.gz;
+        echo "47b55a39126155f89fdfb8eea7c19ba976b3f6fadbdb6867e5582a18137bd180  sass_embedded-1.0.0-beta.5-macos-x64.tar.gz" | shasum -a 256 -c;
+        tar -xvf sass_embedded-1.0.0-beta.5-macos-x64.tar.gz;
+        echo "$GITHUB_WORKSPACE/sass_embedded/" >> $GITHUB_PATH
+    - name: Install dart-sass-embedded Windows
+      if: matrix.os == 'windows-latest'
+      run: |
+        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.5/sass_embedded-1.0.0-beta.5-windows-x64.zip;
+        echo "5e65c0d8cbe038b6a120a3e7f390ad731708998f37c2de8ba565c51746a4588c  sass_embedded-1.0.0-beta.5-windows-x64.zip" | sha256sum -c;
+        unzip sass_embedded-1.0.0-beta.5-windows-x64.zip;
+        echo  "$env:GITHUB_WORKSPACE/sass_embedded/" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf-8 -Append
+    - name: Test
+      run: |
+        mage -v test
+        mage -v check;
+        mage -v hugo
+        HUGO_IGNOREERRORS=error-remote-getjson ./hugo -s docs/
+        HUGO_IGNOREERRORS=error-remote-getjson ./hugo --renderToMemory -s docs/

.travis.yml

@@ -8,7 +8,8 @@ env:
     - GO111MODULE=on
     - GOPROXY=https://proxy.golang.org
     - HUGO_BUILD_TAGS=extended
-
+    - HUGO_IGNOREERRORS=error-remote-getjson
+
 git:
   depth: false
 go:
@@ -46,13 +47,30 @@ cache:
     - $HOME/AppData/Local/go-build
 
 before_install:
+  - mkdir -p $HOME/bin
+  - export PATH="$HOME/bin":"$PATH";
+  - echo "Home is $HOME";
+  - echo "Path is $PATH";
   - df -h
-    # https://travis-ci.community/t/go-cant-find-gcc-with-go1-11-1-on-windows/293/5
   - if [ "$TRAVIS_OS_NAME" = "windows" ]; then
         choco install mingw -y;
         choco install -y --force nodejs;
+        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.5/sass_embedded-1.0.0-beta.5-windows-x64.zip;
+        echo "5e65c0d8cbe038b6a120a3e7f390ad731708998f37c2de8ba565c51746a4588c  sass_embedded-1.0.0-beta.5-windows-x64.zip" | sha256sum -c - || exit 1;
+        unzip sass_embedded-1.0.0-beta.5-windows-x64.zip -d $HOME/bin;
         export PATH=/c/tools/mingw64/bin:"$PATH";
     fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.5/sass_embedded-1.0.0-beta.5-macos-x64.tar.gz;
+        echo "47b55a39126155f89fdfb8eea7c19ba976b3f6fadbdb6867e5582a18137bd180  sass_embedded-1.0.0-beta.5-macos-x64.zip" | sha256sum -c - || exit 1;
+        tar -xvf sass_embedded-1.0.0-beta.5-macos-x64.tar.gz -C $HOME/bin;
+    fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.5/sass_embedded-1.0.0-beta.5-linux-x64.tar.gz;
+        echo "642738beaea4ef1b9168446bc105267a2948a5e939537f5bd5afb48159140a44  sass_embedded-1.0.0-beta.5-linux-x64.zip" | sha256sum -c - || exit 1;
+        tar -xvf sass_embedded-1.0.0-beta.5-linux-x64.tar.gz -C $HOME/bin;
+    fi
+  - ls $HOME/bin;
   - gem install asciidoctor
   - type asciidoctor
 
@@ -73,6 +91,6 @@ script:
         HUGO_TIMEOUT=30000 mage -v check;
     fi
   - mage -v hugo
-  - HUGO_IGNOREERRORS=error-remote-getjson ./hugo -s docs/
-  - HUGO_IGNOREERRORS=error-remote-getjson ./hugo --renderToMemory -s docs/
+  - ./hugo -s docs/
+  - ./hugo --renderToMemory -s docs/
   - df -h

common/herrors/error_locator.go

@@ -70,7 +70,7 @@ func (e ErrorContext) Position() text.Position {
 
 var _ causer = (*ErrorWithFileContext)(nil)
 
-// ErrorWithFileContext is an error with some additional file context related
+// ErrorWithFileCoxntext is an error with some additional file context related
 // to that error.
 type ErrorWithFileContext struct {
 	cause error

deleteme.travis.yml

@@ -0,0 +1,95 @@
+language: go
+
+dist: bionic
+
+env:
+  global:
+    - CACHE_NAME=${TRAVIS_ARCH}
+    - GO111MODULE=on
+    - GOPROXY=https://proxy.golang.org
+    - HUGO_BUILD_TAGS=extended
+
+git:
+  depth: false
+go:
+  - "1.14.8"
+  - "1.15.1"
+  - master
+
+arch:
+  - amd64
+  - arm64
+
+os:
+  - linux
+  - osx
+  - windows
+
+jobs:
+  allow_failures:
+    - go: master
+    - arch: arm64
+  fast_finish: true
+  exclude:
+    - os: windows
+      go: master
+    - arch: arm64
+      os: osx
+    - arch: arm64
+      os: windows
+
+cache:
+  directories:
+    - $HOME/gopath/pkg/mod
+    - $HOME/.cache/go-build
+    - $HOME/Library/Caches/go-build
+    - $HOME/AppData/Local/go-build
+
+before_install:
+  - mkdir -p $HOME/bin
+  - export PATH="$HOME/bin":"$PATH";
+  - echo "Home is $HOME";
+  - echo "Path is $PATH";
+  - df -h
+  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then
+        choco install mingw -y;
+        choco install -y --force nodejs;
+        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.5/sass_embedded-1.0.0-beta.5-windows-x64.zip;
+        echo "5e65c0d8cbe038b6a120a3e7f390ad731708998f37c2de8ba565c51746a4588c  sass_embedded-1.0.0-beta.5-windows-x64.zip" | sha256sum -c - || exit 1;
+        unzip sass_embedded-1.0.0-beta.5-windows-x64.zip -d $HOME/bin;
+        export PATH=/c/tools/mingw64/bin:"$PATH";
+    fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.5/sass_embedded-1.0.0-beta.5-macos-x64.tar.gz;
+        echo "47b55a39126155f89fdfb8eea7c19ba976b3f6fadbdb6867e5582a18137bd180  sass_embedded-1.0.0-beta.5-macos-x64.zip" | sha256sum -c - || exit 1;
+        tar -xvf sass_embedded-1.0.0-beta.5-macos-x64.tar.gz -C $HOME/bin;
+    fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.5/sass_embedded-1.0.0-beta.5-linux-x64.tar.gz;
+        echo "642738beaea4ef1b9168446bc105267a2948a5e939537f5bd5afb48159140a44  sass_embedded-1.0.0-beta.5-linux-x64.zip" | sha256sum -c - || exit 1;
+        tar -xvf sass_embedded-1.0.0-beta.5-linux-x64.tar.gz -C $HOME/bin;
+    fi
+  - ls $HOME/bin;
+  - gem install asciidoctor
+  - type asciidoctor
+
+install:
+  - mkdir -p $HOME/src
+  - mv $TRAVIS_BUILD_DIR $HOME/src
+  - export TRAVIS_BUILD_DIR=$HOME/src/hugo
+  - cd $HOME/src/hugo
+  - go get github.com/magefile/mage
+
+script:
+  - go mod download
+  - go mod verify
+  - mage -v test
+  - if [ "$TRAVIS_ARCH" = "amd64" ]; then
+        mage -v check;
+    else
+        HUGO_TIMEOUT=30000 mage -v check;
+    fi
+  - mage -v hugo
+  - HUGO_IGNOREERRORS=error-remote-getjson ./hugo -s docs/
+  - HUGO_IGNOREERRORS=error-remote-getjson ./hugo --renderToMemory -s docs/
+  - df -h

deps/deps.go

@@ -94,6 +94,9 @@ type Deps struct {
 	// BuildStartListeners will be notified before a build starts.
 	BuildStartListeners *Listeners
 
+	// Resources that gets closed when the build is done or the server shuts down.
+	BuildClosers *Closers
+
 	// Atomic values set during a build.
 	// This is common/global for all sites.
 	BuildState *BuildState
@@ -284,6 +287,7 @@ func New(cfg DepsCfg) (*Deps, error) {
 		Site:                    cfg.Site,
 		FileCaches:              fileCaches,
 		BuildStartListeners:     &Listeners{},
+		BuildClosers:            &Closers{},
 		BuildState:              buildState,
 		Running:                 cfg.Running,
 		Timeout:                 time.Duration(timeoutms) * time.Millisecond,
@@ -297,6 +301,10 @@ func New(cfg DepsCfg) (*Deps, error) {
 	return d, nil
 }
 
+func (d *Deps) Close() error {
+	return d.BuildClosers.Close()
+}
+
 // ForLanguage creates a copy of the Deps with the language dependent
 // parts switched out.
 func (d Deps) ForLanguage(cfg DepsCfg, onCreated func(d *Deps) error) (*Deps, error) {
@@ -399,3 +407,28 @@ func (b *BuildState) Incr() int {
 func NewBuildState() BuildState {
 	return BuildState{}
 }
+
+type Closer interface {
+	Close() error
+}
+
+type Closers struct {
+	mu sync.Mutex
+	cs []Closer
+}
+
+func (cs *Closers) Add(c Closer) {
+	cs.mu.Lock()
+	defer cs.mu.Unlock()
+	cs.cs = append(cs.cs, c)
+}
+
+func (cs *Closers) Close() error {
+	cs.mu.Lock()
+	defer cs.mu.Unlock()
+	for _, c := range cs.cs {
+		c.Close()
+	}
+
+	return nil
+}

docs/content/en/hugo-pipes/scss-sass.md

@@ -24,14 +24,19 @@ Any SASS or SCSS file can be transformed into a CSS file using `resources.ToCSS`
 ```
 
 ### Options
+
+transpiler [string] {{< new-in "0.80.0" >}}
+
+: The `transpiler` to use, valid values are `libsass` (default) and `dartsass`. Note that the Embedded Dart Sass project is still in beta (beta 5 at the time of writing). The release is scheduled for Q1 2021. We will try to improve the installation process by then, but if you want to use Hugo with Dart Sass you need to download a release binary from [Embedded Dart Sass](https://github.com/sass/dart-sass-embedded/releases) and make sure it's in your PC's `$PATH` (or `%PATH%` on Windows).
+
 targetPath [string]
 : If not set, the resource's target path will be the asset file original path with its extension replaced by `.css`.
 
 outputStyle [string]
 : Default is `nested`. Other available output styles are `expanded`, `compact` and `compressed`.
 
 precision [int]
-: Precision of floating point math.
+: Precision of floating point math. **Note:** This option is not supported by Dart Sass.
 
 enableSourceMap [bool]
 : When enabled, a source map will be generated.

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/aws/aws-sdk-go v1.35.0
 	github.com/bep/debounce v1.2.0
 	github.com/bep/gitmap v1.1.2
+	github.com/bep/godartsass v0.9.1-0.20201229162022-42bab9ca669b
 	github.com/bep/golibsass v0.7.0
 	github.com/bep/tmc v0.5.1
 	github.com/cli/safeexec v1.0.0

go.sum

@@ -134,6 +134,12 @@ github.com/bep/debounce v1.2.0 h1:wXds8Kq8qRfwAOpAxHrJDbCXgC5aHSzgQb/0gKsHQqo=
 github.com/bep/debounce v1.2.0/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0=
 github.com/bep/gitmap v1.1.2 h1:zk04w1qc1COTZPPYWDQHvns3y1afOsdRfraFQ3qI840=
 github.com/bep/gitmap v1.1.2/go.mod h1:g9VRETxFUXNWzMiuxOwcudo6DfZkW9jOsOW0Ft4kYaY=
+github.com/bep/godartsass v0.9.0 h1:xiO3MVLqXFDPF2TtkIg0ZN/Iot94h1RjaN2+3YrT0yE=
+github.com/bep/godartsass v0.9.0/go.mod h1:nXQlHHk4H1ghUk6n/JkYKG5RD43yJfcfp5aHRqT/pc4=
+github.com/bep/godartsass v0.9.1-0.20201229152512-275947e04c39 h1:XMg4Pi/CzsVVJWty26QK9Xn3XnD/M0NkTKguwtzrs1M=
+github.com/bep/godartsass v0.9.1-0.20201229152512-275947e04c39/go.mod h1:nXQlHHk4H1ghUk6n/JkYKG5RD43yJfcfp5aHRqT/pc4=
+github.com/bep/godartsass v0.9.1-0.20201229162022-42bab9ca669b h1:xPPQmESPYrFdgP9Zw+XBHXdhLC/ZDYfoVnrU3GKucYk=
+github.com/bep/godartsass v0.9.1-0.20201229162022-42bab9ca669b/go.mod h1:nXQlHHk4H1ghUk6n/JkYKG5RD43yJfcfp5aHRqT/pc4=
 github.com/bep/golibsass v0.7.0 h1:/ocxgtPZ5rgp7FA+mktzyent+fAg82tJq4iMsTMBAtA=
 github.com/bep/golibsass v0.7.0/go.mod h1:DL87K8Un/+pWUS75ggYv41bliGiolxzDKWJAq3eJ1MA=
 github.com/bep/tmc v0.5.1 h1:CsQnSC6MsomH64gw0cT5f+EwQDcvZz4AazKunFwTpuI=
@@ -262,6 +268,7 @@ github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3 h1:x95R7cp+rSeeqAMI2knLtQ0DKlaBhv2NrtrOvafPHRo=
@@ -839,6 +846,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA=
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=

htesting/test_helpers.go

@@ -88,6 +88,18 @@ func DiffStrings(s1, s2 string) []string {
 	return DiffStringSlices(strings.Fields(s1), strings.Fields(s2))
 }
 
+// IsCI reports whether we're running in a CI server.
 func IsCI() bool {
 	return (os.Getenv("CI") != "" || os.Getenv("CI_LOCAL") != "") && os.Getenv("CIRCLE_BRANCH") == ""
 }
+
+// IsGitHubAction reports whether we're running in a GitHub Action.
+func IsGitHubAction() bool {
+	return os.Getenv("GITHUB_ACTION") != ""
+}
+
+// SupportsAll reports whether the running system supports all Hugo features,
+// e.g. Asciidoc, Pandoc etc.
+func SupportsAll() bool {
+	return IsGitHubAction()
+}

hugofs/walk_test.go

@@ -82,7 +82,14 @@ func TestWalkRootMappingFs(t *testing.T) {
 }
 
 func skipSymlink() bool {
-	return runtime.GOOS == "windows" && os.Getenv("CI") == ""
+	if runtime.GOOS != "windows" {
+		return false
+	}
+	if os.Getenv("GITHUB_ACTION") != "" {
+		// TODO(bep) figure out why this fails on GitHub Actions.
+		return true
+	}
+	return os.Getenv("CI") == ""
 }
 
 func TestWalkSymbolicLink(t *testing.T) {

hugolib/hugo_sites_build.go

@@ -48,6 +48,11 @@ func (h *HugoSites) Build(config BuildCfg, events ...fsnotify.Event) error {
 		// Make sure we don't trigger rebuilds in parallel.
 		h.runningMu.Lock()
 		defer h.runningMu.Unlock()
+	} else {
+		defer func() {
+			// TODO1 server close
+			h.Deps.BuildClosers.Close()
+		}()
 	}
 
 	ctx, task := trace.NewTask(context.Background(), "Build")