Skip to content

Commit 0d1d722

Browse files
committed
Update libsass to dart sass
Signed-off-by: Travis Beckham <travis@buoyant.io>
1 parent 7b8afbe commit 0d1d722

60 files changed

Lines changed: 1043 additions & 942 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/on-create.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ set -euo pipefail
55
cd $(mktemp -d)
66

77
# hugo
8-
scurl -O https://github.com/gohugoio/hugo/releases/download/v0.142.0/hugo_extended_0.142.0_linux-amd64.deb
8+
scurl -O https://github.com/gohugoio/hugo/releases/download/v0.142.0/hugo_0.142.0_linux-amd64.deb
99
sudo dpkg -i hugo*.deb
1010
rm hugo*.deb
1111

12+
# dart sass
13+
sudo npm install -g sass-embedded@1.97.3
14+
1215
# htmltest
1316
scurl https://htmltest.wjdp.uk | bash
1417
sudo mv bin/htmltest /usr/local/bin

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ endef
1818
HAS_GSUTIL := $(shell command -v gsutil;)
1919
HAS_FLARECTL := $(shell command -v flarectl;)
2020
HAS_HUGO := $(shell command -v hugo;)
21+
HAS_SASS := $(shell command -v sass;)
2122
HAS_HTMLTEST := $(shell command -v htmltest;)
2223
HAS_MDLINT := $(shell command -v markdownlint;)
2324

@@ -115,6 +116,9 @@ build-linkerd.io: get-versions tmp/linkerd.io
115116
@# Build linkerd.io
116117
ifndef HAS_HUGO
117118
@printf "Install hugo first. For OSX: brew install hugo\n"; exit 1
119+
endif
120+
ifndef HAS_SASS
121+
@printf "Install Dart Sass first: npm install sass\n"; exit 1
118122
endif
119123
cd tmp/linkerd.io && ./build
120124

@@ -146,5 +150,3 @@ has-env-%:
146150
.PHONY: clean
147151
clean:
148152
rm -rf tmp
149-
150-

linkerd.io/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
production-build:
2-
hugo \
2+
npm install --save-dev sass-embedded
3+
PATH="$(CURDIR)/node_modules/.bin:$$PATH" hugo \
34
--cleanDestinationDir \
45
--minify
56

67
preview-build:
7-
hugo \
8+
npm install --save-dev sass-embedded
9+
PATH="$(CURDIR)/node_modules/.bin:$$PATH" hugo \
810
--baseURL $(DEPLOY_PRIME_URL) \
911
--buildDrafts \
1012
--buildFuture \

linkerd.io/README.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,27 @@ docker run \
1212

1313
### Install Hugo to develop locally
1414

15-
For Mac users:
15+
Install Dart Sass first:
16+
17+
```bash
18+
brew install sass/sass/sass
19+
```
20+
21+
Then install Hugo:
1622

1723
```bash
1824
brew install hugo
1925
```
2026

21-
Or download the **extended** release of Hugo from the GitHub
27+
Or download the release of Hugo from the GitHub
2228
[release page](https://github.com/gohugoio/hugo/releases/).
2329

30+
## Hugo version requirements
31+
32+
The minimum version of Hugo needed to build the site is `v0.142.0`.
33+
34+
When linkerd.io is deployed to production, we use Hugo `v0.142.0`.
35+
2436
### Run Hugo locally
2537

2638
From the root `/website` directory, build site and run Hugo in development mode:
@@ -32,12 +44,6 @@ hugo server -s linkerd.io
3244
You should see the site on localhost:1313, and it should reload automatically
3345
upon file write.
3446

35-
## Hugo version requirements
36-
37-
The minimum version of Hugo needed to build the site is `v0.142.0`.
38-
39-
When linkerd.io is deployed to production, we use Hugo `v0.142.0`.
40-
4147
## Website images
4248

4349
Please do not put files in the `static` directory that are referenced on

linkerd.io/assets/scss/_base.scss

Lines changed: 0 additions & 272 deletions
This file was deleted.

0 commit comments

Comments
 (0)