bridgetown-core 1.0.0 → 1.1.0.beta1

data/lib/bridgetown-core/utils.rb

@@ -320,7 +320,7 @@ module Bridgetown
         end
 
         if continue_processing
-          line_indentation = line.match(%r!^ +!).yield_self do |indent|
+          line_indentation = line.match(%r!^ +!).then do |indent|
             indent.nil? ? "" : indent[0]
           end
           new_indentation = line_indentation.rjust(starting_indent_length, " ")
@@ -339,6 +339,11 @@ module Bridgetown
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
 
+    # Return an asset path based on a frontend manifest file
+    #
+    # @param site [Bridgetown::Site] The current site object
+    # @param asset_type [String] js or css, or filename in manifest
+    # @return [String, nil]
     def parse_frontend_manifest_file(site, asset_type)
       case frontend_bundler_type(site.root_dir)
       when :webpack
@@ -362,9 +367,6 @@ module Bridgetown
     #   file isnt found
     # @return [nil] Returns nil if the asset isnt found
     # @return [String] Returns the path to the asset if no issues parsing
-    #
-    # @raise [WebpackAssetError] if unable to find css or js in the manifest
-    #   file
     def parse_webpack_manifest_file(site, asset_type)
       return log_frontend_asset_error(site, "Webpack manifest") if site.frontend_manifest.nil?
 
@@ -389,16 +391,17 @@ module Bridgetown
     #   file isnt found
     # @return [nil] Returns nil if the asset isnt found
     # @return [String] Returns the path to the asset if no issues parsing
-    #
-    # @raise [WebpackAssetError] if unable to find css or js in the manifest
-    #   file
     def parse_esbuild_manifest_file(site, asset_type) # rubocop:disable Metrics/PerceivedComplexity
       return log_frontend_asset_error(site, "esbuild manifest") if site.frontend_manifest.nil?
 
-      asset_path = if %w(js css).include?(asset_type)
-                     folder = asset_type == "js" ? "javascript" : "styles"
-                     site.frontend_manifest["#{folder}/index.#{asset_type}"] ||
-                       site.frontend_manifest["#{folder}/index.#{asset_type}.rb"]
+      asset_path = case asset_type
+                   when "css"
+                     site.frontend_manifest["styles/index.css"] ||
+                       site.frontend_manifest["styles/index.scss"] ||
+                       site.frontend_manifest["styles/index.sass"]
+                   when "js"
+                     site.frontend_manifest["javascript/index.js"] ||
+                       site.frontend_manifest["javascript/index.js.rb"]
                    else
                      site.frontend_manifest.find do |item, _|
                        item.sub(%r{^../(frontend/|src/)?}, "") == asset_type
@@ -488,6 +491,16 @@ module Bridgetown
       %(<script type="module">#{code}</script>).html_safe
     end
 
+    def chomp_locale_suffix!(path, locale)
+      return path unless locale
+
+      if path.ends_with?(".#{locale}")
+        path.chomp!(".#{locale}")
+      elsif path.ends_with?(".multi")
+        path.chomp!(".multi")
+      end
+    end
+
     private
 
     def merge_values(target, overwrite)

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "1.0.0"
-  CODE_NAME = "Pearl"
+  VERSION = "1.1.0.beta1"
+  CODE_NAME = "Belmont"
 end

data/lib/bridgetown-core/watcher.rb

@@ -12,11 +12,21 @@ module Bridgetown
     #
     # @param site [Bridgetown::Site] the current site instance
     # @param options [Bridgetown::Configuration] the site configuration
-    def watch(site, options)
+    # @yield the block will be called when in SSR mode right after the post_read event
+    def watch(site, options, &block)
       ENV["LISTEN_GEM_DEBUGGING"] ||= "1" if options["verbose"]
 
       listen(site, options)
 
+      if site.ssr?
+        # We need to trigger pre/post read hooks when SSR reload occurs in order to re-run Builders
+        Bridgetown::Hooks.register_one :site, :after_soft_reset, reloadable: false do
+          Bridgetown::Hooks.trigger :site, :pre_read, site
+          Bridgetown::Hooks.trigger :site, :post_read, site
+          block&.call(site)
+        end
+      end
+
       Bridgetown.logger.info "Watcher:", "enabled." unless options[:using_puma]
 
       return if options[:serving]
@@ -32,10 +42,9 @@ module Bridgetown
     #
     # @param (see #watch)
     def load_paths_to_watch(site, options)
-      site.plugin_manager.plugins_path.select { |path| Dir.exist?(path) }
-        .then do |paths|
-          (paths + options.autoload_paths).uniq
-        end
+      (site.plugin_manager.plugins_path + options.autoload_paths).uniq.select do |path|
+        Dir.exist?(path)
+      end
     end
 
     # Start a listener to watch for changes and call {#reload_site}
@@ -119,6 +128,10 @@ module Bridgetown
       end
     end
 
+    def component_frontend_matcher
+      %r{_components/.*?(\.js|\.jsx|\.js\.rb|\.css)$}
+    end
+
     def to_exclude(options)
       [
         config_files(options),
@@ -151,7 +164,7 @@ module Bridgetown
         rescue ArgumentError
           # Could not find a relative path
         end
-      end + [%r!^\.bridgetown-metadata!]
+      end + [component_frontend_matcher] + [%r!^\.bridgetown-metadata!]
     end
 
     def sleep_forever

data/lib/bridgetown-core.rb

@@ -32,6 +32,7 @@ require "yaml"
 
 # 3rd party
 require "active_support"
+require "active_support/core_ext/class/attribute"
 require "active_support/core_ext/hash/keys"
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/object/blank"
@@ -50,10 +51,14 @@ require "listen"
 require "kramdown"
 require "colorator"
 require "i18n"
+require "i18n/backend/fallbacks"
 require "faraday"
 require "thor"
 require "zeitwerk"
 
+# Ensure we can set up fallbacks so the default locale gets used
+I18n::Backend::Simple.include I18n::Backend::Fallbacks
+
 module HashWithDotAccess
   class Hash # :nodoc:
     def to_liquid
@@ -85,12 +90,13 @@ module Bridgetown
   autoload :LayoutPlaceable,     "bridgetown-core/concerns/layout_placeable"
   autoload :LayoutReader,        "bridgetown-core/readers/layout_reader"
   autoload :LiquidRenderable,    "bridgetown-core/concerns/liquid_renderable"
+  autoload :Localizable,         "bridgetown-core/concerns/localizable"
   autoload :LiquidRenderer,      "bridgetown-core/liquid_renderer"
   autoload :LogAdapter,          "bridgetown-core/log_adapter"
   autoload :PluginContentReader, "bridgetown-core/readers/plugin_content_reader"
   autoload :PluginManager,       "bridgetown-core/plugin_manager"
+  autoload :Prioritizable,       "bridgetown-core/concerns/prioritizable"
   autoload :Publishable,         "bridgetown-core/concerns/publishable"
-  autoload :Publisher,           "bridgetown-core/publisher"
   autoload :Reader,              "bridgetown-core/reader"
   autoload :RubyTemplateView,    "bridgetown-core/ruby_template_view"
   autoload :LogWriter,           "bridgetown-core/log_writer"
@@ -160,7 +166,7 @@ module Bridgetown
 
     def load_tasks
       require "bridgetown-core/commands/base"
-      Bridgetown::PluginManager.require_from_bundler
+      Bridgetown::PluginManager.require_from_bundler(skip_yarn: true)
       load File.expand_path("bridgetown-core/tasks/bridgetown_tasks.rake", __dir__)
     end
 

data/lib/site_template/README.md

@@ -54,7 +54,7 @@ bin/bridgetown console
 
 ## Deployment
 
-You can deploy Bridgetown sites on hosts like Render or Vercel as well as tranditional web servers by simply building and copying the output folder to your HTML root.
+You can deploy Bridgetown sites on hosts like Render or Vercel as well as traditional web servers by simply building and copying the output folder to your HTML root.
 
 > Read the [Bridgetown Deployment Documentation](https://www.bridgetownrb.com/docs/deployment) for more information.
 
@@ -67,4 +67,4 @@ If repo is on GitHub:
 3. Create your feature branch (`git checkout -b my-new-feature`)
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
-6. Create a new Pull Request
+6. Create a new Pull Request

data/lib/site_template/bridgetown.config.yml

@@ -3,6 +3,9 @@
 # This config file is for settings that affect your whole site, values
 # which you are expected to set up once and rarely edit after that.
 #
+# A list of all available configuration options can be found here:
+# https://www.bridgetownrb.com/docs/configuration/options
+#
 # For technical reasons, this file is *NOT* reloaded automatically when you use
 # `bin/bridgetown start`. If you change this file, please restart the server process.
 #

data/lib/site_template/frontend/javascript/index.js.erb

@@ -3,6 +3,7 @@ import "index.css"
 <%- else -%>
 import "index.scss"
 <%- end -%>
+import "syntax-highlighting.css"
 
 // Import all JavaScript & CSS files from src/_components
 <%- if frontend_bundling_option == "esbuild" -%>

data/lib/site_template/frontend/styles/syntax-highlighting.css

@@ -0,0 +1,77 @@
+/* 
+  Syntax Highlighting for Code Snippets
+
+  https://www.bridgetownrb.com/docs/liquid/tags#stylesheets-for-syntax-highlighting
+
+  Other styles available eg. https://github.com/jwarby/jekyll-pygments-themes
+  To use another style, delete all styles in this file and replace them with
+  the new styles. Or create your own!
+
+*/
+
+pre.highlight {
+  padding: 16px;
+  background-color: #F6F8FA;
+}
+
+.highlight .hll { background-color: #ffffcc }
+.highlight .c { color: #999988; font-style: italic } /* Comment */
+.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
+.highlight .k { color: #000000; font-weight: bold } /* Keyword */
+.highlight .o { color: #000000; font-weight: bold } /* Operator */
+.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #999999; font-weight: bold; font-style: italic } /* Comment.Preproc */
+.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
+.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+.highlight .ge { color: #000000; font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #aa0000 } /* Generic.Error */
+.highlight .gh { color: #999999 } /* Generic.Heading */
+.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+.highlight .go { color: #888888 } /* Generic.Output */
+.highlight .gp { color: #555555 } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #aaaaaa } /* Generic.Subheading */
+.highlight .gt { color: #aa0000 } /* Generic.Traceback */
+.highlight .kc { color: #000000; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #000000; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #000000; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #000000; font-weight: bold } /* Keyword.Pseudo */
+.highlight .kr { color: #000000; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #009999 } /* Literal.Number */
+.highlight .s { color: #d01040 } /* Literal.String */
+.highlight .na { color: #008080 } /* Name.Attribute */
+.highlight .nb { color: #0086B3 } /* Name.Builtin */
+.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
+.highlight .no { color: #008080 } /* Name.Constant */
+.highlight .nd { color: #3c5d5d; font-weight: bold } /* Name.Decorator */
+.highlight .ni { color: #800080 } /* Name.Entity */
+.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
+.highlight .nl { color: #990000; font-weight: bold } /* Name.Label */
+.highlight .nn { color: #555555 } /* Name.Namespace */
+.highlight .nt { color: #000080 } /* Name.Tag */
+.highlight .nv { color: #008080 } /* Name.Variable */
+.highlight .ow { color: #000000; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #009999 } /* Literal.Number.Float */
+.highlight .mh { color: #009999 } /* Literal.Number.Hex */
+.highlight .mi { color: #009999 } /* Literal.Number.Integer */
+.highlight .mo { color: #009999 } /* Literal.Number.Oct */
+.highlight .sb { color: #d01040 } /* Literal.String.Backtick */
+.highlight .sc { color: #d01040 } /* Literal.String.Char */
+.highlight .sd { color: #d01040 } /* Literal.String.Doc */
+.highlight .s2 { color: #d01040 } /* Literal.String.Double */
+.highlight .se { color: #d01040 } /* Literal.String.Escape */
+.highlight .sh { color: #d01040 } /* Literal.String.Heredoc */
+.highlight .si { color: #d01040 } /* Literal.String.Interpol */
+.highlight .sx { color: #d01040 } /* Literal.String.Other */
+.highlight .sr { color: #009926 } /* Literal.String.Regex */
+.highlight .s1 { color: #d01040 } /* Literal.String.Single */
+.highlight .ss { color: #990073 } /* Literal.String.Symbol */
+.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #008080 } /* Name.Variable.Class */
+.highlight .vg { color: #008080 } /* Name.Variable.Global */
+.highlight .vi { color: #008080 } /* Name.Variable.Instance */
+.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */

data/lib/site_template/package.json.erb

@@ -13,34 +13,35 @@
   },
   "devDependencies": {
     <%- if frontend_bundling_option == "webpack" -%>
-    "css-loader": "^4.3.0",
+    "css-loader": "^6.7.1",
     <%- end -%>
-    "esbuild": "^0.13.15",
+    "esbuild": "^0.14.39",
     <%- if frontend_bundling_option == "webpack" -%>
-    "esbuild-loader": "^2.16.0",
+    "esbuild-loader": "^2.18.0",
     "file-loader": "^6.2.0",
-    "mini-css-extract-plugin": "^1.3.1",
+    "mini-css-extract-plugin": "^2.6.0",
     <%- else -%>
-    "glob": "^7.2.0",
+    "glob": "^8.0.1",
     <%- end -%>
-    <%- if postcss_option -%>
-    "postcss": "^8.4.0",
+    <%- unless disable_postcss? -%>
+    "postcss": "^8.4.12",
     "postcss-flexbugs-fixes": "^5.0.2",
     <%- if frontend_bundling_option == "esbuild" -%>
-    "postcss-import": "^14.0.2",
-    "postcss-load-config": "^3.1.0",
+    "postcss-import": "^14.1.0",
+    "postcss-load-config": "^3.1.4",
     <%- else -%>
-    "postcss-loader": "^4.3.0",
+    "postcss-loader": "^6.2.1",
     <%- end -%>
-    "postcss-preset-env": "^7.0.1"<%= "," if frontend_bundling_option == "webpack"  %>
-    <%- else -%>
-    "sass": "^1.32.8",
-    "sass-loader": "^8.0.2",
+    "postcss-preset-env": "^7.4.3"<%= "," if frontend_bundling_option == "webpack" || !postcss_option  %>
+    <%- end -%>
+    <%- unless postcss_option -%>
+    "sass": "^1.50.1",
+    "sass-loader": "^12.6.0"<%= "," if frontend_bundling_option == "webpack" %>
     <%- end -%>
     <%- if frontend_bundling_option == "webpack" -%>
-    "webpack": "^5.39.1",
-    "webpack-cli": "^4.7.2",
-    "webpack-manifest-plugin": "^3.1.1",
+    "webpack": "^5.72.0",
+    "webpack-cli": "^4.9.2",
+    "webpack-manifest-plugin": "^5.0.0",
     "webpack-merge": "^5.8.0"
     <%- end -%>
   }

data/lib/site_template/server/roda_app.rb

@@ -4,21 +4,18 @@
 #
 # Learn more at: http://roda.jeremyevans.net
 
-# Uncomment to use file-based dynamic routing in your project (make sure you
-# uncomment the gem dependency in your Gemfile as well):
-# require "bridgetown-routes"
-
 class RodaApp < Bridgetown::Rack::Roda
   # Add additional Roda configuration here if needed
 
   # Uncomment to use Bridgetown SSR:
   # plugin :bridgetown_ssr
 
-  # And optionally file-based routing:
+  # Uncomment to use file-based dynamic routing in your project (make sure you
+  # uncomment the gem dependency in your `Gemfile` as well):
   # plugin :bridgetown_routes
 
   route do |r|
     # Load Roda routes in server/routes (and src/_routes via `bridgetown-routes`)
-    Bridgetown::Rack::Routes.start! self
+    r.bridgetown
   end
 end

data/lib/site_template/src/404.html

@@ -5,5 +5,6 @@ layout: default
 
 <h1>404</h1>
 
-<p><strong>Page not found :(</strong></p>
+<h2>Page Not Found :(</h2>
+
 <p>The requested page could not be found.</p>

data/lib/site_template/src/500.html

@@ -0,0 +1,10 @@
+---
+permalink: /500.html
+layout: default
+---
+
+<h1>500</h1>
+
+<h2>Internal Server Error :(</h2>
+
+<p>The requested page could not be delivered.</p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0.beta1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -409,6 +409,8 @@ files:
 - lib/bridgetown-core/concerns/front_matter_importer.rb
 - lib/bridgetown-core/concerns/layout_placeable.rb
 - lib/bridgetown-core/concerns/liquid_renderable.rb
+- lib/bridgetown-core/concerns/localizable.rb
+- lib/bridgetown-core/concerns/prioritizable.rb
 - lib/bridgetown-core/concerns/publishable.rb
 - lib/bridgetown-core/concerns/site/configurable.rb
 - lib/bridgetown-core/concerns/site/content.rb
@@ -433,13 +435,23 @@ files:
 - lib/bridgetown-core/configurations/cypress/cypress_tasks
 - lib/bridgetown-core/configurations/gh-pages.rb
 - lib/bridgetown-core/configurations/gh-pages/gh-pages.yml
+- lib/bridgetown-core/configurations/lit.rb
+- lib/bridgetown-core/configurations/lit/esbuild-plugins.js
+- lib/bridgetown-core/configurations/lit/happy-days.lit.js
+- lib/bridgetown-core/configurations/lit/lit-components-entry.js
+- lib/bridgetown-core/configurations/lit/lit-ssr.config.js
 - lib/bridgetown-core/configurations/minitesting.rb
 - lib/bridgetown-core/configurations/netlify.rb
 - lib/bridgetown-core/configurations/netlify/netlify.sh
 - lib/bridgetown-core/configurations/netlify/netlify.toml
+- lib/bridgetown-core/configurations/open-props.rb
+- lib/bridgetown-core/configurations/open-props/variables.css.erb
 - lib/bridgetown-core/configurations/purgecss.rb
 - lib/bridgetown-core/configurations/render.rb
 - lib/bridgetown-core/configurations/render/render.yaml.erb
+- lib/bridgetown-core/configurations/ruby2js.rb
+- lib/bridgetown-core/configurations/ruby2js/hello_world.js.rb
+- lib/bridgetown-core/configurations/shoelace.rb
 - lib/bridgetown-core/configurations/stimulus.rb
 - lib/bridgetown-core/configurations/tailwindcss.rb
 - lib/bridgetown-core/configurations/tailwindcss/css_imports.css
@@ -478,6 +490,7 @@ files:
 - lib/bridgetown-core/filters/date_filters.rb
 - lib/bridgetown-core/filters/from_liquid.rb
 - lib/bridgetown-core/filters/grouping_filters.rb
+- lib/bridgetown-core/filters/translation_filters.rb
 - lib/bridgetown-core/filters/url_filters.rb
 - lib/bridgetown-core/frontmatter_defaults.rb
 - lib/bridgetown-core/generated_page.rb
@@ -485,6 +498,7 @@ files:
 - lib/bridgetown-core/generators/prototype_generator.rb
 - lib/bridgetown-core/helpers.rb
 - lib/bridgetown-core/hooks.rb
+- lib/bridgetown-core/kramdown/parser/gfm.rb
 - lib/bridgetown-core/layout.rb
 - lib/bridgetown-core/liquid_extensions.rb
 - lib/bridgetown-core/liquid_renderer.rb
@@ -501,7 +515,6 @@ files:
 - lib/bridgetown-core/model/repo_origin.rb
 - lib/bridgetown-core/plugin.rb
 - lib/bridgetown-core/plugin_manager.rb
-- lib/bridgetown-core/publisher.rb
 - lib/bridgetown-core/rack/boot.rb
 - lib/bridgetown-core/rack/logger.rb
 - lib/bridgetown-core/rack/roda.rb
@@ -572,6 +585,7 @@ files:
 - lib/site_template/config/puma.rb
 - lib/site_template/frontend/javascript/index.js.erb
 - lib/site_template/frontend/styles/index.css
+- lib/site_template/frontend/styles/syntax-highlighting.css
 - lib/site_template/package.json.erb
 - lib/site_template/plugins/builders/.keep
 - lib/site_template/plugins/site_builder.rb
@@ -580,6 +594,7 @@ files:
 - lib/site_template/server/roda_app.rb
 - lib/site_template/server/routes/hello.rb.sample
 - lib/site_template/src/404.html
+- lib/site_template/src/500.html
 - lib/site_template/src/_data/site_metadata.yml
 - lib/site_template/src/_posts/0000-00-00-welcome-to-bridgetown.md.erb
 - lib/site_template/src/about.md
@@ -607,9 +622,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: 

data/lib/bridgetown-core/publisher.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Bridgetown
-  class Publisher
-    # @param site [Bridgetown::Site]
-    def initialize(site)
-      @site = site
-    end
-
-    def publish?(thing)
-      can_be_published?(thing) && !hidden_in_the_future?(thing)
-    end
-
-    def hidden_in_the_future?(thing)
-      return false unless thing.respond_to?(:date)
-
-      future_allowed =
-        (thing.respond_to?(:collection) && thing.collection.metadata.future) || @site.config.future
-      thing_time = thing.date.is_a?(Date) ? thing.date.to_time.to_i : thing.date.to_i
-      !future_allowed && thing_time > @site.time.to_i
-    end
-
-    private
-
-    def can_be_published?(thing)
-      thing.data.fetch("published", true) || @site.config.unpublished
-    end
-  end
-end