Update to bridgetown 2.0

Author: moonglum

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.2.2.1)
+    activesupport (7.2.2.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -15,22 +15,22 @@ GEM
       tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    amazing_print (1.7.2)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
-    bridgetown (2.0.0.beta5)
-      bridgetown-builder (= 2.0.0.beta5)
-      bridgetown-core (= 2.0.0.beta5)
-      bridgetown-foundation (= 2.0.0.beta5)
-      bridgetown-paginate (= 2.0.0.beta5)
-    bridgetown-builder (2.0.0.beta5)
-      bridgetown-core (= 2.0.0.beta5)
-    bridgetown-core (2.0.0.beta5)
+    amazing_print (1.8.1)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.3)
+    bridgetown (2.0.0)
+      bridgetown-builder (= 2.0.0)
+      bridgetown-core (= 2.0.0)
+      bridgetown-foundation (= 2.0.0)
+      bridgetown-paginate (= 2.0.0)
+    bridgetown-builder (2.0.0)
+      bridgetown-core (= 2.0.0)
+    bridgetown-core (2.0.0)
       activesupport (>= 6.0, < 8.0)
       addressable (~> 2.4)
       amazing_print (~> 1.2)
-      bridgetown-foundation (= 2.0.0.beta5)
+      bridgetown-foundation (= 2.0.0)
       csv (~> 3.2)
       dry-inflector (>= 1.0)
       erubi (~> 1.9)
@@ -53,26 +53,27 @@ GEM
       thor (~> 1.1)
       tilt (~> 2.0)
       zeitwerk (~> 2.5)
-    bridgetown-foundation (2.0.0.beta5)
+    bridgetown-foundation (2.0.0)
       hash_with_dot_access (~> 2.0)
       inclusive (~> 1.0)
       zeitwerk (~> 2.5)
-    bridgetown-paginate (2.0.0.beta5)
-      bridgetown-core (= 2.0.0.beta5)
+    bridgetown-paginate (2.0.0)
+      bridgetown-core (= 2.0.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.2)
-    csv (3.3.4)
+    connection_pool (2.5.4)
+    csv (3.3.5)
     date (3.4.1)
-    drb (2.2.1)
+    drb (2.2.3)
     dry-inflector (1.2.0)
+    erb (5.0.2)
     erubi (1.13.1)
-    faraday (2.13.0)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.4.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
     ffi (1.17.2)
     ffi (1.17.2-aarch64-linux-gnu)
@@ -85,16 +86,16 @@ GEM
     ffi (1.17.2-x86_64-darwin)
     ffi (1.17.2-x86_64-linux-gnu)
     ffi (1.17.2-x86_64-linux-musl)
-    hash_with_dot_access (2.1.1)
+    hash_with_dot_access (2.2.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    inclusive (1.0.0)
-    io-console (0.8.0)
+    inclusive (1.1.0)
+    io-console (0.8.1)
     irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.10.2)
+    json (2.14.1)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
@@ -111,43 +112,44 @@ GEM
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
-    psych (5.2.3)
+    psych (5.2.6)
       date
       stringio
-    public_suffix (6.0.1)
-    puma (6.6.0)
+    public_suffix (6.0.2)
+    puma (7.0.3)
       nio4r (~> 2.0)
-    rack (3.1.14)
+    rack (3.2.1)
     rackup (2.2.1)
       rack (>= 3)
-    rake (13.2.1)
+    rake (13.3.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.13.1)
+    rdoc (6.14.2)
+      erb
       psych (>= 4.0.0)
-    reline (0.6.1)
+    reline (0.6.2)
       io-console (~> 0.5)
-    rexml (3.4.1)
-    roda (3.91.0)
+    rexml (3.4.4)
+    roda (3.96.0)
       rack
-    rouge (4.5.1)
+    rouge (4.6.0)
     securerandom (0.4.1)
-    serbea (2.2.0)
-      erubi (>= 1.10)
-      tilt (~> 2.0)
-    signalize (1.3.0)
+    serbea (2.3.0)
+      erubi (>= 1.11)
+      tilt (>= 2.1)
+    signalize (1.3.1)
       concurrent-ruby (~> 1.2)
-    streamlined (0.6.0)
+    streamlined (0.6.1)
       serbea (>= 2.1)
       zeitwerk (~> 2.5)
     stringio (3.1.7)
-    thor (1.3.2)
-    tilt (2.6.0)
+    thor (1.4.0)
+    tilt (2.6.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uri (1.0.3)
-    zeitwerk (2.7.2)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   aarch64-linux-gnu
@@ -167,4 +169,4 @@ DEPENDENCIES
   puma
 
 BUNDLED WITH
-   2.5.11
+   2.7.2

config/esbuild.defaults.js

@@ -6,7 +6,7 @@
 // when an update is applied hence we strongly recommend adding overrides to
 // `esbuild.config.js` instead of editing this file.
 //
-// Shipped with Bridgetown v2.0.0.beta2
+// Shipped with Bridgetown v2.0.0
 
 // DO NOT MANUALLY EDIT THIS CONFIGURATION:
 const autogeneratedBridgetownConfig = {
@@ -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",

esbuild.config.js

@@ -1,4 +1,4 @@
-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.
 //