bridgetown-core 0.21.0.beta3 → 0.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc153d4826e8e0678bea76a9e2c251040123418ab9cfe0b1243b7f38cb8f1ec5
-  data.tar.gz: '08d6c10878993b10963dc1a89058c8b0a9dbd57a5ed2b399963a68ea537ea5f8'
+  metadata.gz: d33d466ab78dad035cfbd9d255dcd53a42c307cefebb5a12ae215393ec096ee3
+  data.tar.gz: 7c46ed1c37f82ffd63b3ee6753029fc74a17d67c625e638ac5b088fb3d2b929a
 SHA512:
-  metadata.gz: 7151ae352509556c2b6b7e524e56186a3c782746dc1f2090756a37e9325c9153e48a03daf720e64fd0450e472a43b96c3e9b90ec53896d409881ab33b8aabea0
-  data.tar.gz: 42289c4f1da1116e37fa50bdb49345264e2a56a719f1e76691eb294721a1b4c834909ab7dc22691d238bec4df509c6680c479fa7b6fec8831f69d79bee8fef6b
+  metadata.gz: 6a61dfef1bd907e8ff64fccfb43b57f081e45c92c0824b342d13f4137f02bd30d21772c8c9e8e1083d396738ef9df22eba103bbeeb2f7858192bac662cd2b18a
+  data.tar.gz: 19c1ff73c5f47403c6d741935cf0aa6bb52cc8f78b41114521c36f2594d7f79ee49f6919ca07d8cd3ea188edd1eba0a5605e94c102c66ba95b1549755ddbc082

data/lib/bridgetown-core.rb

@@ -257,7 +257,16 @@ end
 
 module Bridgetown
   module Model; end
-  module Resource; end
+  module Resource
+    def self.register_extension(mod)
+      if mod.const_defined?(:LiquidResource)
+        Bridgetown::Drops::ResourceDrop.include mod.const_get(:LiquidResource)
+      end
+      if mod.const_defined?(:RubyResource)
+        Bridgetown::Resource::Base.include mod.const_get(:RubyResource)
+      end
+    end
+  end
 end
 
 # This method is available in Ruby 3, monkey patching for older versions

data/lib/bridgetown-core/collection.rb

@@ -242,7 +242,7 @@ module Bridgetown
       site.config.collections[label] || HashWithDotAccess::Hash.new
     end
 
-    def merge_data_resources
+    def merge_data_resources # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       data_contents = {}
 
       sanitize_filename = ->(name) do
@@ -256,11 +256,16 @@ module Bridgetown
         segments.each_with_index do |segment, index|
           sanitized_segment = sanitize_filename.(File.basename(segment, ".*"))
           hsh = nested.empty? ? data_contents : data_contents.dig(*nested)
-          hsh[sanitized_segment] = if index == segments.length - 1
-                                     data_resource.data.rows || data_resource.data
-                                   else
-                                     {}
-                                   end
+          if !hsh.is_a?(Hash)
+            Bridgetown.logger.error(
+              "Error:",
+              "#{nested.join("/")} is not a Hash structure, #{segment} cannot be read"
+            )
+          elsif index == segments.length - 1
+            hsh[sanitized_segment] = data_resource.data.rows || data_resource.data
+          elsif !hsh.key?(sanitized_segment)
+            hsh[sanitized_segment] = {}
+          end
           nested << sanitized_segment
         end
       end

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

@@ -36,9 +36,9 @@ module Bridgetown
         klass.class_option :limit_posts,
                            type: :numeric,
                            desc: "Limits the number of posts to parse and publish"
-        klass.class_option :baseurl,
+        klass.class_option :base_path,
                            aliases: "-b",
-                           desc: "Serve the website from the given base URL"
+                           desc: "Serve the website from the given base path"
         klass.class_option :force_polling,
                            type: :boolean,
                            desc: "Force watch to use polling"

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

@@ -86,10 +86,10 @@ module Bridgetown
         )
         template("Gemfile.erb", "Gemfile")
         template("package.json.erb", "package.json")
-        template("webpack.config.js.erb", "webpack.config.js")
         template("frontend/javascript/index.js.erb", "frontend/javascript/index.js")
 
         options["use-postcss"] ? configure_postcss : configure_sass
+        invoke(Webpack, ["setup"], {})
       end
 
       def configure_sass
@@ -140,7 +140,7 @@ module Bridgetown
       # rubocop:enable Metrics/PerceivedComplexity
 
       def bundle_install(path)
-        unless Bridgetown.environment == "test"
+        unless Bridgetown.environment.test?
           require "bundler"
           Bridgetown.with_unbundled_env do
             inside(path) do
@@ -156,7 +156,7 @@ module Bridgetown
       end
 
       def git_init(path)
-        unless Bridgetown.environment == "test"
+        unless Bridgetown.environment.test?
           inside(path) do
             initialize_new_repo
           end
@@ -166,7 +166,7 @@ module Bridgetown
       end
 
       def yarn_install(path)
-        unless Bridgetown.environment == "test"
+        unless Bridgetown.environment.test?
           inside(path) do
             run "yarn install", abort_on_failure: true
           end

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

@@ -119,7 +119,7 @@ module Bridgetown
 
       def start_up_webrick(opts, destination)
         @server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
-        @server.mount(opts["baseurl"].to_s, Servlet, destination, file_handler_opts)
+        @server.mount(opts["base_path"].to_s, Servlet, destination, file_handler_opts)
 
         Bridgetown.logger.info "Server address:", server_address(@server, opts)
         launch_browser @server, opts if opts["open_url"]

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

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Commands
+    class Webpack < Thor::Group
+      include Thor::Actions
+      extend Summarizable
+
+      Registrations.register do
+        register(Webpack, "webpack", "webpack ACTION", Webpack.summary)
+      end
+
+      def self.banner
+        "bridgetown webpack ACTION"
+      end
+      summary "Perform actions on the bridgetown webpack configuration"
+
+      def self.exit_on_failure?
+        true
+      end
+
+      def webpack
+        @logger = Bridgetown.logger
+        return show_actions if args.empty?
+
+        action = args.first
+        if supported_actions.include?(action)
+          perform action
+        else
+          @logger.error "Error:".red, "🚨 Please enter a valid action."
+          say "\n"
+          show_actions
+        end
+      end
+
+      def self.source_root
+        File.expand_path("./webpack", __dir__)
+      end
+
+      def self.destination_root
+        config.root_dir
+      end
+
+      protected
+
+      def config
+        @config ||= Bridgetown.configuration({ root_dir: Dir.pwd })
+      end
+
+      def package_json
+        @package_json ||= begin
+          package_json_file = File.read(Bridgetown.sanitized_path(config.root_dir, "package.json"))
+          JSON.parse(package_json_file)
+        end
+      end
+
+      def perform(action)
+        automation = find_in_source_paths("#{action}.rb")
+        inside(New.created_site_dir || Dir.pwd) do
+          apply automation, verbose: false
+        end
+      end
+
+      def show_actions
+        say "Available actions:\n".bold
+
+        longest_action = supported_actions.keys.max_by(&:size).size
+        supported_actions.each do |action, description|
+          say action.ljust(longest_action).to_s.bold.blue + "\t" + "# #{description}"
+        end
+      end
+
+      def supported_actions
+        {
+          setup: "Sets up a webpack integration with Bridgetown in your project",
+          update: "Updates the Bridgetown webpack defaults to the latest available version",
+          "enable-postcss": "Configures PostCSS in your project",
+        }.with_indifferent_access
+      end
+    end
+  end
+end

data/lib/bridgetown-core/commands/webpack/enable-postcss.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+default_postcss_config = File.expand_path("../../../site_template/postcss.config.js.erb", __dir__)
+
+template default_postcss_config, "postcss.config.js"
+template "webpack.defaults.js.erb", "config/webpack.defaults.js", force: true
+
+unless Bridgetown.environment.test?
+  packages = %w(postcss@8.3.0 postcss-loader@4.3.0 postcss-flexbugs-fixes postcss-preset-env)
+  run "yarn add -D #{packages.join(" ")}"
+  run "yarn remove sass sass-loader"
+end

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

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+template "webpack.defaults.js.erb", "config/webpack.defaults.js"
+copy_file "webpack.config.js", force: true

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# rubocop:disable Layout/LineLength
+
+required_packages = %w(esbuild esbuild-loader webpack@5.39.1 webpack-cli@4.7.2 webpack-manifest-plugin@3.1.1)
+redundant_packages = %w(@babel/core @babel/plugin-proposal-class-properties @babel/plugin-proposal-decorators @babel/plugin-transform-runtime @babel/preset-env babel-loader)
+
+template "webpack.defaults.js.erb", "config/webpack.defaults.js", force: true
+say "🎉 Webpack configuration updated successfully!"
+
+return if Bridgetown.environment.test?
+
+say "Installing required packages"
+run "yarn add -D #{required_packages.join(" ")}"
+
+packages_to_remove = package_json["devDependencies"].slice(*redundant_packages).keys
+unless packages_to_remove.empty?
+  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(" ")}"
+end
+
+# rubocop:enable Layout/LineLength

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

@@ -0,0 +1,31 @@
+const { merge } = require('webpack-merge')
+
+var config = require("./config/webpack.defaults.js")
+
+// Add any overrides to the default webpack config here:
+//
+// Eg:
+//
+//  ```
+//    const path = require("path")
+//    config.resolve.modules.push(path.resolve(__dirname, 'frontend', 'components'))
+//    config.resolve.alias.frontendComponents = path.resolve(__dirname, 'frontend', 'components')
+//  ```
+//
+// You can also merge in a custom config using the included `webpack-merge` package.
+// Complete docs available at: https://github.com/survivejs/webpack-merge
+//
+// Eg:
+//
+//  ```
+//    const customConfig = { ..... }
+//    config = merge(config, customConfig)
+//  ```
+
+
+
+
+
+////////////////////////////////////////////////////////
+
+module.exports = config

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

@@ -0,0 +1,130 @@
+// This file is created and managed by Bridgetown.
+// Instead of editing this file, add your overrides to `webpack.config.js`
+//
+// To update this file to the latest version provided by Bridgetown,
+// run `bridgetown webpack update`. Any changes to this file will be overwritten
+// when an update is applied hence we strongly recommend adding overrides to
+// `webpack.config.js` instead of editing this file.
+//
+// Shipped with Bridgetown v<%= Bridgetown::VERSION %>
+
+const path = require("path");
+const rootDir = path.resolve(__dirname, "..")
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const { WebpackManifestPlugin } = require("webpack-manifest-plugin");
+
+// Input and output
+
+const entry = { main: path.resolve(rootDir, "frontend", "javascript", "index.js") }
+const output = {
+  path: path.resolve(rootDir, "output", "_bridgetown", "static", "js"),
+  filename: "[name].[contenthash].js",
+  publicPath: "",
+}
+
+// Rules and Loaders
+
+const jsRule =  {
+  test: /\.(js|jsx)/,
+  use: {
+    loader: "esbuild-loader",
+    options: {
+      target: 'es2016'
+    },
+  },
+}
+
+const cssRules = {
+  test: /\.(s[ac]|c)ss$/,
+  use: [
+    MiniCssExtractPlugin.loader,
+    {
+      loader: "css-loader",
+      options: {
+        url: url => !url.startsWith('/'),
+        importLoaders: 1
+      }
+    }
+  ],
+  mode: '<%= self.config.uses_postcss? ? "postcss" : "sass" %>',
+
+  postcss: () => {
+    cssRules.use.push("postcss-loader")
+    return { test: cssRules.test, use: cssRules.use }
+  },
+
+  sass: () => {
+    cssRules.use.push({
+      loader: "sass-loader",
+      options: {
+        implementation: require("sass"),
+        sassOptions: {
+          fiber: false,
+          includePaths: [
+            path.resolve(rootDir, "src/_components")
+          ],
+        },
+      },
+    })
+    return { test: cssRules.test, use: cssRules.use }
+  }
+}
+
+const fontsRule = {
+  test: /\.woff2?$|\.ttf$|\.eot$/,
+  loader: "file-loader",
+  options: {
+    name: "[name]-[contenthash].[ext]",
+    outputPath: "../fonts",
+    publicPath: "../fonts",
+  },
+}
+
+const imagesRule = {
+  test: /\.png?$|\.gif$|\.jpg$|\.svg$/,
+  loader: "file-loader",
+  options: {
+    name: "[path][name]-[contenthash].[ext]",
+    outputPath: "../",
+    publicPath: "../",
+  },
+}
+
+// Default configuration object
+
+module.exports = {
+  entry: entry,
+  devtool: "source-map",
+  // Set some or all of these to true if you want more verbose logging:
+  stats: {
+    modules: false,
+    builtAt: false,
+    timings: false,
+    children: false,
+  },
+  output: output,
+  resolve: {
+    extensions: [".js", ".jsx"],
+    modules: [
+      path.resolve(rootDir, 'frontend', 'javascript'),
+      path.resolve(rootDir, 'frontend', 'styles'),
+      path.resolve(rootDir, 'node_modules')
+    ],
+    alias: {
+      bridgetownComponents: path.resolve(rootDir, "src", "_components")
+    }
+  },
+  plugins: [
+    new MiniCssExtractPlugin({
+      filename: "../css/[name].[contenthash].css",
+    }),
+    new WebpackManifestPlugin({
+      fileName: path.resolve(rootDir, ".bridgetown-webpack", "manifest.json"),
+    }),
+  ],
+  module: {
+    rules: [
+      jsRule, cssRules[cssRules.mode](), fontsRule, imagesRule
+    ]
+  }
+}

data/lib/bridgetown-core/component.rb

@@ -30,24 +30,24 @@ module Bridgetown
       #
       # @param ext [String] erb, slim, etc.
       def renderer_for_ext(ext, &block)
-        case ext
-        when "erb"
-          include ERBCapture
-          Tilt::ErubiTemplate.new(component_template_path,
-                                  outvar: "@_erbout",
-                                  bufval: "Bridgetown::OutputBuffer.new",
-                                  engine_class: Bridgetown::ERBEngine,
-                                  &block)
-        when "serb" # requires serbea
-          include Serbea::Helpers
-          Tilt::SerbeaTemplate.new(component_template_path, &block)
-        when "slim" # requires bridgetown-slim
-          Slim::Template.new(component_template_path, &block)
-        when "haml" # requires bridgetown-haml
-          Tilt::HamlTemplate.new(component_template_path, &block)
-        else
-          raise NameError
-        end
+        @_tmpl ||= case ext
+                   when "erb"
+                     include ERBCapture
+                     Tilt::ErubiTemplate.new(component_template_path,
+                                             outvar: "@_erbout",
+                                             bufval: "Bridgetown::OutputBuffer.new",
+                                             engine_class: Bridgetown::ERBEngine,
+                                             &block)
+                   when "serb" # requires serbea
+                     include Serbea::Helpers
+                     Tilt::SerbeaTemplate.new(component_template_path, &block)
+                   when "slim" # requires bridgetown-slim
+                     Slim::Template.new(component_template_path, &block)
+                   when "haml" # requires bridgetown-haml
+                     Tilt::HamlTemplate.new(component_template_path, &block)
+                   else
+                     raise NameError
+                   end
       rescue NameError, LoadError
         raise "No component rendering engine could be found for .#{ext} templates"
       end
@@ -56,26 +56,32 @@ module Bridgetown
       #
       # @return [String]
       def component_template_path
-        stripped_path = File.join(
-          File.dirname(source_location),
-          File.basename(source_location, ".*")
-        )
-        supported_template_extensions.each do |ext|
-          test_path = "#{stripped_path}.#{ext}"
-          return test_path if File.exist?(test_path)
-
-          test_path = "#{stripped_path}.html.#{ext}"
-          return test_path if File.exist?(test_path)
+        @_tmpl_path ||= begin
+          stripped_path = File.join(
+            File.dirname(source_location),
+            File.basename(source_location, ".*")
+          )
+          supported_template_extensions.each do |ext|
+            test_path = "#{stripped_path}.#{ext}"
+            break test_path if File.exist?(test_path)
+
+            test_path = "#{stripped_path}.html.#{ext}"
+            break test_path if File.exist?(test_path)
+          end
+        end
+
+        unless @_tmpl_path.is_a?(String)
+          raise "#{name}: no matching template could be found in #{File.dirname(source_location)}"
         end
 
-        raise "No matching templates could be found in #{File.dirname(source_location)}"
+        @_tmpl_path
       end
 
       # Read the template file.
       #
       # @return [String]
       def component_template_content
-        File.read(component_template_path)
+        @_tmpl_content ||= File.read(component_template_path)
       end
 
       # A list of extensions supported by the renderer
@@ -154,7 +160,6 @@ module Bridgetown
     end
 
     def _renderer
-      # TODO: figure out a way to compile templates for increased performance
       @_renderer ||= begin
         ext = File.extname(self.class.component_template_path).delete_prefix(".")
         self.class.renderer_for_ext(ext) { self.class.component_template_content }

data/lib/bridgetown-core/concerns/layout_placeable.rb

@@ -11,7 +11,7 @@ module Bridgetown
     end
 
     def no_layout?
-      data["layout"] == "none" || data["layout"] == false
+      data.layout.nil? || data.layout == "none" || data.layout == false
     end
   end
 end

data/lib/bridgetown-core/concerns/site/configurable.rb

@@ -24,7 +24,6 @@ class Bridgetown::Site
       configure_include_paths
       configure_file_read_opts
 
-      self.baseurl = config.baseurl
       self.permalink_style = (config["permalink"] || "pretty").to_sym
 
       @config
@@ -34,6 +33,22 @@ class Bridgetown::Site
       config[:content_engine] == "resource"
     end
 
+    # Returns a base path from which the site is served (aka `/cool-site`) or
+    # `/` if served from root.
+    #
+    # @param strip_slash_only [Boolean] set to true if you wish "/" to be returned as ""
+    # @return [String]
+    def base_path(strip_slash_only: false)
+      (config[:base_path] || config[:baseurl]).yield_self do |path|
+        strip_slash_only ? path.to_s.sub(%r{^/$}, "") : path
+      end
+    end
+
+    def baseurl
+      Bridgetown::Deprecator.deprecation_message "Site#baseurl is now Site#base_path"
+      base_path(strip_slash_only: true).presence
+    end
+
     def defaults_reader
       @defaults_reader ||= Bridgetown::DefaultsReader.new(self)
     end

data/lib/bridgetown-core/configuration.rb

@@ -54,7 +54,7 @@ module Bridgetown
       "detach"               => false, # default to not detaching the server
       "port"                 => "4000",
       "host"                 => "127.0.0.1",
-      "baseurl"              => nil, # this mounts at /, i.e. no subdirectory
+      "base_path"            => "/",
       "show_dir_listing"     => false,
 
       # Output Configuration
@@ -118,7 +118,7 @@ module Bridgetown
     # override - the command-line options hash
     #
     # Returns the path to the Bridgetown root directory
-    def root_dir(override)
+    def root_dir(override = "")
       get_config_value_with_override("root_dir", override)
     end
 
@@ -127,7 +127,7 @@ module Bridgetown
     # override - the command-line options hash
     #
     # Returns the path to the Bridgetown source directory
-    def source(override)
+    def source(override = "")
       get_config_value_with_override("source", override)
     end
 
@@ -226,7 +226,7 @@ module Bridgetown
         raise ArgumentError, "Configuration file: (INVALID) #{file}".yellow
       end
 
-      Bridgetown.logger.info "Configuration file:", file
+      Bridgetown.logger.debug "Configuration file:", file
       next_config
     rescue SystemCallError
       if @default_config_file ||= nil
@@ -340,5 +340,12 @@ module Bridgetown
 
       self
     end
+
+    # Whether or not PostCSS is being used to process stylesheets.
+    #
+    # @return [Boolean] true if `postcss.config.js` exists, false if not
+    def uses_postcss?
+      File.exist?(Bridgetown.sanitized_path(root_dir, "postcss.config.js"))
+    end
   end
 end

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

@@ -8,17 +8,19 @@ unless File.exist?("postcss.config.js")
   error_message = "#{"postcss.config.js".bold} not found. Please configure postcss in your project."
 
   @logger.error "\nError:".red, "🚨 #{error_message}"
-  @logger.info "\nFor new projects, you can use #{"bridgetown new my_project --use-postcss".bold.blue}\n"
+  @logger.info "\nRun #{"bridgetown webpack enable-postcss".bold.blue} to set it up.\n"
 
   return
 end
 
+confirm = ask "This configuration will ovewrite your existing #{"postcss.config.js".bold.white}. Would you like to continue? [Yn]"
+return unless confirm.casecmp?("Y")
+
 plugins = %w(postcss-easy-import postcss-mixins postcss-color-function cssnano)
 
 say "Adding the following PostCSS plugins: #{plugins.join(' | ')}", :green
 run "yarn add -D #{plugins.join(' ')}"
 
-remove_file "postcss.config.js"
-copy_file "#{TEMPLATE_PATH}/postcss.config.js", "postcss.config.js"
+copy_file "#{TEMPLATE_PATH}/postcss.config.js", "postcss.config.js", force: true
 
 # rubocop:enable all

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

@@ -8,20 +8,27 @@ unless File.exist?("postcss.config.js")
   error_message = "#{"postcss.config.js".bold} not found. Please configure postcss in your project."
 
   @logger.error "\nError:".red, "🚨 #{error_message}"
-  @logger.info "\nFor new projects, you can use #{"bridgetown new my_project --use-postcss".bold.blue}\n"
+  @logger.info "\nRun #{"bridgetown webpack enable-postcss".bold.blue} to set it up.\n"
 
   return
 end
 
+confirm = ask "This configuration will ovewrite your existing #{"postcss.config.js".bold.white}. Would you like to continue? [Yn]"
+return unless confirm.casecmp?("Y")
+
 run "yarn add -D tailwindcss"
 run "npx tailwindcss init"
 
-remove_file "postcss.config.js"
-copy_file "#{TEMPLATE_PATH}/postcss.config.js", "postcss.config.js"
-
-prepend_to_file "frontend/styles/index.css",
-                File.read("#{TEMPLATE_PATH}/css_imports.css")
+copy_file "#{TEMPLATE_PATH}/postcss.config.js", "postcss.config.js", force: true
 
 run "bundle exec bridgetown configure purgecss"
 
+if File.exist?("frontend/styles/index.css")
+  prepend_to_file "frontend/styles/index.css",
+                  File.read("#{TEMPLATE_PATH}/css_imports.css")
+else
+  say "\nPlease add the following lines to your CSS index file:"
+  say File.read("#{TEMPLATE_PATH}/css_imports.css")
+end
+
 # rubocop:enable all

data/lib/bridgetown-core/configurations/tailwindcss/postcss.config.js

@@ -6,7 +6,7 @@ module.exports = {
       autoprefixer: {
         flexbox: 'no-2009'
       },
-      stage: 3
+      stage: 2
     }
   }
-}
+}

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

@@ -17,6 +17,7 @@ module Bridgetown
                      :data,
                      :output,
                      :content,
+                     :summary,
                      :to_s,
                      :absolute_url,
                      :relative_path,
@@ -48,7 +49,7 @@ module Bridgetown
       end
 
       def next
-        @next ||= @obj.previous_resource.to_liquid
+        @next ||= @obj.next_resource.to_liquid
       end
 
       # Generate a Hash for use in generating JSON.

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

@@ -8,6 +8,8 @@ module Bridgetown
       mutable false
 
       def_delegators :@obj,
+                     :baseurl, # deprecated
+                     :base_path,
                      :data,
                      :locale,
                      :time,

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

@@ -5,7 +5,7 @@ module Bridgetown
     module URLFilters
       extend self
 
-      # Produces an absolute URL based on site.url and site.baseurl.
+      # Produces an absolute URL based on site.url and site.base_path.
       #
       # input - the URL to make absolute.
       #
@@ -15,7 +15,7 @@ module Bridgetown
         cache[input] ||= compute_absolute_url(input)
       end
 
-      # Produces a URL relative to the domain root based on site.baseurl
+      # Produces a URL relative to the domain root based on site.base_path
       # unless it is already an absolute url with an authority (host).
       #
       # input - the URL to make relative to the domain root
@@ -70,17 +70,13 @@ module Bridgetown
         input = input.url if input.respond_to?(:url)
         return input if Addressable::URI.parse(input.to_s).absolute?
 
-        parts = [sanitized_baseurl, input]
+        site = @context.registers[:site]
+        parts = [site.base_path.chomp("/"), input]
         Addressable::URI.parse(
           parts.compact.map { |part| ensure_leading_slash(part.to_s) }.join
         ).normalize.to_s
       end
 
-      def sanitized_baseurl
-        site = @context.registers[:site]
-        site.config["baseurl"].to_s.chomp("/")
-      end
-
       def ensure_leading_slash(input)
         return input if input.nil? || input.empty? || input.start_with?("/")
 

data/lib/bridgetown-core/generators/prototype_generator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Handles Legacy Pages
+# Handles Generated Pages
 Bridgetown::Hooks.register :pages, :post_init, reloadable: false do |page|
   if page.class != Bridgetown::PrototypePage && page.data["prototype"].is_a?(Hash)
     Bridgetown::PrototypeGenerator.add_matching_template(page)
@@ -14,6 +14,11 @@ Bridgetown::Hooks.register :resources, :post_read, reloadable: false do |resourc
   end
 end
 
+# Ensure sites clear out templates before rebuild
+Bridgetown::Hooks.register :site, :after_reset, reloadable: false do |_site|
+  Bridgetown::PrototypeGenerator.matching_templates.clear
+end
+
 module Bridgetown
   class PrototypeGenerator < Generator
     priority :low
@@ -21,9 +26,9 @@ module Bridgetown
     # @return [Bridgetown::Site]
     attr_reader :site
 
-    # @return [Array<Bridgetown::Page, Bridgetown::Resource::Base>]
+    # @return [Set<Bridgetown::Page, Bridgetown::Resource::Base>]
     def self.matching_templates
-      @matching_templates ||= []
+      @matching_templates ||= Set.new
     end
 
     def self.add_matching_template(template)
@@ -41,6 +46,8 @@ module Bridgetown
       end
 
       if prototype_pages.length.positive?
+        ensure_pagination_enabled
+
         page_list.reject! do |page|
           prototype_pages.include? page
         end
@@ -56,6 +63,15 @@ module Bridgetown
       end
     end
 
+    def ensure_pagination_enabled
+      unless @site.config.dig(:pagination, :enabled)
+        Bridgetown.logger.warn(
+          "Pagination:",
+          "Must be enabled for prototype pages to contain matches"
+        )
+      end
+    end
+
     # Check incoming prototype configuration and normalize options.
     #
     # @param prototype_page [Bridgetown::Page, Bridgetown::Resource::Base]
@@ -70,7 +86,12 @@ module Bridgetown
         @configured_collection = prototype_page.data["prototype"]["collection"]
       end
 
-      return nil unless site.collections[@configured_collection]
+      unless site.collections[@configured_collection]
+        Bridgetown.logger.warn(
+          "No collection specified for prototype page #{prototype_page.relative_path}"
+        )
+        return nil
+      end
 
       # Categories and Tags are unique in that singular and plural front matter
       # can be present for each

data/lib/bridgetown-core/layout.rb

@@ -39,12 +39,22 @@ module Bridgetown
     # Gets/Sets the document output (for layout-compatible converters)
     attr_accessor :current_document_output
 
+    # Determines the label a layout should use based on its filename
+    #
+    # @param file [String]
+    # @return [String]
+    def self.label_for_file(file)
+      # TODO: refactor this so multi-extension layout filenames don't leak
+      # middle extensions into layout label
+      file.split(".")[0..-2].join(".")
+    end
+
     # Initialize a new Layout.
     #
-    # site - The Site.
-    # base - The String path to the source.
-    # name - The String filename of the layout file.
-    # from_plugin - true if the layout comes from a Gem-based plugin folder.
+    # @param site [Bridgetown::Site]
+    # @param base [String] The path to the source.
+    # @param name [String] The filename of the layout file.
+    # @param from_plugin [Boolean] if the layout comes from a Gem-based plugin folder.
     def initialize(site, base, name, from_plugin: false)
       @site = site
       @base = base
@@ -83,17 +93,24 @@ module Bridgetown
       end
     end
 
-    # The inspect string for this document.
-    # Includes the relative path and the collection label.
+    # The label of the layout (should match what would used in front matter
+    # references).
     #
-    # Returns the inspect string for this document.
+    # @return [String]
+    def label
+      @label ||= self.class.label_for_file(name)
+    end
+
+    # The inspect string for this layout. Includes the relative path.
+    #
+    # @return [String]
     def inspect
-      "#<#{self.class} #{@path}>"
+      "#<#{self.class} #{relative_path}>"
     end
 
-    # Provide this Layout's data to a Hash suitable for use by Liquid.
+    # Provide this Layout's data for use by Liquid.
     #
-    # Returns the Hash representation of this Layout.
+    # @return [HashWithDotAccess::Hash]
     def to_liquid
       data
     end

data/lib/bridgetown-core/readers/layout_reader.rb

@@ -44,7 +44,7 @@ module Bridgetown
     end
 
     def layout_name(file)
-      file.split(".")[0..-2].join(".")
+      Layout.label_for_file(file)
     end
 
     def within(directory)

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

@@ -42,6 +42,22 @@ module Bridgetown
         model.collection
       end
 
+      # Layout associated with this resource
+      # This will output a warning if the layout can't be found.
+      #
+      # @return [Bridgetown::Layout]
+      def layout
+        return @layout if @layout
+        return if no_layout?
+
+        @layout = site.layouts[data.layout].tap do |layout|
+          unless layout
+            Bridgetown.logger.warn "Resource:", "Layout '#{data.layout}' " \
+            "requested via #{relative_path} does not exist."
+          end
+        end
+      end
+
       # The relative path of source file or file-like origin
       #
       # @return [Pathname]
@@ -165,6 +181,16 @@ module Bridgetown
         data["date"] ||= site.time
       end
 
+      # Ask the configured summary extension to output a summary of the content,
+      # otherwise return the first line.
+      #
+      # @return [String]
+      def summary
+        return summary_extension_output if respond_to?(:summary_extension_output)
+
+        content.to_s.strip.lines.first.to_s.strip
+      end
+
       # @return [Hash<String, Hash<String => Bridgetown::Resource::TaxonomyType,
       #   Array<Bridgetown::Resource::TaxonomyTerm>>>]
       def taxonomies

data/lib/bridgetown-core/resource/destination.rb

@@ -32,7 +32,9 @@ module Bridgetown
 
       def output_path
         path = URL.unescape_path(relative_url)
-        path = path.delete_prefix(resource.site.baseurl) if resource.site.baseurl.present?
+        if resource.site.base_path.present?
+          path = path.delete_prefix resource.site.base_path(strip_slash_only: true)
+        end
         path = resource.site.in_dest_dir(path)
         path = File.join(path, "index.html") if relative_url.end_with? "/"
         path

data/lib/bridgetown-core/resource/permalink_processor.rb

@@ -40,7 +40,7 @@ module Bridgetown
         # No relative URLs should ever end in /index.html
         new_url.sub!(%r{/index$}, "") if final_ext == ".html"
 
-        add_baseurl finalize_permalink(new_url, permalink)
+        add_base_path finalize_permalink(new_url, permalink)
       end
 
       def process_segment(segment)
@@ -96,8 +96,12 @@ module Bridgetown
         end
       end
 
-      def add_baseurl(permalink)
-        resource.site.baseurl.present? ? "#{resource.site.baseurl}#{permalink}" : permalink
+      def add_base_path(permalink)
+        if resource.site.base_path.present?
+          return "#{resource.site.base_path(strip_slash_only: true)}#{permalink}"
+        end
+
+        permalink
       end
 
       ### Default Placeholders Processors

data/lib/bridgetown-core/site.rb

@@ -30,7 +30,7 @@ module Bridgetown
     # is default
     alias_method :generated_pages, :pages
 
-    attr_accessor :permalink_style, :time, :baseurl, :data,
+    attr_accessor :permalink_style, :time, :data,
                   :file_read_opts, :plugin_manager, :converters,
                   :generators, :reader
 

data/lib/bridgetown-core/static_file.rb

@@ -58,8 +58,9 @@ module Bridgetown
     def destination(dest)
       dest = site.in_dest_dir(dest)
       dest_url = url
-      dest_url = dest_url.delete_prefix(site.baseurl) if site.uses_resource? &&
-        site.baseurl.present? && collection
+      if site.uses_resource? && site.base_path.present? && collection
+        dest_url = dest_url.delete_prefix site.base_path(strip_slash_only: true)
+      end
       site.in_dest_dir(dest, Bridgetown::URL.unescape_path(dest_url))
     end
 

data/lib/bridgetown-core/utils.rb

@@ -380,7 +380,7 @@ module Bridgetown
 
     def static_frontend_path(site, additional_parts = [])
       path_parts = [
-        site.config["baseurl"].to_s.gsub(%r(^/|/$), ""),
+        site.base_path.gsub(%r(^/|/$), ""),
         "_bridgetown/static",
         *additional_parts,
       ]

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.21.0.beta3"
+  VERSION = "0.21.2"
   CODE_NAME = "Broughton Beach"
 end

data/lib/bridgetown-core/watcher.rb

@@ -127,6 +127,7 @@ module Bridgetown
 
     def process(site, time, options)
       begin
+        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

data/lib/site_template/bridgetown.config.yml

@@ -15,9 +15,13 @@
 # https://learnxinyminutes.com/docs/yaml/
 #
 
-baseurl: "" # OPTIONAL: the subpath of your site, e.g. /blog
 url: "" # the base hostname & protocol for your site, e.g. https://example.com
 
 permalink: pretty
 
+# Other options you might want to investigate:
+# 
+# base_path: "/" # the subpath of your site, e.g. /blog
 # timezone: America/Los_Angeles
+# pagination:
+#   enabled: true

data/lib/site_template/package.json.erb

@@ -13,28 +13,25 @@
     "start": "node start.js"
   },
   "devDependencies": {
-    "@babel/core": "^7.9.0",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-proposal-decorators": "^7.10.1",
-    "@babel/plugin-transform-runtime": "^7.9.0",
-    "@babel/preset-env": "^7.9.0",
-    "babel-loader": "^8.1.0",
     "browser-sync": "^2.26.7",
     "concurrently": "^5.2.0",
     "css-loader": "^4.3.0",
+    "esbuild": "^0.12.7",
+    "esbuild-loader": "^2.13.1",
     "file-loader": "^6.2.0",
     "mini-css-extract-plugin": "^1.3.1",
     <% if options["use-postcss"] %>
-    "postcss": "^8.1.9",
+    "postcss": "^8.3.0",
     "postcss-flexbugs-fixes": "^4.1.0",
-    "postcss-loader": "^4.1.0",
+    "postcss-loader": "^4.3.0",
     "postcss-preset-env": "^6.7.0",
     <% else %>
     "sass": "^1.32.8",
     "sass-loader": "^8.0.2",
     <% end %>
-    "webpack": "^4.44.2",
-    "webpack-cli": "^3.3.11",
-    "webpack-manifest-plugin": "^2.1.0"
+    "webpack": "^5.39.1",
+    "webpack-cli": "^4.7.2",
+    "webpack-manifest-plugin": "^3.1.1",
+    "webpack-merge": "^5.8.0"
   }
 }

data/lib/site_template/src/_data/site_metadata.yml

@@ -7,5 +7,5 @@
 title: Your awesome title
 tagline: This site is totally awesome
 email: your-email@example.com
-description: >- # this means to ignore newlines until "baseurl:"
+description: >-
   Write an awesome description for your new site here. It will appear in your document head meta (for Google search results) and in your feed.xml site description.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.21.0.beta3
+  version: 0.21.2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-15 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -323,6 +323,12 @@ files:
 - lib/bridgetown-core/commands/registrations.rb
 - lib/bridgetown-core/commands/serve.rb
 - lib/bridgetown-core/commands/serve/servlet.rb
+- lib/bridgetown-core/commands/webpack.rb
+- lib/bridgetown-core/commands/webpack/enable-postcss.rb
+- lib/bridgetown-core/commands/webpack/setup.rb
+- lib/bridgetown-core/commands/webpack/update.rb
+- lib/bridgetown-core/commands/webpack/webpack.config.js
+- lib/bridgetown-core/commands/webpack/webpack.defaults.js.erb
 - lib/bridgetown-core/component.rb
 - lib/bridgetown-core/concerns/data_accessible.rb
 - lib/bridgetown-core/concerns/front_matter_importer.rb
@@ -450,6 +456,7 @@ files:
 - lib/site_template/Gemfile.erb
 - lib/site_template/README.md
 - lib/site_template/bridgetown.config.yml
+- lib/site_template/config/.keep
 - lib/site_template/frontend/javascript/index.js.erb
 - lib/site_template/frontend/styles/index.css
 - lib/site_template/frontend/styles/index.scss
@@ -474,7 +481,6 @@ files:
 - lib/site_template/src/posts.md
 - lib/site_template/start.js
 - lib/site_template/sync.js
-- lib/site_template/webpack.config.js.erb
 homepage: https://www.bridgetownrb.com
 licenses:
 - MIT

data/lib/site_template/webpack.config.js.erb

@@ -1,122 +0,0 @@
-const path = require("path");
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const ManifestPlugin = require("webpack-manifest-plugin");
-
-module.exports = {
-  entry: {
-    main: "./frontend/javascript/index.js"
-  },
-  devtool: "source-map",
-  // Set some or all of these to true if you want more verbose logging:
-  stats: {
-    modules: false,
-    builtAt: false,
-    timings: false,
-    children: false,
-  },
-  output: {
-    path: path.resolve(__dirname, "output", "_bridgetown", "static", "js"),
-    filename: "[name].[contenthash].js",
-  },
-  resolve: {
-    extensions: [".js", ".jsx"],
-    modules: [
-      path.resolve(__dirname, 'frontend', 'javascript'),
-      path.resolve(__dirname, 'frontend', 'styles'),
-      path.resolve('./node_modules')
-    ],
-    alias: {
-      bridgetownComponents: path.resolve(__dirname, "src", "_components")
-    }
-  },
-  plugins: [
-    new MiniCssExtractPlugin({
-      filename: "../css/[name].[contenthash].css",
-    }),
-    new ManifestPlugin({
-      fileName: path.resolve(__dirname, ".bridgetown-webpack", "manifest.json"),
-    }),
-  ],
-  module: {
-    rules: [
-      {
-        test: /\.(js|jsx)/,
-        use: {
-          loader: "babel-loader",
-          options: {
-            presets: ["@babel/preset-env"],
-            plugins: [
-              ["@babel/plugin-proposal-decorators", { "legacy": true }],
-              ["@babel/plugin-proposal-class-properties", { "loose" : true }],
-              [
-                "@babel/plugin-transform-runtime",
-                {
-                  helpers: false,
-                },
-              ],
-            ],
-          },
-        },
-      },
-      <% if options["use-postcss"] %>
-      {
-        test: /\.(s[ac]|c)ss$/,
-        use: [
-          MiniCssExtractPlugin.loader,
-          {
-            loader: "css-loader",
-            options: {
-              url: url => !url.startsWith('/'),
-              importLoaders: 1
-            }
-          },
-          "postcss-loader"
-        ],
-      },
-      <% else %>
-      {
-        test: /\.(s[ac]|c)ss$/,
-        use: [
-          MiniCssExtractPlugin.loader,
-          {
-            loader: "css-loader",
-            options: {
-              url: url => !url.startsWith('/')
-            }
-          },
-          {
-            loader: "sass-loader",
-            options: {
-              implementation: require("sass"),
-              sassOptions: {
-                fiber: false,
-                includePaths: [
-                  path.resolve(__dirname, "src/_components")
-                ],
-              },
-            },
-          },
-        ],
-      },
-      <% end %>
-      {
-        test: /\.woff2?$|\.ttf$|\.eot$/,
-        loader: "file-loader",
-        options: {
-          name: "[name]-[contenthash].[ext]",
-          outputPath: "../fonts",
-          publicPath: "../fonts",
-        },
-      },
-      {
-        test: /\.png?$|\.gif$|\.jpg$|\.svg$/,
-        loader: "file-loader",
-        options: {
-          name: "[path][name]-[contenthash].[ext]",
-          outputPath: "../",
-          publicPath: "../",
-        },
-      },
-    ],
-  },
-};