bridgetown-core 1.2.0 → 1.3.0.beta2

data/lib/site_template/Gemfile.erb

@@ -24,10 +24,13 @@ gem "bridgetown", "~> <%= Bridgetown::VERSION %>"
 # Uncomment to add file-based dynamic routing to your project:
 # gem "bridgetown-routes", "~> <%= Bridgetown::VERSION %>"
 
+# Puma is the Rack-compatible web server used by Bridgetown
+# (you can optionally limit this to the "development" group)
+gem "puma", "< 7"
+
 # Uncomment to use the Inspectors API to manipulate the output
 # of your HTML or XML resources:
 # gem "nokogiri", "~> 1.13"
 
-# Puma is a Rack-compatible server used by Bridgetown
-# (you can optionally limit this to the "development" group)
-gem "puma", "~> 5.6"
+# Or for faster parsing of HTML-only resources via Inspectors, use Nokolexbor:
+# gem "nokolexbor", "~> 0.4"

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

@@ -1,13 +1,22 @@
+<%- if frontend_bundling_option == "esbuild" -%>
+<%- if postcss_option -%>
+import "$styles/index.css"
+<%- else -%>
+import "$styles/index.scss"
+<%- end -%>
+import "$styles/syntax-highlighting.css"
+<%- else -%>
 <%- if postcss_option -%>
 import "index.css"
 <%- else -%>
 import "index.scss"
 <%- end -%>
 import "syntax-highlighting.css"
+<%- end -%>
 
 // Import all JavaScript & CSS files from src/_components
 <%- if frontend_bundling_option == "esbuild" -%>
-import components from "bridgetownComponents/**/*.{js,jsx,js.rb,css}"
+import components from "$components/**/*.{js,jsx,js.rb,css}"
 <%- else -%>
 const componentsContext = require.context("bridgetownComponents", true, /\.(js|css)$/)
 componentsContext.keys().forEach(componentsContext)

data/lib/site_template/package.json.erb

@@ -15,29 +15,29 @@
     <%- if frontend_bundling_option == "webpack" -%>
     "css-loader": "^6.7.1",
     <%- end -%>
-    "esbuild": "^0.15.12",
+    "esbuild": "^0.17.19",
     <%- if frontend_bundling_option == "webpack" -%>
     "esbuild-loader": "^2.18.0",
     "mini-css-extract-plugin": "^2.6.0",
     <%- else -%>
-    "glob": "^8.0.1",
+    "glob": "^10.2.6",
     <%- end -%>
     <%- unless disable_postcss? -%>
-    "postcss": "^8.4.12",
+    "postcss": "^8.4.23",
     "postcss-flexbugs-fixes": "^5.0.2",
     <%- if frontend_bundling_option == "esbuild" -%>
-    "postcss-import": "^14.1.0",
+    "postcss-import": "^15.1.0",
     "postcss-load-config": "^4.0.1",
     <%- else -%>
     "postcss-loader": "^6.2.1",
     <%- end -%>
-    "postcss-preset-env": "^7.4.3",
+    "postcss-preset-env": "^8.4.1",
     <%- if frontend_bundling_option == "esbuild" -%>
     "read-cache": "^1.0.0"<%= "," unless postcss_option  %>
     <%- end -%>
     <%- end -%>
     <%- unless postcss_option -%>
-    "sass": "^1.50.1",
+    "sass": "^1.62.1",
     "sass-loader": "^12.6.0"<%= "," if frontend_bundling_option == "webpack" %>
     <%- end -%>
     <%- if frontend_bundling_option == "webpack" -%>

data/lib/site_template/server/roda_app.rb

@@ -2,9 +2,11 @@
 # on the concept of a routing tree. Bridgetown uses it for its development
 # server, but you can also run it in production for fast, dynamic applications.
 #
-# Learn more at: http://roda.jeremyevans.net
+# Learn more at: https://www.bridgetownrb.com/docs/routes
+
+class RodaApp < Roda
+  plugin :bridgetown_server
 
-class RodaApp < Bridgetown::Rack::Roda
   # Some Roda configuration is handled in the `config/initializers.rb` file.
   # But you can also add additional Roda configuration here if needed.
 

data/lib/site_template/src/_posts/0000-00-00-welcome-to-bridgetown.md.erb

@@ -5,7 +5,7 @@ date:   <%= Time.now.strftime('%Y-%m-%d %H:%M:%S %z') %>
 categories: updates
 ---
 
-You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `bridgetown serve`, which launches a web server and auto-regenerates your site when a file is updated.
+You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `bin/bridgetown start`, which launches a web server and auto-regenerates your site when a file is updated.
 
 Bridgetown requires blog post files to be named according to the following format:
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0.beta2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2023-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -112,28 +112,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: hash_with_dot_access
   requirement: !ruby/object:Gem::Requirement
@@ -302,20 +302,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: webrick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -362,14 +348,13 @@ files:
 - lib/bridgetown-core/commands/esbuild.rb
 - lib/bridgetown-core/commands/esbuild/esbuild.config.js
 - lib/bridgetown-core/commands/esbuild/esbuild.defaults.js.erb
+- lib/bridgetown-core/commands/esbuild/jsconfig.json
 - lib/bridgetown-core/commands/esbuild/migrate-from-webpack.rb
 - lib/bridgetown-core/commands/esbuild/setup.rb
 - lib/bridgetown-core/commands/esbuild/update.rb
 - lib/bridgetown-core/commands/new.rb
 - lib/bridgetown-core/commands/plugins.rb
 - lib/bridgetown-core/commands/registrations.rb
-- lib/bridgetown-core/commands/serve.rb
-- lib/bridgetown-core/commands/serve/servlet.rb
 - lib/bridgetown-core/commands/start.rb
 - lib/bridgetown-core/commands/webpack.rb
 - lib/bridgetown-core/commands/webpack/enable-postcss.rb
@@ -408,6 +393,7 @@ files:
 - lib/bridgetown-core/configurations/cypress/cypress_tasks
 - lib/bridgetown-core/configurations/gh-pages.rb
 - lib/bridgetown-core/configurations/gh-pages/gh-pages.yml
+- lib/bridgetown-core/configurations/is-land.rb
 - lib/bridgetown-core/configurations/lit.rb
 - lib/bridgetown-core/configurations/lit/esbuild-plugins.js
 - lib/bridgetown-core/configurations/lit/happy-days.lit.js
@@ -424,6 +410,7 @@ files:
 - 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/shoelace.rb
 - lib/bridgetown-core/configurations/stimulus.rb
 - lib/bridgetown-core/configurations/tailwindcss.rb
@@ -460,6 +447,7 @@ files:
 - lib/bridgetown-core/filters/date_filters.rb
 - lib/bridgetown-core/filters/from_liquid.rb
 - lib/bridgetown-core/filters/grouping_filters.rb
+- lib/bridgetown-core/filters/localization_filters.rb
 - lib/bridgetown-core/filters/translation_filters.rb
 - lib/bridgetown-core/filters/url_filters.rb
 - lib/bridgetown-core/frontmatter_defaults.rb
@@ -487,7 +475,6 @@ files:
 - lib/bridgetown-core/plugin_manager.rb
 - lib/bridgetown-core/rack/boot.rb
 - lib/bridgetown-core/rack/logger.rb
-- lib/bridgetown-core/rack/roda.rb
 - lib/bridgetown-core/rack/routes.rb
 - lib/bridgetown-core/rack/static_indexes.rb
 - lib/bridgetown-core/reader.rb
@@ -507,8 +494,10 @@ files:
 - lib/bridgetown-core/static_file.rb
 - lib/bridgetown-core/tags/asset_path.rb
 - lib/bridgetown-core/tags/class_map.rb
+- lib/bridgetown-core/tags/dsd.rb
 - lib/bridgetown-core/tags/find.rb
 - lib/bridgetown-core/tags/highlight.rb
+- lib/bridgetown-core/tags/l.rb
 - lib/bridgetown-core/tags/link.rb
 - lib/bridgetown-core/tags/live_reload_dev_js.rb
 - lib/bridgetown-core/tags/post_url.rb
@@ -529,7 +518,7 @@ files:
 - lib/bridgetown-core/version.rb
 - lib/bridgetown-core/watcher.rb
 - lib/bridgetown-core/yaml_parser.rb
-- lib/roda/plugins/bridgetown_boot.rb
+- lib/roda/plugins/bridgetown_server.rb
 - lib/roda/plugins/bridgetown_ssr.rb
 - lib/roda/plugins/initializers.rb
 - lib/roda/plugins/method_override.rb
@@ -601,9 +590,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: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: 

data/lib/bridgetown-core/commands/serve/servlet.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require "webrick"
-
-module Bridgetown
-  module Commands
-    class Serve
-      class Servlet < WEBrick::HTTPServlet::FileHandler
-        DEFAULTS = {
-          "Cache-Control" => "private, max-age=0, proxy-revalidate, " \
-                             "no-store, no-cache, must-revalidate",
-        }.freeze
-
-        def initialize(server, root, callbacks)
-          # So we can access them easily.
-          @bridgetown_opts = server.config[:BridgetownOptions]
-          set_defaults
-          super
-        end
-
-        def search_index_file(req, res)
-          super ||
-            search_file(req, res, ".html") ||
-            search_file(req, res, ".xhtml")
-        end
-
-        # Add the ability to tap file.html the same way that Nginx does on our
-        # Docker images (or on GitHub Pages.) The difference is that we might end
-        # up with a different preference on which comes first.
-
-        def search_file(req, res, basename)
-          # /file.* > /file/index.html > /file.html
-          super ||
-            super(req, res, "#{basename}.html") ||
-            super(req, res, "#{basename}.xhtml")
-        end
-
-        # rubocop:disable Naming/MethodName
-        def do_GET(req, res)
-          rtn = super
-
-          validate_and_ensure_charset(req, res)
-          res.header.merge!(@headers)
-          rtn
-        end
-        # rubocop:enable Naming/MethodName
-
-        private
-
-        def validate_and_ensure_charset(_req, res)
-          key = res.header.keys.grep(%r!content-type!i).first
-          typ = res.header[key]
-
-          return if %r!;\s*charset=!.match?(typ)
-
-          res.header[key] = "#{typ}; charset=#{@bridgetown_opts["encoding"]}"
-        end
-
-        def set_defaults
-          hash_ = @bridgetown_opts.fetch("webrick", {}).fetch("headers", {})
-          DEFAULTS.each_with_object(@headers = hash_) do |(key, val), hash|
-            hash[key] = val unless hash.key?(key)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/bridgetown-core/commands/serve.rb

@@ -1,253 +0,0 @@
-# frozen_string_literal: true
-
-module Bridgetown
-  module Commands
-    class Serve < Thor::Group
-      extend BuildOptions
-      extend Summarizable
-      include ConfigurationOverridable
-
-      Registrations.register do
-        register(Serve, "serve", "serve", Serve.summary)
-      end
-
-      class_option :host, aliases: "-H", desc: "Host to bind to"
-      class_option :port, aliases: "-P", desc: "Port to listen on"
-      class_option :detach,
-                   aliases: "-B",
-                   type: :boolean,
-                   desc: "Run the server in the background"
-      class_option :ssl_cert, desc: "X.509 (SSL) certificate."
-      class_option :ssl_key, desc: "X.509 (SSL) Private Key."
-      class_option :show_dir_listing,
-                   type: :boolean,
-                   desc: "Show a directory listing instead of loading your index file."
-      class_option :skip_initial_build,
-                   type: :boolean,
-                   desc: "Skips the initial site build which occurs before the server is started."
-      class_option :watch,
-                   type: :boolean,
-                   aliases: "-w",
-                   default: true,
-                   desc: "Watch for changes and rebuild"
-
-      def self.banner
-        "bridgetown serve [options]"
-      end
-      summary "DEPRECATED (Serve your site locally using WEBrick)"
-
-      DIRECTORY_INDEX = %w(
-        index.htm
-        index.html
-        index.rhtml
-        index.xht
-        index.xhtml
-        index.cgi
-        index.xml
-        index.json
-      ).freeze
-
-      def serve
-        Bridgetown::Deprecator.deprecation_message(
-          "WEBrick (serve) will be removed in favor of Puma (start) in the next Bridgetown release"
-        )
-
-        @mutex = Mutex.new
-        @run_cond = ConditionVariable.new
-        @running = false
-
-        no_watch = options["watch"] == false
-
-        options = Thor::CoreExt::HashWithIndifferentAccess.new(self.options)
-        options["serving"] = true
-        options["watch"] = true unless no_watch
-
-        config = configuration_with_overrides(options, Bridgetown::Current.preloaded_configuration)
-        if Bridgetown.environment == "development"
-          default_url(config).tap do |url|
-            options["url"] = url
-            config.url = url
-          end
-        end
-
-        invoke(Build, [], options)
-        start_server
-      end
-
-      protected
-
-      def start_server
-        destination = Bridgetown::Current.preloaded_configuration.destination
-        setup(destination)
-
-        start_up_webrick(destination)
-      end
-
-      def setup(destination)
-        require_relative "serve/servlet"
-
-        FileUtils.mkdir_p(destination)
-        return unless File.exist?(File.join(destination, "404.html"))
-
-        WEBrick::HTTPResponse.class_eval do
-          def create_error_page
-            @header["Content-Type"] = "text/html; charset=UTF-8"
-            @body = File.read(File.join(@config[:DocumentRoot], "404.html"))
-          end
-        end
-      end
-
-      def webrick_opts(opts)
-        opts = {
-          BridgetownOptions: opts,
-          DoNotReverseLookup: true,
-          MimeTypes: mime_types,
-          DocumentRoot: opts["destination"],
-          StartCallback: start_callback(opts["detach"]),
-          StopCallback: stop_callback(opts["detach"]),
-          BindAddress: opts["host"],
-          Port: opts["port"],
-          DirectoryIndex: DIRECTORY_INDEX,
-        }
-
-        opts[:DirectoryIndex] = [] if opts[:BridgetownOptions]["show_dir_listing"]
-
-        enable_ssl(opts)
-        enable_logging(opts)
-        opts
-      end
-
-      def start_up_webrick(destination)
-        opts = Bridgetown::Current.preloaded_configuration
-        @server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
-        @server.mount(opts["base_path"].to_s, Servlet, destination, file_handler_opts)
-
-        Bridgetown.logger.info "Server address:", server_address(@server, opts)
-        launch_browser @server, opts if opts["open_url"]
-        boot_or_detach @server, opts
-      end
-
-      def shutdown
-        @server.shutdown if running?
-      end
-
-      def default_url(config)
-        format_url(
-          config["ssl_cert"] && config["ssl_key"],
-          config["host"] == "127.0.0.1" ? "localhost" : config["host"],
-          config["port"]
-        )
-      end
-
-      def format_url(ssl_enabled, address, port, baseurl = nil)
-        format("%<prefix>s://%<address>s:%<port>i%<baseurl>s",
-               prefix: ssl_enabled ? "https" : "http",
-               address: address,
-               port: port,
-               baseurl: baseurl ? "#{baseurl}/" : "")
-      end
-
-      # Recreate NondisclosureName under utf-8 circumstance
-      def file_handler_opts
-        WEBrick::Config::FileHandler.merge(
-          FancyIndexing: true,
-          NondisclosureName: [
-            ".ht*", "~*",
-          ]
-        )
-      end
-
-      def server_address(server, options = {})
-        format_url(
-          server.config[:SSLEnable],
-          server.config[:BindAddress],
-          server.config[:Port],
-          options["baseurl"]
-        )
-      end
-
-      # Keep in our area with a thread or detach the server as requested
-      # by the user.  This method determines what we do based on what you
-      # ask us to do.
-      def boot_or_detach(server, opts)
-        if opts["detach"]
-          pid = Process.fork do
-            server.start
-          end
-
-          Process.detach(pid)
-          Bridgetown.logger.info "Server detached with pid '#{pid}'.", \
-                                 "Run `pkill -f bridgetown' or `kill -9 #{pid}' " \
-                                 "to stop the server."
-        else
-          t = Thread.new { server.start }
-          trap("INT") { server.shutdown }
-          t.join
-        end
-      end
-
-      # Make the stack verbose if the user requests it.
-      def enable_logging(opts)
-        opts[:AccessLog] = []
-        level = WEBrick::Log.const_get(opts[:BridgetownOptions]["verbose"] ? :DEBUG : :WARN)
-        opts[:Logger] = WEBrick::Log.new($stdout, level)
-      end
-
-      # Add SSL to the stack if the user triggers --enable-ssl and they
-      # provide both types of certificates commonly needed.  Raise if they
-      # forget to add one of the certificates.
-      def enable_ssl(opts)
-        cert, key, src =
-          opts[:BridgetownOptions].values_at("ssl_cert", "ssl_key", "source")
-
-        return if cert.nil? && key.nil?
-        raise "Missing --ssl_cert or --ssl_key. Both are required." unless cert && key
-
-        require "openssl"
-        require "webrick/https"
-
-        opts[:SSLCertificate] = OpenSSL::X509::Certificate.new(read_file(src, cert))
-        begin
-          opts[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(read_file(src, key))
-        rescue StandardError
-          raise unless defined?(OpenSSL::PKey::EC)
-
-          opts[:SSLPrivateKey] = OpenSSL::PKey::EC.new(read_file(src, key))
-        end
-        opts[:SSLEnable] = true
-      end
-
-      def start_callback(detached)
-        return if detached
-
-        proc do
-          @mutex.synchronize do
-            @running = true
-            Bridgetown.logger.info("Server running…", "press ctrl-c to stop.")
-            @run_cond.broadcast
-          end
-        end
-      end
-
-      def stop_callback(detached)
-        return if detached
-
-        proc do
-          @mutex.synchronize do
-            @running = false
-            @run_cond.broadcast
-          end
-        end
-      end
-
-      def mime_types
-        file = File.expand_path("../mime.types", __dir__)
-        WEBrick::HTTPUtils.load_mime_types(file)
-      end
-
-      def read_file(source_dir, file_path)
-        File.read(Bridgetown.sanitized_path(source_dir, file_path))
-      end
-    end
-  end
-end