github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

dartsass: Add sourceMapIncludeSources option

Browse source
This commit is contained in:
Bjørn Erik Pedersen 2022-12-02 09:26:38 +01:00
parent 7d16c3c0c1
commit e93138dfdb
4 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
.github/workflows/test.yml vendored
View file

@ -4,17 +4,16 @@ on:
pull_request: pull_request:
name: Test name: Test
env: env:
DART_SASS_VERSION: 1.56.1 GOPROXY: https://proxy.golang.org
DART_SASS_SHA_LINUX: c6dd75ab1acb2cab98982a32622c0ba631cfaa753e7bac84efd32c6c19ea9303 GO111MODULE: on
DART_SASS_SHA_MACOS: df6f4813501f906ffc8f8af865452b037bc1c3a17448c4b8ffa3be82793eb0c8 DART_SASS_VERSION: 1.56.1
DART_SASS_SHA_WINDOWS: c8bf9c009afd6bbeb1742e010845b84e1021fdba6edc80b4dd1fbbee75354b39 DART_SASS_SHA_LINUX: c6dd75ab1acb2cab98982a32622c0ba631cfaa753e7bac84efd32c6c19ea9303
DART_SASS_SHA_MACOS: df6f4813501f906ffc8f8af865452b037bc1c3a17448c4b8ffa3be82793eb0c8
DART_SASS_SHA_WINDOWS: c8bf9c009afd6bbeb1742e010845b84e1021fdba6edc80b4dd1fbbee75354b39
permissions: permissions:
contents: read contents: read
jobs: jobs:
test: test:
env:
GOPROXY: https://proxy.golang.org
GO111MODULE: on
strategy: strategy:
matrix: matrix:
# Note: We upgraded to Go 1.18 in Hugo v0.95.0 # Note: We upgraded to Go 1.18 in Hugo v0.95.0
@ -70,23 +69,25 @@ jobs:
- if: matrix.os == 'ubuntu-latest' - if: matrix.os == 'ubuntu-latest'
name: Install dart-sass-embedded Linux name: Install dart-sass-embedded Linux
run: | run: |
curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/${DART_SASS_VERSION}/sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz; echo "Install Dart Sass version ${DART_SASS_VERSION} ..."
curl -LJO "https://github.com/sass/dart-sass-embedded/releases/download/${DART_SASS_VERSION}/sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz";
echo "${DART_SASS_SHA_LINUX} sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz" | sha256sum -c; echo "${DART_SASS_SHA_LINUX} sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz" | sha256sum -c;
tar -xvf sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz; tar -xvf "sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz";
echo "$GITHUB_WORKSPACE/sass_embedded/" >> $GITHUB_PATH echo "$GITHUB_WORKSPACE/sass_embedded/" >> $GITHUB_PATH
- if: matrix.os == 'macos-latest' - if: matrix.os == 'macos-latest'
name: Install dart-sass-embedded MacOS name: Install dart-sass-embedded MacOS
run: | run: |
curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/${DART_SASS_VERSION}/sass_embedded-${DART_SASS_VERSION}-macos-x64.tar.gz; echo "Install Dart Sass version ${DART_SASS_VERSION} ..."
echo "${DART_SASS_SHA_MACOS} sass_embedded-${DART_SASS_VERSION}-macos-x64.tar.gz" | shasum -a 256 -c; curl -LJO "https://github.com/sass/dart-sass-embedded/releases/download/${DART_SASS_VERSION}/sass_embedded-${DART_SASS_VERSION}-macos-x64.tar.gz";
tar -xvf sass_embedded-${DART_SASS_VERSION}-macos-x64.tar.gz; echo "${DART_SASS_SHA_MACOS} sass_embedded-${DART_SASS_VERSION}-macos-x64.tar.gz" | shasum -a 256 -c;
tar -xvf "sass_embedded-${DART_SASS_VERSION}-macos-x64.tar.gz";
echo "$GITHUB_WORKSPACE/sass_embedded/" >> $GITHUB_PATH echo "$GITHUB_WORKSPACE/sass_embedded/" >> $GITHUB_PATH
- if: matrix.os == 'windows-latest' - if: matrix.os == 'windows-latest'
name: Install dart-sass-embedded Windows name: Install dart-sass-embedded Windows
run: | run: |
curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/${DART_SASS_VERSION}/sass_embedded-${DART_SASS_VERSION}-windows-x64.zip; echo "Install Dart Sass version ${env:DART_SASS_VERSION} ..."
echo "${DART_SASS_SHA_WINDOWS} sass_embedded-${DART_SASS_VERSION}-windows-x64.zip" | sha256sum -c; curl -LJO "https://github.com/sass/dart-sass-embedded/releases/download/${env:DART_SASS_VERSION}/sass_embedded-${env:DART_SASS_VERSION}-windows-x64.zip";
unzip sass_embedded-${DART_SASS_VERSION}-windows-x64.zip; Expand-Archive -Path "sass_embedded-${env:DART_SASS_VERSION}-windows-x64.zip" -DestinationPath .;
echo "$env:GITHUB_WORKSPACE/sass_embedded/" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf-8 -Append echo "$env:GITHUB_WORKSPACE/sass_embedded/" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf-8 -Append
- name: Check - name: Check
run: | run: |

3
docs/content/en/hugo-pipes/scss-sass.md
View file

@ -38,6 +38,9 @@ precision [int]
enableSourceMap [bool] enableSourceMap [bool]
: When enabled, a source map will be generated. : When enabled, a source map will be generated.
sourceMapIncludeSources [bool]
: When enabled, sources will be embedded in the generated source map. (Dart Sass only). {{< new-in "0.108.0" >}}
includePaths [string slice] includePaths [string slice]
: Additional SCSS/Sass include paths. Paths must be relative to the project directory. : Additional SCSS/Sass include paths. Paths must be relative to the project directory.

3
resources/resource_transformers/tocss/dartsass/client.go
View file

@ -127,6 +127,9 @@ type Options struct {
// When enabled, Hugo will generate a source map. // When enabled, Hugo will generate a source map.
EnableSourceMap bool EnableSourceMap bool
// If enabled, sources will be embedded in the generated source map.
SourceMapIncludeSources bool
} }
func decodeOptions(m map[string]any) (opts Options, err error) { func decodeOptions(m map[string]any) (opts Options, err error) {

5
resources/resource_transformers/tocss/dartsass/transform.go
View file

@ -85,8 +85,9 @@ func (t *transform) Transform(ctx *resources.ResourceTransformationCtx) error {
baseDir: baseDir, baseDir: baseDir,
c: t.c, c: t.c,
}, },
OutputStyle: godartsass.ParseOutputStyle(opts.OutputStyle), OutputStyle: godartsass.ParseOutputStyle(opts.OutputStyle),
EnableSourceMap: opts.EnableSourceMap, EnableSourceMap: opts.EnableSourceMap,
SourceMapIncludeSources: opts.SourceMapIncludeSources,
} }
// Append any workDir relative include paths // Append any workDir relative include paths