bridgetown-core 2.1.0.beta1 → 2.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 696307e4270883706cdcff2ad44ea6d83120449aab4a5e74a67101fc3769fc3b
-  data.tar.gz: 5596f15af73805b95d1f2c8df40e4da2256733363697b235828fe6f59a5469fe
+  metadata.gz: 1f895d51e27a507afdcb11da40c28ac1d39f2aa63992c8cc3e0fe70234624054
+  data.tar.gz: d7cfd9665c5df7bea956e474eaf09bcd2e2c01a7a3f13614998837293ed0bf34
 SHA512:
-  metadata.gz: a72aa20636088803d8960f3880b48465702fa8961923b51ec6edc7b5245d8d6f9645c83c18b02993f396076c35cd7c461dfb5b97f04bcfc4f78d4f8984bd5eed
-  data.tar.gz: 9f4bdb2e72807ddc0a6caf528a26931ea6ce02e4384c6c31f889ab12f6bd0887d0da6181d7d1ee4c54d06b62f9f646958cf1d0ad09f50c66e346b45b1e0b1ca8
+  metadata.gz: e6963b721efce454a663b32d3d866a83f3f8e34675f4be92342c3200198fcdeb2ea122f34af67aa14227fc5048b99f0ecfaaf867c2da2b2ad7e794456db858a1
+  data.tar.gz: 5ed2af1ac5a40dda08ce53742797106da1b8ed710c59a1aaa3f2c6469f4735faa2ba0a2e89631fca710d431dd477a107f38ac0c530be8f097d5d08fd3e1de8fd

data/.rubocop.yml

@@ -12,7 +12,6 @@ AllCops:
     - tmp/**/*
     - test/source/**/*
     - test/resources/src/**/*.rb
-    - lib/bridgetown-core/configurations/ruby2js/**/*
     - lib/bridgetown-core/rack/roda.rb
     - lib/site_template/TEMPLATES/**/*
     - lib/site_template/Rakefile

data/lib/bridgetown-core/configurations/is-land.rb

@@ -7,7 +7,6 @@ add_npm_package "@11ty/is-land"
 javascript_import do
   <<~JS
     import "@11ty/is-land/is-land.js"
-    import "@11ty/is-land/is-land-autoinit.js"
   JS
 end
 

data/lib/bridgetown-core/front_matter/ruby.rb

@@ -25,6 +25,8 @@ module Bridgetown
 
       def get(key) = @data[key]
 
+      def key?(key) = @data.key?(key)
+
       def set(key, value = nil, &block)
         # Handle nested data within a block
         if block

data/lib/bridgetown-core/rack/routes.rb

@@ -14,7 +14,7 @@ module Bridgetown
       }.freeze
 
       class << self
-        # rubocop:disable Bridgetown/NoPutsAllowed, Metrics/MethodLength
+        # rubocop:disable Bridgetown/NoPutsAllowed, Metrics
         def print_routes
           # TODO: this needs to be fully documented
           routes = begin
@@ -26,24 +26,27 @@ module Bridgetown
           rescue StandardError
             []
           end
+
+          puts "Routes:".bold.green
           puts
-          puts "Routes:"
-          puts "=======\n"
+
           if routes.empty?
             puts "No routes found. Have you commented all of your routes?"
-            puts "Documentation: https://github.com/jeremyevans/roda-route_list#basic-usage-"
+            puts "Documentation: https://github.com/jeremyevans/roda-route_list#label-Basic+Usage"
           end
 
-          routes.each do |route|
-            puts [
-              route["methods"]&.join("|") || "GET",
-              route["path"],
-              route["file"] ? "\n  File: #{route["file"]}" : nil,
-            ].compact.join(" ")
+          routes.group_by { _1["file"] }.each do |file, file_routes|
+            file_routes.each_with_index do |route, index|
+              puts [
+                (route["methods"]&.join("|") || "GET").cyan,
+                route["path"],
+                file && index == file_routes.length - 1 ? "\n  #{"File:".yellow} #{file}" : nil,
+              ].compact.join(" ")
+            end
+            puts
           end
-          puts
         end
-        # rubocop:enable Bridgetown/NoPutsAllowed, Metrics/MethodLength
+        # rubocop:enable Bridgetown/NoPutsAllowed, Metrics
 
         # @return [Proc]
         attr_accessor :router_block

data/lib/bridgetown-core/readers/plugin_content_reader.rb

@@ -5,11 +5,11 @@ module Bridgetown
     attr_reader :site, :manifest, :content_dirs
 
     # @param site [Bridgetown::Site]
-    # @param manifest [Bridgetown::Plugin::SourceManifest]
+    # @param manifest [Bridgetown::Configuration::SourceManifest]
     def initialize(site, manifest)
       @site = site
       @manifest = manifest
-      @content_dirs = manifest.contents
+      @content_dirs = manifest.contents || {}
       @content_files = Set.new
       @supports_bare_text = manifest.bare_text
       @bare_text_extensions = site.config.markdown_ext.split(",").map { ".#{_1}" } + [".html"]

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

@@ -40,10 +40,13 @@ end
 Bridgetown.initializer :parse_routes do |config|
   # This builds upon the work done here:
   # https://github.com/jeremyevans/roda-route_list/blob/master/bin/roda-parse_routes
+  config.roda do |app|
+    app.plugin :route_list, file: ".routes.json"
+  end
 
   require "roda-route_parser"
 
-  route_files = Dir["#{config.root_dir}/server/**/*.rb"]
+  route_files = Dir["#{config.root_dir}/#{config.server_dir}/**/*.rb"]
   if config.key?(:routes)
     config.routes.source_paths.each do |routes_dir|
       routes_dir = File.expand_path(routes_dir, config.source)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta1
+  version: 2.1.0.beta2
 platform: ruby
 authors:
 - Bridgetown Team
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0.beta1
+        version: 2.1.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0.beta1
+        version: 2.1.0.beta2
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -501,9 +501,6 @@ files:
 - lib/bridgetown-core/configurations/purgecss.rb
 - lib/bridgetown-core/configurations/render.rb
 - lib/bridgetown-core/configurations/render/render.yaml.erb
-- lib/bridgetown-core/configurations/ruby2js.rb
-- lib/bridgetown-core/configurations/ruby2js/hello_world.js.rb
-- lib/bridgetown-core/configurations/ruby2js/ruby2js.rb
 - lib/bridgetown-core/configurations/seo.rb
 - lib/bridgetown-core/configurations/shoelace.rb
 - lib/bridgetown-core/configurations/tailwindcss.rb

data/lib/bridgetown-core/configurations/ruby2js/hello_world.js.rb

@@ -1,9 +0,0 @@
-class HelloWorld < HTMLElement
-  def connected_callback()
-    self.inner_html = "<p><strong>Hello World!</strong></p>"
-  end
-end
-
-# Try adding `<hello-world></hello-world>` somewhere on your site to see this
-# example web component in action!
-custom_elements.define "hello-world", HelloWorld

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

@@ -1,10 +0,0 @@
-# See docs on Ruby2JS options here: https://www.ruby2js.com/docs/options
-
-preset
-
-filter :camelCase
-filter :lit
-
-eslevel 2022
-
-autoexports :default

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

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-unless Bridgetown::Utils.frontend_bundler_type == :esbuild
-  error_message = "#{"esbuild.config.js".bold} not found. (This configuration doesn't currently " \
-                  "support Webpack.)"
-
-  @logger.error "\nError:".red, "🚨 #{error_message}"
-
-  return
-end
-
-say_status :ruby2js, "Installing Ruby2JS..."
-
-add_gem "ruby2js"
-add_npm_package "-D @ruby2js/esbuild-plugin"
-
-insert_into_file "esbuild.config.js",
-                 after: 'const build = require("./config/esbuild.defaults.js")' do
-  <<~JS
-
-    const ruby2js = require("@ruby2js/esbuild-plugin")
-  JS
-end
-
-insert_into_file "esbuild.config.js",
-                 after: "\n  plugins: [\n" do
-  <<-JS
-    ruby2js(),
-  JS
-end
-
-copy_file in_templates_dir("ruby2js.rb"), "config/ruby2js.rb"
-copy_file in_templates_dir("hello_world.js.rb"), "src/_components/hello_world.js.rb"
-
-say_status :ruby2js, "Ruby2JS is now configured!"
-
-say "Check out the example `hello_world.js.rb` file in `src/_components`", :blue
-say "Ruby2JS configuration options are saved in `config/ruby2js.rb`", :blue
-say 'For further reading, check out "https://www.ruby2js.com"', :blue