bridgetown-core 0.18.6 → 0.20.0

data/lib/bridgetown-core/configurations/swup.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# rubocop:disable all
+
+packages = "swup @swup/body-class-plugin @swup/scroll-plugin @swup/fade-theme"
+say_status :swup, "Adding the following yarn packages: #{packages}"
+system("yarn add #{packages}")
+
+javascript_import do
+  <<~JS
+    import Swup from "swup"
+    import SwupBodyClassPlugin from "@swup/body-class-plugin"
+    import SwupScrollPlugin from "@swup/scroll-plugin"
+    import SwupFadeTheme from "@swup/fade-theme"
+    const swup = new Swup({
+      plugins: [
+        new SwupBodyClassPlugin(),
+        new SwupScrollPlugin(),
+        new SwupFadeTheme(),
+      ]
+    })
+  JS
+end
+
+css_index = File.exist?(File.expand_path("frontend/styles/index.scss", destination_root)) ? "frontend/styles/index.scss" : "frontend/styles/index.css"
+append_to_file css_index do
+  <<~CSS
+    .swup-transition-main {
+      transition: opacity .2s;
+    }
+  CSS
+end
+
+say_status :swup, "All done! Edit .swup-transition-main in #{css_index} if you wish to adjust the transition animation"
+say_status :swup, "Make sure you add id=\"swup\" to the primary container of your HTML layout (perhaps <main>)"
+
+# rubocop:enable all

data/lib/bridgetown-core/configurations/tailwindcss.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# rubocop:disable all
+
+TEMPLATE_PATH = File.expand_path("./tailwindcss", __dir__)
+
+begin
+  find_in_source_paths("postcss.config.js")
+rescue Thor::Error
+  error_message = "#{"postcss.config.js".bold} not found. Please configure postcss in your project."
+
+  @logger.error "\nError:".red, "🚨 #{error_message}"
+  @logger.info "\nFor new projects, you can use #{"bridgetown new my_project --use-postcss".bold.blue}\n"
+
+  return
+end
+
+run "yarn add -D tailwindcss"
+run "npx tailwindcss init"
+
+remove_file "postcss.config.js"
+copy_file "#{TEMPLATE_PATH}/postcss.config.js", "postcss.config.js"
+
+prepend_to_file "frontend/styles/index.css",
+                File.read("#{TEMPLATE_PATH}/css_imports.css")
+
+run "bundle exec bridgetown configure purgecss"
+
+# rubocop:enable all

data/lib/bridgetown-core/configurations/tailwindcss/css_imports.css

@@ -0,0 +1,4 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+

data/lib/bridgetown-core/configurations/tailwindcss/postcss.config.js

@@ -0,0 +1,12 @@
+module.exports = {
+  plugins: {
+    'tailwindcss': {},
+    'postcss-flexbugs-fixes': {},
+    'postcss-preset-env': {
+      autoprefixer: {
+        flexbox: 'no-2009'
+      },
+      stage: 3
+    }
+  }
+}

data/lib/bridgetown-core/configurations/turbo.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+say "Installing Turbo...", :green
+
+run("yarn add @hotwired/turbo")
+
+say 'Adding Turbo to "frontend/javascript/index.js"...', :magenta
+
+javascript_import do
+  <<~JS
+    import Turbo from "@hotwired/turbo"
+  JS
+end
+
+say "Turbo successfully added", :green
+say 'For further reading, check out "https://turbo.hotwire.dev/"', :blue

data/lib/bridgetown-core/converter.rb

@@ -23,6 +23,16 @@ module Bridgetown
       @config = config
     end
 
+    # Logic to do the content conversion.
+    #
+    # @param content [String] content of file (without front matter).
+    # @param convertible [Bridgetown::Document, Bridgetown::Layout, Bridgetown::Resource::Base]
+    #
+    # @return [String] the converted content.
+    def convert(content, convertible = nil) # rubocop:disable Lint/UnusedMethodArgument
+      content
+    end
+
     # Does the given extension match this converter's list of acceptable extensions?
     #
     # @param [String] ext
@@ -42,5 +52,9 @@ module Bridgetown
     def output_ext(_ext)
       ".html"
     end
+
+    def inspect
+      "#<#{self.class}#{self.class.extname_list ? " #{self.class.extname_list.join(", ")}" : nil}>"
+    end
   end
 end

data/lib/bridgetown-core/converters/erb_templates.rb

@@ -65,24 +65,17 @@ module Bridgetown
         block.nil? ? input.to_s : capture(&block)
       )
       converter = site.find_converter_instance(Bridgetown::Converters::Markdown)
-      converter.convert(content).strip
+      result = converter.convert(content).strip
+      result.respond_to?(:html_safe) ? result.html_safe : result
     end
 
-    def capture(obj = nil, &block)
+    def capture(*args, &block)
+      return capture_in_view_component(*args, &block) if @in_view_component
+
       previous_buffer_state = @_erbout
       @_erbout = ERBBuffer.new
-
-      # For compatibility with ActionView, not used by Bridgetown normally
-      previous_ob_state = @output_buffer
-      @output_buffer = ERBBuffer.new
-
-      result = instance_exec(obj, &block)
-      if @output_buffer != ""
-        # use Rails' ActionView buffer if present
-        result = @output_buffer
-      end
+      result = yield(*args)
       @_erbout = previous_buffer_state
-      @output_buffer = previous_ob_state
 
       result.respond_to?(:html_safe) ? result.html_safe : result
     end

data/lib/bridgetown-core/converters/identity.rb

@@ -25,15 +25,6 @@ module Bridgetown
       def output_ext(ext)
         ext
       end
-
-      # Logic to do the content conversion.
-      #
-      # content - String content of file (without front matter).
-      #
-      # Returns a String of the converted content.
-      def convert(content)
-        content
-      end
     end
   end
 end

data/lib/bridgetown-core/converters/markdown.rb

@@ -22,7 +22,9 @@ module Bridgetown
           raise Errors::FatalException, "Invalid Markdown processor given: #{@config["markdown"]}"
         end
 
-        @cache = Bridgetown::Cache.new("Bridgetown::Converters::Markdown")
+        unless @config.cache_markdown == false || @config.kramdown.input == "GFMExtractions"
+          @cache = Bridgetown::Cache.new("Bridgetown::Converters::Markdown")
+        end
         @setup = true
       end
 
@@ -59,10 +61,18 @@ module Bridgetown
       # content - String content of file (without front matter).
       #
       # Returns a String of the converted content.
-      def convert(content)
+      def convert(content, convertible = nil)
         setup
-        @cache.getset(content) do
-          @parser.convert(content)
+        if @cache
+          @cache.getset(content) do
+            @parser.convert(content)
+          end
+        else
+          output = @parser.convert(content)
+          if @parser.respond_to?(:extractions)
+            convertible.data.markdown_extractions = @parser.extractions
+          end
+          output
         end
       end
 

data/lib/bridgetown-core/converters/markdown/kramdown_parser.rb

@@ -69,6 +69,8 @@ module Bridgetown
   module Converters
     class Markdown
       class KramdownParser
+        attr_reader :extractions
+
         def initialize(config)
           @main_fallback_highlighter = config["highlighter"] || "rouge"
           @config = config["kramdown"] || {}
@@ -95,6 +97,7 @@ module Bridgetown
               Bridgetown.logger.warn "Kramdown warning:", warning
             end
           end
+          @extractions = document.root.options[:extractions] # could be nil
           html_output
         end
 

data/lib/bridgetown-core/current.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  class Current < ActiveSupport::CurrentAttributes
+    # @!method self.site
+    #   @return [Bridgetown::Site]
+
+    attribute :site
+  end
+end

data/lib/bridgetown-core/document.rb

@@ -52,7 +52,7 @@ module Bridgetown
       @has_yaml_header = nil
 
       data.default_proc = proc do |_, key|
-        site.frontmatter_defaults.find(relative_path, type, key)
+        site.frontmatter_defaults.find(relative_path, type, key.to_s)
       end
 
       trigger_hooks(:post_init)
@@ -81,7 +81,7 @@ module Bridgetown
     #
     # Return document date string.
     def date
-      data["date"] ||= site.time
+      data["date"] ||= site.time # TODO: this doesn't reflect documented behavior
     end
 
     # Return document file modification time in the form of a Time object.
@@ -402,21 +402,13 @@ module Bridgetown
     end
 
     def populate_categories
-      categories = Array(data["categories"]) + Utils.pluralized_array_from_hash(
-        data, "category", "categories"
-      )
-      categories.map!(&:to_s)
-      categories.flatten!
-      categories.uniq!
-
-      merge_data!({ "categories" => categories })
+      data.categories = Utils.pluralized_array_from_hash(
+        data, :category, :categories
+      ).map(&:to_s)
     end
 
     def populate_tags
-      tags = Utils.pluralized_array_from_hash(data, "tag", "tags")
-      tags.flatten!
-
-      merge_data!({ "tags" => tags })
+      data.tags = Utils.pluralized_array_from_hash(data, :tag, :tags)
     end
 
     def determine_locale

data/lib/bridgetown-core/drops/collection_drop.rb

@@ -8,7 +8,7 @@ module Bridgetown
       mutable false
 
       def_delegator  :@obj, :write?, :output
-      def_delegators :@obj, :label, :docs, :files, :relative_path
+      def_delegators :@obj, :label, :docs, :files, :relative_path, :resources, :static_files
 
       private def_delegator :@obj, :metadata, :fallback_data
 

data/lib/bridgetown-core/drops/page_drop.rb

@@ -9,6 +9,10 @@ module Bridgetown
 
       def_delegators :@obj, :content, :dir, :name, :path, :url, :pager
       private def_delegator :@obj, :data, :fallback_data
+
+      def relative_url
+        @obj.relative_url
+      end
     end
   end
 end

data/lib/bridgetown-core/drops/resource_drop.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Drops
+    class ResourceDrop < Drop
+      extend Forwardable
+
+      NESTED_OBJECT_FIELD_BLACKLIST = %w(
+        content output excerpt next previous
+      ).freeze
+
+      mutable false
+
+      def_delegator :@obj, :relative_path, :path
+      def_delegators :@obj,
+                     :id,
+                     :output,
+                     :content,
+                     :to_s,
+                     :absolute_url,
+                     :relative_path,
+                     :relative_url,
+                     :date,
+                     :taxonomies
+
+      private def_delegator :@obj, :data, :fallback_data
+
+      def collection
+        @collection ||= @obj.collection.to_liquid
+      end
+
+      def excerpt
+        fallback_data["excerpt"].to_s
+      end
+
+      def <=>(other)
+        return nil unless other.is_a? ResourceDrop
+
+        cmp = self["date"] <=> other["date"]
+        cmp = self["path"] <=> other["path"] if cmp.nil? || cmp.zero?
+        cmp
+      end
+
+      def previous
+        @previous ||= @obj.previous_resource.to_liquid
+      end
+
+      def next
+        @next ||= @obj.previous_resource.to_liquid
+      end
+
+      # Generate a Hash for use in generating JSON.
+      # This is useful if fields need to be cleared before the JSON can generate.
+      #
+      # state - the JSON::State object which determines the state of current processing.
+      #
+      # Returns a Hash ready for JSON generation.
+      def hash_for_json(state = nil)
+        to_h.tap do |hash|
+          # use collection label in the hash
+          hash["collection"] = hash["collection"]["label"] if hash["collection"]
+
+          if state && state.depth >= 2
+            hash["previous"] = collapse_document(hash["previous"]) if hash["previous"]
+            hash["next"]     = collapse_document(hash["next"]) if hash["next"]
+          end
+        end
+      end
+
+      # Generate a Hash which breaks the recursive chain.
+      # Certain fields which are normally available are omitted.
+      #
+      # Returns a Hash with only non-recursive fields present.
+      def collapse_document(doc)
+        doc.keys.each_with_object({}) do |(key, _), result|
+          result[key] = doc[key] unless NESTED_OBJECT_FIELD_BLACKLIST.include?(key)
+        end
+      end
+    end
+  end
+end

data/lib/bridgetown-core/drops/site_drop.rb

@@ -7,35 +7,53 @@ module Bridgetown
 
       mutable false
 
-      def_delegator  :@obj, :data
-      def_delegators :@obj, :locale, :time, :pages, :static_files, :tags, :categories
+      def_delegators :@obj,
+                     :data,
+                     :locale,
+                     :time,
+                     :pages,
+                     :generated_pages,
+                     :static_files,
+                     :tags,
+                     :categories,
+                     :taxonomies,
+                     :taxonomy_types
 
       private def_delegator :@obj, :config, :fallback_data
 
       attr_writer :current_document
 
       def [](key)
-        if key != "posts" && @obj.collections.key?(key)
-          @obj.collections[key].docs
-        else
-          super(key)
+        if !@obj.uses_resource? && !%w(posts data).freeze.include?(key) &&
+            @obj.collections.key?(key)
+          return @obj.collections[key].docs
         end
+
+        super(key)
       end
 
       def key?(key)
-        (key != "posts" && @obj.collections.key?(key)) || super
+        (!@obj.uses_resource? && key != "posts" && @obj.collections.key?(key)) || super
+      end
+
+      def uses_resource
+        @obj.uses_resource?
       end
 
       def posts
-        @site_posts ||= @obj.posts.docs.sort { |a, b| b <=> a }
+        unless @obj.uses_resource?
+          @site_posts ||= @obj.collections.posts.docs.sort { |a, b| b <=> a }
+        end
       end
 
+      # TODO: deprecate before v1.0
       def html_pages
         @site_html_pages ||= @obj.pages.select do |page|
           page.html? || page.url.end_with?("/")
         end
       end
 
+      # TODO: deprecate before v1.0
       def collections
         @site_collections ||= @obj.collections.values.sort_by(&:label).map(&:to_liquid)
       end
@@ -50,6 +68,10 @@ module Bridgetown
         @documents ||= @obj.documents
       end
 
+      def resources
+        @resources ||= @obj.resources
+      end
+
       def contents
         @contents ||= @obj.contents
       end
@@ -58,6 +80,9 @@ module Bridgetown
         @site_metadata ||= @obj.data["site_metadata"]
       end
 
+      # TODO: change this so you *do* use site.config...aka site.config.timezone,
+      # not site.timezone
+      #
       # return nil for `{{ site.config }}` even if --config was passed via CLI
       def config; end
     end