bridgetown-core 2.0.0.beta2 → 2.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad323d78c36221049d27482e186a24793c5e52b478e913b778ba0d8809658990
-  data.tar.gz: dfc80b46023d5f28e38f2116e62676f579d175f1fcca023c46bb921298c99dc7
+  metadata.gz: 813f0bb565e3342b5eb466d6f3f65575adec5ba64d0a355c29c49f74925ee695
+  data.tar.gz: b8141708de43e8035b04ce2085fded27ddd5f4b5657ed53143c80ccf26927b5e
 SHA512:
-  metadata.gz: b0a025a6629018fc3cd5687f6675aee4ce0f4ef0edb740c35b1ba45f1f77df3fc6bb85b658d52a469d9b7f2e83820efcb636a9e062d1b196372fb8cb0b3b447e
-  data.tar.gz: a7af845632eda73b48f00fe07863f2b90f287e35402239203be296808aa5ae57d41fb3e8a498882254ed3407022f5f88d0895e0e81d59d861f83794f6bdbef76
+  metadata.gz: acad0c9039fcad0cf8654b19672b149ef660cc2adb75307a810d9379695a54398c6dbaffb206f850b2272e831b2280853f82b20e35115c0454457e21ec22c055
+  data.tar.gz: 51af878741c57eac002b78b3690887703d0469f851f6b980203f187d5731282feec110d91ad0abafa60fc99d3ba813d39b8174a22931d32daf4eb209511774e1

data/.rubocop.yml

@@ -43,3 +43,6 @@ Style/OpenStructUse:
 Style/StringConcatenation:
   Exclude:
     - test/test_apply_command.rb
+
+Style/SafeNavigationChainLength:
+  Enabled: false

data/bridgetown-core.gemspec

@@ -2,58 +2,59 @@
 
 require_relative "../bridgetown-foundation/lib/bridgetown/version"
 
-Gem::Specification.new do |s|
-  s.name          = "bridgetown-core"
-  s.version       = Bridgetown::VERSION
-  s.license       = "MIT"
-  s.author        = "Bridgetown Team"
-  s.email         = "maintainers@bridgetownrb.com"
-  s.homepage      = "https://www.bridgetownrb.com"
-  s.summary       = "A next-generation, progressive site generator & fullstack framework, powered by Ruby"
-  s.description   = "Bridgetown is a next-generation, progressive site generator & fullstack framework, powered by Ruby"
+Gem::Specification.new do |spec|
+  spec.name          = "bridgetown-core"
+  spec.version       = Bridgetown::VERSION
+  spec.license       = "MIT"
+  spec.author        = "Bridgetown Team"
+  spec.email         = "maintainers@bridgetownrb.com"
+  spec.homepage      = "https://www.bridgetownrb.com"
+  spec.summary       = "A next-generation, progressive site generator & fullstack framework, powered by Ruby"
+  spec.description   = "Bridgetown is a next-generation, progressive site generator & fullstack framework, powered by Ruby"
 
-  s.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r!^(benchmark|features|script|test)/!)
   end
-  s.executables   = ["bridgetown", "bt"] # `bt` is a shortcut to `bridgetown` command
-  s.bindir        = "bin"
-  s.require_paths = ["lib"]
+  spec.executables   = ["bridgetown", "bt"] # `bt` is a shortcut to `bridgetown` command
+  spec.bindir        = "bin"
+  spec.require_paths = ["lib"]
 
-  s.metadata      = {
+  spec.metadata      = {
     "source_code_uri"       => "https://github.com/bridgetownrb/bridgetown",
     "bug_tracker_uri"       => "https://github.com/bridgetownrb/bridgetown/issues",
     "changelog_uri"         => "https://github.com/bridgetownrb/bridgetown/releases",
-    "homepage_uri"          => s.homepage,
+    "homepage_uri"          => spec.homepage,
     "rubygems_mfa_required" => "true",
   }
 
-  s.rdoc_options = ["--charset=UTF-8"]
+  spec.rdoc_options = ["--charset=UTF-8"]
 
-  s.required_ruby_version     = ">= 3.1.0"
+  spec.required_ruby_version     = ">= 3.1.0"
 
-  s.add_runtime_dependency("activesupport",             [">= 6.0", "< 8.0"])
-  s.add_runtime_dependency("addressable",               "~> 2.4")
-  s.add_runtime_dependency("amazing_print",             "~> 1.2")
-  s.add_runtime_dependency("bridgetown-foundation",     Bridgetown::VERSION)
-  s.add_runtime_dependency("csv",                       "~> 3.2")
-  s.add_runtime_dependency("dry-inflector",             ">= 1.0")
-  s.add_runtime_dependency("erubi",                     "~> 1.9")
-  s.add_runtime_dependency("faraday",                   "~> 2.0")
-  s.add_runtime_dependency("faraday-follow_redirects",  "~> 0.3")
-  s.add_runtime_dependency("i18n",                      "~> 1.0")
-  s.add_runtime_dependency("kramdown",                  "~> 2.1")
-  s.add_runtime_dependency("kramdown-parser-gfm",       "~> 1.0")
-  s.add_runtime_dependency("liquid",                    [">= 5.0", "< 5.5"])
-  s.add_runtime_dependency("listen",                    "~> 3.0")
-  s.add_runtime_dependency("rack",                      ">= 3.0")
-  s.add_runtime_dependency("rackup",                    "~> 2.0")
-  s.add_runtime_dependency("rake",                      ">= 13.0")
-  s.add_runtime_dependency("roda",                      "~> 3.46")
-  s.add_runtime_dependency("rouge",                     [">= 3.0", "< 5.0"])
-  s.add_runtime_dependency("serbea",                    "~> 2.1")
-  s.add_runtime_dependency("signalize",                 "~> 1.3")
-  s.add_runtime_dependency("streamlined",               ">= 0.5.2")
-  s.add_runtime_dependency("thor",                      "~> 1.1")
-  s.add_runtime_dependency("tilt",                      "~> 2.0")
-  s.add_runtime_dependency("zeitwerk",                  "~> 2.5")
+  spec.add_dependency("activesupport",             [">= 6.0", "< 8.0"])
+  spec.add_dependency("addressable",               "~> 2.4")
+  spec.add_dependency("amazing_print",             "~> 1.2")
+  spec.add_dependency("bridgetown-foundation",     Bridgetown::VERSION)
+  spec.add_dependency("csv",                       "~> 3.2")
+  spec.add_dependency("dry-inflector",             ">= 1.0")
+  spec.add_dependency("erubi",                     "~> 1.9")
+  spec.add_dependency("faraday",                   "~> 2.0")
+  spec.add_dependency("faraday-follow_redirects",  "~> 0.3")
+  spec.add_dependency("i18n",                      "~> 1.0")
+  spec.add_dependency("irb",                       ">= 1.14")
+  spec.add_dependency("kramdown",                  "~> 2.1")
+  spec.add_dependency("kramdown-parser-gfm",       "~> 1.0")
+  spec.add_dependency("liquid",                    [">= 5.0", "< 5.5"])
+  spec.add_dependency("listen",                    "~> 3.0")
+  spec.add_dependency("rack",                      ">= 3.0")
+  spec.add_dependency("rackup",                    "~> 2.0")
+  spec.add_dependency("rake",                      ">= 13.0")
+  spec.add_dependency("roda",                      "~> 3.46")
+  spec.add_dependency("rouge",                     [">= 3.0", "< 5.0"])
+  spec.add_dependency("serbea",                    "~> 2.1")
+  spec.add_dependency("signalize",                 "~> 1.3")
+  spec.add_dependency("streamlined",               ">= 0.6.0")
+  spec.add_dependency("thor",                      "~> 1.1")
+  spec.add_dependency("tilt",                      "~> 2.0")
+  spec.add_dependency("zeitwerk",                  "~> 2.5")
 end

data/lib/bridgetown-core/cache.rb

@@ -33,8 +33,6 @@ module Bridgetown
 
       # Compare the current config to the cached config
       # If they are different, clear all caches
-      #
-      # Returns nothing.
       def clear_if_config_changed(config)
         config = config.inspect
         cache = Bridgetown::Cache.new "Bridgetown::Cache"
@@ -49,8 +47,6 @@ module Bridgetown
       private
 
       # Delete all cached items from all caches
-      #
-      # Returns nothing.
       def delete_cache_files
         FileUtils.rm_rf(@cache_dir) if disk_cache_enabled
       end
@@ -60,9 +56,7 @@ module Bridgetown
 
     # Get an existing named cache, or create a new one if none exists
     #
-    # name - name of the cache
-    #
-    # Returns nothing.
+    # @param name [String] name of the cache
     def initialize(name)
       @cache = Bridgetown::Cache.base_cache[name] ||= {}
       @name = name.gsub(%r![^\w\s-]!, "-")
@@ -77,7 +71,7 @@ module Bridgetown
     # Retrieve a cached item
     # Raises if key does not exist in cache
     #
-    # Returns cached value
+    # @return [Object] cached value
     def [](key)
       return @cache[key] if @cache.key?(key)
 
@@ -88,8 +82,6 @@ module Bridgetown
     end
 
     # Add an item to cache
-    #
-    # Returns nothing.
     def []=(key, value)
       @cache[key] = value
       return unless disk_cache_enabled?
@@ -112,8 +104,6 @@ module Bridgetown
     end
 
     # Remove one particular item from the cache
-    #
-    # Returns nothing.
     def delete(key)
       @cache.delete(key)
       File.delete(path_to(hash(key))) if disk_cache_enabled?
@@ -121,7 +111,7 @@ module Bridgetown
 
     # Check if `key` already exists in this cache
     #
-    # Returns true if key exists in the cache, false otherwise
+    # @return [Boolean] true if key exists in the cache, false otherwise
     def key?(key)
       # First, check if item is already cached in memory
       return true if @cache.key?(key)
@@ -153,14 +143,11 @@ module Bridgetown
     end
 
     # Remove all this caches items from disk
-    #
-    # Returns nothing.
     def delete_cache_files
       FileUtils.rm_rf(path_to) if disk_cache_enabled?
     end
 
     # Load `path` from disk and return the result.
-    # This MUST NEVER be called in Safe Mode
     # rubocop:disable Security/MarshalLoad
     def load(path)
       raise unless disk_cache_enabled?
@@ -173,9 +160,6 @@ module Bridgetown
     # rubocop:enable Security/MarshalLoad
 
     # Given a path and a value, save value to disk at path.
-    # This should NEVER be called in Safe Mode
-    #
-    # Returns nothing.
     def dump(path, value)
       return unless disk_cache_enabled?
 

data/lib/bridgetown-core/cleaner.rb

@@ -17,9 +17,9 @@ module Bridgetown
 
     private
 
-    # Private: The list of files and directories to be deleted during cleanup process
+    # The list of files and directories to be deleted during cleanup process
     #
-    # Returns an Array of the file and directory paths
+    # @return [Array<String>] file and directory paths
     def obsolete_files
       out = (existing_files - new_files - new_dirs + replaced_files).to_a
       Bridgetown::Hooks.trigger :clean, :on_obsolete, out
@@ -27,10 +27,9 @@ module Bridgetown
       out
     end
 
-    # Private: The list of existing files, apart from those included in
-    # keep_files and hidden files.
+    # The list of existing files, apart from those included in keep_files and hidden files
     #
-    # Returns a Set with the file paths
+    # @return [Set<String>] file paths
     def existing_files
       files = Set.new
       regex = keep_file_regex
@@ -45,9 +44,9 @@ module Bridgetown
       files
     end
 
-    # Private: The list of files to be created when site is built.
+    # The list of files to be created when site is built.
     #
-    # Returns a Set with the file paths
+    # @return [Set<String>] file paths
     def new_files
       @new_files ||= Set.new.tap do |files|
         site.each_site_file do |item|
@@ -60,17 +59,17 @@ module Bridgetown
       end
     end
 
-    # Private: The list of directories to be created when site is built.
+    # The list of directories to be created when site is built.
     # These are the parent directories of the files in #new_files.
     #
-    # Returns a Set with the directory paths
+    # @return [Set<String>] directory paths
     def new_dirs
       @new_dirs ||= new_files.flat_map { |file| parent_dirs(file) }.to_set
     end
 
-    # Private: The list of parent directories of a given file
+    # The list of parent directories of a given file
     #
-    # Returns an Array with the directory paths
+    # @return [Array<String>] directory paths
     def parent_dirs(file)
       parent_dir = File.dirname(file)
       if parent_dir == site.dest
@@ -80,29 +79,28 @@ module Bridgetown
       end
     end
 
-    # Private: The list of existing files that will be replaced by a directory
-    # during build
+    # The list of existing files that will be replaced by a directory during build
     #
-    # Returns a Set with the file paths
+    # @return [Set<String>] file paths
     def replaced_files
       new_dirs.select { |dir| File.file?(dir) }.to_set
     end
 
-    # Private: The list of directories that need to be kept because they are
+    # The list of directories that need to be kept because they are
     # parent directories of files specified in keep_files
     #
-    # Returns a Set with the directory paths
+    # @return [Set<String>] directory paths
     def keep_dirs
       site.config.keep_files.flat_map { |file| parent_dirs(site.in_dest_dir(file)) }.to_set
     end
 
-    # Private: Creates a regular expression from the config's keep_files array
+    # Creates a regular expression from the config's keep_files array
     #
-    # Examples
+    # @example
     #   ['.git','.svn'] with site.dest "/myblog/_site" creates
     #   the following regex: /\A\/myblog\/_site\/(\.git|\/.svn)/
     #
-    # Returns the regular expression
+    # @return [Regexp]
     def keep_file_regex
       %r!\A#{Regexp.quote(site.dest)}/(#{Regexp.union(site.config.keep_files).source})!
     end

data/lib/bridgetown-core/collection.rb

@@ -55,13 +55,13 @@ module Bridgetown
     # Iterate over Resources by delegating to `resources.each` (supports Enumerable)
     def each(...) = resources.each(...)
 
-    # Delgates to `resources.last`
+    # Delegates to `resources.last`
     def last(...) = resources.last(...)
 
-    # Delgates to `resources.deconstruct`
+    # Delegates to `resources.deconstruct`
     def deconstruct = resources.deconstruct
 
-    # Delgates to `resources[]`
+    # Delegates to `resources[]`
     def [](...) = resources.[](...)
 
     # Fetch the static files in this collection.
@@ -184,7 +184,8 @@ module Bridgetown
     #
     # @return [String]
     def inspect
-      "#<#{self.class} @label=#{label} resources=#{resources}>"
+      "#<#{self.class} #{label}: #{resources.count} metadata=#{metadata.inspect} " \
+        "static_files: #{static_files.count}>"
     end
 
     # Produce a sanitized label name
@@ -400,7 +401,7 @@ module Bridgetown
 
     def model_id_from_relative_path(model_relative_path, manifest: nil)
       scheme = manifest ? "plugin" : "repo"
-      id = +"#{scheme}://#{label}.collection/"
+      id = "#{scheme}://#{label}.collection/"
       id += "#{manifest.origin}/" if manifest
       id += Addressable::URI.escape(model_relative_path).gsub("#", "%23")
       id

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

@@ -66,6 +66,13 @@ module Bridgetown
               puts "Unknown task: #{cmd.split("[")[0]}\n\nHere's a list of tasks you can run:"
               display_rake_tasks(rake)
             end
+          rescue RuntimeError => e
+            # re-raise error unless it's an error through Minitest
+            raise e unless e.message.include?("ruby -Ilib:test")
+
+            Bridgetown.logger.error "test aborted!"
+            Bridgetown.logger.error e.message
+            exit(false)
           end
         end
       end

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

@@ -50,11 +50,7 @@ module Bridgetown
           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
-            rake["frontend:watcher"].invoke(true)
-          end
+          invoke_frontend_watcher_from_rake
         end
 
         @site = Bridgetown::Site.new(config_options)
@@ -66,11 +62,7 @@ module Bridgetown
           build_site(config_options)
         end
 
-        # TODO: remove this logic…I can't find "detach" anywhere
-        if config_options.fetch("detach", false)
-          Bridgetown.logger.info "Auto-regeneration:",
-                                 "disabled when running server detached."
-        elsif config_options.fetch("watch", false)
+        if config_options.fetch("watch", false)
           watch_site(config_options)
         else
           Bridgetown.logger.info "Auto-regeneration:", "disabled. Use --watch to enable."
@@ -79,11 +71,9 @@ module Bridgetown
 
       protected
 
-      # Build your Bridgetown site.
-      #
-      # options - A Hash of options passed to the command or loaded from config
+      # Build your Bridgetown site
       #
-      # Returns nothing.
+      # @param options [Bridgetown::Configuration] options loaded from config and/or CLI
       def build_site(config_options)
         t = Time.now
         display_folder_paths(config_options)
@@ -97,32 +87,55 @@ module Bridgetown
                                           "#{(Time.now - t).ceil(2)} seconds."
       end
 
-      # Watch for file changes and rebuild the site.
-      #
-      # options - A Hash of options passed to the command or loaded from config
+      # Watch for file changes and rebuild the site
       #
-      # Returns nothing.
+      # @param options [Bridgetown::Configuration] options loaded from config and/or CLI
       def watch_site(config_options)
+        if config_options["url"]&.include?("://localhost")
+          require "socket"
+          external_ip = Socket.ip_address_list.find do |ai|
+            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)
+          Bridgetown.logger.info ""
+          Bridgetown.logger.info "Now serving at:", "#{scheme}://localhost:#{port}".magenta
+          Bridgetown.logger.info "", "#{scheme}://#{external_ip}:#{port}".magenta if external_ip
+          Bridgetown.logger.info ""
+        end
+
         Bridgetown::Watcher.watch(@site, config_options)
       end
 
       # Display the source and destination folder paths
       #
-      # options - A Hash of options passed to the command
-      #
-      # Returns nothing.
+      # @param options [Bridgetown::Configuration] options loaded from config and/or CLI
       def display_folder_paths(config_options)
         source = File.expand_path(config_options["source"])
         destination = File.expand_path(config_options["destination"])
         Bridgetown.logger.info "Environment:", Bridgetown.environment.cyan
         Bridgetown.logger.info "Source:", source
         Bridgetown.logger.info "Destination:", destination
-        # TODO: work with arrays
         return unless config_options["plugins_dir"].is_a?(String)
 
         plugins_dir = File.expand_path(config_options["plugins_dir"])
         Bridgetown.logger.info "Custom Plugins:", plugins_dir if Dir.exist?(plugins_dir)
       end
+
+      def invoke_frontend_watcher_from_rake
+        require "rake"
+        Rake.with_application do |rake|
+          begin
+            rake.raw_load_rakefile
+          rescue StandardError => e
+            unless e.message.include?("No Rakefile found")
+              Bridgetown.logger.error "Error Running Rake:", "#{e.message} (#{e.class})"
+              e.backtrace[0..1].each { |backtrace_line| Bridgetown.logger.info backtrace_line }
+            end
+          end
+          rake["frontend:watcher"].invoke(true) if rake.tasks.any? { _1.name == "frontend:watcher" }
+        end
+      end
     end
   end
 end

data/lib/bridgetown-core/commands/concerns/actions.rb

@@ -116,6 +116,10 @@ module Bridgetown
         run "#{Bridgetown::PluginManager.package_manager} #{Bridgetown::PluginManager.package_manager_install_command} #{package_details}" # rubocop:disable Layout
       end
 
+      def remove_npm_package(package_details)
+        run "#{Bridgetown::PluginManager.package_manager} #{Bridgetown::PluginManager.package_manager_uninstall_command} #{package_details}" # rubocop:disable Layout
+      end
+
       def apply_from_url(url)
         apply transform_automation_url(url.dup)
       end

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

@@ -80,7 +80,6 @@ module Bridgetown
 
         config_options = configuration_with_overrides(options)
         if options[:"server-config"]
-          require "puma"
           require "bridgetown-core/rack/boot"
           Bridgetown::Rack.boot
         else

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

@@ -1,16 +1,17 @@
-const build = require("./config/esbuild.defaults.js")
+import build from "./config/esbuild.defaults.js"
 
 // You can customize this as you wish, perhaps to add new esbuild plugins.
 //
 // ```
-// const path = require("path")
-// const esbuildCopy = require('esbuild-plugin-copy').default
+// import { copy } from 'esbuild-plugin-copy'
+// 
 // const esbuildOptions = {
 //   plugins: [
-//     esbuildCopy({
+//     copy({
+//       resolveFrom: 'cwd',
 //       assets: {
-//         from: [path.resolve(__dirname, 'node_modules/somepackage/files/*')],
-//         to: [path.resolve(__dirname, 'output/_bridgetown/somepackage/files')],
+//         from: ['./node_modules/somepackage/files/*')],
+//         to: ['./output/_bridgetown/somepackage/files')],
 //       },
 //       verbose: false
 //     }),

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

@@ -16,19 +16,19 @@ const autogeneratedBridgetownConfig = {
   "islandsDir": "_islands"
 }
 
-const path = require("path")
-const fsLib = require("fs")
+import path from "path"
+import fsLib from "fs"
 const fs = fsLib.promises
-const { pathToFileURL, fileURLToPath } = require("url")
-const glob = require("glob")
-const postcss = require("postcss")
-const postCssImport = require("postcss-import")
-const readCache = require("read-cache")
+import { pathToFileURL, fileURLToPath } from "url"
+import { glob } from "glob"
+import postcss from "postcss"
+import postCssImport from "postcss-import"
+import readCache from "read-cache"
 
 // Detect if an NPM package is available
 const moduleAvailable = name => {
   try {
-    require.resolve(name)
+    import.meta.resolve(name)
     return true
   } catch (e) { }
   return false
@@ -43,7 +43,7 @@ const generateSourceMappingURL = sourceMap => {
 // Import Sass if available
 let sass
 if (moduleAvailable("sass")) {
-  sass = require("sass")
+  sass = (await import("sass")).default
 }
 
 // Glob plugin derived from:
@@ -288,9 +288,9 @@ const bridgetownConfigured = (bridgetownConfig, outputFolder) => {
 }
 
 // Load the PostCSS config from postcss.config.js or whatever else is a supported location/format
-const postcssrc = require("postcss-load-config")
+const postcssrc = (await import("postcss-load-config")).default
 
-module.exports = async (esbuildOptions, ...args) => {
+export default async (esbuildOptions, ...args) => {
   let outputFolder;
   if (typeof esbuildOptions === "string") { // legacy syntax where first argument is output folder
     outputFolder = esbuildOptions
@@ -313,11 +313,12 @@ module.exports = async (esbuildOptions, ...args) => {
   esbuildOptions.plugins.push(bridgetownPreset(bridgetownConfig))
   if (esbuildOptions.bridgetownConfig) delete esbuildOptions.bridgetownConfig
 
-  const esbuild = require("esbuild")
+  const esbuild = (await import("esbuild")).default
   const entryPoints = esbuildOptions.entryPoints || ["./frontend/javascript/index.js"]
   if (esbuildOptions.entryPoints) delete esbuildOptions.entryPoints
 
   const islands = glob.sync(`./${bridgetownConfig.source}/${bridgetownConfig.islandsDir}/*.{js,js.rb}`).map(item => `./${item}`)
+  const islandsAsObject = islands.reduce((obj, str) => obj[str] = str, {})
 
   esbuild.context({
     bundle: true,
@@ -339,7 +340,7 @@ module.exports = async (esbuildOptions, ...args) => {
     minify: process.argv.includes("--minify"),
     sourcemap: true,
     target: "es2020",
-    entryPoints: [...entryPoints, ...islands],
+    entryPoints: Array.isArray(entryPoints) ? [...entryPoints, ...islands] : {...entryPoints, ...islandsAsObject},
     entryNames: "[dir]/[name].[hash]",
     outdir: path.join(process.cwd(), `${bridgetownConfig.destination}/_bridgetown/static`),
     publicPath: "/_bridgetown/static",

data/lib/bridgetown-core/commands/esbuild/migrate-from-webpack.rb

@@ -25,7 +25,7 @@ unless Bridgetown.environment.test?
     confirm = ask "\nThe following packages will be removed: \n\n#{packages_to_remove.join("\n")}\n\nWould you like to continue? [Yn]"
     return unless confirm.casecmp?("Y")
 
-    run "yarn remove #{packages_to_remove.join(" ")}"
+    remove_npm_package packages_to_remove.join(" ")
   end
 end
 

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

@@ -2,8 +2,22 @@
 
 template "esbuild.defaults.js.erb", "config/esbuild.defaults.js", force: true
 copy_file "jsconfig.json"
-say "🎉 esbuild configuration updated successfully!"
+
+unless File.read("package.json").include?('"type": "module"')
+  insert_into_file "package.json",
+                   after: '"private": true,' do
+    <<-JS.chomp
+
+  "type": "module",
+    JS
+  end
+end
+
+gsub_file "postcss.config.js", "module.exports =", "export default"
+gsub_file "esbuild.config.js", 'const build = require("./config/esbuild.defaults.js")',
+          'import build from "./config/esbuild.defaults.js"'
+add_npm_package "esbuild@latest glob@latest" unless Bridgetown.env.test?
+
+say "\n🎉 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."
-say "⚠️ Don't forget to update the esbuild version in your `package.json` file to \"^0.20.2\""
-say "and run `npm install`!"

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

@@ -3,7 +3,7 @@
 module Bridgetown
   module Commands
     class Esbuild < Thor::Group
-      include Thor::Actions
+      include Thor::Actions, Bridgetown::Commands::Actions
       extend Summarizable
 
       Registrations.register do