bridgetown-core 1.3.0.beta1 → 1.3.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9176399e9b750178476e2d57edb346989426407d5d40e8958c5be3901626f77f
-  data.tar.gz: a5130e5511c64acba6e6ee619a7529b49415e1c25b3e056cf4e709c4d78361da
+  metadata.gz: 58cbef52cc9ace0226b8a2ba380589287678d686684bf4d81e5889a6d3ed25bc
+  data.tar.gz: 14a1a0f631574b0df1e9844660eeff2a6e5e50ad53b998991a3b9a636654a05f
 SHA512:
-  metadata.gz: 849bff55f1997483ce24f67536daec7bdd53ff016d7e4ab8937b0184892680eb59f159d3a3d26c22fbc63ef63486ddd1b793943cd21fead6c281f0d2d9698f69
-  data.tar.gz: e5c317edb3ae4e232cd2a56c885b44af5375d7daeff71f385e620d402cbe57c68cf32fdc6eb13508bb92e3e8dff254cf53e59f56790631692eee092c6eaa0463
+  metadata.gz: 520791c7e08bdc24e4af37ac399bc0a2d73d939b8ea229188b162f90063b05e394e254dabfa7d529db2d41018bc2bf0fee62b5591a14961a2f88fd40d47a1ddc
+  data.tar.gz: d623c999cb2ceadcacbed1b1dfbdfd365dd3b705e5583037cb23398d0519301d0052e20b9005b3ab0ce75d0b8c6143abc46f352fbeec7313eef1c8864da6ec57

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

@@ -48,6 +48,9 @@ module Bridgetown
 
         if !Bridgetown.env.production? &&
             !config_options[:skip_frontend] && config_options["using_puma"]
+          if Bridgetown::Utils.frontend_bundler_type(config_options[:root_dir]) == :esbuild
+            Bridgetown::Utils.update_esbuild_autogenerated_config config_options
+          end
           require "rake"
           Rake.with_application do |rake|
             rake.load_rakefile

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

@@ -16,7 +16,6 @@ module Bridgetown
       I18n.reload! # make sure any locale files get read again
       Bridgetown::Hooks.trigger :site, :pre_reload, site
       Bridgetown::Hooks.clear_reloadable_hooks
-      site.plugin_manager.reload_plugin_files
       site.loaders_manager.reload_loaders
       Bridgetown::Hooks.trigger :site, :post_reload, site
 

data/lib/bridgetown-core/commands/esbuild/esbuild.config.js

@@ -24,13 +24,23 @@ const outputFolder = "output"
 // You can also support custom base_path deployments via changing `publicPath`.
 //
 // ```
-// const esbuildOptions = { publicPath: "/my_subfolder/_bridgetown/static" }
+// const esbuildOptions = {
+//   publicPath: "/my_subfolder/_bridgetown/static",
+//   ...
+// }
 // ```
 
 /**
  * @typedef { import("esbuild").BuildOptions } BuildOptions
  * @type {BuildOptions}
  */
-const esbuildOptions = {}
+const esbuildOptions = {
+  plugins: [
+    // add new plugins here...
+  ],
+  globOptions: {
+    excludeFilter: /\.(dsd|lit)\.(css|js)$/
+  }
+}
 
 build(outputFolder, esbuildOptions)

data/lib/bridgetown-core/commands/esbuild/esbuild.defaults.js.erb

@@ -8,6 +8,14 @@
 //
 // Shipped with Bridgetown v<%= Bridgetown::VERSION %>
 
+// DO NOT MANUALLY EDIT THIS CONFIGURATION:
+const autogeneratedBridgetownConfig = {
+  "source": "src",
+  "destination": "output",
+  "componentsDir": "_components",
+  "islandsDir": "_islands"
+}
+
 const path = require("path")
 const fsLib = require("fs")
 const fs = fsLib.promises
@@ -41,7 +49,7 @@ if (moduleAvailable("sass")) {
 // Glob plugin derived from:
 // https://github.com/thomaschaaf/esbuild-plugin-import-glob
 // https://github.com/xiaohui-zhangxh/jsbundling-rails/commit/b15025dcc20f664b2b0eb238915991afdbc7cb58
-const importGlobPlugin = () => ({
+const importGlobPlugin = (options, bridgetownConfig) => ({
   name: "import-glob",
   setup: (build) => {
     build.onResolve({ filter: /\*/ }, async (args) => {
@@ -49,7 +57,9 @@ const importGlobPlugin = () => ({
         return; // Ignore unresolvable paths
       }
 
-      const adjustedPath = args.path.replace(/^bridgetownComponents\//, "../../src/_components/")
+      const adjustedPath = args.path
+        .replace(/^\$components\/\*\*/, `../../${bridgetownConfig.source}/${bridgetownConfig.componentsDir}/**`)
+        .replace(/^bridgetownComponents\//, `../../${bridgetownConfig.source}/${bridgetownConfig.componentsDir}/`) // legacy
 
       return {
         path: adjustedPath,
@@ -64,7 +74,11 @@ const importGlobPlugin = () => ({
     build.onLoad({ filter: /.*/, namespace: "import-glob" }, async (args) => {
       const files = glob.sync(args.pluginData.path, {
         cwd: args.pluginData.resolveDir,
-      }).sort()
+      })
+        .filter(module => options.excludeFilter ? !options.excludeFilter.test(module) : true)
+        .sort()
+        .map(module => module.replace(`../../${bridgetownConfig.source}/${bridgetownConfig.componentsDir}/`, "$components/"))
+        .map(module => module.match(/^[a-zA-Z0-9]/) ? `./${module}` : module)
 
       const importerCode = `
         ${files
@@ -72,7 +86,7 @@ const importGlobPlugin = () => ({
           .join(';')}
         const modules = {${files
           .map((module, index) => `
-            "${module.replace("../../src/_components/", "")}": module${index},`)
+            "${module.replace("$components/", "")}": module${index},`)
           .join("")}
         };
         export default modules;
@@ -187,7 +201,7 @@ const sassPlugin = (options) => ({
 })
 
 // Set up defaults and generate frontend bundling manifest file
-const bridgetownPreset = (outputFolder) => ({
+const bridgetownPreset = (bridgetownConfig) => ({
   name: "bridgetownPreset",
   async setup(build) {
     // Ensure any imports anywhere starting with `/` are left verbatim
@@ -210,8 +224,10 @@ const bridgetownPreset = (outputFolder) => ({
       const manifest = {}
       const entrypoints = []
 
-      // We don't need `frontend/` cluttering up everything
-      const stripPrefix = (str) => str.replace(/^frontend\//, "")
+      // Clean up entrypoint naming
+      const stripPrefix = (str) => str
+        .replace(/^frontend\//, "")
+        .replace(RegExp(String.raw`^${bridgetownConfig.source}\/${bridgetownConfig.islandsDir}\/`), "islands/")
 
       // For calculating the file size of bundle output
       const fileSize = (path) => {
@@ -220,11 +236,12 @@ const bridgetownPreset = (outputFolder) => ({
         return (size / Math.pow(1024, i)).toFixed(2) * 1 + ['B', 'KB', 'MB', 'GB', 'TB'][i]
       }
 
+      const pathShortener = new RegExp(String.raw`^${bridgetownConfig.destination}\/_bridgetown\/static\/`, "g")
+
       // Let's loop through all the various outputs
       for (const key in result.metafile.outputs) {
         const value = result.metafile.outputs[key]
         const inputs = Object.keys(value.inputs)
-        const pathShortener = new RegExp(`^${outputFolder}\\/_bridgetown\\/static\\/`, "g")
         const outputPath = key.replace(pathShortener, "")
 
         if (value.entryPoint) {
@@ -256,23 +273,43 @@ const bridgetownPreset = (outputFolder) => ({
   }
 })
 
+const bridgetownConfigured = (bridgetownConfig, outputFolder) => {
+  bridgetownConfig = {...autogeneratedBridgetownConfig, ...bridgetownConfig}
+  if (outputFolder) bridgetownConfig.destination = outputFolder
+
+  return bridgetownConfig
+}
+
 // Load the PostCSS config from postcss.config.js or whatever else is a supported location/format
 const postcssrc = require("postcss-load-config")
 
-module.exports = async (outputFolder, esbuildOptions) => {
+module.exports = async (esbuildOptions) => {
+  let outputFolder;
+  if (typeof esbuildOptions === "string") { // legacy syntax where first argument is output folder
+    esbuildOptions = arguments[1]
+    outputFolder = arguments[0]
+  }
+  const bridgetownConfig = bridgetownConfigured(esbuildOptions.bridgetownConfig, outputFolder)
+
   esbuildOptions.plugins = esbuildOptions.plugins || []
   // Add the PostCSS & glob plugins to the top of the plugin stack
   const postCssConfig = await postcssrc()
   esbuildOptions.plugins.unshift(importPostCssPlugin(postCssConfig, esbuildOptions.postCssPluginConfig || {}))
   if (esbuildOptions.postCssPluginConfig) delete esbuildOptions.postCssPluginConfig
-  esbuildOptions.plugins.unshift(importGlobPlugin())
+  // Add the Glob plugin
+  esbuildOptions.plugins.unshift(importGlobPlugin(esbuildOptions.globOptions || {}, bridgetownConfig))
+  if (esbuildOptions.globOptions) delete esbuildOptions.globOptions
   // Add the Sass plugin
   esbuildOptions.plugins.push(sassPlugin(esbuildOptions.sassOptions || {}))
+  if (esbuildOptions.sassOptions) delete esbuildOptions.sassOptions
   // Add the Bridgetown preset
-  esbuildOptions.plugins.push(bridgetownPreset(outputFolder))
+  esbuildOptions.plugins.push(bridgetownPreset(bridgetownConfig))
+  if (esbuildOptions.bridgetownConfig) delete esbuildOptions.bridgetownConfig
 
-  // esbuild, take it away!
-  require("esbuild").build({
+  const esbuild = require("esbuild")
+  const islands = glob.sync(`./${bridgetownConfig.source}/${bridgetownConfig.islandsDir}/*.{js,js.rb}`).map(item => `./${item}`)
+
+  esbuild.context({
     bundle: true,
     loader: {
       ".jpg": "file",
@@ -285,16 +322,25 @@ module.exports = async (outputFolder, esbuildOptions) => {
       ".eot": "file",
     },
     resolveExtensions: [".tsx", ".ts", ".jsx", ".js", ".css", ".scss", ".sass", ".json", ".js.rb"],
-    nodePaths: ["frontend/javascript", "frontend/styles"],
-    watch: process.argv.includes("--watch"),
     minify: process.argv.includes("--minify"),
     sourcemap: true,
-    target: "es2016",
-    entryPoints: ["./frontend/javascript/index.js"],
+    target: "es2020",
+    entryPoints: ["./frontend/javascript/index.js", ...islands],
     entryNames: "[dir]/[name].[hash]",
-    outdir: path.join(process.cwd(), `${outputFolder}/_bridgetown/static`),
+    outdir: path.join(process.cwd(), `${bridgetownConfig.destination}/_bridgetown/static`),
     publicPath: "/_bridgetown/static",
     metafile: true,
     ...esbuildOptions,
+  }).then(context => {
+    if (process.argv.includes("--watch")) {
+      // Enable watch mode
+      context.watch()
+    } else {
+      // Build once and exit if not in watch mode
+      context.rebuild().then(result => {
+        context.dispose()
+      })
+    }
+    process.on('SIGINT', () => process.exit())
   }).catch(() => process.exit(1))
 }

data/lib/bridgetown-core/commands/esbuild/jsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+        "$styles/*": ["./frontend/styles/*"],
+        "$javascript/*": ["./frontend/javascript/*"],
+        "$components/*": ["./src/_components/*"]
+    }
+  }, 
+}

data/lib/bridgetown-core/commands/esbuild/setup.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
 template "esbuild.defaults.js.erb", "config/esbuild.defaults.js"
+copy_file "jsconfig.json"
 copy_file "esbuild.config.js", force: true

data/lib/bridgetown-core/commands/esbuild/update.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
 
 template "esbuild.defaults.js.erb", "config/esbuild.defaults.js", force: true
+copy_file "jsconfig.json"
 say "🎉 esbuild configuration updated successfully!"
+say "You may need to add `$styles/` to the front of your main CSS imports."
+say "See https://www.bridgetownrb.com/docs/frontend-assets#esbuild-setup for details."

data/lib/bridgetown-core/configuration.rb

@@ -33,8 +33,8 @@ module Bridgetown
       "collections_dir"            => "",
       "cache_dir"                  => ".bridgetown-cache",
       "layouts_dir"                => "_layouts",
-      "data_dir"                   => "_data",
       "components_dir"             => "_components",
+      "islands_dir"                => "_islands",
       "partials_dir"               => "_partials",
       "collections"                => {},
       "taxonomies"                 => {
@@ -44,7 +44,6 @@ module Bridgetown
       "eager_load_paths"           => [],
       "autoloader_collapsed_paths" => [],
       "additional_watch_paths"     => [],
-      "plugins_use_zeitwerk"       => true,
 
       # Handling Reading
       "include"                    => [".htaccess", "_redirects", ".well-known"],
@@ -335,30 +334,32 @@ module Bridgetown
         self[:source] = File.expand_path(self[:source], self[:root_dir])
         self[:destination] = File.expand_path(self[:destination], self[:root_dir])
 
-        if self[:plugins_use_zeitwerk]
-          autoload_paths.unshift({
-            path: self[:plugins_dir],
-            eager: true,
-          })
-        end
+        autoload_paths.unshift({
+          path: self[:plugins_dir],
+          eager: true,
+        })
+        autoload_paths.unshift({
+          path: File.expand_path(self[:islands_dir], self[:source]),
+          eager: true,
+        })
       end
 
       autoload_paths.map! do |load_path|
         if load_path.is_a?(Hash)
-          expanded = File.expand_path(load_path[:path], root_dir)
+          expanded = File.expand_path(load_path[:path], self[:root_dir])
           self[:eager_load_paths] << expanded if load_path[:eager]
           next expanded
         end
 
-        File.expand_path(load_path, root_dir)
+        File.expand_path(load_path, self[:root_dir])
       end
 
       autoloader_collapsed_paths.map! do |collapsed_path|
-        File.expand_path(collapsed_path, root_dir)
+        File.expand_path(collapsed_path, self[:root_dir])
       end
 
       additional_watch_paths.map! do |collapsed_path|
-        File.expand_path(collapsed_path, root_dir)
+        File.expand_path(collapsed_path, self[:root_dir])
       end
 
       self

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+say_status "is-land", "Installing <is-land>..."
+
+run "yarn add @11ty/is-land"
+
+javascript_import do
+  <<~JS
+    import "@11ty/is-land/is-land.js"
+    import "@11ty/is-land/is-land-autoinit.js"
+  JS
+end
+
+say_status "is-land", "<is-land> is now configured!"
+say 'For further reading, check out "https://www.bridgetownrb.com/docs/islands"', :blue

data/lib/bridgetown-core/configurations/lit/lit-components-entry.js

@@ -1 +1 @@
-import components from "bridgetownComponents/**/*.{lit.js,lit.js.rb}"
+import components from "$components/**/*.{lit.js,lit.js.rb}"

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

@@ -11,9 +11,9 @@ end
 
 say_status :lit, "Installing Lit + SSR Plugin..."
 
-add_gem "bridgetown-lit-renderer"
+add_gem "bridgetown-lit-renderer", version: "2.1.0.beta1"
 
-run "yarn add lit esbuild-plugin-lit-css bridgetown-lit-renderer"
+run "yarn add lit esbuild-plugin-lit-css bridgetown-lit-renderer@2.1.0-beta1"
 
 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"
@@ -27,45 +27,13 @@ insert_into_file "esbuild.config.js",
   JS
 end
 
-found_match = false
-gsub_file "esbuild.config.js", %r{const esbuildOptions = {}\n} do |_match|
-  found_match = true
-
-  <<~JS
-    const esbuildOptions = {
-      plugins: [...plugins],
-      // Uncomment the following to opt into `.global.css` & `.lit.css` nomenclature.
-      // Read https://www.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation.
-      /*
-      postCssPluginConfig: {
-        filter: /(?:index|\\.global)\\.css$/,
-      },
-      */
-    }
+insert_into_file "esbuild.config.js",
+                 after: "  plugins: [" do
+  <<-JS
+    plugins: [...plugins],
   JS
 end
 
-unless found_match
-  insert_into_file "esbuild.config.js",
-                   after: 'const { plugins } = require("./config/esbuild-plugins.js")' do
-    <<~JS
-
-      // TODO: You will manually need to move any plugins below you wish to share with
-      // Lit SSR into the `config/esbuild-plugins.js` file.
-      // Then add `...plugins` as an item in your plugins array.
-      //
-      // You might also want to include the following in your esbuild config to opt into
-      // `.global.css` & `.lit.css` nomenclature.
-      // Read https://www.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation.
-      /*
-      postCssPluginConfig: {
-        filter: /(?:index|\\.global)\\.css$/,
-      },
-      */
-    JS
-  end
-end
-
 copy_file in_templates_dir("happy-days.lit.js"), "src/_components/happy-days.lit.js"
 
 javascript_import do
@@ -74,24 +42,11 @@ javascript_import do
   JS
 end
 
-insert_into_file "frontend/javascript/index.js",
-                 before: 'import components from "bridgetownComponents/**/*.{js,jsx,js.rb,css}"' do
-  <<~JS
-    // To opt into `.global.css` & `.lit.css` nomenclature, change the `css` extension below to `global.css`.
-    // Read https://www.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation.
-  JS
-end
-
 add_initializer :"bridgetown-lit-renderer"
 
-if found_match
-  say_status :lit, "Lit is now configured!"
-  say_status :lit,
-             "The `config/esbuild-plugins.js` file will let you add full-stack plugins in future."
-else
-  say_status :lit, "Lit is just about configured!"
-  say_status :lit, "You will need to edit `esbuild.config.js` to finish setting up the plugin."
-end
+say_status :lit, "Lit is now configured!"
+say_status :lit,
+           "The `config/esbuild-plugins.js` file will let you add full-stack plugins in future."
 
 say "Check out the example `happy-days.lit.js` file in `src/_components`", :blue
 say 'For further reading, check out "https://www.bridgetownrb.com/docs/components/lit"', :blue

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

@@ -0,0 +1,10 @@
+# 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

@@ -11,57 +11,29 @@ end
 
 say_status :ruby2js, "Installing Ruby2JS..."
 
+add_gem "ruby2js"
 run "yarn add -D @ruby2js/esbuild-plugin"
 
-found_match = false
-gsub_file "esbuild.config.js", %r{const esbuildOptions = {}\n} do |_match|
-  found_match = true
-
+insert_into_file "esbuild.config.js",
+                 after: 'const build = require("./config/esbuild.defaults.js")' do
   <<~JS
-    const ruby2js = require("@ruby2js/esbuild-plugin")
 
-    const esbuildOptions = {
-      plugins: [
-        // See docs on Ruby2JS options here: https://www.ruby2js.com/docs/options
-        ruby2js({
-          eslevel: 2022,
-          autoexports: "default",
-          filters: ["camelCase", "functions", "lit", "esm", "return"]
-        })
-      ]
-    }
+    const ruby2js = require("@ruby2js/esbuild-plugin")
   JS
 end
 
-unless found_match
-  insert_into_file "esbuild.config.js",
-                   after: 'const build = require("./config/esbuild.defaults.js")' do
-    <<~JS
-
-      const ruby2js = require("@ruby2js/esbuild-plugin")
-
-      // TODO: Uncomment and move the following into your plugins array:
-      //
-      //  ruby2js({
-      //    eslevel: 2022,
-      //    autoexports: "default",
-      //    filters: ["camelCase", "functions", "lit", "esm", "return"]
-      //  })
-      //
-      // See docs on Ruby2JS options here: https://www.ruby2js.com/docs/options
-
-    JS
-  end
+insert_into_file "esbuild.config.js",
+                 after: "  plugins: [" 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"
 
-if found_match
-  say_status :ruby2js, "Ruby2JS is now configured!"
-else
-  say_status :ruby2js, "Ruby2JS is just about configured!"
-  say_status :ruby2js, "You will need to edit `esbuild.config.js` to finish setting up the plugin."
-end
+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

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

@@ -3,6 +3,7 @@
 say_status :turbo, "Installing Turbo..."
 
 run("yarn add @hotwired/turbo")
+run("yarn add turbo-shadow")
 
 say_status :turbo, 'Adding Turbo to "frontend/javascript/index.js"...', :magenta
 
@@ -10,11 +11,17 @@ javascript_import do
   <<~JS
     import * as Turbo from "@hotwired/turbo"
 
-    // Uncomment the line below to add transition animations when Turbo navigates.
-    // We recommend adding <meta name="turbo-cache-control" content="no-preview" />
-    // to your HTML head if you turn on transitions. Use data-turbo-transition="false"
-    // on your <main> element for pages where you don't want any transition animation.
-    //
+    /**
+     * Adds support for declarative shadow DOM. Requires your HTML <head> to include:
+     * `<meta name="turbo-cache-control" content="no-cache" />`
+     */
+    import * as TurboShadow from "turbo-shadow"
+
+    /**
+     * Uncomment the line below to add transition animations when Turbo navigates.
+     * Use data-turbo-transition="false" on your <main> element for pages where
+     * you don't want any transition animation.
+     */
     // import "./turbo_transitions.js"
   JS
 end
@@ -22,5 +29,8 @@ end
 copy_file in_templates_dir("turbo_transitions.js"), "frontend/javascript/turbo_transitions.js"
 
 say_status :turbo, "Turbo successfully added!", :magenta
-say_status :turbo, "Take a look in your index.js file for optional animation setup.", :blue
-say_status :turbo, 'For further reading, check out "https://turbo.hotwired.dev/"', :blue
+say_status :turbo, "For declarative shadow DOM support, you will need to update", :blue
+say_status :turbo, "your HTML <head> to add the following code:", :blue
+say %(<meta name="turbo-cache-control" content="no-cache" />)
+say_status :turbo, "Check out your index.js file for optional animation setup.", :blue
+say_status :turbo, 'For further reading, visit "https://turbo.hotwired.dev/"', :blue

data/lib/bridgetown-core/filters/localization_filters.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Filters
+    module LocalizationFilters
+      def l(input)
+        I18n.l(input.to_s)
+      end
+    end
+  end
+end

data/lib/bridgetown-core/helpers.rb

@@ -135,6 +135,14 @@ module Bridgetown
         I18n.send :t, *args, **kwargs
       end
 
+      # Forward all arguments to I18n.l method
+      #
+      # @return [String] the localized string
+      # @see I18n
+      def l(*args, **kwargs)
+        I18n.send :l, *args, **kwargs
+      end
+
       # For template contexts where ActiveSupport's output safety is loaded, we
       # can ensure a string has been marked safe
       #
@@ -221,6 +229,32 @@ module Bridgetown
         end
       end
 
+      def dsd(input = nil, &block)
+        tmpl_content = block.nil? ? input.to_s : view.capture(&block)
+
+        Bridgetown::Utils.dsd_tag(tmpl_content)
+      end
+
+      def dsd_style
+        tmpl_path = caller_locations(1, 2).find do |loc|
+                      loc.label.include?("method_missing").!
+                    end&.path
+
+        return unless tmpl_path # virtually guaranteed not to happen
+
+        tmpl_basename = File.basename(tmpl_path, ".*")
+        style_path = File.join(File.dirname(tmpl_path), "#{tmpl_basename}.dsd.css")
+
+        unless File.file?(style_path)
+          raise Bridgetown::Errors::FatalException, "Missing stylesheet at #{style_path}"
+        end
+
+        style_tag = site.tmp_cache["dsd_style:#{style_path}"] ||=
+          "<style>#{File.read(style_path)}</style>"
+
+        style_tag.html_safe
+      end
+
       private
 
       # Covert an underscored value into a dashed string.

data/lib/bridgetown-core/plugin_manager.rb

@@ -206,30 +206,6 @@ module Bridgetown
         sorted_plugin_files.each do |plugin_file|
           self.class.add_registered_plugin plugin_file
         end
-        next if site.config[:plugins_use_zeitwerk]
-
-        Deprecator.deprecation_message(
-          "The `plugins_use_zeitwerk' configuration option will be removed in the next version " \
-          "of Bridgetown (aka will be permanently set to \"true\")"
-        )
-        Bridgetown::Utils::RequireGems.require_with_graceful_fail(sorted_plugin_files)
-      end
-    end
-
-    # Reloads .rb plugin files via the watcher
-    # DEPRECATED (not necessary with Zeitwerk)
-    #
-    # @return [void]
-    def reload_plugin_files
-      return if site.config[:plugins_use_zeitwerk]
-
-      plugins_path.each do |plugin_search_path|
-        plugin_files = Utils.safe_glob(plugin_search_path, File.join("**", "*.rb"))
-        Array(plugin_files).each do |name|
-          Bridgetown.logger.debug "Reloading:", name.to_s
-          self.class.add_registered_plugin name
-          load name
-        end
       end
     end
 

data/lib/bridgetown-core/tags/dsd.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Tags
+    class DSDTag < Liquid::Block
+      def render(_context)
+        template_content = super
+
+        Bridgetown::Utils.dsd_tag(template_content)
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag("dsd", Bridgetown::Tags::DSDTag)

data/lib/bridgetown-core/tags/l.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Tags
+    class LocalizationTag < Liquid::Tag
+      def render(_context)
+        key = @markup.strip
+        I18n.l(key)
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag("l", Bridgetown::Tags::LocalizationTag)

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

@@ -29,6 +29,8 @@ module Bridgetown
           loop do
             line = rd.gets
             line.to_s.lines.map(&:chomp).each do |message|
+              next if name == "Frontend" && %r{ELIFECYCLE.*?Command failed}.match?(message)
+
               output = +""
               output << with_color(color, "[#{name}] ") if color
               output << message

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

@@ -62,6 +62,9 @@ module Bridgetown
           end
           loader.enable_reloading if reloading_enabled?(load_path)
           loader.ignore(File.join(load_path, "**", "*.js.rb"))
+          loader.ignore(
+            File.join(File.expand_path(config[:islands_dir], config[:source]), "routes")
+          )
           config.autoloader_collapsed_paths.each do |collapsed_path|
             next unless collapsed_path.starts_with?(load_path)
 

data/lib/bridgetown-core/utils.rb

@@ -412,7 +412,7 @@ module Bridgetown
                      end&.last
                    end
 
-      return log_frontend_asset_error(site, asset_type) if asset_path.nil?
+      return log_frontend_asset_error(site, "`#{asset_type}' asset") if asset_path.nil?
 
       static_frontend_path site, [asset_path]
     end
@@ -429,14 +429,16 @@ module Bridgetown
 
     def log_frontend_asset_error(site, asset_type)
       site.data[:__frontend_asset_errors] ||= {}
-      site.data[:__frontend_asset_errors][asset_type] ||=
+      site.data[:__frontend_asset_errors][asset_type] ||= begin
+        Bridgetown.logger.warn("#{frontend_bundler_type}:", "The #{asset_type} could not be found.")
         Bridgetown.logger.warn(
           "#{frontend_bundler_type}:",
-          "There was an error parsing your #{asset_type} file. \
-          Please check your #{asset_type} file for any errors."
+          "Double-check your frontend config or re-run `bin/bridgetown frontend:build'"
         )
+        true
+      end
 
-      "MISSING_#{frontend_bundler_type.upcase}_MANIFEST_FILE"
+      "MISSING_#{frontend_bundler_type.upcase}_ASSET"
     end
 
     def frontend_bundler_type(cwd = Dir.pwd)
@@ -449,6 +451,27 @@ module Bridgetown
       end
     end
 
+    def update_esbuild_autogenerated_config(config)
+      defaults_file = File.join(config[:root_dir], "config", "esbuild.defaults.js")
+      return unless File.exist?(defaults_file)
+
+      config_hash = {
+        source: Pathname.new(config[:source]).relative_path_from(config[:root_dir]),
+        destination: Pathname.new(config[:destination]).relative_path_from(config[:root_dir]),
+        componentsDir: config[:components_dir],
+        islandsDir: config[:islands_dir],
+      }
+
+      defaults_file_contents = File.read(defaults_file)
+      File.write(
+        defaults_file,
+        defaults_file_contents.sub(
+          %r{(const autogeneratedBridgetownConfig = ){\n.*?}}m,
+          "\\1#{JSON.pretty_generate config_hash}"
+        )
+      )
+    end
+
     def default_github_branch_name(repo_url)
       repo_match = Bridgetown::Commands::Actions::GITHUB_REPO_REGEX.match(repo_url)
       api_endpoint = "https://api.github.com/repos/#{repo_match[1]}"
@@ -523,6 +546,12 @@ module Bridgetown
       end
     end
 
+    def dsd_tag(input, shadow_root_mode: :open)
+      raise ArgumentError unless [:open, :closed].include? shadow_root_mode
+
+      %(<template shadowrootmode="#{shadow_root_mode}">#{input}</template>).html_safe
+    end
+
     private
 
     def merge_values(target, overwrite)

data/lib/bridgetown-core/version.rb

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

data/lib/bridgetown-core/watcher.rb

@@ -55,7 +55,7 @@ module Bridgetown
     # Start a listener to watch for changes and call {#reload_site}
     #
     # @param (see #watch)
-    def listen(site, options)
+    def listen(site, options) # rubocop:disable Metrics/MethodLength
       bundling_path = site.frontend_bundling_path
       FileUtils.mkdir_p(bundling_path)
       Listen.to(
@@ -66,12 +66,17 @@ module Bridgetown
         force_polling: options["force_polling"]
       ) do |modified, added, removed|
         c = modified + added + removed
+
+        # NOTE: inexplicably, this matcher doesn't work with the Listen gem, so
+        # we have to run it here manually
+        c.reject! { component_frontend_matcher(options).match? _1 }
         n = c.length
+        next if n.zero?
 
         unless site.ssr?
           Bridgetown.logger.info(
             "Reloading…",
-            "#{n} file#{"s" if c.length > 1} changed at #{Time.now.strftime("%Y-%m-%d %H:%M:%S")}"
+            "#{n} file#{"s" if n > 1} changed at #{Time.now.strftime("%Y-%m-%d %H:%M:%S")}"
           )
           c.each { |path| Bridgetown.logger.info "", "- #{path["#{site.root_dir}/".length..]}" }
         end
@@ -93,7 +98,6 @@ module Bridgetown
         catch :halt do
           Bridgetown::Hooks.trigger :site, :pre_reload, site, paths
           Bridgetown::Hooks.clear_reloadable_hooks
-          site.plugin_manager.reload_plugin_files
           site.loaders_manager.reload_loaders
           Bridgetown::Hooks.trigger :site, :post_reload, site, paths
 
@@ -124,12 +128,15 @@ module Bridgetown
     end
 
     def custom_excludes(options)
-      Array(options["exclude"]).map { |e| Bridgetown.sanitized_path(options["source"], e) }
+      Array(options["exclude"]).map { |e| Bridgetown.sanitized_path(options["root_dir"], e) }
     end
 
-    def component_frontend_matcher
-      %r{_components/.*?(\.js|\.jsx|\.js\.rb|\.css)$}
+    # rubocop:disable Layout/LineLength
+    def component_frontend_matcher(options)
+      @fematcher ||=
+        %r{(#{options[:components_dir]}|#{options[:islands_dir]})/(?:[^.]+|\.(?!dsd))+(\.js|\.jsx|\.js\.rb|\.css)$}
     end
+    # rubocop:enable Layout/LineLength
 
     def to_exclude(options)
       [
@@ -162,7 +169,7 @@ module Bridgetown
         rescue ArgumentError
           # Could not find a relative path
         end
-      end + [component_frontend_matcher] + [%r!^\.bridgetown-metadata!]
+      end
     end
 
     def sleep_forever

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" -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.3.0.beta1
+  version: 1.3.0.beta2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-01 00:00:00.000000000 Z
+date: 2023-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -348,6 +348,7 @@ 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
@@ -392,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
@@ -408,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
@@ -444,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
@@ -490,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