bridgetown-core 0.21.3 → 0.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93f29ed24b8de3b277f80f77581605e3e0ed4aa8a40f87bb5b3e3cbc68fa8dfa
-  data.tar.gz: 9da3d6b3c608d7b067fdd9a65f6c05f1f40479c752d5c4fc5c523bcb9074e41b
+  metadata.gz: 45adfcd2a3d839fa9857ba0458db4090ef70e0c89cb9015d5813d5e2c7969224
+  data.tar.gz: 9e4a491aad2846485a35aa3114fdc656fe6577bcb46559117c1f908aaced9f46
 SHA512:
-  metadata.gz: 63578f5534657f1ce647edd2f8d63ab7603d95d2ab3e2090a67baee046aa851f25eebca7d140525e39d5291f7101a286e0667eddedfe3dbbfe25a9f5a965f6ec
-  data.tar.gz: a0d39c95cd660de86debb328c6aecd8e884ef2154caedd5e8d61b5de7c9268e3df4feb4c7f2ebc0706ec5d7eef40ce40b46be38190ce68a7679d42abd4dffd68
+  metadata.gz: a376dd395a1e6c217479441a15edaca9be963b246b54d19ed07ead07e148838b84ada1dd077b6e8a62e07979cad979b13f36f7579af5a110f67d470a7df1d8db
+  data.tar.gz: aba8119209faee49d7180e29f1526e8e0aaf0726e164fb0ee384736e451f709f52be13ab897ef49500316b1e782d1f719fa8879ecb09281a684fb4c80ff897a0

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/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/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/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.3"
+  VERSION = "0.21.4"
   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-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.3
+  version: 0.21.4
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-07 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel