bridgetown-core 1.0.0 → 1.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdb62333635d80ceb9561a0cd9be68f0220ea729c8ac4505bb8e4460894075e1
-  data.tar.gz: f7377127b4d64846e694d8ba4c032706ed161ea1595cf8dbf3eca3d2b6e4692d
+  metadata.gz: 95b4ce1888886fbccd72391216d1298ce7d20e6bfb506ceedab3208881b4d25c
+  data.tar.gz: 712ddfbba10913becc4fb800a499ce602d9e2848f395b87cf8c205d97000ab2e
 SHA512:
-  metadata.gz: 051a34337053c1370745d37a7cc3def36e1623193e4c03e0b1006d06280303ad5442c289465185314f916dbcf2aa1b1123990ca196041b03bf3804a03b36f695
-  data.tar.gz: d5adcc3f8c7c7938bbc220329c002c7cea281f4e21f8ea2bab685dabaffe48c5acca3998482d1e0ec6d0c7c172751c0c6b34481821f51b5d1ccc687b137e55a5
+  metadata.gz: 1efd58dbca74ae1f3903bd91e225c28abb74131a5b1bc1885b7cac696d5f97a6a1ee7b973fed4d9ad2a90fec9ccc610f4ab19c4cb60666bfeafc0f4cda28f715
+  data.tar.gz: 545fe04a5338166bf02927395c131d65a822b524b551865bc558dd1e4ffa4c1438ace43bad4fe09a29e980c77d458bcc9876a249bbf4598d45764f471693521b

data/.rubocop.yml

@@ -11,12 +11,17 @@ AllCops:
     - vendor/**/*
     - tmp/**/*
     - test/source/**/*
-    - test/resources/src/_pages/*.rb
+    - test/resources/src/**/*.rb
+    - lib/bridgetown-core/commands/base.rb
+    - lib/bridgetown-core/commands/plugins.rb
+    - lib/bridgetown-core/configurations/ruby2js/**/*
+    - lib/bridgetown-core/rack/roda.rb
     - lib/site_template/TEMPLATES/**/*
     - lib/site_template/Rakefile
     - lib/site_template/config.ru
     - lib/site_template/config/**/*
     - lib/site_template/plugins/site_builder.rb
+    - lib/site_template/server/roda_app.rb
 
 Lint/ConstantDefinitionInBlock:
   Exclude:

data/lib/bridgetown-core/collection.rb

@@ -20,11 +20,11 @@ module Bridgetown
     end
 
     def builtin?
-      label.in? %w(posts pages data).freeze
+      @is_builtin ||= label.in?(%w(posts pages data).freeze)
     end
 
     def data?
-      label == "data"
+      @is_data ||= label == "data"
     end
 
     # Fetch the Resources in this collection.
@@ -215,7 +215,7 @@ module Bridgetown
     # Used by Resource's permalink processor
     # @return [String]
     def default_permalink
-      metadata.fetch("permalink", "/:collection/:path/")
+      metadata.fetch("permalink", "/:locale/:collection/:path/")
     end
 
     # Extract options for this collection from the site configuration.
@@ -270,32 +270,29 @@ module Bridgetown
 
     # Read in resource from repo path
     # @param full_path [String]
-    def read_resource(full_path, manifest: nil) # rubocop:todo Metrics/AbcSize
-      scheme = manifest ? "plugin" : "repo"
-      id = +"#{scheme}://#{label}.collection/"
-      id += "#{manifest.origin}/" if manifest
-      id += Addressable::URI.escape(
-        Pathname(full_path).relative_path_from(
-          manifest ? Pathname(manifest.content) : Pathname(site.source)
-        ).to_s
-      ).gsub("#", "%23")
-      model = Bridgetown::Model::Base.find(id)
-
-      if model.attributes.key?(:locale) && model.locale.to_sym == :multi
+    def read_resource(full_path, manifest: nil)
+      model_relative_path = relative_model_path_for(full_path, manifest: manifest)
+      model = Bridgetown::Model::Base.find(model_id_from_relative_path(model_relative_path,
+                                                                       manifest: manifest))
+
+      if model_is_multi_locale?(model, model_relative_path)
         site.config.available_locales.each do |locale|
           model.locale = locale
-          add_model_resource model
+          add_resource_from_model model
         end
         return
       end
 
-      add_model_resource model
+      add_resource_from_model model
     end
 
-    def add_model_resource(model)
-      resource = model.to_resource.read!
-      resources << resource if site.config.unpublished || resource.published?
+    # @param model [Bridgetown::Model::Base]
+    def add_resource_from_model(model)
+      model.to_resource.read!.tap do |resource|
+        resources << resource if resource.publishable?
+      end
     end
+    alias_method :add_model_resource, :add_resource_from_model
 
     def sort_resources!
       if metadata["sort_by"].is_a?(String)
@@ -365,5 +362,25 @@ module Bridgetown
         self
       )
     end
+
+    def relative_model_path_for(full_path, manifest: nil)
+      Pathname(full_path).relative_path_from(
+        manifest ? Pathname(manifest.content) : Pathname(site.source)
+      ).to_s
+    end
+
+    def model_id_from_relative_path(model_relative_path, manifest: nil)
+      scheme = manifest ? "plugin" : "repo"
+      id = +"#{scheme}://#{label}.collection/"
+      id += "#{manifest.origin}/" if manifest
+      id += Addressable::URI.escape(model_relative_path).gsub("#", "%23")
+      id
+    end
+
+    def model_is_multi_locale?(model, model_relative_path)
+      (model.attributes.key?(:locale) && model.locale.to_sym == :multi) ||
+        File.extname(File.basename(model_relative_path, ".*")) == ".multi" ||
+        site.frontmatter_defaults.all(model_relative_path, label.to_sym)["locale"].to_s == "multi"
+    end
   end
 end

data/lib/bridgetown-core/commands/concerns/actions.rb

@@ -54,7 +54,8 @@ module Bridgetown
 
       def add_bridgetown_plugin(gemname, version: nil)
         version = " -v \"#{version}\"" if version
-        run "bundle add #{gemname}#{version} -g bridgetown_plugins"
+        run "bundle add #{gemname}#{version} -g bridgetown_plugins",
+            env: { "BUNDLE_GEMFILE" => File.join(destination_root, "Gemfile") }
       rescue SystemExit
         say_status :run, "Gem not added due to bundler error", :red
       end
@@ -79,7 +80,7 @@ module Bridgetown
 
       def determine_remote_filename(arg)
         if arg.end_with?(".rb")
-          arg.split("/").yield_self do |segments|
+          arg.split("/").then do |segments|
             arg.sub!(%r!/#{segments.last}$!, "")
             segments.last
           end

data/lib/bridgetown-core/commands/configure.rb

@@ -60,7 +60,7 @@ module Bridgetown
 
       def configurations
         inside self.class.source_root do
-          return Dir.glob("*.rb").map { |file| file.sub(".rb", "") }
+          return Dir.glob("*.rb").map { |file| file.sub(".rb", "") }.sort
         end
       end
 

data/lib/bridgetown-core/commands/esbuild/esbuild.defaults.js.erb

@@ -11,11 +11,33 @@
 const path = require("path")
 const fsLib = require("fs")
 const fs = fsLib.promises
+const { pathToFileURL, fileURLToPath } = require("url")
 const glob = require("glob")
 const postcss = require("postcss")
 const postCssImport = require("postcss-import")
 const readCache = require("read-cache")
 
+// Detect if an NPM package is available
+const moduleAvailable = name => {
+  try {
+    require.resolve(name)
+    return true
+  } catch (e) { }
+  return false
+}
+
+// Generate a Source Map URL (used by the Sass plugin)
+const generateSourceMappingURL = sourceMap => {
+  const data = Buffer.from(JSON.stringify(sourceMap), "utf-8").toString("base64")
+  return `/*# sourceMappingURL=data:application/json;charset=utf-8;base64,${data} */`
+}
+
+// Import Sass if available
+let sass
+if (moduleAvailable("sass")) {
+  sass = require("sass")
+}
+
 // Glob plugin derived from:
 // https://github.com/thomaschaaf/esbuild-plugin-import-glob
 // https://github.com/xiaohui-zhangxh/jsbundling-rails/commit/b15025dcc20f664b2b0eb238915991afdbc7cb58
@@ -61,24 +83,23 @@ const importGlobPlugin = () => ({
   },
 })
 
-const postCssPlugin = (options) => ({
+// Plugin for PostCSS
+const postCssPlugin = (options, configuration) => ({
   name: "postcss",
   async setup(build) {
     // Process .css files with PostCSS
-    build.onLoad({ filter: /\.(css)$/ }, async (args) => {
+    build.onLoad({ filter: (configuration.filter || /\.css$/) }, async (args) => {
       const additionalFilePaths = []
       const css = await fs.readFile(args.path, "utf8")
 
       // Configure import plugin so PostCSS can properly resolve `@import`ed CSS files
       const importPlugin = postCssImport({
-        filter: itemPath => {
-          // We'll want to track any imports later when in watch mode
-          additionalFilePaths.push(path.resolve(path.dirname(args.path), itemPath))
-          return true
-        },
+        filter: itemPath => !itemPath.startsWith("/"), // ensure it doesn't try to import source-relative paths
         load: async filename => {
           let contents = await readCache(filename, "utf-8")
           const filedir = path.dirname(filename)
+          // We'll want to track any imports later when in watch mode:          
+          additionalFilePaths.push(filename)
 
           // We need to transform `url(...)` in imported CSS so the filepaths are properly
           // relative to the entrypoint. Seems icky to have to hack this! C'est la vie...
@@ -106,6 +127,65 @@ const postCssPlugin = (options) => ({
   },
 })
 
+// Plugin for Sass
+const sassPlugin = (options) => ({
+  name: "sass",
+  async setup(build) {
+    // Process .scss and .sass files with Sass
+    build.onLoad({ filter: /\.(sass|scss)$/ }, async (args) => {
+      if (!sass) {
+        console.error("error: Sass is not installed. Try running `yarn add sass` and then building again.")
+        return
+      }
+
+      const modulesFolder = pathToFileURL("node_modules/")
+
+      const localOptions = {
+        importers: [{
+          // An importer that redirects relative URLs starting with "~" to
+          // `node_modules`.
+          findFileUrl(url) {
+            if (!url.startsWith('~')) return null
+            return new URL(url.substring(1), modulesFolder)
+          }
+        }],
+        sourceMap: true,
+        ...options
+      }
+      const result = sass.compile(args.path, localOptions)
+
+      const watchPaths = result.loadedUrls
+        .filter((x) => x.protocol === "file:" && !x.pathname.startsWith(modulesFolder.pathname))
+        .map((x) => x.pathname)
+
+      let cssOutput = result.css.toString()
+
+      if (result.sourceMap) {
+        const basedir = process.cwd()
+        const sourceMap = result.sourceMap
+
+        const promises = sourceMap.sources.map(async source => {
+          const sourceFile = await fs.readFile(fileURLToPath(source), "utf8")
+          return sourceFile
+        })
+        sourceMap.sourcesContent = await Promise.all(promises)
+
+        sourceMap.sources = sourceMap.sources.map(source => {
+          return path.relative(basedir, fileURLToPath(source))
+        })
+
+        cssOutput += '\n' + generateSourceMappingURL(sourceMap)
+      }
+
+      return {
+        contents: cssOutput,
+        loader: "css",
+        watchFiles: [args.path, ...watchPaths],
+      }
+    })
+  },
+})
+
 // Set up defaults and generate frontend bundling manifest file
 const bridgetownPreset = (outputFolder) => ({
   name: "bridgetownPreset",
@@ -151,9 +231,9 @@ const bridgetownPreset = (outputFolder) => ({
           // We have an entrypoint!
           manifest[stripPrefix(value.entryPoint)] = outputPath
           entrypoints.push([outputPath, fileSize(key)])
-        } else if (key.match(/index(\.js)?\.[^-.]*\.css/) && inputs.find(item => item.endsWith("index.css"))) {
+        } else if (key.match(/index(\.js)?\.[^-.]*\.css/) && inputs.find(item => item.match(/\.(s?css|sass)$/))) {
           // Special treatment for index.css
-          manifest[stripPrefix(inputs.find(item => item.endsWith("index.css")))] = outputPath
+          manifest[stripPrefix(inputs.find(item => item.match(/\.(s?css|sass)$/)))] = outputPath
           entrypoints.push([outputPath, fileSize(key)])
         } else if (inputs.length > 0) {
           // Naive implementation, we'll just grab the first input and hope it's accurate
@@ -182,9 +262,12 @@ const postCssConfig = postcssrc.sync()
 module.exports = (outputFolder, esbuildOptions) => {
   esbuildOptions.plugins = esbuildOptions.plugins || []
   // Add the PostCSS & glob plugins to the top of the plugin stack
-  esbuildOptions.plugins.unshift(postCssPlugin(postCssConfig))
+  esbuildOptions.plugins.unshift(postCssPlugin(postCssConfig, esbuildOptions.postCssPluginConfig || {}))
+  if (esbuildOptions.postCssPluginConfig) delete esbuildOptions.postCssPluginConfig
   esbuildOptions.plugins.unshift(importGlobPlugin())
-  // Add the Bridgetown preset to the bottom of the plugin stack
+  // Add the Sass plugin
+  esbuildOptions.plugins.push(sassPlugin(esbuildOptions.sassOptions || {}))
+  // Add the Bridgetown preset
   esbuildOptions.plugins.push(bridgetownPreset(outputFolder))
 
   // esbuild, take it away!
@@ -200,7 +283,7 @@ module.exports = (outputFolder, esbuildOptions) => {
       ".ttf": "file",
       ".eot": "file",
     },
-    resolveExtensions: [".tsx",".ts",".jsx",".js",".css",".json",".js.rb"],
+    resolveExtensions: [".tsx", ".ts", ".jsx", ".js", ".css", ".scss", ".sass", ".json", ".js.rb"],
     nodePaths: ["frontend/javascript", "frontend/styles"],
     watch: process.argv.includes("--watch"),
     minify: process.argv.includes("--minify"),

data/lib/bridgetown-core/commands/new.rb

@@ -43,7 +43,7 @@ module Bridgetown
                    desc: "Skip 'yarn install'"
       class_option :"use-sass",
                    type: :boolean,
-                   desc: "(Webpack only) Create a Sass configuration instead of using PostCSS"
+                   desc: "Set up a Sass configuration for your stylesheet"
 
       DOCSURL = "https://bridgetownrb.com/docs"
 
@@ -62,11 +62,6 @@ module Bridgetown
       def new_site
         raise ArgumentError, "You must specify a path." if args.empty?
 
-        if frontend_bundling_option != "webpack" && options["use-sass"]
-          raise ArgumentError,
-                "To install Sass, you must choose Webpack (-e webpack) as your frontend bundler"
-        end
-
         new_site_path = File.expand_path(args.join(" "), Dir.pwd)
         @site_name = new_site_path.split(File::SEPARATOR).last
 
@@ -98,7 +93,11 @@ module Bridgetown
       end
 
       def postcss_option
-        !(frontend_bundling_option == "webpack" && options["use-sass"])
+        !options["use-sass"]
+      end
+
+      def disable_postcss?
+        options["use-sass"] && options["frontend-bundling"] == "webpack"
       end
 
       def create_site(new_site_path)
@@ -116,6 +115,7 @@ module Bridgetown
         template("frontend/javascript/index.js.erb", "frontend/javascript/index.js")
         template("src/index.md.erb", "src/index.md")
         template("src/posts.md.erb", "src/posts.md")
+        copy_file("frontend/styles/syntax-highlighting.css")
 
         case options["templates"]
         when "erb"
@@ -126,11 +126,11 @@ module Bridgetown
           setup_liquid_templates
         end
 
+        postcss_option ? configure_postcss : configure_sass
+
         if frontend_bundling_option == "esbuild"
-          configure_postcss
           invoke(Esbuild, ["setup"], {})
         else
-          postcss_option ? configure_postcss : configure_sass
           invoke(Webpack, ["setup"], {})
         end
       end
@@ -165,6 +165,7 @@ module Bridgetown
       end
 
       def configure_sass
+        template("postcss.config.js.erb", "postcss.config.js") unless disable_postcss?
         copy_file("frontend/styles/index.css", "frontend/styles/index.scss")
       end
 

data/lib/bridgetown-core/commands/plugins.rb

@@ -120,6 +120,7 @@ module Bridgetown
                                  " return to your site root.")
           puts
 
+          # rubocop: disable Style/RedundantCondition
           Dir.chdir dir do
             ENV["BRIDGETOWN_SITE"] = site.root_dir
             if ENV["SHELL"]
@@ -128,6 +129,7 @@ module Bridgetown
               system("/bin/sh")
             end
           end
+          # rubocop: enable Style/RedundantCondition
 
           puts
           Bridgetown.logger.info("Done!", "You're back in #{Dir.pwd.green}")

data/lib/bridgetown-core/commands/start.rb

@@ -70,6 +70,9 @@ module Bridgetown
             end
 
             cli = Puma::CLI.new puma_args
+            cli.launcher.events.on_stopped do
+              Bridgetown::Hooks.trigger :site, :server_shutdown
+            end
             cli.run
           end
 

data/lib/bridgetown-core/commands/webpack/update.rb

@@ -7,11 +7,11 @@ say "🎉 Webpack configuration updated successfully!"
 
 return if Bridgetown.environment.test?
 
-required_packages = %w(esbuild esbuild-loader webpack@5.39.1 webpack-cli@4.7.2 webpack-manifest-plugin@3.1.1)
+required_packages = %w(esbuild esbuild-loader css-loader@6.7.1 webpack@5.72.0 webpack-cli@4.9.2 webpack-manifest-plugin@5.0.0)
 redundant_packages = %w(@babel/core @babel/plugin-proposal-class-properties @babel/plugin-proposal-decorators @babel/plugin-transform-runtime @babel/preset-env babel-loader)
 
 say "Installing required packages"
-run "yarn add -D #{required_packages.join(" ")}"
+run "yarn add -D --tilde #{required_packages.join(" ")}"
 
 packages_to_remove = package_json["devDependencies"].slice(*redundant_packages).keys
 unless packages_to_remove.empty?

data/lib/bridgetown-core/commands/webpack/webpack.defaults.js.erb

@@ -41,7 +41,9 @@ const cssRules = {
     {
       loader: "css-loader",
       options: {
-        url: url => !url.startsWith('/'),
+        url: {
+          filter: url => !url.startsWith('/')
+        },
         importLoaders: 1
       }
     }
@@ -49,7 +51,14 @@ const cssRules = {
   mode: '<%= self.config.uses_postcss? ? "postcss" : "sass" %>',
 
   postcss: () => {
-    cssRules.use.push("postcss-loader")
+    cssRules.use.push({
+      loader: "postcss-loader",
+      options: {
+        postcssOptions: {
+          config: "postcss.config.js"
+        }
+      }
+    })
     return { test: cssRules.test, use: cssRules.use }
   },
 

data/lib/bridgetown-core/component.rb

@@ -4,7 +4,7 @@ module Bridgetown
   class Component
     extend Forwardable
 
-    def_delegators :@view_context, :helpers, :liquid_render, :partial
+    def_delegators :@view_context, :liquid_render, :partial
 
     # @return [Bridgetown::Site]
     attr_reader :site # will be nil unless you explicitly set a `@site` ivar
@@ -32,14 +32,12 @@ module Bridgetown
       def renderer_for_ext(ext, &block)
         @_tmpl ||= case ext.to_s
                    when "erb"
-                     include ERBCapture
                      Tilt::ErubiTemplate.new(component_template_path,
                                              outvar: "@_erbout",
                                              bufval: "Bridgetown::OutputBuffer.new",
                                              engine_class: Bridgetown::ERBEngine,
                                              &block)
-                   when "serb" # requires serbea
-                     include Serbea::Helpers
+                   when "serb"
                      Tilt::SerbeaTemplate.new(component_template_path, &block)
                    when "slim" # requires bridgetown-slim
                      Slim::Template.new(component_template_path, &block)
@@ -166,12 +164,20 @@ module Bridgetown
     def _renderer
       @_renderer ||= begin
         ext = File.extname(self.class.component_template_path).delete_prefix(".")
-        self.class.renderer_for_ext(ext) { self.class.component_template_content }
+        self.class.renderer_for_ext(ext) { self.class.component_template_content }.tap do |rn|
+          self.class.include(rn.is_a?(Tilt::SerbeaTemplate) ? Serbea::Helpers : ERBCapture)
+        end
       end
     end
 
+    def helpers
+      @helpers ||= Bridgetown::RubyTemplateView::Helpers.new(
+        self, view_context&.site || Bridgetown::Current.site
+      )
+    end
+
     def method_missing(method, *args, **kwargs, &block)
-      if view_context && helpers.respond_to?(method.to_sym)
+      if helpers.respond_to?(method.to_sym)
         helpers.send method.to_sym, *args, **kwargs, &block
       else
         super
@@ -179,7 +185,7 @@ module Bridgetown
     end
 
     def respond_to_missing?(method, include_private = false)
-      (view_context && helpers.respond_to?(method.to_sym, include_private)) || super
+      helpers.respond_to?(method.to_sym, include_private) || super
     end
   end
 end

data/lib/bridgetown-core/concerns/localizable.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Localizable
+    def all_locales
+      result_set = case self
+                   when Bridgetown::Resource::Base
+                     collection.resources
+                   when Bridgetown::GeneratedPage
+                     site.generated_pages
+                   else
+                     []
+                   end
+
+      result_set.select { |item| item.data.slug == data.slug }.sort_by do |item|
+        site.config.available_locales.index item.data.locale
+      end
+    end
+  end
+end

data/lib/bridgetown-core/concerns/prioritizable.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Prioritizable
+    module ClassMethods
+      # @!method priorities
+      #   @return [Hash<Symbol, Object>]
+
+      # Get or set the priority of this class. When called without an
+      # argument it returns the priority. When an argument is given, it will
+      # set the priority.
+      #
+      # @param priority [Symbol] new priority (optional)
+      #   Valid options are: `:lowest`, `:low`, `:normal`, `:high`, `:highest`
+      # @return [Symbol]
+      def priority(priority = nil)
+        @priority ||= nil
+        @priority = priority if priority && priorities.key?(priority)
+        @priority || :normal
+      end
+
+      # Spaceship is priority [higher -> lower]
+      #
+      # @param other [Class] The class to be compared.
+      # @return [Integer] -1, 0, 1.
+      def <=>(other)
+        priorities[other.priority] <=> priorities[priority]
+      end
+    end
+
+    def self.included(klass)
+      klass.extend ClassMethods
+      klass.class_attribute :priorities, instance_accessor: false
+    end
+
+    # Spaceship is priority [higher -> lower]
+    #
+    # @param other [object] The object to be compared.
+    # @return [Integer] -1, 0, 1.
+    def <=>(other)
+      self.class <=> other.class
+    end
+  end
+end

data/lib/bridgetown-core/concerns/publishable.rb

@@ -2,9 +2,19 @@
 
 module Bridgetown
   module Publishable
-    # Whether the file is published or not, as indicated in YAML front-matter
+    # Whether the resource is published or not, as indicated in YAML front-matter
     def published?
       !(data.key?("published") && data["published"] == false)
     end
+
+    def publishable?
+      return true if collection.data?
+      return false unless published? || @site.config.unpublished
+
+      future_allowed = collection.metadata.future || @site.config.future
+      this_time = date.is_a?(Date) ? date.to_time.to_i : date.to_i
+
+      future_allowed || this_time <= @site.time.to_i
+    end
   end
 end

data/lib/bridgetown-core/concerns/site/configurable.rb

@@ -38,7 +38,7 @@ class Bridgetown::Site
     # @param strip_slash_only [Boolean] set to true if you wish "/" to be returned as ""
     # @return [String]
     def base_path(strip_slash_only: false)
-      (config[:base_path] || config[:baseurl]).yield_self do |path|
+      (config[:base_path] || config[:baseurl]).then do |path|
         strip_slash_only ? path.to_s.sub(%r{^/$}, "") : path
       end
     end
@@ -61,14 +61,6 @@ class Bridgetown::Site
       @frontmatter_defaults ||= Bridgetown::FrontmatterDefaults.new(self)
     end
 
-    # Returns the current instance of {Publisher} or creates a new instance of
-    #   {Publisher} if one doesn't exist.
-    #
-    # @return [Publisher] Returns an instance of {Publisher}
-    def publisher
-      @publisher ||= Bridgetown::Publisher.new(self)
-    end
-
     # Prefix a path or paths with the {#root_dir} directory.
     #
     # @see Bridgetown.sanitized_path
@@ -166,7 +158,7 @@ class Bridgetown::Site
       plugin_components_load_paths = Bridgetown::PluginManager.source_manifests
         .filter_map(&:components)
 
-      local_components_load_paths = config["components_dir"].yield_self do |dir|
+      local_components_load_paths = config["components_dir"].then do |dir|
         dir.is_a?(Array) ? dir : [dir]
       end
       local_components_load_paths.map! do |dir|

data/lib/bridgetown-core/concerns/site/localizable.rb

@@ -7,11 +7,15 @@ class Bridgetown::Site
     def locale
       @locale ||= begin
         locale = ENV.fetch("BRIDGETOWN_LOCALE", config[:default_locale]).to_sym
-        Dir["#{in_source_dir("_locales")}/*.yml"].each do |locale_path|
+        Dir["#{in_source_dir("_locales")}/*.{json,rb,yml}"].each do |locale_path|
           I18n.load_path << locale_path
         end
         I18n.available_locales = config[:available_locales]
         I18n.default_locale = locale
+        I18n.fallbacks = (config[:available_locales] + [:en]).uniq.to_h do |available_locale|
+          [available_locale, [available_locale, locale, :en].uniq]
+        end
+        locale
       end
     end