bridgetown-core 0.21.1 → 0.21.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3ba931e1d2393d0b13861c33e41c465a4e422baac0f9a68e39699b8159a2c5c
-  data.tar.gz: ff03f8af4f51257689ec84b0b661b0ba22ceb16a9110c5715aab56645020219c
+  metadata.gz: f9369cb49650eed5ad6776258f190b8afd8afa714d6dfaa77b2c6c1c15537346
+  data.tar.gz: f8625881a5386a7520e4e22981254352d0040d28052e2f85c64f072884da6f05
 SHA512:
-  metadata.gz: 82407b17c101d072436853bb2892108b544d91d2667dbdef36696d674ce3af18a123920f0e33dd3acce352bf7ad48c9df162c03aba977d7dad2a23ad1dfbc20e
-  data.tar.gz: 6c6c47fbf536cf3e3104040ce480be88183b60df5220845fe8a163af32de700b9f358c9d2bf58d19985da42d66e4005765c3d47a5e3c29def6039f77a640447b
+  metadata.gz: f8d19b3e0926ed332e4030ddf4c039292d14f490b509708dd51f81b0cd4b177b22a819920d35a3e4f0a4924204893f36fdc00c388ef9bed28dbf672af590dc96
+  data.tar.gz: 25dc48e4587613c547cd12cb762c7a968efedda1905d3fca1814deeab3af2f70ebdb755c6572793e8db817cbef8e16a8d741e517ae1eb7c978da05d353492d39

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

@@ -220,5 +220,15 @@ class Bridgetown::Site
     def add_generated_page(generated_page)
       generated_pages << generated_page
     end
+
+    # Loads and memoizes the parsed Webpack manifest file (if available)
+    # @return [Hash]
+    def frontend_manifest
+      @frontend_manifest ||= begin
+        manifest_file = in_root_dir(".bridgetown-webpack", "manifest.json")
+
+        JSON.parse(File.read(manifest_file)) if File.exist?(manifest_file)
+      end
+    end
   end
 end

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

@@ -34,6 +34,7 @@ class Bridgetown::Site
       self.pages = []
       self.static_files = []
       self.data = HashWithDotAccess::Hash.new
+      @frontend_manifest = nil
       @post_attr_hash = {}
       @collections = nil
       @documents = nil

data/lib/bridgetown-core/errors.rb

@@ -14,7 +14,5 @@ module Bridgetown
     PostURLError                = Class.new(FatalException)
     InvalidURLError             = Class.new(FatalException)
     InvalidConfigurationError   = Class.new(FatalException)
-
-    WebpackAssetError           = Class.new(FatalException)
   end
 end

data/lib/bridgetown-core/frontmatter_defaults.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  # This class handles custom defaults for YAML frontmatter settings.
-  # These are set in bridgetown.config.yml and apply both to internal use (e.g. layout)
-  # and the data available to liquid.
-  #
+  # This class handles custom defaults for YAML frontmatter variables.
   # It is exposed via the frontmatter_defaults method on the site class.
+  # TODO: needs simplification/refactoring.
   class FrontmatterDefaults
-    # Initializes a new instance.
+    # @return [Bridgetown::Site]
+    attr_reader :site
+
     def initialize(site)
       @site = site
     end
@@ -45,7 +45,7 @@ module Bridgetown
       set
     end
 
-    # Finds a default value for a given setting, filtered by path and type
+    # TODO: deprecated. See `all` method instead
     #
     # path - the path (relative to the source) of the page or
     # post the default is used in
@@ -96,8 +96,8 @@ module Bridgetown
     private
 
     def merge_data_cascade_for_path(path, merged_data)
-      absolute_path = @site.in_source_dir(path)
-      @site.defaults_reader.path_defaults
+      absolute_path = site.in_source_dir(path)
+      site.defaults_reader.path_defaults
         .select { |k, _v| absolute_path.include? k }
         .sort_by { |k, _v| k.length }
         .each do |defaults|
@@ -130,7 +130,7 @@ module Bridgetown
     end
 
     def glob_scope(sanitized_path, rel_scope_path)
-      site_source    = Pathname.new(@site.source)
+      site_source    = Pathname.new(site.source)
       abs_scope_path = site_source.join(rel_scope_path).to_s
 
       glob_cache(abs_scope_path).each do |scope_path|
@@ -152,7 +152,7 @@ module Bridgetown
     end
 
     def strip_collections_dir(path)
-      collections_dir  = @site.config["collections_dir"]
+      collections_dir  = site.config["collections_dir"]
       slashed_coll_dir = collections_dir.empty? ? "/" : "#{collections_dir}/"
       return path if collections_dir.empty? || !path.to_s.start_with?(slashed_coll_dir)
 
@@ -226,7 +226,7 @@ module Bridgetown
     #
     # Returns an array of hashes
     def valid_sets
-      sets = @site.config["defaults"]
+      sets = site.config["defaults"]
       return [] unless sets.is_a?(Array)
 
       sets.map do |set|

data/lib/bridgetown-core/generators/prototype_generator.rb

@@ -79,11 +79,11 @@ module Bridgetown
     # @return [String, nil]
     def validate_search_term(prototype_page)
       # @type [String]
-      search_term = prototype_page.data["prototype"]["term"]
-      return nil unless search_term.is_a?(String)
+      search_term = prototype_page.data["prototype"]["term"].to_s
+      return nil unless search_term.present?
 
       if prototype_page.data["prototype"]["collection"]
-        @configured_collection = prototype_page.data["prototype"]["collection"]
+        @configured_collection = prototype_page.data["prototype"]["collection"].to_s
       end
 
       unless site.collections[@configured_collection]

data/lib/bridgetown-core/plugin_manager.rb

@@ -173,13 +173,15 @@ module Bridgetown
       # source components _before_ we load any from plugins
       site.components_load_paths.reverse_each do |load_path|
         next unless Dir.exist? load_path
-        next if Zeitwerk::Registry.loaders.find { |loader| loader.manages?(load_path) }
 
-        @component_loaders[load_path] = Zeitwerk::Loader.new
-        @component_loaders[load_path].push_dir(load_path)
-        @component_loaders[load_path].enable_reloading if load_path.start_with?(site.root_dir)
-        @component_loaders[load_path].ignore(File.join(load_path, "**", "*.js.rb"))
-        @component_loaders[load_path].setup
+        begin
+          @component_loaders[load_path] = Zeitwerk::Loader.new
+          @component_loaders[load_path].push_dir(load_path)
+          @component_loaders[load_path].enable_reloading if load_path.start_with?(site.root_dir)
+          @component_loaders[load_path].ignore(File.join(load_path, "**", "*.js.rb"))
+          @component_loaders[load_path].setup
+        rescue Zeitwerk::Error # rubocop:disable Lint/SuppressedException
+        end
       end
     end
     # rubocop:enable Metrics/AbcSize

data/lib/bridgetown-core/reader.rb

@@ -2,6 +2,7 @@
 
 module Bridgetown
   class Reader
+    # @return [Bridgetown::Site]
     attr_reader :site
 
     def initialize(site)
@@ -17,12 +18,13 @@ module Bridgetown
       read_directories
       read_included_excludes
       sort_files!
-      read_collections
       site.data = if site.uses_resource?
+                    site.collections.data.read
                     site.collections.data.merge_data_resources
                   else
                     DataReader.new(site).read
                   end
+      read_collections
       Bridgetown::PluginManager.source_manifests.map(&:content).compact.each do |plugin_content_dir|
         PluginContentReader.new(site, plugin_content_dir).read
       end
@@ -30,15 +32,17 @@ module Bridgetown
 
     def read_collections
       site.collections.each_value do |collection|
-        collection.read unless !site.uses_resource? &&
-          collection.legacy_reader?
+        next if site.uses_resource? && collection.data?
+        next if !site.uses_resource? && collection.legacy_reader?
+
+        collection.read
       end
     end
 
     # Sorts posts, pages, and static files.
     def sort_files!
-      site.collections.each_value { |c| c.docs.sort! }
-      site.pages.sort_by!(&:name)
+      site.collections.posts.docs.sort! unless site.uses_resource?
+      site.generated_pages.sort_by!(&:name)
       site.static_files.sort_by!(&:relative_path)
     end
 
@@ -197,6 +201,7 @@ module Bridgetown
       dir  = File.dirname(entry_path).sub(site.source, "")
       file = Array(File.basename(entry_path))
       if Utils.has_yaml_header?(entry_path)
+        # TODO: does this need to get incorporated into the resource engine?
         site.pages.concat(PageReader.new(site, dir).read(file))
       else
         retrieve_static_files(dir, file)

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

@@ -30,9 +30,9 @@ module Bridgetown
       def initialize(model:)
         @model = model
         @site = model.site
-        self.data = HashWithDotAccess::Hash.new
+        @data = front_matter_defaults
 
-        trigger_hooks(:post_init)
+        trigger_hooks :post_init
       end
 
       # Collection associated with this resource
@@ -75,20 +75,21 @@ module Bridgetown
         @relations ||= Bridgetown::Resource::Relations.new(self)
       end
 
+      # Loads in any default front matter associated with the resource.
+      #
+      # @return [HashWithDotAccess::Hash]
+      def front_matter_defaults
+        site.frontmatter_defaults.all(
+          relative_path.to_s,
+          collection.label.to_sym
+        ).with_dot_access
+      end
+
+      # Merges new data into the existing data hash.
+      #
       # @param new_data [HashWithDotAccess::Hash]
       def data=(new_data)
-        unless new_data.is_a?(HashWithDotAccess::Hash)
-          raise "#{self.class} data should be of type HashWithDotAccess::Hash"
-        end
-
-        @data = new_data
-        @data.default_proc = proc do |_, key|
-          site.frontmatter_defaults.find(
-            relative_path.to_s,
-            collection.label.to_sym,
-            key.to_s
-          )
-        end
+        @data = @data.merge(new_data)
       end
 
       # @return [Bridgetown::Resource::Base]
@@ -107,7 +108,7 @@ module Bridgetown
 
         @destination = Destination.new(self) if requires_destination?
 
-        trigger_hooks(:post_read)
+        trigger_hooks :post_read
 
         self
       end
@@ -188,7 +189,7 @@ module Bridgetown
       def summary
         return summary_extension_output if respond_to?(:summary_extension_output)
 
-        content.to_s.strip.lines.first.to_s.strip
+        content.to_s.strip.lines.first.to_s.strip.html_safe
       end
 
       # @return [Hash<String, Hash<String => Bridgetown::Resource::TaxonomyType,

data/lib/bridgetown-core/utils.rb

@@ -354,28 +354,19 @@ module Bridgetown
     # @raise [WebpackAssetError] if unable to find css or js in the manifest
     # file
     def parse_webpack_manifest_file(site, asset_type)
-      manifest_file = site.in_root_dir(".bridgetown-webpack", "manifest.json")
-      return "MISSING_WEBPACK_MANIFEST" unless File.exist?(manifest_file)
+      return log_webpack_asset_error("Webpack manifest") if site.frontend_manifest.nil?
 
-      manifest = JSON.parse(File.read(manifest_file))
+      asset_path = if %w(js css).include?(asset_type)
+                     site.frontend_manifest["main.#{asset_type}"]
+                   else
+                     site.frontend_manifest.find do |item, _|
+                       item.sub(%r{^../(frontend/|src/)?}, "") == asset_type
+                     end&.last
+                   end
 
-      known_assets = %w(js css)
-      asset_path = nil
-      if known_assets.include?(asset_type)
-        asset_path = manifest["main.#{asset_type}"]
-        log_webpack_asset_error(asset_type) && return if asset_path.nil?
-      else
-        asset_path = manifest.find do |item, _|
-          item.sub(%r{^../(frontend/|src/)?}, "") == asset_type
-        end&.last
-      end
+      return log_webpack_asset_error(asset_type) if asset_path.nil?
 
-      if asset_path
-        static_frontend_path(site, ["js", asset_path])
-      else
-        Bridgetown.logger.error("Unknown Webpack asset type", asset_type)
-        nil
-      end
+      static_frontend_path site, ["js", asset_path]
     end
 
     def static_frontend_path(site, additional_parts = [])
@@ -389,10 +380,13 @@ module Bridgetown
     end
 
     def log_webpack_asset_error(asset_type)
-      error_message = "There was an error parsing your #{asset_type} files. \
-        Please check your #{asset_type} for any errors."
+      Bridgetown.logger.warn(
+        "Webpack:",
+        "There was an error parsing your #{asset_type} file. \
+        Please check your #{asset_type} file for any errors."
+      )
 
-      Bridgetown.logger.warn(Errors::WebpackAssetError, error_message)
+      "MISSING_WEBPACK_MANIFEST_FILE"
     end
 
     def default_github_branch_name(repo_url)

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.21.1"
+  VERSION = "0.21.5"
   CODE_NAME = "Broughton Beach"
 end

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

@@ -1,8 +1,8 @@
-<% if options["use-postcss"] %>
+<%- if options["use-postcss"] -%>
 import "index.css"
-<% else %>
+<%- else -%>
 import "index.scss"
-<% end %>
+<%- end -%>
 
 // Import all javascript files from src/_components
 const componentsContext = require.context("bridgetownComponents", true, /.js$/)

data/lib/site_template/package.json.erb

@@ -20,18 +20,21 @@
     "esbuild-loader": "^2.13.1",
     "file-loader": "^6.2.0",
     "mini-css-extract-plugin": "^1.3.1",
-    <% if options["use-postcss"] %>
+    <%- if options["use-postcss"] -%>
     "postcss": "^8.3.0",
     "postcss-flexbugs-fixes": "^4.1.0",
     "postcss-loader": "^4.3.0",
     "postcss-preset-env": "^6.7.0",
-    <% else %>
+    <%- else -%>
     "sass": "^1.32.8",
     "sass-loader": "^8.0.2",
-    <% end %>
+    <%- end -%>
     "webpack": "^5.39.1",
     "webpack-cli": "^4.7.2",
-    "webpack-manifest-plugin": "^3.1.1"
+    "webpack-manifest-plugin": "^3.1.1",
     "webpack-merge": "^5.8.0"
+  },
+  "resolutions": {
+    "postcss-focus-within": "^4.0.0"
   }
 }

data/lib/site_template/start.js

@@ -8,9 +8,9 @@ const port = 4001
 // Concurrently
 /////////////////
 concurrently([
-  { command: "yarn webpack-dev", name: "Webpack", prefixColor: "yellow"},
-  { command: "sleep 4; yarn serve --port " + port, name: "Bridgetown", prefixColor: "green"},
-  { command: "sleep 8; yarn sync", name: "Live", prefixColor: "blue"}
+  { command: "yarn webpack-dev", name: "Webpack", prefixColor: "yellow" },
+  { command: "sleep 4; yarn serve --port " + port, name: "Bridgetown", prefixColor: "green" },
+  { command: "sleep 8; yarn sync", name: "Live", prefixColor: "blue" }
 ], {
   restartTries: 3,
   killOthers: ['failure', 'success'],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.21.5
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel