bridgetown-core 1.1.0.beta3 → 1.2.0.beta1

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

@@ -4,30 +4,6 @@ module Bridgetown
   module Utils
     module RequireGems
       class << self
-        #
-        # Require a gem or file if it's present, otherwise silently fail.
-        #
-        # names - a string gem name or array of gem names
-        #
-        def require_if_present(names)
-          Array(names).each do |name|
-            require name
-          rescue LoadError
-            Bridgetown.logger.debug "Couldn't load #{name}. Skipping."
-            yield(name, version_constraint(name)) if block_given?
-            false
-          end
-        end
-
-        #
-        # The version constraint required to activate a given gem.
-        #
-        # Returns a String version constraint in a parseable form for
-        # RubyGems.
-        def version_constraint
-          "> 0"
-        end
-
         #
         # Require a gem or gems. If it's not present, show a very nice error
         # message that explains everything and is much more helpful than the
@@ -38,17 +14,17 @@ module Bridgetown
         def require_with_graceful_fail(names)
           Array(names).each do |name|
             Bridgetown.logger.debug "Requiring:", name.to_s
-            require name
-          rescue LoadError => e
-            Bridgetown.logger.error "Dependency Error:", <<~MSG
-              Oops! It looks like you don't have #{name} or one of its dependencies installed.
-              Please double-check you've added #{name} to your Gemfile.
-
-              If you're stuck, you can find help at https://www.bridgetownrb.com/community
-
-              The full error message from Ruby is: '#{e.message}'
-            MSG
-            raise Bridgetown::Errors::MissingDependencyException, name
+            require name.to_s
+          rescue LoadError => _e
+            Bridgetown.logger.error(
+              "Dependency Error:",
+              "Hmm, it looks like you don't have `#{name}' or one of its dependencies " \
+              "installed. Please double-check you've added it to your Gemfile."
+            )
+            Bridgetown.logger.error(
+              "", "You can also find help at https://www.bridgetownrb.com/community"
+            )
+            exit(1)
           end
         end
       end

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

@@ -9,9 +9,8 @@ module Bridgetown
     end
 
     class RubyFrontMatter
-      def initialize(scope: nil)
-        @data = {}
-        @scope = scope
+      def initialize(scope: nil, data: {})
+        @data, @scope = data, scope
       end
 
       def method_missing(key, *value, &block) # rubocop:disable Metrics/CyclomaticComplexity, Style/MissingRespondToMissing

data/lib/bridgetown-core/{converters/smartypants.rb → utils/smarty_pants_converter.rb}

@@ -18,35 +18,16 @@ module Kramdown
 end
 
 module Bridgetown
-  module Converters
-    # SmartyPants converter.
-    # For more info on converters see https://bridgetownrb.com/docs/plugins/converters/
-    class SmartyPants < Converter
-      priority :low
-
+  module Utils
+    class SmartyPantsConverter
+      # @param config [Bridgetown::Configuration]
       def initialize(config)
-        super
-        unless defined?(Kramdown)
-          Bridgetown::Utils::RequireGems.require_with_graceful_fail "kramdown"
-        end
         @config = config["kramdown"].dup || {}
         @config[:input] = :SmartyPants
       end
 
-      # Public: The extension to be given to the output file (including the dot).
-      #
-      # ext - The String extension or original file.
-      #
-      # Returns The String output file extension.
-      def output_ext(_ext)
-        nil
-      end
-
-      # Logic to do the content conversion.
-      #
-      # content - String content of file (without front matter).
-      #
-      # Returns a String of the converted content.
+      # @param content [String]
+      # @return String
       def convert(content)
         document = Kramdown::Document.new(content, @config)
         html_output = document.to_html.chomp

data/lib/bridgetown-core/utils.rb

@@ -10,6 +10,7 @@ module Bridgetown
     autoload :RubyExec, "bridgetown-core/utils/ruby_exec"
     autoload :RubyFrontMatter, "bridgetown-core/utils/ruby_front_matter"
     autoload :RubyFrontMatterDSL, "bridgetown-core/utils/ruby_front_matter"
+    autoload :SmartyPantsConverter, "bridgetown-core/utils/smarty_pants_converter"
 
     # Constants for use in #slugify
     SLUGIFY_MODES = %w(raw default pretty simple ascii latin).freeze

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "1.1.0.beta3"
-  CODE_NAME = "Belmont"
+  VERSION = "1.2.0.beta1"
+  CODE_NAME = "Bonny Slope"
 end

data/lib/bridgetown-core/watcher.rb

@@ -84,7 +84,7 @@ module Bridgetown
       begin
         time = Time.now
         I18n.reload! # make sure any locale files get read again
-        Bridgetown::Current.site = site # needed in SSR mode apparently
+        Bridgetown::Current.sites[site.label] = site # needed in SSR mode apparently
         catch :halt do
           Bridgetown::Hooks.trigger :site, :pre_reload, site, paths
           Bridgetown::Hooks.clear_reloadable_hooks
@@ -122,19 +122,12 @@ module Bridgetown
       Array(options["exclude"]).map { |e| Bridgetown.sanitized_path(options["source"], e) }
     end
 
-    def config_files(options)
-      %w(yml yaml toml).map do |ext|
-        Bridgetown.sanitized_path(options["source"], "_config.#{ext}")
-      end
-    end
-
     def component_frontend_matcher
       %r{_components/.*?(\.js|\.jsx|\.js\.rb|\.css)$}
     end
 
     def to_exclude(options)
       [
-        config_files(options),
         options["destination"],
         custom_excludes(options),
       ].flatten

data/lib/bridgetown-core.rb

@@ -101,6 +101,7 @@ module Bridgetown
   autoload :RubyTemplateView,    "bridgetown-core/ruby_template_view"
   autoload :LogWriter,           "bridgetown-core/log_writer"
   autoload :Site,                "bridgetown-core/site"
+  autoload :Slot,                "bridgetown-core/slot"
   autoload :StaticFile,          "bridgetown-core/static_file"
   autoload :Transformable,       "bridgetown-core/concerns/transformable"
   autoload :URL,                 "bridgetown-core/url"
@@ -134,6 +135,13 @@ module Bridgetown
     end
     alias_method :env, :environment
 
+    def begin!
+      ENV["RACK_ENV"] = ENV["BRIDGETOWN_ENV"]
+
+      Bridgetown::Current.preloaded_configuration = Bridgetown::Configuration::Preflight.new
+      Bridgetown::PluginManager.setup_bundler
+    end
+
     # Generate a Bridgetown configuration hash by merging the default
     #   options with anything in bridgetown.config.yml, and adding the given
     #   options on top.
@@ -146,18 +154,74 @@ module Bridgetown
     # @return [Hash] The final configuration hash.
     def configuration(override = {})
       config = Configuration.new
-      override = Configuration[override].stringify_keys
+      override = Configuration.new(override)
       unless override.delete("skip_config_files")
         config = config.read_config_files(config.config_files(override))
       end
 
       # Merge DEFAULTS < bridgetown.config.yml < override
+      # @param obj [Bridgetown::Configuration]
       Configuration.from(Utils.deep_merge_hashes(config, override)).tap do |obj|
         set_timezone(obj["timezone"]) if obj["timezone"]
+
+        # Copy "global" source manifests and initializers into this new configuration
+        if Bridgetown::Current.preloaded_configuration.is_a?(Bridgetown::Configuration::Preflight)
+          obj.source_manifests = Bridgetown::Current.preloaded_configuration.source_manifests
+
+          if Bridgetown::Current.preloaded_configuration.initializers
+            obj.initializers = Bridgetown::Current.preloaded_configuration.initializers
+          end
+        end
+
+        Bridgetown::Current.preloaded_configuration = obj
       end
     end
 
-    # Conveinence method to register a new Thor command
+    def initializer(name, prepend: false, replace: false, &block) # rubocop:todo Metrics
+      unless Bridgetown::Current.preloaded_configuration
+        raise "The `#{name}' initializer in #{block.source_location[0]} was called " \
+              "without a preloaded configuration"
+      end
+
+      Bridgetown::Current.preloaded_configuration.initializers ||= {}
+
+      if Bridgetown::Current.preloaded_configuration.initializers.key?(name.to_sym)
+        if replace
+          Bridgetown.logger.warn(
+            "Initializing:",
+            "The previous `#{name}' initializer was replaced by a new initializer"
+          )
+        else
+          prev_block = Bridgetown::Current.preloaded_configuration.initializers[name.to_sym].block
+          new_block = block
+          block = if prepend
+                    proc do |*args, **kwargs|
+                      new_block.(*args, **kwargs)
+                      prev_block.(*args, **kwargs)
+                    end
+                  else
+                    proc do |*args, **kwargs|
+                      prev_block.(*args, **kwargs)
+                      new_block.(*args, **kwargs)
+                    end
+                  end
+        end
+      end
+
+      Bridgetown::Current.preloaded_configuration.initializers[name.to_sym] =
+        Bridgetown::Configuration::Initializer.new(
+          name: name.to_sym,
+          block: block,
+          completed: false
+        )
+    end
+
+    # @yieldself [Bridgetown::Configuration::ConfigurationDSL]
+    def configure(&block)
+      initializer :init, &block
+    end
+
+    # Convenience method to register a new Thor command
     #
     # @see Bridgetown::Commands::Registrations.register
     def register_command(&block)
@@ -166,10 +230,28 @@ module Bridgetown
 
     def load_tasks
       require "bridgetown-core/commands/base"
-      Bridgetown::PluginManager.require_from_bundler(skip_yarn: true)
+      Bridgetown::PluginManager.setup_bundler(skip_yarn: true)
+      if Bridgetown::Current.preloaded_configuration.is_a?(Bridgetown::Configuration::Preflight)
+        Bridgetown::Current.preloaded_configuration = Bridgetown.configuration
+      else
+        Bridgetown::Current.preloaded_configuration ||= Bridgetown.configuration
+      end
       load File.expand_path("bridgetown-core/tasks/bridgetown_tasks.rake", __dir__)
     end
 
+    # Loads ENV configuration via dotenv gem, if available
+    #
+    # @param root [String] root of Bridgetown site
+    def load_dotenv(root:)
+      dotenv_files = [
+        File.join(root, ".env.#{Bridgetown.env}.local"),
+        (File.join(root, ".env.local") unless Bridgetown.env.test?),
+        File.join(root, ".env.#{Bridgetown.env}"),
+        File.join(root, ".env"),
+      ].compact
+      Dotenv.load(*dotenv_files)
+    end
+
     # Determines the correct Bundler environment block method to use and passes
     # the block on to it.
     #
@@ -214,6 +296,10 @@ module Bridgetown
     #
     # @return [Array<Bridgetown::Site>] the Bridgetown sites created.
     def sites
+      Deprecator.deprecation_message(
+        "Bridgetown.sites will be removed in the next version. Use Bridgetown::Current.sites" \
+        "instead"
+      )
       [Bridgetown::Current.site].compact
     end
 
@@ -246,9 +332,6 @@ module Bridgetown
         File.join(base_directory, clean_path)
       end
     end
-
-    # Conditional optimizations
-    Bridgetown::Utils::RequireGems.require_if_present("liquid/c")
   end
 end
 

data/lib/roda/plugins/bridgetown_boot.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class Roda
+  module RodaPlugins
+    module BridgetownBoot
+      Roda::RodaRequest.alias_method :_previous_roda_cookies, :cookies
+
+      module RequestMethods
+        # Monkeypatch Roda/Rack's Request object so it returns a hash which allows for
+        # indifferent access
+        def cookies
+          # TODO: maybe replace with a simpler hash that offers an overloaded `[]` method
+          _previous_roda_cookies.with_indifferent_access
+        end
+
+        # Starts up the Bridgetown routing system
+        def bridgetown
+          Bridgetown::Rack::Routes.start!(scope)
+        end
+      end
+    end
+
+    register_plugin :bridgetown_boot, BridgetownBoot
+  end
+end

data/lib/roda/plugins/bridgetown_ssr.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Roda
+  module RodaPlugins
+    module BridgetownSSR
+      module InstanceMethods
+        # Helper to get the site associated with the Roda app
+        # @return [Bridgetown::Site]
+        def bridgetown_site
+          self.class.opts[:bridgetown_site]
+        end
+      end
+
+      def self.configure(app, _opts = {}, &block)
+        app.include Bridgetown::Filters::URLFilters
+        app.opts[:bridgetown_site] =
+          Bridgetown::Site.start_ssr!(loaders_manager: Bridgetown::Rack.loaders_manager, &block)
+      end
+    end
+
+    register_plugin :bridgetown_ssr, BridgetownSSR
+  end
+end

data/lib/roda/plugins/initializers.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Roda
+  module RodaPlugins
+    module Initializers
+      def self.load_dependencies(app)
+        Bridgetown::Current.preloaded_configuration.initialize_roda_app(app)
+      end
+
+      def self.configure(app, _opts = {})
+        app.opts[:bridgetown_preloaded_config] = Bridgetown::Current.preloaded_configuration
+      end
+    end
+
+    register_plugin :initializers, Initializers
+  end
+end

data/lib/site_template/.gitignore

@@ -3,6 +3,7 @@ output
 .bridgetown-cache
 .bridgetown-metadata
 .bridgetown-webpack
+.routes.json
 
 # Dependency folders
 node_modules

data/lib/site_template/Gemfile.erb

@@ -22,7 +22,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gem "bridgetown", "~> <%= Bridgetown::VERSION %>"
 
 # Uncomment to add file-based dynamic routing to your project:
-# gem "bridgetown-routes", "~> <%= Bridgetown::VERSION %>", group: :bridgetown_plugins
+# gem "bridgetown-routes", "~> <%= Bridgetown::VERSION %>"
 
 # Uncomment to use the Inspectors API to manipulate the output
 # of your HTML or XML resources:

data/lib/site_template/TEMPLATES/erb/_layouts/default.erb

@@ -1,9 +1,9 @@
 <!doctype html>
 <html lang="<%= site.locale %>">
   <head>
-    <%= render "head", metadata: site.metadata, title: resource.data.title %>
+    <%= render "head", metadata: site.metadata, title: data.title %>
   </head>
-  <body class="<%= resource.data.layout %> <%= resource.data.page_class %>">
+  <body class="<%= data.layout %> <%= data.page_class %>">
     <%= render Shared::Navbar.new(metadata: site.metadata, resource: resource) %>
 
     <main>

data/lib/site_template/TEMPLATES/erb/_layouts/page.erb

@@ -2,6 +2,6 @@
 layout: default
 ---
 
-<h1><%= resource.data.title %></h1>
+<h1><%= data.title %></h1>
 
 <%= yield %>

data/lib/site_template/TEMPLATES/erb/_layouts/post.erb

@@ -2,6 +2,6 @@
 layout: default
 ---
 
-<h1><%= resource.data.title %></h1>
+<h1><%= data.title %></h1>
 
 <%= yield %>

data/lib/site_template/TEMPLATES/liquid/_layouts/default.liquid

@@ -1,9 +1,9 @@
 <!doctype html>
 <html lang="{{ site.locale }}">
   <head>
-    {% render "head", metadata: site.metadata, title: page.title %}
+    {% render "head", metadata: site.metadata, title: data.title %}
   </head>
-  <body class="{{ resource.data.layout }} {{ resource.data.page_class }}">
+  <body class="{{ data.layout }} {{ data.page_class }}">
     {% render "navbar", metadata: site.metadata, resource: resource %}
 
     <main>

data/lib/site_template/TEMPLATES/liquid/_layouts/page.liquid

@@ -2,6 +2,6 @@
 layout: default
 ---
 
-<h1>{{ page.title }}</h1>
+<h1>{{ data.title }}</h1>
 
 {{ content }}

data/lib/site_template/TEMPLATES/liquid/_layouts/post.liquid

@@ -2,6 +2,6 @@
 layout: default
 ---
 
-<h1>{{ page.title }}</h1>
+<h1>{{ data.title }}</h1>
 
 {{ content }}

data/lib/site_template/TEMPLATES/serbea/_layouts/default.serb

@@ -1,9 +1,9 @@
 <!doctype html>
 <html lang="{%= site.locale %}">
   <head>
-    {%@ "head", metadata: site.metadata, title: resource.data.title %}
+    {%@ "head", metadata: site.metadata, title: data.title %}
   </head>
-  <body class="{{ resource.data.layout }} {{ resource.data.page_class }}">
+  <body class="{{ data.layout }} {{ data.page_class }}">
     {%@ Shared::Navbar metadata: site.metadata, resource: resource %}
 
     <main>

data/lib/site_template/TEMPLATES/serbea/_layouts/page.serb

@@ -2,6 +2,6 @@
 layout: default
 ---
 
-<h1>{{ resource.data.title }}</h1>
+<h1>{{ data.title }}</h1>
 
 {%= yield %}

data/lib/site_template/TEMPLATES/serbea/_layouts/post.serb

@@ -2,6 +2,6 @@
 layout: default
 ---
 
-<h1>{{ resource.data.title }}</h1>
+<h1>{{ data.title }}</h1>
 
 {%= yield %}

data/lib/site_template/config/initializers.rb

@@ -0,0 +1,43 @@
+Bridgetown.configure do |config|
+  # You can configure aspects of your Bridgetown site here instead of using
+  # `bridgetown.config.yml`. For example:
+  #
+  # permalink "simple"
+  # timezone "America/Los_Angeles"
+  #
+  # You can also modify options on the configuration object directly, like so:
+  #
+  # config.autoload_paths << "models"
+  #
+
+  # You can use `init` to initialize various Bridgetown features or plugin gems.
+  # For example, you can use the Dotenv gem to load environment variables from
+  # `.env`. Just `bundle add dotenv` and then uncomment this:
+  #
+  # init :dotenv
+  #
+
+  # Uncomment to use Bridgetown SSR (aka dynamic rendering of content via Roda):
+  #
+  # init :ssr
+  #
+
+  # Uncomment to use file-based dynamic template routing via Roda (make sure you
+  # uncomment the gem dependency in your `Gemfile` as well):
+  #
+  # init :"bridgetown-routes"
+  #
+
+  # We also recommend that if you're using Roda routes you include this plugin
+  # so you can get a generated routes list in `.routes.json`. You can then run
+  # `bin/bridgetown roda:routes` to print the routes. (This will require you to
+  # comment your route blocks. See example in `server/routes/hello.rb.sample`.)
+  #
+  # only :server do
+  #   init :parse_routes
+  # end
+  #
+
+  # For more documentation on how to configure your site using this initializers file,
+  # visit: https://edge.bridgetownrb.com/documentation/configuration/initializers/
+end

data/lib/site_template/package.json.erb

@@ -27,7 +27,7 @@
     "postcss-flexbugs-fixes": "^5.0.2",
     <%- if frontend_bundling_option == "esbuild" -%>
     "postcss-import": "^14.1.0",
-    "postcss-load-config": "^3.1.4",
+    "postcss-load-config": "^4.0.1",
     <%- else -%>
     "postcss-loader": "^6.2.1",
     <%- end -%>

data/lib/site_template/server/roda_app.rb

@@ -5,14 +5,8 @@
 # Learn more at: http://roda.jeremyevans.net
 
 class RodaApp < Bridgetown::Rack::Roda
-  # Add additional Roda configuration here if needed
-
-  # Uncomment to use Bridgetown SSR:
-  # plugin :bridgetown_ssr
-
-  # 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
+  # Some Roda configuration is handled in the `config/initializers.rb` file.
+  # But you can also add additional Roda configuration here if needed.
 
   route do |r|
     # Load Roda routes in server/routes (and src/_routes via `bridgetown-routes`)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta3
+  version: 1.2.0.beta1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2022-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -344,8 +344,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
-description: Bridgetown is a Webpack-aware, Ruby-powered static site generator for
-  the modern Jamstack era
+description: Bridgetown is a next-generation, progressive site generator & fullstack
+  framework, powered by Ruby
 email: maintainers@bridgetownrb.com
 executables:
 - bridgetown
@@ -408,6 +408,7 @@ files:
 - lib/bridgetown-core/concerns/site/writable.rb
 - lib/bridgetown-core/concerns/transformable.rb
 - lib/bridgetown-core/configuration.rb
+- lib/bridgetown-core/configuration/configuration_dsl.rb
 - lib/bridgetown-core/configurations/.keep
 - lib/bridgetown-core/configurations/bt-postcss.rb
 - lib/bridgetown-core/configurations/bt-postcss/postcss.config.js
@@ -455,7 +456,6 @@ files:
 - 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
 - lib/bridgetown-core/deprecator.rb
@@ -519,6 +519,7 @@ files:
 - lib/bridgetown-core/resource/transformer.rb
 - lib/bridgetown-core/ruby_template_view.rb
 - lib/bridgetown-core/site.rb
+- lib/bridgetown-core/slot.rb
 - lib/bridgetown-core/static_file.rb
 - lib/bridgetown-core/tags/asset_path.rb
 - lib/bridgetown-core/tags/class_map.rb
@@ -535,13 +536,18 @@ files:
 - lib/bridgetown-core/utils.rb
 - lib/bridgetown-core/utils/ansi.rb
 - lib/bridgetown-core/utils/aux.rb
+- lib/bridgetown-core/utils/initializers.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
+- lib/bridgetown-core/utils/smarty_pants_converter.rb
 - lib/bridgetown-core/version.rb
 - lib/bridgetown-core/watcher.rb
 - lib/bridgetown-core/yaml_parser.rb
+- lib/roda/plugins/bridgetown_boot.rb
+- lib/roda/plugins/bridgetown_ssr.rb
+- lib/roda/plugins/initializers.rb
 - lib/site_template/.gitignore
 - lib/site_template/Gemfile.erb
 - lib/site_template/README.md
@@ -568,6 +574,7 @@ files:
 - lib/site_template/TEMPLATES/serbea/_partials/_head.serb
 - lib/site_template/bridgetown.config.yml
 - lib/site_template/config.ru
+- lib/site_template/config/initializers.rb
 - lib/site_template/config/puma.rb
 - lib/site_template/frontend/javascript/index.js.erb
 - lib/site_template/frontend/styles/index.css
@@ -596,6 +603,7 @@ metadata:
   bug_tracker_uri: https://github.com/bridgetownrb/bridgetown/issues
   changelog_uri: https://github.com/bridgetownrb/bridgetown/releases
   homepage_uri: https://www.bridgetownrb.com
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -615,6 +623,6 @@ requirements: []
 rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: A Webpack-aware, Ruby-based static site generator for the modern Jamstack
-  era
+summary: A next-generation, progressive site generator & fullstack framework, powered
+  by Ruby
 test_files: []