bridgetown-core 1.2.0.beta3 → 1.2.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b1d92b4942102e7a3aba18f3a617d905bdb13bf7193a816cd444e26340935c7
-  data.tar.gz: 6fdc5319169d9b2cc712680c0d73c12ea71364610172f7af5764d068c555457e
+  metadata.gz: '08e8af225c97352ea9bcd919e789a97324fb28e6b2db3c6b48855f9a28cc3174'
+  data.tar.gz: 6919f66af92cccfac42de96d715a5607be949d8718cbb1d445525a305fd9c337
 SHA512:
-  metadata.gz: 7e82b661568cedb825c2de4c327b759169dad229e23a64bd256d28fa37cd64108901143ff882afe3b9db7393427a3863a33017bf414ccbe53c5ea12d148ba2cb
-  data.tar.gz: 2f957ec8ade498fcce3667604779db33f4a5b71778e8c5d449afec3c56b224aa8c034d0c5eb0894d68c23b049a0db9a36c9db84bf05e76a1c1dd5dc59acc7683
+  metadata.gz: 6ff56bf0f74c78ca29f34f975ef53b21c3ca909dfd3089a73e83765cd573d9d330c7434f17192088d1ee009e60d39b52312de43758de061139e3f0e606bc9f82
+  data.tar.gz: 00ddd1d66a630f5e9ba30d693fc5df8feefaa455343bbb6c13100e87f0428b1ea33d2ff50b160ae1f1857294aebdf594d26111feb815d4f9249d00737c0cfe0e

data/.rubocop.yml

@@ -25,7 +25,6 @@ AllCops:
 
 Lint/ConstantDefinitionInBlock:
   Exclude:
-    - test/test_filters.rb
     - test/test_liquid_extensions.rb
     - test/test_site.rb
 

data/lib/bridgetown-core/collection.rb

@@ -271,6 +271,7 @@ module Bridgetown
     # Read in resource from repo path
     # @param full_path [String]
     # @param manifest [Bridgetown::Configuration::SourceManifest]
+    # @return [void]
     def read_resource(full_path, manifest: nil)
       model_relative_path = relative_model_path_for(full_path, manifest: manifest)
       model = Bridgetown::Model::Base.find(
@@ -279,14 +280,20 @@ module Bridgetown
       )
 
       if model_is_multi_locale?(model, model_relative_path)
-        site.config.available_locales.each do |locale|
+        # If the model specifies a locales key, use that to determine the
+        # the locale of each resource, otherwise fall back to `site.config.available_locales`
+        locales = model.locales || site.config.available_locales
+
+        locales.each do |locale|
           model.locale = locale
           add_resource_from_model model
         end
+
         return
       end
 
       add_resource_from_model model
+      nil
     end
 
     # @param model [Bridgetown::Model::Base]

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

@@ -108,6 +108,8 @@ module Bridgetown
             end
           end
         end
+      rescue LoadError
+        nil
       end
     end
   end

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

@@ -67,6 +67,7 @@ module Bridgetown
         say_status :initializer, name
         data = yield if block_given?
         data = data.indent(2).lstrip
+        data = " #{data}" unless data.start_with?(",")
         data += "\n" unless data.chars.last == "\n"
 
         init_file = File.join("config", "initializers.rb")

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

@@ -290,7 +290,7 @@ module.exports = async (outputFolder, esbuildOptions) => {
     minify: process.argv.includes("--minify"),
     sourcemap: true,
     target: "es2016",
-    entryPoints: ["frontend/javascript/index.js"],
+    entryPoints: ["./frontend/javascript/index.js"],
     entryNames: "[dir]/[name].[hash]",
     outdir: path.join(process.cwd(), `${outputFolder}/_bridgetown/static`),
     publicPath: "/_bridgetown/static",

data/lib/bridgetown-core/configuration.rb

@@ -43,6 +43,7 @@ module Bridgetown
       "autoload_paths"             => [],
       "eager_load_paths"           => [],
       "autoloader_collapsed_paths" => [],
+      "additional_watch_paths"     => [],
       "plugins_use_zeitwerk"       => true,
 
       # Handling Reading
@@ -353,6 +354,10 @@ module Bridgetown
         File.expand_path(collapsed_path, root_dir)
       end
 
+      additional_watch_paths.map! do |collapsed_path|
+        File.expand_path(collapsed_path, root_dir)
+      end
+
       self
     end
 

data/lib/bridgetown-core/configurations/bt-postcss.rb

@@ -11,7 +11,7 @@ unless File.exist?("postcss.config.js")
   return
 end
 
-confirm = ask "This configuration will ovewrite your existing #{"postcss.config.js".bold.white}. Would you like to continue? [Yn]"
+confirm = ask "This configuration will overwrite your existing #{"postcss.config.js".bold.white}. Would you like to continue? [Yn]"
 return unless confirm.casecmp?("Y")
 
 plugins = %w(postcss-mixins postcss-color-mod-function cssnano)

data/lib/bridgetown-core/configurations/gh-pages/gh-pages.yml

@@ -6,7 +6,7 @@ on:
       - main
 
 jobs:
-  deploy:
+  build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -26,10 +26,26 @@ jobs:
       - name: Build
         env:
           BRIDGETOWN_ENV: production
-        run:  bin/bridgetown deploy
+        run: bin/bridgetown deploy
 
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+      - name: Upload build artifact
+        uses: actions/upload-pages-artifact@v1
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./output
+          path: ./output
+
+  deploy:
+    needs: build
+
+    permissions:
+      pages: write
+      id-token: write
+
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1

data/lib/bridgetown-core/configurations/gh-pages.rb

@@ -7,7 +7,7 @@ copy_file in_templates_dir("gh-pages.yml"), ".github/workflows/gh-pages.yml"
 say "🎉 A GitHub action to deploy your site to GitHub pages has been configured!"
 say ""
 
-say "🛠️  After pushing the action, go to your repository settings and configure GitHub Pages to deploy from the branch `gh-pages`."
+say "🛠️  After pushing the action, go to your repository settings and configure GitHub Pages to deploy from GitHub Actions."
 say ""
 
 say "You'll likely also need to set `base_path` in your `bridgetown.config.yml` to your repository's name. If you do this you'll need to use the `relative_url` helper for all links and assets in your HTML."

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

@@ -38,7 +38,7 @@ gsub_file "esbuild.config.js", %r{const esbuildOptions = {}\n} do |_match|
       // Read https://www.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation.
       /*
       postCssPluginConfig: {
-        filter: /(?:index|\.global)\.css$/,
+        filter: /(?:index|\\.global)\\.css$/,
       },
       */
     }
@@ -59,7 +59,7 @@ unless found_match
       // Read https://www.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation.
       /*
       postCssPluginConfig: {
-        filter: /(?:index|\.global)\.css$/,
+        filter: /(?:index|\\.global)\\.css$/,
       },
       */
     JS

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

@@ -36,7 +36,7 @@ append_to_file(File.join(javascript_dir, "index.js")) do
       Object.entries(controllers).forEach(([filename, controller]) => {
         if (filename.includes("_controller.") || filename.includes("-controller.")) {
           const identifier = filename.replace("./controllers/", "")
-            .replace(/[_\-]controller\..*$/, "")
+            .replace(/[_-]controller\\..*$/, "")
             .replace("_", "-")
             .replace("/", "--")
 
@@ -48,7 +48,7 @@ append_to_file(File.join(javascript_dir, "index.js")) do
     <<~JS
 
       window.Stimulus = Application.start()
-      const context = require.context("./controllers", true, /\.js$/)
+      const context = require.context("./controllers", true, /\\.js$/)
       Stimulus.load(definitionsFromContext(context))
     JS
   end

data/lib/bridgetown-core/drops/drop.rb

@@ -184,7 +184,7 @@ module Bridgetown
           if block_given?
             self[key] = yield key, self[key], other[key]
           else
-            if Utils.mergable?(self[key]) && Utils.mergable?(other[key])
+            if Utils.mergeable?(self[key]) && Utils.mergeable?(other[key])
               self[key] = Utils.deep_merge_hashes(self[key], other[key])
               next
             end

data/lib/bridgetown-core/helpers.rb

@@ -63,7 +63,7 @@ module Bridgetown
           return safe(relative_path.relative_url) # new resource engine
         elsif relative_path.respond_to?(:url)
           return safe(relative_url(relative_path.url)) # old legacy engine
-        elsif relative_path.to_s.start_with?("/", "http")
+        elsif relative_path.to_s.start_with?("/", "http", "#", "mailto:", "tel:")
           return safe(relative_path)
         end
 
@@ -97,7 +97,13 @@ module Bridgetown
       # @param options [Hash] key-value pairs of HTML attributes to add to the tag
       # @return [String] the anchor tag HTML
       # @raise [ArgumentError] if the file cannot be found
-      def link_to(text, relative_path, options = {})
+      def link_to(text, relative_path = nil, options = {})
+        if block_given?
+          relative_path = text
+          text = yield
+        elsif relative_path.nil?
+          raise ArgumentError, "You must provide a relative path"
+        end
         segments = attributes_from_options({ href: url_for(relative_path) }.merge(options))
 
         safe("<a #{segments}>#{text}</a>")

data/lib/bridgetown-core/model/repo_origin.rb

@@ -111,7 +111,7 @@ module Bridgetown
           collection.data?
       end
 
-      def read_file_data # rubocop:todo Metrics/MethodLength
+      def read_file_data # rubocop:todo Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/AbcSize
         case original_path.extname.downcase
         when ".csv"
           {
@@ -130,6 +130,9 @@ module Bridgetown
           }
         when ".rb"
           process_ruby_data(File.read(original_path), original_path, 1)
+        when ".json"
+          json_data = JSON.parse(File.read(original_path))
+          json_data.is_a?(Array) ? { rows: json_data } : json_data
         else
           yaml_data = YAMLParser.load_file(original_path)
           yaml_data.is_a?(Array) ? { rows: yaml_data } : yaml_data

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, "bundle exec bridgetown frontend:dev"
+    Bridgetown::Utils::Aux.run_process "Frontend", :yellow, "bridgetown frontend:dev"
 
     if sidecar
       # give FE bundler time to boot before returning control to the start command

data/lib/bridgetown-core/utils.rb

@@ -2,6 +2,7 @@
 
 module Bridgetown
   module Utils # rubocop:todo Metrics/ModuleLength
+    extend Gem::Deprecate
     extend self
     autoload :Ansi, "bridgetown-core/utils/ansi"
     autoload :Aux, "bridgetown-core/utils/aux"
@@ -62,9 +63,11 @@ module Bridgetown
       target
     end
 
-    def mergable?(value)
+    def mergeable?(value)
       value.is_a?(Hash) || value.is_a?(Drops::Drop)
     end
+    alias_method :mergable?, :mergeable?
+    deprecate :mergable?, :mergeable?, 2023, 7
 
     def duplicable?(obj)
       case obj
@@ -449,10 +452,10 @@ module Bridgetown
     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]}"
-      JSON.parse(Faraday.get(api_endpoint).body)["default_branch"] || "master"
+      JSON.parse(Faraday.get(api_endpoint).body)["default_branch"] || "main"
     rescue StandardError => e
       Bridgetown.logger.warn("Unable to connect to GitHub API: #{e.message}")
-      "master"
+      "main"
     end
 
     def live_reload_js(site) # rubocop:disable Metrics/MethodLength
@@ -508,7 +511,7 @@ module Bridgetown
       target.merge!(overwrite) do |_key, old_val, new_val|
         if new_val.nil?
           old_val
-        elsif mergable?(old_val) && mergable?(new_val)
+        elsif mergeable?(old_val) && mergeable?(new_val)
           deep_merge_hashes(old_val, new_val)
         else
           new_val

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "1.2.0.beta3"
+  VERSION = "1.2.0.beta4"
   CODE_NAME = "Bonny Slope"
 end

data/lib/bridgetown-core/watcher.rb

@@ -42,7 +42,12 @@ module Bridgetown
     #
     # @param (see #watch)
     def load_paths_to_watch(site, options)
-      (site.plugin_manager.plugins_path + options.autoload_paths).uniq.select do |path|
+      additional_paths = options.additional_watch_paths
+      [
+        *site.plugin_manager.plugins_path,
+        *options.autoload_paths,
+        *additional_paths,
+      ].uniq.select do |path|
         Dir.exist?(path)
       end
     end

data/lib/bridgetown-core.rb

@@ -230,11 +230,13 @@ module Bridgetown
 
     def load_tasks
       require "bridgetown-core/commands/base"
+      unless Bridgetown::Current.preloaded_configuration
+        Bridgetown::Current.preloaded_configuration = Bridgetown::Configuration::Preflight.new
+      end
       Bridgetown::PluginManager.setup_bundler(skip_yarn: true)
+
       if Bridgetown::Current.preloaded_configuration.is_a?(Bridgetown::Configuration::Preflight)
         Bridgetown::Current.preloaded_configuration = Bridgetown.configuration
-      else
-        Bridgetown::Current.preloaded_configuration ||= Bridgetown.configuration
       end
       load File.expand_path("bridgetown-core/tasks/bridgetown_tasks.rake", __dir__)
     end

data/lib/site_template/config/initializers.rb

@@ -39,5 +39,5 @@ Bridgetown.configure do |config|
   #
 
   # For more documentation on how to configure your site using this initializers file,
-  # visit: https://edge.bridgetownrb.com/documentation/configuration/initializers/
+  # visit: https://edge.bridgetownrb.com/docs/configuration/initializers/
 end

data/lib/site_template/package.json.erb

@@ -15,7 +15,7 @@
     <%- if frontend_bundling_option == "webpack" -%>
     "css-loader": "^6.7.1",
     <%- end -%>
-    "esbuild": "^0.14.39",
+    "esbuild": "^0.15.12",
     <%- if frontend_bundling_option == "webpack" -%>
     "esbuild-loader": "^2.18.0",
     "mini-css-extract-plugin": "^2.6.0",
@@ -31,7 +31,10 @@
     <%- else -%>
     "postcss-loader": "^6.2.1",
     <%- end -%>
-    "postcss-preset-env": "^7.4.3"<%= "," if frontend_bundling_option == "webpack" || !postcss_option  %>
+    "postcss-preset-env": "^7.4.3",
+    <%- if frontend_bundling_option == "esbuild" -%>
+    "read-cache": "^1.0.0"<%= "," unless postcss_option  %>
+    <%- end -%>
     <%- end -%>
     <%- unless postcss_option -%>
     "sass": "^1.50.1",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta3
+  version: 1.2.0.beta4
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-09 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel