Skip to content

Commit 27a9cfb

Browse files
committed
first pass at a local incremental build
1 parent 94bec68 commit 27a9cfb

File tree

8 files changed

+22
-77
lines changed

8 files changed

+22
-77
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ vendor/
77
/.idea
88
.ruby-version
99
.sass-cache/
10+
.ivy2/
11+
.sbt/
1012
target

README.md

+6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ bin/serve
2525
bundle exec jekyll serve --incremental
2626
```
2727

28+
### For ScalaJs Development
29+
```
30+
sbt ~fastOptJS
31+
```
32+
Then follow `For Compose`
33+
2834
## Viewing the site
2935

3036
Regardless of your method of running Jekyll, the generated site is available at `http://localhost:4000`.

_config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ exclude:
2121
- vendor
2222
- Procfile
2323
- Rakefile
24+
- docker-compose.yml
2425

2526
future: true
2627

bin/build-js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash -x
2+
command -v docker-compose >/dev/null 2>&1 || { echo >&2 "Please install Docker Compose: https://docs.docker.com/compose/install/"; exit 1; }
3+
docker-compose run js-build sbt fullOptJS

bin/serve

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#!/bin/bash
22
command -v docker-compose >/dev/null 2>&1 || { echo >&2 "Please install Docker Compose: https://docs.docker.com/compose/install/"; exit 1; }
3-
docker-compose run --service-ports scala-lang jekyll serve --incremental
3+
docker-compose up
4+
docker-compose stop

docker-compose.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
version: "2"
22
services:
3+
js-build:
4+
image: hseeberger/scala-sbt:latest
5+
volumes:
6+
- $PWD:/root
7+
command: sbt ~fastOptJS
38
scala-lang:
49
image: jekyll/jekyll:latest
510
volumes:
@@ -9,4 +14,5 @@ services:
914
- 4000:4000
1015
- 35729:35729
1116
- 3000:3000
12-
- 80:4000
17+
- 80:4000
18+
command: jekyll serve --incremental

resources/js/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
scala-functions.*

resources/js/scala-functions.js

-75
This file was deleted.

0 commit comments

Comments
 (0)