|
|
|
|
-|:---:|:---:|:---:|:---:|
-|@michaelherold|@joemasilotti|@ikass|@jw81|
-|Omaha, NE|Portland, OR|Latvia|Kansas City, MO|
+|||||
+|:---:|:---:|:---:|:---:|:---:|
+|@michaelherold|@joemasilotti|@ikass|@jw81|@MSILycanthropy|
+|Omaha, NE|Portland, OR|Latvia|Kansas City, MO|Kansas City, MO|
|
|
|:---:|
diff --git a/bridgetown-core/bridgetown-core.gemspec b/bridgetown-core/bridgetown-core.gemspec
index 550caad9f..f5be28b6f 100644
--- a/bridgetown-core/bridgetown-core.gemspec
+++ b/bridgetown-core/bridgetown-core.gemspec
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency("listen", "~> 3.0")
s.add_runtime_dependency("rake", ">= 13.0")
s.add_runtime_dependency("roda", "~> 3.46")
- s.add_runtime_dependency("rouge", "~> 3.0")
+ s.add_runtime_dependency("rouge", [">= 3.0", "< 5.0"])
s.add_runtime_dependency("serbea", "~> 1.0")
s.add_runtime_dependency("thor", "~> 1.1")
s.add_runtime_dependency("tilt", "~> 2.0")
diff --git a/bridgetown-core/lib/bridgetown-core/commands/console.rb b/bridgetown-core/lib/bridgetown-core/commands/console.rb
index bace48fac..9b1e43bca 100644
--- a/bridgetown-core/lib/bridgetown-core/commands/console.rb
+++ b/bridgetown-core/lib/bridgetown-core/commands/console.rb
@@ -2,17 +2,11 @@
module Bridgetown
module ConsoleMethods
- def site
- Bridgetown::Current.site
- end
-
- def collections
- site.collections
- end
-
def reload!
Bridgetown.logger.info "Reloading site..."
+ site = Bridgetown::Current.site
+
I18n.reload! # make sure any locale files get read again
Bridgetown::Hooks.trigger :site, :pre_reload, site
Bridgetown::Hooks.clear_reloadable_hooks
@@ -99,6 +93,8 @@ def console # rubocop:disable Metrics
IRB::ExtendCommandBundle.include ConsoleMethods
IRB.setup(nil)
workspace = IRB::WorkSpace.new
+ workspace.main.define_singleton_method(:site) { Bridgetown::Current.site }
+ workspace.main.define_singleton_method(:collections) { site.collections }
irb = IRB::Irb.new(workspace)
IRB.conf[:IRB_RC]&.call(irb.context)
IRB.conf[:MAIN_CONTEXT] = irb.context
diff --git a/bridgetown-core/lib/bridgetown-core/configurations/netlify.rb b/bridgetown-core/lib/bridgetown-core/configurations/netlify.rb
index 68c9aaf10..d4b61d236 100644
--- a/bridgetown-core/lib/bridgetown-core/configurations/netlify.rb
+++ b/bridgetown-core/lib/bridgetown-core/configurations/netlify.rb
@@ -1,5 +1,3 @@
# frozen_string_literal: true
copy_file in_templates_dir("netlify.toml"), "netlify.toml"
-copy_file in_templates_dir("netlify.sh"), "bin/netlify.sh"
-`chmod a+x ./bin/netlify.sh`
diff --git a/bridgetown-core/lib/bridgetown-core/configurations/netlify/netlify.sh b/bridgetown-core/lib/bridgetown-core/configurations/netlify/netlify.sh
deleted file mode 100755
index 229fa0367..000000000
--- a/bridgetown-core/lib/bridgetown-core/configurations/netlify/netlify.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-# Taken from https://docs.netlify.com/configure-builds/file-based-configuration/#inject-environment-variable-values
-
-echo "Updating netlify.toml with references to our built files"
-
-CSS_PATH=`find output/_bridgetown/static/*.css -type f | sed -e 's,output\/,/,g'`
-JS_PATH=`find output/_bridgetown/static/*.js -type f | sed -e 's,output\/,/,g'`
-
-echo "CSS Path: ${CSS_PATH}"
-echo "JS Path: ${JS_PATH}"
-
-sed -i s,CSS_PATH,${CSS_PATH},g netlify.toml
-sed -i s,JS_PATH,${JS_PATH},g netlify.toml
diff --git a/bridgetown-core/lib/bridgetown-core/configurations/netlify/netlify.toml b/bridgetown-core/lib/bridgetown-core/configurations/netlify/netlify.toml
index f83d157bc..cd28b679c 100644
--- a/bridgetown-core/lib/bridgetown-core/configurations/netlify/netlify.toml
+++ b/bridgetown-core/lib/bridgetown-core/configurations/netlify/netlify.toml
@@ -1,5 +1,17 @@
+[dev]
+ command = "bin/bridgetown dev"
+ targetPort = 4000
+ port = 8888
+ publish = "output"
+ autoLaunch = true
+ framework = "#custom"
+
+[context.dev.build.environment]
+ NODE_ENV = "development"
+ BRIDGETOWN_ENV = "development"
+
[build]
- command = "bin/bridgetown deploy && bin/netlify.sh"
+ command = "bin/bridgetown deploy"
publish = "output"
[build.environment]
@@ -19,14 +31,6 @@
Referrer-Policy = "no-referrer-when-downgrade"
Cache-Control = "public, max-age=604800, s-max-age=604800"
-[[headers]]
- for = "/"
- [headers.values]
- Link = [
- "yes_var == "yes", falsy: nil, "more-falsy" => "no" == "yes"}\">classes!
", ""
end
end
+
+ context "translate" do
+ should "return translation when given a string" do
+ assert_equal "foo", @helpers.translate("about.foo")
+ end
+
+ should "return translations when given an array" do
+ assert_equal %w[foo bar], @helpers.translate(%w[about.foo about.bar])
+ end
+
+ should "return html safe string when key ends with _html" do
+ assert @helpers.translate("about.foo_html").html_safe?
+ end
+
+ should "not return html safe string when key does not end with _html" do
+ refute @helpers.translate("about.foo").html_safe?
+ end
+
+ should "return relative translation when key starts with period" do
+ assert_equal "foo", @helpers.translate(".foo")
+ end
+
+ should "return relative translation when key starts with period and view is in a folder" do
+ helpers = Bridgetown::RubyTemplateView::Helpers.new(
+ Bridgetown::ERBView.new(
+ @site.collections.pages.resources.find { |p| p.basename_without_ext == "bar" }
+ ),
+ @site
+ )
+ assert_equal "foo", helpers.translate(".foo")
+ end
+
+ should "return translation missing if key doesn't exist" do
+ assert_equal "Translation missing: en.about.not_here", @helpers.translate(".not_here")
+ end
+
+ should "have alias method t" do
+ assert_equal @helpers.method(:translate), @helpers.method(:t)
+ end
+ end
+
+ context "localize" do
+ should "return same output as I18n.localize" do
+ time = Time.now
+ assert_equal I18n.localize(time), @helpers.localize(time)
+ end
+
+ should "have alias method l" do
+ assert_equal @helpers.method(:localize), @helpers.method(:l)
+ end
+ end
end
diff --git a/bridgetown-website/Gemfile.lock b/bridgetown-website/Gemfile.lock
index 160d3c69a..44829a08a 100644
--- a/bridgetown-website/Gemfile.lock
+++ b/bridgetown-website/Gemfile.lock
@@ -1,13 +1,13 @@
PATH
remote: ../bridgetown-builder
specs:
- bridgetown-builder (1.3.1)
- bridgetown-core (= 1.3.1)
+ bridgetown-builder (1.3.2)
+ bridgetown-core (= 1.3.2)
PATH
remote: ../bridgetown-core
specs:
- bridgetown-core (1.3.1)
+ bridgetown-core (1.3.2)
activemodel (>= 6.0, < 8.0)
activesupport (>= 6.0, < 8.0)
addressable (~> 2.4)
@@ -25,7 +25,7 @@ PATH
listen (~> 3.0)
rake (>= 13.0)
roda (~> 3.46)
- rouge (~> 3.0)
+ rouge (>= 3.0, < 5.0)
serbea (~> 1.0)
thor (~> 1.1)
tilt (~> 2.0)
@@ -34,16 +34,16 @@ PATH
PATH
remote: ../bridgetown-paginate
specs:
- bridgetown-paginate (1.3.1)
- bridgetown-core (= 1.3.1)
+ bridgetown-paginate (1.3.2)
+ bridgetown-core (= 1.3.2)
PATH
remote: ../bridgetown
specs:
- bridgetown (1.3.1)
- bridgetown-builder (= 1.3.1)
- bridgetown-core (= 1.3.1)
- bridgetown-paginate (= 1.3.1)
+ bridgetown (1.3.2)
+ bridgetown-builder (= 1.3.2)
+ bridgetown-core (= 1.3.2)
+ bridgetown-paginate (= 1.3.2)
GEM
remote: https://rubygems.org/
@@ -93,7 +93,7 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
minitest (5.19.0)
- nio4r (2.5.9)
+ nio4r (2.7.0)
nokogiri (1.15.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.4-x86_64-linux)
@@ -104,10 +104,10 @@ GEM
ast (~> 2.4.1)
racc
public_suffix (5.0.3)
- puma (6.3.1)
+ puma (6.4.2)
nio4r (~> 2.0)
racc (1.7.1)
- rack (3.0.8)
+ rack (3.0.9.1)
rake (13.0.6)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
@@ -116,7 +116,7 @@ GEM
rexml (3.2.6)
roda (3.71.0)
rack
- rouge (3.30.0)
+ rouge (4.2.0)
ruby2_keywords (0.0.5)
ruby2js (5.1.0)
parser
diff --git a/bridgetown-website/config/esbuild.defaults.js b/bridgetown-website/config/esbuild.defaults.js
index 104f973a8..f15964469 100644
--- a/bridgetown-website/config/esbuild.defaults.js
+++ b/bridgetown-website/config/esbuild.defaults.js
@@ -318,9 +318,13 @@ module.exports = async (esbuildOptions, ...args) => {
bundle: true,
loader: {
".jpg": "file",
+ ".jpeg": "file",
".png": "file",
".gif": "file",
".svg": "file",
+ ".avif": "file",
+ ".jxl": "file",
+ ".webp": "file",
".woff": "file",
".woff2": "file",
".ttf": "file",
diff --git a/bridgetown-website/frontend/styles/theme-dark.css b/bridgetown-website/frontend/styles/theme-dark.css
index 65fa486d9..30df5c475 100644
--- a/bridgetown-website/frontend/styles/theme-dark.css
+++ b/bridgetown-website/frontend/styles/theme-dark.css
@@ -58,6 +58,10 @@
fill: var(--color-light-gray);
}
+ & abbr[title] {
+ color: var(--color-light-gray);
+ }
+
& code,
& pre {
background-color: var(--color-blackish);
@@ -85,10 +89,10 @@
}
& .highlight :is(.k, .mi) {
- color: var(--color-syntax-light-beige);
+ color: var(--color-syntax-beige);
}
- & .highlight .kn {
+ & .highlight :is(.kn, .m) {
color: var(--color-syntax-mid-blue);
}
@@ -107,10 +111,10 @@
}
& .highlight .s {
- color: var(--color-syntax-steel-teal);
+ color: var(--color-syntax-light-gray);
}
- & .highlight :is(.c, .c1, .nx) {
+ & .highlight :is(.c, .c1, .nx, .nl) {
color: var(--color-syntax-charcoal);
}
@@ -118,14 +122,10 @@
color: var(--color-syntax-steel-teal);
}
- & .highlight .n {
+ & .highlight :is(.n, .nd) {
color: var(--color-syntax-light-green);
}
- & .highlight .nb {
- color: #8aaee3;
- }
-
& .highlight .nc {
color: var(--color-syntax-dark-red);
}
@@ -147,7 +147,7 @@
}
& .highlight .nt {
- color: var(--color-syntax-beige);
+ color: var(--color-syntax-light-beige);
}
& .highlight .nv {
@@ -159,11 +159,11 @@
}
& .highlight .s2 {
- color: var(--color-syntax-steel-teal);
+ color: var(--color-syntax-light-gray);
}
& .highlight :is(.gs, .kd) {
- color: var(--color-syntax-mid-blue);
+ color: var(--color-syntax-light-green);
}
/* highlights end */
@@ -189,7 +189,12 @@
}
& body > nav.edge {
- background: linear-gradient(to bottom, var(--color-darkest-gray) 0%, #492512 90%, var(--color-darkest-gray) 100%);
+ background: linear-gradient(
+ to bottom,
+ var(--color-darkest-gray) 0%,
+ #492512 90%,
+ var(--color-darkest-gray) 100%
+ );
}
& sl-button[variant="primary"]::part(base) {
diff --git a/bridgetown-website/src/_data/authors.yml b/bridgetown-website/src/_data/authors.yml
index 122f4c861..f45a54a9c 100644
--- a/bridgetown-website/src/_data/authors.yml
+++ b/bridgetown-website/src/_data/authors.yml
@@ -1,7 +1,7 @@
jared:
name: Jared White
avatar: /images/jared-white-avatar.jpg
- twitter: jaredcwhite
+ mastodon: indieweb.social/@jaredwhite
website: https://jaredwhite.com
margaret:
name: Margaret Berry
diff --git a/bridgetown-website/src/_docs/command-line-usage.md b/bridgetown-website/src/_docs/command-line-usage.md
index cf39fc102..b57c0d2b1 100644
--- a/bridgetown-website/src/_docs/command-line-usage.md
+++ b/bridgetown-website/src/_docs/command-line-usage.md
@@ -28,6 +28,7 @@ Available commands are:
* [`bin/bridgetown plugins [list|cd]`](/docs/commands/plugins) - Display information about installed plugins or allow you to copy content out of gem-based plugins into your site folders.
* `bin/bridgetown apply` - Run an [automation script](/docs/automations) for your existing site.
* `bin/bridgetown configure CONFIGURATION` - Run a [bundled configuration](/docs/bundled-configurations) for your existing site. Invoke without arguments to see all available configurations.
+* `bin/bridgetown date` - Displays the current date and time so you can copy'n'paste it into your front matter.
* `bin/bridgetown help` - Shows help, optionally for a given subcommand, e.g. `bridgetown help build`.
* `bin/bridgetown doctor` - Outputs any deprecation or configuration issues.
* `bin/bridgetown clean` - Removes all generated files: destination folder, metadata file, and Bridgetown caches.
diff --git a/bridgetown-website/src/_docs/deployment.md b/bridgetown-website/src/_docs/deployment.md
index bfd83dd85..1e17dbccb 100644
--- a/bridgetown-website/src/_docs/deployment.md
+++ b/bridgetown-website/src/_docs/deployment.md
@@ -44,6 +44,10 @@ Some popular services include:
[Netlify](https://www.netlify.com) is a web developer platform which focuses on productivity and global scale without requiring costly infrastructure. Get set up with continuous deployment, lead gen forms, one click HTTPS, and so much more.
+### Fly.io
+
+[Fly.io](https://fly.io) is a platform that focuses on container based deployment. Their service transforms containers into micro-VMs that run on hardware all across the globe. The section below on [Docker](/docs/deployment#docker) has some examples that can be used with Fly.
+
## Manual Deployment
For a simple method of deployment, you can simply transfer the contents of your `output` folder to any web server. You can use something like `scp` to securely copy the folder, or you can use a more advanced tool:
@@ -56,7 +60,11 @@ rsync in the [Digital Ocean tutorial](https://www.digitalocean.com/community/tut
### Docker
-Many modern hosting solutions support deploying a `Dockerfile`. Building a Bridgetown site for one of these services is as easy as adding this file to a `Dockerfile` in the root directory of your project:
+Many modern hosting solutions support deploying with a `Dockerfile`. Building a Bridgetown site for one of these services is as easy as creating a `Dockerfile` in the root directory of your project. See the examples below.
+
+#### Static Site
+
+If you're simply looking to deploy a static version of your site.
```Dockerfile
# Build frontend JS and CSS assets using ESbuild
@@ -85,11 +93,45 @@ FROM pierrezemb/gostatic
COPY --from=bridgetown_builder /app/output /srv/http/
```
-A `Dockerfile` like this could be used, for example, to [deploy a static website to Fly.io](https://fly.io/docs/languages-and-frameworks/static/).
+#### Dynamic Site
+
+If you're looking to use things like [Dynamic Routes & SSR](/docs/routes).
+
+```Dockerfile
+ARG RUBY_VERSION=3.2.2
+FROM ruby:$RUBY_VERSION-slim as base
+
+ENV VOLTA_HOME=/usr/local
+
+RUN apt-get update &&\
+ apt-get install --yes build-essential git curl
+
+RUN curl https://get.volta.sh | bash &&\
+ volta install node@lts yarn@latest
+
+WORKDIR /app
+
+FROM base as gems
+COPY Gemfile* .
+RUN bundle install
+
+FROM base
+COPY . .
+COPY --from=base $VOLTA_HOME/bin $VOLTA_HOME/bin
+COPY --from=base $VOLTA_HOME/tools $VOLTA_HOME/tools
+COPY --from=base /app /app
+COPY --from=gems /usr/local/bundle /usr/local/bundle
+
+RUN yarn install
+RUN bundle exec bridgetown frontend:build
+
+EXPOSE 4000
+CMD bundle exec bridgetown start
+```
### GitLab Pages
-[GitLab pages](https://docs.gitlab.com/ee/user/project/pages/) can host static websites. Create a repository on GitLab,
+[GitLab pages](https://docs.gitlab.com/ee/user/project/pages/) can host static websites. Create a repository on GitLab,
which we suppose is at https://gitlab.com/bridgetownrb/mysite
Add the following .gitlab-ci.yml file to your project, which we shall suppose is called `mysite` following the documentation setup [instructions](/docs/). The .gitlab-ci.yml file should be in the mysite directory created using `bridgetown new mysite` and should contain
@@ -173,7 +215,7 @@ For more details, [see the documentation](https://docs.gitlab.com/ee/user/projec
### GitHub Pages
-Much like with GitLab, you can also deploy static sites to [GitHub Pages](https://pages.github.com/). You can make use of [GitHub Actions](https://github.com/features/actions) to automate building and deploying your site to GitHub Pages.
+Much like with GitLab, you can also deploy static sites to [GitHub Pages](https://pages.github.com/). You can make use of [GitHub Actions](https://github.com/features/actions) to automate building and deploying your site to GitHub Pages.
Bridgetown includes a [bundled configuration to set up GitHub pages](/docs/bundled-configurations#github-pages-configuration). You can apply it with the following command:
diff --git a/bridgetown-website/src/_docs/internationalization.md b/bridgetown-website/src/_docs/internationalization.md
index 7c71bed37..442c35f2e 100644
--- a/bridgetown-website/src/_docs/internationalization.md
+++ b/bridgetown-website/src/_docs/internationalization.md
@@ -76,7 +76,11 @@ and in ERB:
<%= t("welcome.intro") %>
```
-The Ruby helper in particular also supports variable interpolation. If you store a translation like this:
+The Ruby helper in particular also supports some additional functionality.
+
+#### Variable Interpolation
+
+If you store a translation like this:
```yml
en:
@@ -90,6 +94,41 @@ Then you can pass that variable to the `t` helper:
<%= t("products.price", price: resource.data.price) %>
```
+#### Relative page keys
+
+If you start your translation key starts with a period, we'll automatically scope the key to the page. For example, if the page is `about.html`:
+
+```erb
+<%= t(".foo") %>
+```
+
+Will retrieve the key from:
+
+```yml
+en:
+ about:
+ foo: Foo
+```
+
+Or if the page is `contact/about.html`:
+
+```yml
+en:
+ contact:
+ about:
+ foo: Foo
+```
+
+#### Automatic HTML key safety
+
+If your translation key ends with `_html` or is `html`, it will automatically be marked `html_safe`.
+
+```yml
+en:
+ products:
+ tagline_html: The
@@ -244,7 +244,7 @@ Bridgetown's philosophy is if we take the time to build what you'll actually nee
### Modern Frontend Build System
- Bridgetown sets you up with blazing-fast, zero-config esbuild & PostCSS. Or pick Webpack if you prefer. Either way, add modern JavaScript libraries like Turbo, Stimulus, Lit, even Preact with a simple command. Install comprehensive component libraries such as Shoelace for rapid UI development. Go big with interactive functionality or stay minimalist for that “zero JS" experience. It's totally your choice.
+ Bridgetown sets you up with blazing-fast, zero-config esbuild & PostCSS. Add modern CSS starter kits and JavaScript libraries in a performant way with a few simple commands. Install comprehensive component libraries such as Shoelace for rapid UI development. Go big with interactive functionality or stay minimalist for that “zero JS" experience. It's totally your choice.
diff --git a/bridgetown-website/src/_partials/_footer.serb b/bridgetown-website/src/_partials/_footer.serb
index 4215d3142..27b0ac71e 100644
--- a/bridgetown-website/src/_partials/_footer.serb
+++ b/bridgetown-website/src/_partials/_footer.serb
@@ -23,7 +23,7 @@
@@ -34,7 +34,7 @@
- Discussions on GitHub
- Contribute on GitHub
+ Contribute & Participate
+ Community Site Discussions
Discord Chat