bridgetown-core 2.0.0.beta6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d84ce34a5f59d6f344056c29003ebaca94ae161ad2ac6b0e65c431e55a83c85
-  data.tar.gz: f09f1457b4a8afe31f15822ce0a453a4cbd049f30dc62cec82871f1d310bf43d
+  metadata.gz: 9889270f38c2b3d048f01c752698f114a7658cc04395dd7661c72bd0b56a7192
+  data.tar.gz: f08f67a0089dbe1cd2e2ace89b4cbff51a70caaf1d46982a0ab85982616e23bb
 SHA512:
-  metadata.gz: 8b49a0456bcb39c02a6ca661f16ce30f693845d0460f30a00971785962d23402de1c3c96aa03c07dbf7c15dc9a3ddcb6fab3ccb2638a7e8226cd9ccf8ad1a7ce
-  data.tar.gz: ce6c40abf5657a8c290899765384089793e5c01c54cb1122183d0523585c50ac4d9df422ac24e9cce04ad23f40107baaf255e2b84176752d19d4205316aa85ce
+  metadata.gz: d21d3bca29c9bb0cccf17fabdd1a66a00b720e72fd1803f48e33dcb8e210f492d16a7d5a517b26b5094bde1ae0507a0f86f9496fe0af810a8e2467908066c646
+  data.tar.gz: c5db97ee273e4f62bfeec5cb63251734bfffc6282eb87bf80a3e79e7c3b8716d5f9fee2b4233185233cae66b71da7aae93d9cab7ccbe2aeba35cd791527c5bd8

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

@@ -97,7 +97,7 @@ module Bridgetown
             ai.ipv4? && !ai.ipv4_loopback?
           end&.ip_address
           scheme = config_options.bind&.split("://")&.first == "ssl" ? "https" : "http"
-          port = ENV.fetch("BRIDGETOWN_PORT", config_options.port)
+          port = config_options.port
           Bridgetown.logger.info ""
           Bridgetown.logger.info "Now serving at:", "#{scheme}://localhost:#{port}".magenta
           Bridgetown.logger.info "", "#{scheme}://#{external_ip}:#{port}".magenta if external_ip

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

@@ -16,6 +16,11 @@ module Bridgetown
       end
       summary "Creates a new Bridgetown site scaffold in PATH"
 
+      argument :path,
+               type: :string,
+               required: false, # we're changing for path in new_site method
+               desc: "PATH where new Bridgetown site will be created"
+
       class_option :apply,
                    aliases: "-a",
                    banner: "PATH|URL",
@@ -60,9 +65,9 @@ module Bridgetown
       end
 
       def new_site
-        raise ArgumentError, "You must specify a path." if args.empty?
+        raise ArgumentError, "You must specify a path." if path.nil? || path.empty?
 
-        new_site_path = File.expand_path(args.join(" "), Dir.pwd)
+        new_site_path = File.expand_path(path, Dir.pwd)
         @site_name = new_site_path.split(File::SEPARATOR).last
 
         if preserve_source_location?(new_site_path, options)
@@ -77,7 +82,7 @@ module Bridgetown
 
         say_status :create, new_site_path
         create_site new_site_path
-        after_install new_site_path, args.join(" "), options
+        after_install new_site_path, path, options
       rescue ArgumentError => e
         say_status :alert, e.message, :red
       ensure

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

@@ -42,7 +42,6 @@ module Bridgetown
       class_option :port,
                    aliases: "-P",
                    type: :numeric,
-                   default: 4000,
                    desc: "Serve your site on the specified port. Defaults to 4000."
       class_option :bind,
                    aliases: "-B",
@@ -72,7 +71,7 @@ module Bridgetown
 
         # Load Bridgetown configuration into thread memory
         bt_options = configuration_with_overrides(options)
-        port = ENV.fetch("BRIDGETOWN_PORT", bt_options.port)
+        bt_options.port = port = load_env_and_determine_port(bt_options, options)
         # TODO: support Puma serving HTTPS directly?
         bt_bound_url = "http://#{bt_options.bind}:#{port}"
 
@@ -125,6 +124,22 @@ module Bridgetown
           "config.ru" :
           File.expand_path("../rack/default_config.ru", __dir__)
       end
+
+      def load_env_and_determine_port(config, options)
+        initializer_file = File.join(config.root_dir, "config", "initializers.rb")
+        if File.exist?(initializer_file) &&
+            File.read(initializer_file) =~ (%r!^[\s]*init[\s]*:dotenv!)
+          require "dotenv"
+          Bridgetown.load_dotenv(root: config.root_dir)
+        end
+
+        # Options ordering for "who wins" is:
+        #   1. CLI
+        #   2. BRIDGETOWN_PORT env var
+        #   3. YAML config (if present)
+        #   4. 4000
+        options[:port] || ENV.fetch("BRIDGETOWN_PORT", config.port || 4000)
+      end
     end
   end
 end

data/lib/bridgetown-core/configuration/configuration_dsl.rb

@@ -3,6 +3,8 @@
 module Bridgetown
   class Configuration
     class ConfigurationDSL < Bridgetown::FrontMatter::RubyFrontMatter
+      include Bridgetown::Refinements::Helper
+
       attr_reader :context
 
       # @yieldself [ConfigurationDSL]

data/lib/bridgetown-core/configurations/lit/esbuild-plugins.js

@@ -4,21 +4,20 @@
 
 // This plugin will let you import `.lit.css` files as sidecar stylesheets.
 // Read https://www.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation.
-const { litCssPlugin } = require("esbuild-plugin-lit-css")
-const postcssrc = require("postcss-load-config")
-const postcss = require("postcss")
+import { litCssPlugin } from "esbuild-plugin-lit-css"
+import postcss from "postcss"
 
-module.exports = {
-  plugins: [
-    litCssPlugin({
-      filter: /\.lit\.css$/,
-      transform: async (css, { filePath }) => {
-        const postCssConfig = await postcssrc()
-        const postCssProcessor = postcss([...postCssConfig.plugins])
+const postcssrc = (await import("postcss-load-config")).default
 
-        const results = await postCssProcessor.process(css, { ...postCssConfig.options, from: filePath })
-        return results.css
-      }
-    }),
-  ]
-}
+export const plugins = [
+  litCssPlugin({
+    filter: /\.lit\.css$/,
+    transform: async (css, { filePath }) => {
+      const postCssConfig = await postcssrc()
+      const postCssProcessor = postcss([...postCssConfig.plugins])
+
+      const results = await postCssProcessor.process(css, { ...postCssConfig.options, from: filePath })
+      return results.css
+    }
+  }),
+]

data/lib/bridgetown-core/configurations/lit/lit-ssr.config.js

@@ -1,5 +1,5 @@
-const build = require("bridgetown-lit-renderer/build")
-const { plugins } = require("./esbuild-plugins.js")
+import build from "bridgetown-lit-renderer/build"
+import { plugins } from "./esbuild-plugins.js"
 
 const esbuildOptions = { plugins }
 

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

@@ -11,19 +11,19 @@ end
 
 say_status :lit, "Installing Lit + SSR Plugin..."
 
-add_gem "bridgetown-lit-renderer", version: "2.1.0.beta2"
+add_gem "bridgetown-lit-renderer", version: "3.0.0"
 
-add_npm_package "lit esbuild-plugin-lit-css bridgetown-lit-renderer@2.1.0-beta2"
+add_npm_package "lit esbuild-plugin-lit-css bridgetown-lit-renderer@3.0.0"
 
 copy_file in_templates_dir("lit-ssr.config.js"), "config/lit-ssr.config.js"
 copy_file in_templates_dir("lit-components-entry.js"), "config/lit-components-entry.js"
 copy_file in_templates_dir("esbuild-plugins.js"), "config/esbuild-plugins.js"
 
 insert_into_file "esbuild.config.js",
-                 after: 'const build = require("./config/esbuild.defaults.js")' do
+                 after: 'import build from "./config/esbuild.defaults.js"' do
   <<~JS
 
-    const { plugins } = require("./config/esbuild-plugins.js")
+    import { plugins } from "./config/esbuild-plugins.js"
   JS
 end
 

data/lib/bridgetown-core/configurations/render/render.yaml.erb

@@ -1,13 +1,10 @@
 services:
   - type: web
     name: <%= @render_service_name %>
-    env: static
+    runtime: static
     buildCommand: bin/bridgetown deploy
     staticPublishPath: ./output
     pullRequestPreviewsEnabled: true
-    envVars:
-      - key: BRIDGETOWN_ENV
-        value: production
     headers:
       - path: /*
         name: X-Frame-Options
@@ -27,3 +24,42 @@ services:
       - path: /*
         name: Cache-Control
         value: "public, max-age=86400, s-max-age=86400"
+    envVars:
+      - key: BRIDGETOWN_ENV
+        value: production
+###########
+# Uncomment and modify the following for hybrid deployments, database support, etc.
+#   Use the `routes` rewrite feature to "poke holes" through your static CDN to specific
+#   route handlers in your Roda server application.
+###########
+#
+#       - key: DATABASE_URL
+#         fromDatabase:
+#           name: <%= @render_service_name %>_proddb
+#           property: connectionString
+#       - fromGroup: <%= @render_service_name %>-prod-envs
+#     routes:
+#       - type: rewrite
+#         source: /account/*
+#         destination: https://<%= @render_service_name %>-api.onrender.com/account/*
+#       - type: rewrite
+#         source: /auth/*
+#         destination: https://<%= @render_service_name %>-api.onrender.com/auth/*
+#   - type: web
+#     name: <%= @render_service_name %>-api
+#     plan: standard
+#     runtime: ruby
+#     buildCommand: bundle install && npm install && bin/bridgetown frontend:build
+#     startCommand: bin/bridgetown start
+#     envVars:
+#       - key: BRIDGETOWN_ENV
+#         value: production
+#       - key: DATABASE_URL
+#         fromDatabase:
+#           name: <%= @render_service_name %>_proddb
+#           property: connectionString
+#       - fromGroup: <%= @render_service_name %>-prod-envs
+# databases:
+#   - name: <%= @render_service_name %>_proddb
+#     plan: starter
+#     databaseName: <%= @render_service_name %>_production

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

@@ -3,4 +3,11 @@
 @render_service_name = ask "What would like to call your Render service?"
 template in_templates_dir("render.yaml.erb"), "render.yaml"
 
-say "All done. Just create a new blueprint from the Render dashboard and connect this repo."
+say_status :render, "Your render.yaml file is now configured!"
+say ""
+say "Verify its contents and once ready, create a new blueprint from the Render dashboard"
+say "and connect your repo."
+say ""
+say "Optionally, if you're setting up a backend API and database, create a environment group"
+say "on Render called [yourservicehere]-prod-envs for sharing environment variables between"
+say "multiple servers."

data/lib/bridgetown-core/helpers.rb

@@ -6,6 +6,7 @@ module Bridgetown
   class RubyTemplateView
     class Helpers
       using Bridgetown::Refinements
+      include Bridgetown::Refinements::Helper
       include Bridgetown::Filters
       include Bridgetown::Filters::FromLiquid
       include ::Streamlined::Helpers
@@ -127,12 +128,10 @@ module Bridgetown
       # Provide backwards compatibility via Streamlined helper
       alias_method :attributes_from_options, :html_attributes
 
-      # Delegates to <tt>I18n#translate</tt> but also performs two additional
-      # functions.
+      # Delegates to `I18n#translate` but with some additional smarts.
       #
-      # First, if the key starts with a period <tt>translate</tt> will scope
-      # the key by the current view. Calling <tt>translate(".foo")</tt> from
-      # the <tt>people/index.html.erb</tt> template is equivalent to calling
+      # You can scope to the current view. Calling <tt>translate(".foo")</tt> from
+      # the <tt>people/index.erb</tt> template is equivalent to calling
       # <tt>translate("people.index.foo")</tt>. This makes it less
       # repetitive to translate many keys within the same view and provides
       # a convention to scope keys consistently.
@@ -148,14 +147,14 @@ module Bridgetown
       #
       # @return [String] the translated string
       # @see I18n
-      def translate(key, **options) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def translate(key, **options)
         return key.map { |k| translate(k, **options) } if key.is_a?(Array)
 
         key = key&.to_s
 
         if key&.start_with?(".")
-          view_path = view&.page&.relative_path&.to_s&.split(".")&.first
-          key = "#{view_path.tr("/", ".")}#{key}" if view_path.present?
+          view_path = Bridgetown::Filters::URLFilters.strip_extname(view.resource.relative_path)
+          key = "#{view_path.tr("_/", " .").lstrip}#{key}"
         end
 
         return I18n.translate(key, **options) unless %r{(?:_|\b)html\z}.match?(key)
@@ -264,14 +263,19 @@ module Bridgetown
         end
       end
 
-      # TODO: docu
+      # Output a declarative shadow DOM tag to wrap the input argument or block
+      #
+      # @param input [String] content to wrap if block isn't provided
+      # @return [String]
       def dsd(input = nil, &block)
         tmpl_content = block.nil? ? input.to_s : view.capture(&block)
 
         Bridgetown::Utils.dsd_tag(tmpl_content)
       end
 
-      # TODO: docu
+      # Load a sidecar CSS file with a .dsd.css extension and output a style tag
+      #
+      # @return [String]
       def dsd_style
         tmpl_path = caller_locations(1, 2).find do |loc|
                       loc.label.include?("method_missing").!
@@ -292,7 +296,8 @@ module Bridgetown
         style_tag.html_safe
       end
 
-      # TODO: docu
+      # If you need to access signals without creating a tracking dependency, wrap a
+      # block of code in this helper
       def bypass_tracking(...) = Signalize.untracked(...)
     end
   end

data/lib/bridgetown-core/plugin_manager.rb

@@ -102,7 +102,7 @@ module Bridgetown
 
     # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
 
-    # Iterates through loaded gems and finds npm-add gemspec metadata.
+    # Iterates through loaded gems and finds npm_add gemspec metadata.
     # If that exact package hasn't been installed, execute npm i
     #
     # @return [Bundler::SpecSet]
@@ -134,7 +134,7 @@ module Bridgetown
     end
 
     def self.find_npm_dependency(loaded_gem)
-      npm_metadata = loaded_gem.to_spec&.metadata&.dig("npm-add") ||
+      npm_metadata = loaded_gem.to_spec&.metadata&.dig("npm_add") ||
         loaded_gem.to_spec&.metadata&.dig("yarn-add")
       npm_dependency = npm_metadata&.match(NPM_DEPENDENCY_REGEXP)
       return nil if npm_dependency&.length != 3 || npm_dependency[2] == ""

data/lib/bridgetown-core/tasks/bridgetown_tasks.rake

@@ -11,7 +11,7 @@ namespace :frontend do
   task :watcher, :sidecar do |_task, args|
     # sidecar is when the task is running alongside the start command
     sidecar = args[:sidecar] == true
-    Bridgetown::Utils::Aux.run_process "Frontend", :yellow, "bridgetown frontend:dev"
+    Bridgetown::Utils::Aux.run_process "Frontend", :blue, "bridgetown frontend:dev"
 
     if sidecar
       # give FE bundler time to boot before returning control to the start command

data/lib/roda/plugins/bridgetown_server.rb

@@ -102,6 +102,8 @@ class Roda
       end
 
       module InstanceMethods
+        include Bridgetown::Refinements::Helper
+
         def initialize_bridgetown_context
           if self.class.opts[:bridgetown_site]
             # The site had previously been initialized via the bridgetown_ssr plugin
@@ -157,9 +159,15 @@ class Roda
           scope.initialize_bridgetown_root
 
           base_path = Bridgetown::Current.preloaded_configuration.base_path.delete_prefix("/")
-          on(base_path.empty? ? true : base_path) do
+
+          if base_path.empty?
             ssg # static file server
             Bridgetown::Rack::Routes.load_all scope
+          else
+            on(base_path) do
+              ssg # static file server
+              Bridgetown::Rack::Routes.load_all scope
+            end
           end
         end
       end

data/lib/site_template/config/puma.rb

@@ -2,9 +2,10 @@
 #
 # Learn more at: https://puma.io
 # Bridgetown configuration documentation:
-# https://edge.bridgetownrb.com/docs/configuration/puma
+# https://www.bridgetownrb.com/docs/configuration/puma
 
-# This port number can be overriden by a bind configuration option
+# This port number typically gets overridden by Bridgetown's boot & config loader
+# so you probably don't want to touch the number here
 #
 port ENV.fetch("BRIDGETOWN_PORT") { 4000 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta6
+  version: 2.0.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-30 00:00:00.000000000 Z
+date: 2025-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta6
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta6
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -668,9 +668,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.26
 signing_key: