bridgetown-core 1.3.0.beta3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec81158ce54460fb44c4296bae6c3eb75c95c627492c6fe5891cbd853089a13c
-  data.tar.gz: e22e4e4cfd9b4c27a5eefefd1670e43c99badb7eb9c8be96105b47e024324543
+  metadata.gz: 90337c7726115f901df3009e9e2d4b528e8439850ac995c38e2cfec4aca38109
+  data.tar.gz: 7f32a5135963a21cd915e3a2dd37576daed3c1a9783feb3c236bc5c73b0b138a
 SHA512:
-  metadata.gz: 6130dec47320b9b66406afbb6e98e5851ceba1664292c37be8d02a800c9e95a6c9678ccbc5c822dc2f64497e0b9b0826c0956dd72ab81c2526b9fb499b3d13a5
-  data.tar.gz: ac1d0032d102186ae07d41997bd29541bf96eb3e7aee7aa6ca25df8da5b3cebef18ebb7cb3d51c1ef58270df68c65d126271b55bb822f8fdd046927ccfee68b5
+  metadata.gz: 94c3185a2170a979aaa6434b5f36e45e9e73fc331aa42ede507ad559b2dc4abee70f7b8c77b8349a6a7449bd17e15f8ea1a47f6356a7a577829342623c09f84e
+  data.tar.gz: 0d03a222870a2a66184498a04681e0b90252602d580e46b90208b10a76528543854ba4a5c6113fe623fead0dc95d49cf0e052cdc20466101ece87223c85e4134

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

@@ -103,6 +103,8 @@ const importPostCssPlugin = (options, configuration) => ({
   async setup(build) {
     // Process .css files with PostCSS
     build.onLoad({ filter: (configuration.filter || /\.css$/) }, async (args) => {
+      if (args.path.endsWith(".lit.css")) return;
+
       const additionalFilePaths = []
       const css = await fs.readFile(args.path, "utf8")
 
@@ -307,6 +309,9 @@ module.exports = async (esbuildOptions, ...args) => {
   if (esbuildOptions.bridgetownConfig) delete esbuildOptions.bridgetownConfig
 
   const esbuild = require("esbuild")
+  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}`)
 
   esbuild.context({
@@ -325,7 +330,7 @@ module.exports = async (esbuildOptions, ...args) => {
     minify: process.argv.includes("--minify"),
     sourcemap: true,
     target: "es2020",
-    entryPoints: ["./frontend/javascript/index.js", ...islands],
+    entryPoints: [...entryPoints, ...islands],
     entryNames: "[dir]/[name].[hash]",
     outdir: path.join(process.cwd(), `${bridgetownConfig.destination}/_bridgetown/static`),
     publicPath: "/_bridgetown/static",

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

@@ -5,3 +5,5 @@ 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."
+say "⚠️ Don't forget to update the esbuild version in your `package.json` file to \"^0.17.19\""
+say "and run `yarn install`!"

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

@@ -28,7 +28,7 @@ insert_into_file "esbuild.config.js",
 end
 
 insert_into_file "esbuild.config.js",
-                 after: "  plugins: [" do
+                 after: "\n  plugins: [\n" do
   <<-JS
     ...plugins,
   JS

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

@@ -23,7 +23,7 @@ insert_into_file "esbuild.config.js",
 end
 
 insert_into_file "esbuild.config.js",
-                 after: "  plugins: [" do
+                 after: "\n  plugins: [\n" do
   <<-JS
     ruby2js(),
   JS

data/lib/bridgetown-core/filters.rb

@@ -102,7 +102,7 @@ module Bridgetown
     def obfuscate_link(input, prefix = "mailto")
       link = "<a href=\"#{prefix}:#{input}\">#{input}</a>"
       script = "<script type=\"text/javascript\">document.currentScript.insertAdjacentHTML('"
-      script += "beforebegin', '#{rot47(link).gsub(%r!\\!, '\\\\\\')}'.replace(/[!-~]/g," # rubocop:disable Style/StringLiteralsInInterpolation
+      script += "beforebegin', '#{rot47(link).gsub(%r!\\!, '\\\\\\')}'.replace(/[!-~]/g," # rubocop:disable Style/StringLiteralsInInterpolation, Style/RedundantRegexpArgument
       script += "function(c){{var j=c.charCodeAt(0);if((j>=33)&&(j<=126)){"
       script += "return String.fromCharCode(33+((j+ 14)%94));}"
       script += "else{return String.fromCharCode(j);}}}));</script>"

data/lib/bridgetown-core/helpers.rb

@@ -221,7 +221,7 @@ module Bridgetown
                      view.view_context.resource
                    end
 
-        return unless resource
+        return false unless resource
 
         name = name.to_s
         resource.slots.any? do |slot|

data/lib/bridgetown-core/version.rb

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

data/lib/bridgetown-core/watcher.rb

@@ -133,6 +133,7 @@ module Bridgetown
 
     # rubocop:disable Layout/LineLength
     def component_frontend_matcher(options)
+      # TODO: maybe a negative lookbehind would make this regex cleaner?
       @fematcher ||=
         %r{(#{options[:components_dir]}|#{options[:islands_dir]})/(?:[^.]+|\.(?!dsd))+(\.js|\.jsx|\.js\.rb|\.css)$}
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.3.0.beta3
+  version: 1.3.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-18 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -590,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: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: