bridgetown-core 0.21.0.beta2 → 0.21.1

data/lib/bridgetown-core/related_posts.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Bridgetown
+  # TODO: to be retired once the Resource engine is made official
   class RelatedPosts
     class << self
       attr_accessor :lsi
@@ -11,13 +12,15 @@ module Bridgetown
     def initialize(post)
       @post = post
       @site = post.site
-      Bridgetown::Utils::RequireGems.require_with_graceful_fail("classifier-reborn") if site.lsi
+      if site.config.lsi
+        Bridgetown::Utils::RequireGems.require_with_graceful_fail("classifier-reborn")
+      end
     end
 
     def build
       return [] unless site.collections.posts.docs.size > 1
 
-      if site.lsi
+      if site.config.lsi
         build_index
         lsi_related_posts
       else

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]
@@ -98,7 +114,7 @@ module Bridgetown
       alias_method :read, :read! # TODO: eventually use the bang version only
 
       def transform!
-        transformer.process! if output_allowed?
+        transformer.process! unless collection.data?
       end
 
       def trigger_hooks(hook_name, *args)
@@ -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
@@ -178,12 +204,8 @@ module Bridgetown
         end
       end
 
-      def output_allowed?
-        !collection.data? && data.config&.output != false
-      end
-
       def requires_destination?
-        collection.write? && output_allowed?
+        collection.write? && data.config&.output != false
       end
 
       def write?
@@ -262,7 +284,7 @@ module Bridgetown
       alias_method :next_doc, :next_resource
 
       def previous_resource
-        pos = collection.docs.index { |item| item.equal?(self) }
+        pos = collection.resources.index { |item| item.equal?(self) }
         collection.resources[pos - 1] if pos&.positive?
       end
       alias_method :previous_doc, :previous_resource

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/resource/transformer.rb

@@ -15,6 +15,7 @@ module Bridgetown
       def initialize(resource)
         @resource = resource
         @site = resource.site
+        @conversions = []
       end
 
       # @return [String]
@@ -110,7 +111,7 @@ module Bridgetown
 
       ### Transformation Actions
 
-      def run_conversions # rubocop:disable Metrics/AbcSize
+      def run_conversions # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         input = resource.content.to_s
 
         # @param content [String]
@@ -125,7 +126,8 @@ module Bridgetown
             type: :content,
             converter: converter,
             output: Bridgetown.env.production? ? nil : output,
-            output_ext: conversions[index][:output_ext],
+            output_ext: conversions[index]&.dig(:output_ext) ||
+              converter.output_ext(resource.extname),
           }
           output.html_safe
         rescue StandardError => e

data/lib/bridgetown-core/site.rb

@@ -30,12 +30,11 @@ module Bridgetown
     # is default
     alias_method :generated_pages, :pages
 
-    attr_accessor :exclude, :include, :lsi, :highlighter, :permalink_style,
-                  :time, :future, :unpublished, :limit_posts,
-                  :keep_files, :baseurl, :data, :file_read_opts,
-                  :plugin_manager, :converters, :generators, :reader
+    attr_accessor :permalink_style, :time, :data,
+                  :file_read_opts, :plugin_manager, :converters,
+                  :generators, :reader
 
-    # Public: Initialize a new Site.
+    # Initialize a new Site.
     #
     # config - A Hash containing site configuration details.
     def initialize(config)

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/tags/highlight.rb

@@ -36,13 +36,11 @@ module Bridgetown
         code = super.to_s.gsub(LEADING_OR_TRAILING_LINE_TERMINATORS, "")
 
         output =
-          case context.registers[:site].highlighter
+          case context.registers[:site].config.highlighter
           when "rouge"
             render_rouge(code)
-          when "pygments"
-            render_pygments(code, context)
           else
-            render_codehighlighter(code)
+            h(code).strip
           end
 
         rendered_output = add_code_tag(output)
@@ -72,13 +70,6 @@ module Bridgetown
         options
       end
 
-      def render_pygments(code, _context)
-        Bridgetown.logger.warn "Warning:", "Highlight Tag no longer supports" \
-                                " rendering with Pygments."
-        Bridgetown.logger.warn "", "Using the default highlighter, Rouge, instead."
-        render_rouge(code)
-      end
-
       def render_rouge(code)
         require "rouge"
         formatter = ::Rouge::Formatters::HTMLLegacy.new(
@@ -92,10 +83,6 @@ module Bridgetown
         formatter.format(lexer.lex(code))
       end
 
-      def render_codehighlighter(code)
-        h(code).strip
-      end
-
       def add_code_tag(code)
         code_attributes = [
           "class=\"language-#{@lang.to_s.tr("+", "-")}\"",

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.beta2"
+  VERSION = "0.21.1"
   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/bridgetown-core/yaml_parser.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  class YAMLParser
+    PERMITTED_CLASSES = [Date, Time, Rb].freeze
+
+    class << self
+      def load_file(filename, **kwargs)
+        kwargs = { permitted_classes: PERMITTED_CLASSES }.merge(kwargs)
+        YAML.safe_load_file(filename, **kwargs)
+      end
+
+      def load(yaml)
+        if RUBY_VERSION.start_with?("2.5")
+          YAML.safe_load yaml, PERMITTED_CLASSES
+        else
+          YAML.safe_load yaml, permitted_classes: PERMITTED_CLASSES
+        end
+      end
+    end
+  end
+end

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/plugins/site_builder.rb

@@ -1,4 +1,4 @@
 class SiteBuilder < Bridgetown::Builder
-  # write builders which subclass SiteBuilder in plugins/builder
+  # write builders which subclass SiteBuilder in plugins/builders
 end
 

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.beta2
+  version: 0.21.1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -234,20 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: safe_yaml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -327,6 +313,7 @@ files:
 - lib/bridgetown-core/commands/concerns/actions.rb
 - lib/bridgetown-core/commands/concerns/build_options.rb
 - lib/bridgetown-core/commands/concerns/configuration_overridable.rb
+- lib/bridgetown-core/commands/concerns/git_helpers.rb
 - lib/bridgetown-core/commands/concerns/summarizable.rb
 - lib/bridgetown-core/commands/configure.rb
 - lib/bridgetown-core/commands/console.rb
@@ -336,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
@@ -373,6 +366,7 @@ files:
 - lib/bridgetown-core/converters/markdown/kramdown_parser.rb
 - lib/bridgetown-core/converters/ruby_templates.rb
 - lib/bridgetown-core/converters/smartypants.rb
+- lib/bridgetown-core/core_ext/psych.rb
 - lib/bridgetown-core/current.rb
 - lib/bridgetown-core/deprecator.rb
 - lib/bridgetown-core/document.rb
@@ -457,10 +451,12 @@ files:
 - lib/bridgetown-core/utils/ruby_front_matter.rb
 - lib/bridgetown-core/version.rb
 - lib/bridgetown-core/watcher.rb
+- lib/bridgetown-core/yaml_parser.rb
 - lib/site_template/.gitignore
 - 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
@@ -485,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: "../",
-        },
-      },
-    ],
-  },
-};