bridgetown-core 1.0.0.alpha5 → 1.0.0.alpha9

data/lib/bridgetown-core/rack/boot.rb

@@ -14,9 +14,17 @@ require_relative "static_indexes"
 
 module Bridgetown
   module Rack
-    def self.boot
-      autoload_server_folder(root: Dir.pwd)
-      RodaApp.opts[:bridgetown_preloaded_config] = Bridgetown::Current.preloaded_configuration
+    class << self
+      # @return [Bridgetown::Utils::LoadersManager]
+      attr_accessor :loaders_manager
+    end
+
+    def self.boot(roda_app = nil)
+      self.loaders_manager =
+        Bridgetown::Utils::LoadersManager.new(Bridgetown::Current.preloaded_configuration)
+      autoload_server_folder
+      (roda_app || RodaApp).opts[:bridgetown_preloaded_config] =
+        Bridgetown::Current.preloaded_configuration
     rescue Roda::RodaError => e
       if e.message.include?("sessions plugin :secret option")
         raise Bridgetown::Errors::InvalidConfigurationError,
@@ -27,29 +35,44 @@ module Bridgetown
       raise e
     end
 
-    def self.autoload_server_folder(root:)
+    # @param root [String] root of Bridgetown site, defaults to config value
+    def self.autoload_server_folder( # rubocop:todo Metrics/MethodLength
+      root: Bridgetown::Current.preloaded_configuration.root_dir
+    )
       server_folder = File.join(root, "server")
-      loader = Zeitwerk::Loader.new
-      loader.push_dir server_folder
-      loader.enable_reloading unless ENV["BRIDGETOWN_ENV"] == "production"
-      loader.setup
-      loader.eager_load
-      loader.do_not_eager_load(File.join(server_folder, "roda_app.rb"))
-
-      unless ENV["BRIDGETOWN_ENV"] == "production"
-        begin
-          Listen.to(server_folder) do |_modified, _added, _removed|
-            loader.reload
-            loader.eager_load
-            Bridgetown::Rack::Routes.reload_subclasses
-          end.start
-        # interrupt isn't handled well by the listener
-        rescue ThreadError # rubocop:disable Lint/SuppressedException
+      #      Bridgetown::Current.preloaded_configuration.autoload_paths << server_folder
+
+      Bridgetown::Hooks.register_one(
+        :loader, :post_setup, reloadable: false
+      ) do |loader, load_path|
+        next unless load_path == server_folder
+
+        loader.eager_load
+        loader.do_not_eager_load(File.join(server_folder, "roda_app.rb"))
+
+        unless ENV["BRIDGETOWN_ENV"] == "production"
+          begin
+            Listen.to(server_folder) do |_modified, _added, _removed|
+              loader.reload
+              loader.eager_load
+              Bridgetown::Rack::Routes.reload_subclasses
+            end.start
+          # interrupt isn't handled well by the listener
+          rescue ThreadError # rubocop:disable Lint/SuppressedException
+          end
         end
       end
-    rescue Zeitwerk::Error
-      # We assume if there's an error it's because Zeitwerk already registered this folder,
-      # so it's fine to swallow the error
+
+      Bridgetown::Hooks.register_one(
+        :loader, :post_reload, reloadable: false
+      ) do |loader, load_path|
+        next unless load_path == server_folder
+
+        loader.eager_load
+        Bridgetown::Rack::Routes.reload_subclasses
+      end
+
+      loaders_manager.setup_loaders([server_folder])
     end
   end
 end

data/lib/bridgetown-core/rack/roda.rb

@@ -6,7 +6,8 @@ class Roda
   module RodaPlugins
     module BridgetownSSR
       def self.configure(app, _opts = {}, &block)
-        app.opts[:bridgetown_site] = Bridgetown::Site.start_ssr!(&block)
+        app.opts[:bridgetown_site] =
+          Bridgetown::Site.start_ssr!(loaders_manager: Bridgetown::Rack.loaders_manager, &block)
       end
     end
 

data/lib/bridgetown-core/rack/routes.rb

@@ -72,9 +72,9 @@ module Bridgetown
         instance_exec(@_roda_app.request, &self.class.router_block)
       end
 
-      ruby2_keywords def method_missing(method_name, *args, &block)
+      def method_missing(method_name, *args, **kwargs, &block)
         if @_roda_app.respond_to?(method_name.to_sym)
-          @_roda_app.send method_name.to_sym, *args, &block
+          @_roda_app.send method_name.to_sym, *args, **kwargs, &block
         else
           super
         end

data/lib/bridgetown-core/readers/layout_reader.rb

@@ -15,7 +15,7 @@ module Bridgetown
           Layout.new(site, layout_directory, layout_file)
       end
 
-      Bridgetown::PluginManager.source_manifests.map(&:layouts).compact.each do |plugin_layouts|
+      Bridgetown::PluginManager.source_manifests.filter_map(&:layouts).each do |plugin_layouts|
         layout_entries(plugin_layouts).each do |layout_file|
           @layouts[layout_name(layout_file)] ||= \
             Layout.new(site, plugin_layouts, layout_file, from_plugin: true)

data/lib/bridgetown-core/readers/plugin_content_reader.rb

@@ -40,7 +40,7 @@ module Bridgetown
     end
 
     def add_to(content_type, klass)
-      existing_paths = content_type.map(&:relative_path).compact
+      existing_paths = content_type.filter_map(&:relative_path)
       @content_files.select { |item| item.is_a?(klass) }.each do |item|
         content_type << item unless existing_paths.include?(item.relative_path)
       end

data/lib/bridgetown-core/renderer.rb

@@ -161,9 +161,9 @@ module Bridgetown
     end
 
     def output_exts
-      @output_exts ||= converters.map do |c|
+      @output_exts ||= converters.filter_map do |c|
         c.output_ext(document.extname)
-      end.compact
+      end
     end
   end
 end

data/lib/bridgetown-core/resource/base.rb

@@ -255,8 +255,8 @@ module Bridgetown
         to_h
       end
 
-      ruby2_keywords def to_json(*options)
-        as_json(*options).to_json(*options)
+      def to_json(...)
+        as_json(...).to_json(...)
       end
 
       def inspect
@@ -349,7 +349,7 @@ module Bridgetown
 
       # Look for alternative front matter or look at the filename pattern: slug.locale.ext
       def locale_from_alt_data_or_filename
-        found_locale = data.language || data.lang || basename_without_ext.split(".")[1..-1].last
+        found_locale = data.language || data.lang || basename_without_ext.split(".")[1..].last
         return unless found_locale && site.config.available_locales.include?(found_locale.to_sym)
 
         found_locale

data/lib/bridgetown-core/resource/relations.rb

@@ -95,7 +95,7 @@ module Bridgetown
       def belongs_to_relation_for_type(type)
         if resource.data[type].is_a?(Array)
           other_slugs = other_collection_for_type(type).resources_by_slug
-          resource.data[type].map { |slug| other_slugs[slug] }.compact
+          resource.data[type].filter_map { |slug| other_slugs[slug] }
         else
           other_collection_for_type(type).resources.find do |other_resource|
             other_resource.data.slug == resource.data[type]

data/lib/bridgetown-core/resource/taxonomy_term.rb

@@ -22,8 +22,8 @@ module Bridgetown
         to_h
       end
 
-      ruby2_keywords def to_json(*options)
-        as_json(*options).to_json(*options)
+      def to_json(...)
+        as_json(...).to_json(...)
       end
     end
   end

data/lib/bridgetown-core/resource/taxonomy_type.rb

@@ -48,8 +48,8 @@ module Bridgetown
         to_h
       end
 
-      ruby2_keywords def to_json(*options)
-        as_json(*options).to_json(*options)
+      def to_json(...)
+        as_json(...).to_json(...)
       end
     end
   end

data/lib/bridgetown-core/ruby_template_view.rb

@@ -61,9 +61,9 @@ module Bridgetown
       @helpers ||= Helpers.new(self, site)
     end
 
-    ruby2_keywords def method_missing(method_name, *args, &block)
+    def method_missing(method_name, *args, **kwargs, &block)
       if helpers.respond_to?(method_name.to_sym)
-        helpers.send method_name.to_sym, *args, &block
+        helpers.send method_name.to_sym, *args, **kwargs, &block
       else
         super
       end

data/lib/bridgetown-core/site.rb

@@ -13,9 +13,10 @@ module Bridgetown
     include SSR
     include Writable
 
-    attr_reader   :root_dir, :source, :dest, :cache_dir, :config,
-                  :liquid_renderer, :components_load_paths,
-                  :includes_load_paths
+    attr_reader :root_dir, :source, :dest, :cache_dir, :config, :liquid_renderer
+
+    # @return [Bridgetown::Utils::LoadersManager]
+    attr_reader :loaders_manager
 
     # All files not pages/documents or structured data in the source folder
     # @return [Array<StaticFile>]
@@ -33,11 +34,20 @@ module Bridgetown
 
     # Initialize a new Site.
     #
-    # config - A Hash containing site configuration details.
-    def initialize(config)
+    # @param config [Bridgetown::Configuration]
+    # @param loaders_manager [Bridgetown::Utils::LoadersManager] initialized if none provided
+    def initialize(config, loaders_manager: nil)
       self.config = config
       locale
 
+      loaders_manager = if loaders_manager
+                          loaders_manager.config = self.config
+                          loaders_manager
+                        else
+                          Bridgetown::Utils::LoadersManager.new(self.config)
+                        end
+      @loaders_manager = loaders_manager
+
       @plugin_manager  = PluginManager.new(self)
       @cleaner         = Cleaner.new(self)
       @reader          = Reader.new(self)

data/lib/bridgetown-core/utils/loaders_manager.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Utils
+    class LoadersManager
+      attr_accessor :config
+
+      attr_reader :loaders, :root_dir
+
+      # @param config [Bridgetown::Configuration]
+      # @param root_dir [String] root of the current site
+      def initialize(config, root_dir = Dir.pwd)
+        @config = config
+        @loaders = {}
+        @root_dir = root_dir
+      end
+
+      def unload_loaders
+        return if @loaders.keys.empty?
+
+        @loaders.each do |_path, loader|
+          loader.unload
+        end
+        @loaders = {}
+      end
+
+      def reloading_enabled?(load_path)
+        load_path.start_with?(root_dir) && ENV["BRIDGETOWN_ENV"] != "production"
+      end
+
+      def setup_loaders(autoload_paths = []) # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+        (autoload_paths.presence || config.autoload_paths).each do |load_path|
+          if @loaders.key?(load_path)
+            raise "Zeitwerk loader already added for `#{load_path}'. Please check your config"
+          end
+
+          next unless Dir.exist? load_path
+
+          loader = Zeitwerk::Loader.new
+          begin
+            loader.push_dir(load_path)
+          rescue Zeitwerk::Error
+            next
+          end
+          loader.enable_reloading if reloading_enabled?(load_path)
+          loader.ignore(File.join(load_path, "**", "*.js.rb"))
+          config.autoloader_collapsed_paths.each do |collapsed_path|
+            next unless collapsed_path.starts_with?(load_path)
+
+            loader.collapse(collapsed_path)
+          end
+          Bridgetown::Hooks.trigger :loader, :pre_setup, loader, load_path
+          loader.setup
+          loader.eager_load if config.eager_load_paths.include?(load_path)
+          Bridgetown::Hooks.trigger :loader, :post_setup, loader, load_path
+          @loaders[load_path] = loader
+        end
+      end
+
+      def reload_loaders
+        @loaders.each do |load_path, loader|
+          next unless reloading_enabled?(load_path)
+
+          Bridgetown::Hooks.trigger :loader, :pre_reload, loader, load_path
+          loader.reload
+          loader.eager_load if config.eager_load_paths.include?(load_path)
+          Bridgetown::Hooks.trigger :loader, :post_reload, loader, load_path
+        end
+      end
+    end
+  end
+end

data/lib/bridgetown-core/utils.rb

@@ -5,6 +5,7 @@ module Bridgetown
     extend self
     autoload :Ansi, "bridgetown-core/utils/ansi"
     autoload :Aux, "bridgetown-core/utils/aux"
+    autoload :LoadersManager, "bridgetown-core/utils/loaders_manager"
     autoload :RequireGems, "bridgetown-core/utils/require_gems"
     autoload :RubyExec, "bridgetown-core/utils/ruby_exec"
     autoload :RubyFrontMatter, "bridgetown-core/utils/ruby_front_matter"
@@ -120,15 +121,11 @@ module Bridgetown
     # @return [Boolean] if the YAML front matter is present.
     # rubocop: disable Naming/PredicateName
     def has_yaml_header?(file)
-      File.open(file, "rb", &:readline).match? Bridgetown::FrontMatterImporter::YAML_HEADER
-    rescue EOFError
-      false
+      File.open(file, "rb", &:gets)&.match?(Bridgetown::FrontMatterImporter::YAML_HEADER) || false
     end
 
     def has_rbfm_header?(file)
-      File.open(file, "rb", &:readline).match? Bridgetown::FrontMatterImporter::RUBY_HEADER
-    rescue EOFError
-      false
+      File.open(file, "rb", &:gets)&.match?(Bridgetown::FrontMatterImporter::RUBY_HEADER) || false
     end
 
     # Determine whether the given content string contains Liquid Tags or Vaiables
@@ -354,7 +351,7 @@ module Bridgetown
     # @raise [WebpackAssetError] if unable to find css or js in the manifest
     # file
     def parse_webpack_manifest_file(site, asset_type)
-      return log_webpack_asset_error("Webpack manifest") if site.frontend_manifest.nil?
+      return log_webpack_asset_error(site, "Webpack manifest") if site.frontend_manifest.nil?
 
       asset_path = if %w(js css).include?(asset_type)
                      site.frontend_manifest["main.#{asset_type}"]
@@ -364,7 +361,7 @@ module Bridgetown
                      end&.last
                    end
 
-      return log_webpack_asset_error(asset_type) if asset_path.nil?
+      return log_webpack_asset_error(site, asset_type) if asset_path.nil?
 
       static_frontend_path site, ["js", asset_path]
     end
@@ -379,12 +376,14 @@ module Bridgetown
       Addressable::URI.parse(path_parts.join("/")).normalize.to_s
     end
 
-    def log_webpack_asset_error(asset_type)
-      Bridgetown.logger.warn(
-        "Webpack:",
-        "There was an error parsing your #{asset_type} file. \
-        Please check your #{asset_type} file for any errors."
-      )
+    def log_webpack_asset_error(site, asset_type)
+      site.data[:__webpack_asset_errors] ||= {}
+      site.data[:__webpack_asset_errors][asset_type] ||=
+        Bridgetown.logger.warn(
+          "Webpack:",
+          "There was an error parsing your #{asset_type} file. \
+          Please check your #{asset_type} file for any errors."
+        )
 
       "MISSING_WEBPACK_MANIFEST_FILE"
     end

data/lib/bridgetown-core/version.rb

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

data/lib/bridgetown-core/watcher.rb

@@ -41,10 +41,12 @@ module Bridgetown
         Dir.exist?(path)
       end
 
+      paths_to_watch = (plugin_paths_to_watch + options.autoload_paths).uniq
+
       Listen.to(
         options["source"],
         webpack_path,
-        *plugin_paths_to_watch,
+        *paths_to_watch,
         ignore: listen_ignore_paths(options),
         force_polling: options["force_polling"],
         &listen_handler(site, options)
@@ -57,10 +59,12 @@ module Bridgetown
         c = modified + added + removed
         n = c.length
 
-        Bridgetown.logger.info "Regenerating…"
-        Bridgetown.logger.info "", "#{n} file(s) changed at #{t.strftime("%Y-%m-%d %H:%M:%S")}"
+        unless site.ssr?
+          Bridgetown.logger.info "Regenerating…"
+          Bridgetown.logger.info "", "#{n} file(s) changed at #{t.strftime("%Y-%m-%d %H:%M:%S")}"
+          c.each { |path| Bridgetown.logger.info "", path["#{site.root_dir}/".length..] }
+        end
 
-        c.each { |path| Bridgetown.logger.info "", path["#{site.root_dir}/".length..-1] }
         process(site, t, options)
       end
     end
@@ -101,7 +105,7 @@ module Bridgetown
       source = Pathname.new(options["source"]).expand_path
       paths  = to_exclude(options)
 
-      paths.map do |p|
+      paths.filter_map do |p|
         absolute_path = Pathname.new(normalize_encoding(p, options["source"].encoding)).expand_path
         next unless absolute_path.exist?
 
@@ -116,20 +120,25 @@ module Bridgetown
         rescue ArgumentError
           # Could not find a relative path
         end
-      end.compact + [%r!^\.bridgetown-metadata!]
+      end + [%r!^\.bridgetown-metadata!]
     end
 
     def sleep_forever
       loop { sleep 1000 }
     end
 
+    # @param site [Bridgetown::Site]
     def process(site, time, options)
       begin
         I18n.reload! # make sure any locale files get read again
+        Bridgetown::Current.site = site # needed in SSR mode apparently
         Bridgetown::Hooks.trigger :site, :pre_reload, site
         Bridgetown::Hooks.clear_reloadable_hooks
         site.plugin_manager.reload_plugin_files
-        site.plugin_manager.reload_component_loaders
+        site.loaders_manager.reload_loaders
+
+        return site.ssr_reload if site.ssr?
+
         site.process
         Bridgetown.logger.info "Done! 🎉", "#{"Completed".green} in less than" \
                                           " #{(Time.now - time).ceil(2)} seconds."

data/lib/bridgetown-core/yaml_parser.rb

@@ -11,11 +11,7 @@ module Bridgetown
       end
 
       def load(yaml)
-        if RUBY_VERSION.start_with?("2.5")
-          YAML.safe_load yaml, PERMITTED_CLASSES
-        else
-          YAML.safe_load yaml, permitted_classes: PERMITTED_CLASSES
-        end
+        YAML.safe_load yaml, permitted_classes: PERMITTED_CLASSES
       end
     end
   end

data/lib/bridgetown-core.rb

@@ -46,7 +46,6 @@ require "active_support/descendants_tracker"
 require "hash_with_dot_access"
 require "addressable/uri"
 require "liquid"
-require "liquid-component"
 require "listen"
 require "kramdown"
 require "colorator"

data/lib/site_template/README.md

@@ -16,7 +16,7 @@ Welcome to your new Bridgetown website! You can update this README file to provi
 - [GCC](https://gcc.gnu.org/install/)
 - [Make](https://www.gnu.org/software/make/)
 - [Ruby](https://www.ruby-lang.org/en/downloads/)
-  - `>= 2.5`
+  - `>= 2.7`
 - [Bridgetown Gem](https://rubygems.org/gems/bridgetown)
   - `gem install bridgetown -N`
 - [Node](https://nodejs.org)

data/lib/site_template/Rakefile

@@ -2,6 +2,9 @@ require "bridgetown"
 
 Bridgetown.load_tasks
 
+# Run rake without specifying any command to execute a deploy build by default.
+task default: :deploy
+
 #
 # Standard set of tasks, which you can customize if you wish:
 #
@@ -44,6 +47,3 @@ end
 #     say_status :rake, "I'm a Rake tast =) #{site.config.url}"
 #   end
 # end
-
-# Run rake without specifying any command to execute a deploy build by default.
-task default: :deploy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha5
+  version: 1.0.0.alpha9
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -192,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: liquid-component
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +262,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: serbea
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -390,11 +390,21 @@ files:
 - lib/bridgetown-core/configurations/.keep
 - lib/bridgetown-core/configurations/bt-postcss.rb
 - lib/bridgetown-core/configurations/bt-postcss/postcss.config.js
+- lib/bridgetown-core/configurations/cypress.rb
+- lib/bridgetown-core/configurations/cypress/cypress.json
+- lib/bridgetown-core/configurations/cypress/cypress_dir/fixtures/example.json
+- lib/bridgetown-core/configurations/cypress/cypress_dir/integration/navbar.spec.js
+- lib/bridgetown-core/configurations/cypress/cypress_dir/plugins/index.js
+- lib/bridgetown-core/configurations/cypress/cypress_dir/support/commands.js
+- lib/bridgetown-core/configurations/cypress/cypress_dir/support/index.js
+- lib/bridgetown-core/configurations/cypress/cypress_tasks
 - 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/purgecss.rb
+- lib/bridgetown-core/configurations/render.rb
+- lib/bridgetown-core/configurations/render/render.yaml.erb
 - lib/bridgetown-core/configurations/stimulus.rb
 - lib/bridgetown-core/configurations/swup.rb
 - lib/bridgetown-core/configurations/tailwindcss.rb
@@ -408,6 +418,7 @@ files:
 - lib/bridgetown-core/converters/markdown.rb
 - lib/bridgetown-core/converters/markdown/kramdown_parser.rb
 - lib/bridgetown-core/converters/ruby_templates.rb
+- lib/bridgetown-core/converters/serbea_templates.rb
 - lib/bridgetown-core/converters/smartypants.rb
 - lib/bridgetown-core/core_ext/psych.rb
 - lib/bridgetown-core/current.rb
@@ -488,6 +499,7 @@ files:
 - lib/bridgetown-core/utils.rb
 - lib/bridgetown-core/utils/ansi.rb
 - lib/bridgetown-core/utils/aux.rb
+- lib/bridgetown-core/utils/loaders_manager.rb
 - lib/bridgetown-core/utils/require_gems.rb
 - lib/bridgetown-core/utils/ruby_exec.rb
 - lib/bridgetown-core/utils/ruby_front_matter.rb
@@ -542,12 +554,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: