bridgetown-core 1.1.0.beta3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afc674e5aa40d66a2b9e4f24c0aad39108f47e70c8d4756cbfa86623ed2dc7e0
-  data.tar.gz: 4bf462c506c3fcdd09a4750bedae19cb2ee4ff429b57a6266dd56d62645d4926
+  metadata.gz: e1a8e2712c8b2f218d0082a2d890bb53401efb354a055c323189bbefd1d9f9a6
+  data.tar.gz: 99d3049dabe2ba5e3e812240268fb754c842b1bbcf0acbe46345fbc1ada7194f
 SHA512:
-  metadata.gz: 5baaa3f133d0e1cbd5e7e972645f107361088d9d11b5bebb38374573d898b67a07b318b4d19e1e5731a696dafe88a3b2ded6ba1c068b869e5bad750200905417
-  data.tar.gz: 4a88c972c98f54ac8b98538fec81f907797cb423f6fa89907cab21a58c29d5961b5e6bf156a3d2846a6d2fd831656696fa9a2afd76d2c2a6f3f5b62663db2c8d
+  metadata.gz: d820196117aad565c3dd7150c535ccd98b08b1d4cdad4b439855ea4a2666ce58f67abe67a0b68dc40959fd3e9d7eac299bf9261a43f4ef119294549bd7a95595
+  data.tar.gz: 40a94f0d056e35ea8f1f34d2e0f5684ed0990ee2a2804aac4d91766d2d8ead3528dbdbbf555f14035878a1287a58cf60a70e9ffc7a60a41bcf6c1cfcf9b2bf31

data/lib/bridgetown-core/configuration.rb

@@ -48,7 +48,6 @@ module Bridgetown
       "content_engine"             => "resource",
       "markdown"                   => "kramdown",
       "highlighter"                => "rouge",
-      "excerpt_separator"          => "\n\n",
 
       # Serving
       "port"                       => "4000",
@@ -155,6 +154,8 @@ module Bridgetown
         raise ArgumentError,
               "No parser for '#{filename}' is available. Use a .y(a)ml or .toml file instead."
       end
+    rescue Psych::DisallowedClass => e
+      raise "Unable to parse `#{File.basename(filename)}'. #{e.message}"
     end
 
     # Public: Generate list of configuration files from the override

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

@@ -10,33 +10,45 @@ create_builder "purgecss.rb" do
   <<~RUBY
     class Builders::Purgecss < SiteBuilder
       def build
-        unless config[:watch] # don't run in "watch mode"
-          hook :site, :post_write do
-            purgecss_file = site.in_root_dir("purgecss.config.js")
-            unless File.exist?(purgecss_file)
-              config_js = <<~PURGE
-                module.exports = {
-                  content: ['frontend/javascript/*.js','./output/**/*.html'],
-                  output: "./output/_bridgetown/static/css"
-                }
-              PURGE
-              File.write(purgecss_file, config_js.strip)
-            end
-            manifest_file = File.join(site.frontend_bundling_path, "manifest.json")
-            if File.exist?(manifest_file)
-              manifest = JSON.parse(File.read(manifest_file))
-              # TODO: make this work with esbuild too
+        return if config[:watch] # don't run in "watch mode"
+
+        hook :site, :post_write do
+          purgecss_file = site.in_root_dir("purgecss.config.js")
+
+          unless File.exist?(purgecss_file)
+            config_js = <<~PURGE
+              module.exports = {
+                content: ['frontend/javascript/*.js','./output/**/*.html'],
+                output: "./output/_bridgetown/static"
+              }
+            PURGE
+            File.write(purgecss_file, config_js.strip)
+          end
+
+          manifest_file = File.join(site.frontend_bundling_path, "manifest.json")
+
+          if File.exist?(manifest_file)
+            manifest = JSON.parse(File.read(manifest_file))
+
+            if Bridgetown::Utils.frontend_bundler_type == :esbuild
+              css_file = manifest["styles/index.css"].split("/").last
+              css_path = ["output", "_bridgetown", "static", css_file].join("/")
+            else
               css_file = manifest["main.css"].split("/").last
               css_path = ["output", "_bridgetown", "static", "css", css_file].join("/")
-              Bridgetown.logger.info "PurgeCSS", "Purging \#{css_file}"
-              oldsize = File.stat(css_path).size / 1000
-              system "./node_modules/.bin/purgecss -c purgecss.config.js -css \#{css_path}"
-              newsize = File.stat(css_path).size / 1000
-              if newsize < oldsize
-                Bridgetown.logger.info "PurgeCSS", "Done! File size reduced from \#{oldsize}kB to \#{newsize}kB"
-              else
-                Bridgetown.logger.info "PurgeCSS", "Done. No apparent change in file size (\#{newsize}kB)."
-              end
+            end
+
+            Bridgetown.logger.info "PurgeCSS", "Purging \#{css_file}"
+            oldsize = File.stat(css_path).size / 1000
+            system "./node_modules/.bin/purgecss -c purgecss.config.js -css \#{css_path}"
+            newsize = File.stat(css_path).size / 1000
+
+            if newsize < oldsize
+              Bridgetown.logger.info "PurgeCSS",
+                                     "Done! File size reduced from \#{oldsize}kB to \#{newsize}kB"
+            else
+              Bridgetown.logger.info "PurgeCSS",
+                                     "Done. No apparent change in file size (\#{newsize}kB)."
             end
           end
         end

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

@@ -4,14 +4,27 @@ say_status :shoelace, "Installing Shoelace..."
 
 run "yarn add @shoelace-style/shoelace"
 
+stylesheet_import = <<~CSS
+  /* Import the base Shoelace stylesheet: */
+  @import "@shoelace-style/shoelace/dist/themes/light.css";
+
+CSS
+
+if File.exist?("frontend/styles/index.css")
+  prepend_to_file "frontend/styles/index.css", stylesheet_import
+elsif File.exist?("frontend/styles/index.scss")
+  prepend_to_file "frontend/styles/index.scss", stylesheet_import
+else
+  say "\nPlease add the following lines to your CSS index file:"
+  say stylesheet_import
+end
+
 say 'Adding Shoelace to "frontend/javascript/index.js"...', :magenta
 
 javascript_import do
   <<~JS
-    // Import the base Shoelace stylesheet:
-    import "@shoelace-style/shoelace/dist/themes/light.css"
 
-    // Example components, mix 'n' match however you like!
+    // Example Shoelace components. Mix 'n' match however you like!
     import "@shoelace-style/shoelace/dist/components/button/button.js"
     import "@shoelace-style/shoelace/dist/components/icon/icon.js"
     import "@shoelace-style/shoelace/dist/components/spinner/spinner.js"
@@ -45,6 +58,15 @@ else
             '"webpack-dev": "yarn shoelace:copy-assets && webpack'
 end
 
+if File.exist?(".gitignore")
+  append_to_file ".gitignore" do
+    <<~FILES
+
+      src/shoelace-assets
+    FILES
+  end
+end
+
 say_status :shoelace, "Shoelace is now configured!"
 
 say 'For further reading, check out "https://shoelace.style"', :blue

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

@@ -45,11 +45,13 @@ insert_into_file "Rakefile",
   JS
 end
 
-append_to_file ".gitignore" do
-  <<~FILES
+if File.exist?(".gitignore")
+  append_to_file ".gitignore" do
+    <<~FILES
 
-    frontend/styles/jit-refresh.css
-  FILES
+      frontend/styles/jit-refresh.css
+    FILES
+  end
 end
 
 create_builder "tailwind_jit.rb" do

data/lib/bridgetown-core/version.rb

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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta3
+  version: 1.1.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -608,9 +608,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: