Skip to content

Commit fafd589

Browse files
committed
Convert to Bridgetown
I could not get the setup to work, so I instead copied the setup from my homepage. This also updates some parts of the content (mainly legal stuff) and cleans up the CSS and JS.
1 parent 8d6a416 commit fafd589

Some content is hidden

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

82 files changed

+4826
-9387
lines changed

.eslintrc

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

.github/dependabot.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
version: 2
22
updates:
3-
# Maintain dependencies for GitHub Actions
43
- package-ecosystem: "github-actions"
54
directory: "/"
65
schedule:
76
interval: "daily"
87

9-
# Maintain dependencies for npm
108
- package-ecosystem: "npm"
119
directory: "/"
1210
schedule:
1311
interval: "daily"
12+
13+
- package-ecosystem: "bundler"
14+
directory: "/"
15+
schedule:
16+
interval: "daily"

.github/workflows/tests.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
name: tests
22
on:
3-
- push
3+
- push
44
jobs:
5-
build:
6-
runs-on: ubuntu-latest
7-
strategy:
8-
matrix:
9-
node-version:
10-
- 18.x
11-
steps:
12-
- uses: actions/checkout@v4
13-
- uses: actions/setup-node@v3
14-
with:
15-
node-version: ${{ matrix.node-version }}
16-
- run: npm install-test
17-
env:
18-
CI: true
5+
build:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v4
9+
- uses: actions/setup-node@v4
10+
with:
11+
node-version: '22.x'
12+
cache: 'npm'
13+
- uses: ruby/setup-ruby@v1
14+
with:
15+
ruby-version: '3.3'
16+
bundler-cache: true
17+
- run: bundle exec bri
18+
- run: bundle exec bridgetown frontend:build
19+
- run: bundle exec bridgetown build

.gitignore

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
/node_modules
2-
/.eslintcache
3-
4-
/dist
2+
/.gems
3+
/.bridgetown-cache
4+
/compact_index
5+
/output
6+
/tmp
7+
/.envrc

Gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
source "https://rubygems.org"
2+
3+
gem "bridgetown", "~> 2.0.0.beta2"
4+
gem "puma"

Gemfile.lock

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
activesupport (7.2.2.1)
5+
base64
6+
benchmark (>= 0.3)
7+
bigdecimal
8+
concurrent-ruby (~> 1.0, >= 1.3.1)
9+
connection_pool (>= 2.2.5)
10+
drb
11+
i18n (>= 1.6, < 2)
12+
logger (>= 1.4.2)
13+
minitest (>= 5.1)
14+
securerandom (>= 0.3)
15+
tzinfo (~> 2.0, >= 2.0.5)
16+
addressable (2.8.7)
17+
public_suffix (>= 2.0.2, < 7.0)
18+
amazing_print (1.7.2)
19+
base64 (0.2.0)
20+
benchmark (0.4.0)
21+
bigdecimal (3.1.9)
22+
bridgetown (2.0.0.beta4)
23+
bridgetown-builder (= 2.0.0.beta4)
24+
bridgetown-core (= 2.0.0.beta4)
25+
bridgetown-foundation (= 2.0.0.beta4)
26+
bridgetown-paginate (= 2.0.0.beta4)
27+
bridgetown-builder (2.0.0.beta4)
28+
bridgetown-core (= 2.0.0.beta4)
29+
bridgetown-core (2.0.0.beta4)
30+
activesupport (>= 6.0, < 8.0)
31+
addressable (~> 2.4)
32+
amazing_print (~> 1.2)
33+
bridgetown-foundation (= 2.0.0.beta4)
34+
csv (~> 3.2)
35+
dry-inflector (>= 1.0)
36+
erubi (~> 1.9)
37+
faraday (~> 2.0)
38+
faraday-follow_redirects (~> 0.3)
39+
i18n (~> 1.0)
40+
irb (>= 1.14)
41+
kramdown (~> 2.1)
42+
kramdown-parser-gfm (~> 1.0)
43+
liquid (>= 5.0, < 5.5)
44+
listen (~> 3.0)
45+
rack (>= 3.0)
46+
rackup (~> 2.0)
47+
rake (>= 13.0)
48+
roda (~> 3.46)
49+
rouge (>= 3.0, < 5.0)
50+
serbea (~> 2.1)
51+
signalize (~> 1.3)
52+
streamlined (>= 0.6.0)
53+
thor (~> 1.1)
54+
tilt (~> 2.0)
55+
zeitwerk (~> 2.5)
56+
bridgetown-foundation (2.0.0.beta4)
57+
hash_with_dot_access (~> 2.0)
58+
inclusive (~> 1.0)
59+
zeitwerk (~> 2.5)
60+
bridgetown-paginate (2.0.0.beta4)
61+
bridgetown-core (= 2.0.0.beta4)
62+
concurrent-ruby (1.3.5)
63+
connection_pool (2.5.0)
64+
csv (3.3.2)
65+
date (3.4.1)
66+
drb (2.2.1)
67+
dry-inflector (1.2.0)
68+
erubi (1.13.1)
69+
faraday (2.12.2)
70+
faraday-net_http (>= 2.0, < 3.5)
71+
json
72+
logger
73+
faraday-follow_redirects (0.3.0)
74+
faraday (>= 1, < 3)
75+
faraday-net_http (3.4.0)
76+
net-http (>= 0.5.0)
77+
ffi (1.17.1)
78+
ffi (1.17.1-aarch64-linux-gnu)
79+
ffi (1.17.1-aarch64-linux-musl)
80+
ffi (1.17.1-arm-linux-gnu)
81+
ffi (1.17.1-arm-linux-musl)
82+
ffi (1.17.1-arm64-darwin)
83+
ffi (1.17.1-x86-linux-gnu)
84+
ffi (1.17.1-x86-linux-musl)
85+
ffi (1.17.1-x86_64-darwin)
86+
ffi (1.17.1-x86_64-linux-gnu)
87+
ffi (1.17.1-x86_64-linux-musl)
88+
hash_with_dot_access (2.1.1)
89+
i18n (1.14.7)
90+
concurrent-ruby (~> 1.0)
91+
inclusive (1.0.0)
92+
io-console (0.8.0)
93+
irb (1.15.1)
94+
pp (>= 0.6.0)
95+
rdoc (>= 4.0.0)
96+
reline (>= 0.4.2)
97+
json (2.9.1)
98+
kramdown (2.5.1)
99+
rexml (>= 3.3.9)
100+
kramdown-parser-gfm (1.1.0)
101+
kramdown (~> 2.0)
102+
liquid (5.4.0)
103+
listen (3.9.0)
104+
rb-fsevent (~> 0.10, >= 0.10.3)
105+
rb-inotify (~> 0.9, >= 0.9.10)
106+
logger (1.6.5)
107+
minitest (5.25.4)
108+
net-http (0.6.0)
109+
uri
110+
nio4r (2.7.4)
111+
pp (0.6.2)
112+
prettyprint
113+
prettyprint (0.2.0)
114+
psych (5.2.3)
115+
date
116+
stringio
117+
public_suffix (6.0.1)
118+
puma (6.5.0)
119+
nio4r (~> 2.0)
120+
rack (3.1.8)
121+
rackup (2.2.1)
122+
rack (>= 3)
123+
rake (13.2.1)
124+
rb-fsevent (0.11.2)
125+
rb-inotify (0.11.1)
126+
ffi (~> 1.0)
127+
rdoc (6.11.0)
128+
psych (>= 4.0.0)
129+
reline (0.6.0)
130+
io-console (~> 0.5)
131+
rexml (3.4.0)
132+
roda (3.88.0)
133+
rack
134+
rouge (4.5.1)
135+
securerandom (0.4.1)
136+
serbea (2.2.0)
137+
erubi (>= 1.10)
138+
tilt (~> 2.0)
139+
signalize (1.3.0)
140+
concurrent-ruby (~> 1.2)
141+
streamlined (0.6.0)
142+
serbea (>= 2.1)
143+
zeitwerk (~> 2.5)
144+
stringio (3.1.2)
145+
thor (1.3.2)
146+
tilt (2.6.0)
147+
tzinfo (2.0.6)
148+
concurrent-ruby (~> 1.0)
149+
uri (1.0.2)
150+
zeitwerk (2.7.1)
151+
152+
PLATFORMS
153+
aarch64-linux-gnu
154+
aarch64-linux-musl
155+
arm-linux-gnu
156+
arm-linux-musl
157+
arm64-darwin
158+
ruby
159+
x86-linux-gnu
160+
x86-linux-musl
161+
x86_64-darwin
162+
x86_64-linux-gnu
163+
x86_64-linux-musl
164+
165+
DEPENDENCIES
166+
bridgetown (~> 2.0.0.beta2)
167+
puma
168+
169+
BUNDLED WITH
170+
2.5.11

README.md

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1-
[![Netlify
2-
Status](https://api.netlify.com/api/v1/badges/79fe58f2-05cd-4e71-9563-703a16605716/deploy-status)](https://app.netlify.com/sites/faucet-pipeline/deploys)
3-
41
# faucet-pipeline Documentation
52

63
This repository contains the documentation for the faucet-pipeline project.
74
The documentation can be found at:
85

96
[www.faucet-pipeline.org](https://www.faucet-pipeline.org)
107

11-
It is deployed automatically via Netlify.
12-
138
## Contributing
149

15-
* ensure [Node](http://nodejs.org) is installed
16-
* `npm install` downloads dependencies
17-
* `npm run compile` generates the site at `dist/site`
18-
* `npm start` automatically recompiles while monitoring code changes - the site
19-
is available at http://localhost:8000
20-
* `npm test` checks code for stylistic consistency
10+
You need Ruby & Node, then run:
11+
12+
* `bundle`
13+
* `npm i`
14+
* `bundle exec bridgetown start` (or `just start`)
15+
* and you are good to go!
16+
17+
## Deploy
18+
19+
If you have `just` installed, run `just deploy`.
20+
If not, run it manually:
21+
22+
* `bundle exec bridgetown clean`
23+
* `bundle exec bridgetown frontend:build`
24+
* `bundle exec bridgetown build`
25+
* `rsync -uvcr --delete output/ $TARGET`

Rakefile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
require "bridgetown"
2+
3+
Bridgetown.load_tasks
4+
5+
# Run rake without specifying any command to execute a deploy build by default.
6+
task default: :deploy
7+
8+
desc "Build the Bridgetown site for deployment"
9+
task :deploy => [:clean, "frontend:build"] do
10+
Bridgetown::Commands::Build.start
11+
end
12+
13+
desc "Build the site in a test environment"
14+
task :test do
15+
ENV["BRIDGETOWN_ENV"] = "test"
16+
Bridgetown::Commands::Build.start
17+
end
18+
19+
desc "Runs the clean command"
20+
task :clean do
21+
Bridgetown::Commands::Clean.start
22+
end
23+
24+
namespace :frontend do
25+
desc "Build the frontend with esbuild for deployment"
26+
task :build do
27+
sh "npm run esbuild"
28+
end
29+
30+
desc "Watch the frontend with esbuild during development"
31+
task :dev do
32+
sh "npm run esbuild-dev"
33+
rescue Interrupt
34+
end
35+
end

config.ru

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# This file is used by Rack-based servers during the Bridgetown boot process.
2+
3+
require "bridgetown-core/rack/boot"
4+
5+
Bridgetown::Rack.boot
6+
7+
run RodaApp.freeze.app # see server/roda_app.rb

0 commit comments

Comments
 (0)