bridgetown-core 1.0.0.beta1 → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6953f85017e90090c0078b710b3e447b69366bd9fed38bd5e307ee72ae3181c
-  data.tar.gz: 863dcdcea016110ae4e05922f7357b866bd2a77998b5da78ffb92819238c59c4
+  metadata.gz: e6a9d2528b695e8e0cf1016e12d9ef4f83ea3983568db4b20e740f5256024990
+  data.tar.gz: 8cfdc7484ba7f011cac11708667eb93e3fa27400269b7a548fc1cbc80dee37c1
 SHA512:
-  metadata.gz: eb6a1aa56f1544fcc37c4e204df417b5d7d37fa0e219e6a484872cdf4defee1c165fda09f4f30486d64635ef9ab6cf6db3edc8c63316dd3e61ab37be1394443c
-  data.tar.gz: 81b03e750b6fe6b25c1fbb2e62350f2c2776bf4902c236c5299f90c653720037e74ae8500bf71d928825efd3d83c651ad1d80523cb1362a1db2100d8f88daef9
+  metadata.gz: 98523ff2520d3428505ba743408fd20f4672cdfdebdb50fe914b025b7e63e6d661f923cdd6ee0d27c9f8cd126fc08b8b522206461b5e5862b6ddc7b30fcfe02c
+  data.tar.gz: 795673a2a1e3b44aa0624fbf1c7bb0e9bac35d2f3882dd45d309f70346777896a9ed75c1993f186f2a3adfc94df0d5c69e0beb71a7fbeaea3aa7ac5bf774400f

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

@@ -91,6 +91,8 @@ class Bridgetown::Site
     #   {Bridgetown.sanitized_path} method.
     # @return [Array<String>] Return an array of updated paths if multiple paths given.
     def in_source_dir(*paths)
+      # TODO: this operation is expensive across thousands of iterations. Look for ways
+      # to workaround use of this wherever possible...
       paths.reduce(source) do |base, path|
         Bridgetown.sanitized_path(base, path.to_s)
       end

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

@@ -41,6 +41,7 @@ class Bridgetown::Site
       @documents = nil
       @docs_to_write = nil
       @liquid_renderer.reset
+      tmp_cache.clear
 
       if soft
         refresh_layouts_and_data

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

@@ -34,9 +34,10 @@ append_to_file(File.join(javascript_dir, "index.js")) do
 
       import controllers from "./controllers/**/*.{js,js.rb}"
       Object.entries(controllers).forEach(([filename, controller]) => {
-        if (filename.includes("_controller.")) {
+        if (filename.includes("_controller.") || filename.includes("-controller.")) {
           const identifier = filename.replace("./controllers/", "")
-            .replace(/_controller\..*$/, "")
+            .replace(/[_\-]controller\..*$/, "")
+            .replace("_", "-")
             .replace("/", "--")
 
           Stimulus.register(identifier, controller.default)

data/lib/bridgetown-core/configurations/vercel/vercel.json

@@ -0,0 +1,45 @@
+{
+  "cleanUrls": true,
+  "trailingSlash": false,
+  "redirects": [],
+  "headers": [
+    {
+      "source": "/(.*)",
+      "headers": [
+        {
+          "key": "X-Content-Type-Options",
+          "value": "nosniff"
+        },
+        {
+          "key": "X-Frame-Options",
+          "value": "DENY"
+        },
+        {
+          "key": "X-XSS-Protection",
+          "value": "1; mode=block"
+        },
+        {
+          "key": "Referrer-Policy",
+          "value": "strict-origin"
+        },
+        {
+          "key": "Permissions-Policy",
+          "value": "geolocation=(self), microphone=()"
+        }
+      ]
+    },
+    {
+      "source": "/feed.xml",
+      "headers": [
+        {
+          "key": "Content-Type",
+          "value": "application/rss+xml"
+        },
+        {
+          "key": "Cache-Control",
+          "value": "public, max-age=3600"
+        }
+      ]
+    }
+  ]
+}

data/lib/bridgetown-core/configurations/vercel/vercel_url.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class Builders::VercelUrl < SiteBuilder
+  def build
+    hook :site, :pre_render do |site|
+      next unless ENV["VERCEL_URL"] && ENV["VERCEL_ENV"] != "production"
+
+      Bridgetown.logger.info("Subbing Vercel URL")
+      site.config.update(url: "https://#{ENV["VERCEL_URL"]}")
+    end
+  end
+end

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

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+copy_file in_templates_dir("vercel.json"), "vercel.json"
+copy_file in_templates_dir("vercel_url.rb"), "plugins/builders/vercel_url.rb"

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

@@ -83,16 +83,14 @@ module Bridgetown
       options.merge!(options[:locals]) if options[:locals]
       options[:content] = yield if block_given?
 
-      partial_segments = partial_name.split("/")
-      partial_segments.last.sub!(%r!^!, "_")
-      partial_name = partial_segments.join("/")
-
-      Tilt::ErubiTemplate.new(
-        site.in_source_dir(site.config[:partials_dir], "#{partial_name}.erb"),
+      partial_path = _partial_path(partial_name, "erb")
+      tmpl = site.tmp_cache["partial-tmpl:#{partial_path}"] ||= Tilt::ErubiTemplate.new(
+        partial_path,
         outvar: "@_erbout",
         bufval: "Bridgetown::OutputBuffer.new",
         engine_class: ERBEngine
-      ).render(self, options)
+      )
+      tmpl.render(self, options)
     end
   end
 

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

@@ -11,13 +11,10 @@ module Bridgetown
       options.merge!(options[:locals]) if options[:locals]
       options[:content] = capture(&block) if block
 
-      partial_segments = partial_name.split("/")
-      partial_segments.last.sub!(%r!^!, "_")
-      partial_name = partial_segments.join("/")
-
-      Tilt::SerbeaTemplate.new(
-        site.in_source_dir(site.config[:partials_dir], "#{partial_name}.serb")
-      ).render(self, options)
+      partial_path = _partial_path(partial_name, "serb")
+      tmpl = site.tmp_cache["partial-tmpl:#{partial_path}"] ||=
+        Tilt::SerbeaTemplate.new(partial_path)
+      tmpl.render(self, options)
     end
   end
 

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

@@ -30,7 +30,7 @@ module Bridgetown
       def initialize(model:)
         @model = model
         @site = model.site
-        @data = front_matter_defaults
+        @data = collection.data? ? HashWithDotAccess::Hash.new : front_matter_defaults
 
         trigger_hooks :post_init
       end

data/lib/bridgetown-core/ruby_template_view.rb

@@ -107,5 +107,12 @@ module Bridgetown
         strict_variables: site.config["liquid"]["strict_variables"],
       }
     end
+
+    def _partial_path(partial_name, ext)
+      partial_name = partial_name.split("/").tap { _1.last.prepend("_") }.join("/")
+
+      # TODO: see if there's a workaround for this to speed up performance
+      site.in_source_dir(site.config[:partials_dir], "#{partial_name}.#{ext}")
+    end
   end
 end

data/lib/bridgetown-core/site.rb

@@ -53,6 +53,7 @@ module Bridgetown
       @reader          = Reader.new(self)
       @liquid_renderer = LiquidRenderer.new(self)
 
+      Bridgetown::Cache.base_cache["site_tmp"] = {}.with_dot_access
       ensure_not_in_dest
 
       Bridgetown::Current.site = self
@@ -74,6 +75,10 @@ module Bridgetown
       end
     end
 
+    def tmp_cache
+      Bridgetown::Cache.base_cache["site_tmp"]
+    end
+
     def inspect
       "#<Bridgetown::Site #{metadata.inspect.delete_prefix("{").delete_suffix("}")}>"
     end

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

@@ -33,6 +33,12 @@ module Bridgetown
           return
         end
 
+        if defined?(ActiveSupport::RubyFeatures) && ActiveSupport::RubyFeatures::CLASS_SUBCLASSES
+          ActiveSupport::DescendantsTracker.clear([value.superclass])
+          return
+        end
+
+        # TODO: this could probably be refactored to work like the above
         ActiveSupport::DescendantsTracker.class_variable_get(
           :@@direct_descendants
         )[value.superclass]&.reject! { _1 == value }

data/lib/bridgetown-core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -443,6 +443,9 @@ files:
 - lib/bridgetown-core/configurations/tailwindcss/postcss.config.js
 - lib/bridgetown-core/configurations/turbo.rb
 - lib/bridgetown-core/configurations/turbo/turbo_transitions.js
+- lib/bridgetown-core/configurations/vercel.rb
+- lib/bridgetown-core/configurations/vercel/vercel.json
+- lib/bridgetown-core/configurations/vercel/vercel_url.rb
 - lib/bridgetown-core/converter.rb
 - lib/bridgetown-core/converters/erb_templates.rb
 - lib/bridgetown-core/converters/identity.rb