bridgetown-core 0.19.1 → 0.21.0.beta2

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.19.1"
-  CODE_NAME = "Arbor Lodge"
+  VERSION = "0.21.0.beta2"
+  CODE_NAME = "Broughton Beach"
 end

data/lib/bridgetown-core/watcher.rb

@@ -140,7 +140,7 @@ module Bridgetown
         if options[:trace]
           Bridgetown.logger.info e.backtrace.join("\n")
         else
-          Bridgetown.logger.warn "Error:", "Use the --trace option for more information."
+          Bridgetown.logger.warn "Backtrace:", "Use the --trace option for more information."
         end
       end
       Bridgetown.logger.info ""

data/lib/site_template/README.md

@@ -0,0 +1,70 @@
+# Bridgetown Website README
+
+Welcome to your new Bridgetown website! You can update this README file to provide additional context and setup information for yourself or other contributors.
+
+## Table of Contents
+
+- [Prerequisites](#prerequisites)
+- [Install](#install)
+- [Development](#development)
+- [Commands](#commands)
+- [Deployment](#deployment)
+- [Contributing](#contributing)
+
+## Prerequisites
+
+- [GCC](https://gcc.gnu.org/install/)
+- [Make](https://www.gnu.org/software/make/)
+- [Ruby](https://www.ruby-lang.org/en/downloads/)
+  - `>= 2.5`
+- [Bridgetown Gem](https://rubygems.org/gems/bridgetown)
+  - `gem install bundler bridgetown -N`
+- [Node](https://nodejs.org)
+  - `>= 10.13`
+- [Yarn](https://yarnpkg.com)
+
+## Install
+
+```sh
+cd bridgetown-site-folder
+bundle install && yarn install
+```
+> Learn more: [Bridgetown Getting Started Documentation](https://www.bridgetownrb.com/docs/).
+
+## Development
+
+To start your site in development mode, run `yarn start` and navigate to [localhost:4000](https://localhost:4000/)!
+
+Use a [theme](https://github.com/topics/bridgetown-theme), add some [plugins](https://www.bridgetownrb.com/plugins/), and/or run some [automations](https://github.com/topics/bridgetown-automation) to get started quickly.
+
+### Commands
+
+```sh
+# running locally
+yarn start
+
+# build & deploy to production
+yarn deploy
+
+# load the site up within a Ruby console (IRB)
+bundle exec bridgetown console
+```
+
+> Learn more: [Bridgetown CLI Documentation](https://www.bridgetownrb.com/docs/command-line-usage)
+
+## Deployment
+
+You can deploy Bridgetown sites on "Jamstack" hosts (Netlify, Vercel, Render, etc.) or virtually any tranditional web server by simply building and copying the output folder to your HTML root.
+
+> Read the [Bridgetown Deployment Documentation](https://www.bridgetownrb.com/docs/deployment) for more information.
+
+## Contributing
+
+If repo is on GitHub:
+
+1. Fork it
+2. Clone the fork using `git clone` to your local development machine.
+3. Create your feature branch (`git checkout -b my-new-feature`)
+4. Commit your changes (`git commit -am 'Add some feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create a new Pull Request

data/lib/site_template/package.json.erb

@@ -30,8 +30,8 @@
     "postcss-loader": "^4.1.0",
     "postcss-preset-env": "^6.7.0",
     <% else %>
-    "node-sass": "^4.13.1",
-    "sass-loader": "^8.0.2",    
+    "sass": "^1.32.8",
+    "sass-loader": "^8.0.2",
     <% end %>
     "webpack": "^4.44.2",
     "webpack-cli": "^3.3.11",

data/lib/site_template/src/_posts/0000-00-00-welcome-to-bridgetown.md.erb

@@ -21,6 +21,6 @@ def print_hi(name)
 end
 print_hi('Tom')
 #=> prints 'Hi, Tom' to STDOUT.
-````
+```
 
 Check out the [Bridgetown docs](https://bridgetownrb.com/docs/) for more info on how to get the most out of Bridgetown. File all bugs/feature requests at [Bridgetown’s GitHub repo](https://github.com/bridgetownrb/bridgetown). If you have questions, you can ask them on [Bridgetown Discussions on GitHub](https://github.com/bridgetownrb/bridgetown/discussions).

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

@@ -3,7 +3,9 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const ManifestPlugin = require("webpack-manifest-plugin");
 
 module.exports = {
-  entry: "./frontend/javascript/index.js",
+  entry: {
+    main: "./frontend/javascript/index.js"
+  },
   devtool: "source-map",
   // Set some or all of these to true if you want more verbose logging:
   stats: {
@@ -14,7 +16,7 @@ module.exports = {
   },
   output: {
     path: path.resolve(__dirname, "output", "_bridgetown", "static", "js"),
-    filename: "all.[contenthash].js",
+    filename: "[name].[contenthash].js",
   },
   resolve: {
     extensions: [".js", ".jsx"],
@@ -29,7 +31,7 @@ module.exports = {
   },
   plugins: [
     new MiniCssExtractPlugin({
-      filename: "../css/all.[contenthash].css",
+      filename: "../css/[name].[contenthash].css",
     }),
     new ManifestPlugin({
       fileName: path.resolve(__dirname, ".bridgetown-webpack", "manifest.json"),
@@ -64,22 +66,30 @@ module.exports = {
           {
             loader: "css-loader",
             options: {
+              url: url => !url.startsWith('/'),
               importLoaders: 1
             }
           },
           "postcss-loader"
         ],
-      },      
+      },
       <% else %>
       {
         test: /\.(s[ac]|c)ss$/,
         use: [
           MiniCssExtractPlugin.loader,
-          "css-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")
                 ],
@@ -90,13 +100,23 @@ module.exports = {
       },
       <% end %>
       {
-        test: /\.woff2?$|\.ttf$|\.eot$|\.svg$/,
+        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: "../",
+        },
+      },
     ],
   },
 };

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.21.0.beta2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-26 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: liquid-component
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +206,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: liquid-render-tag
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: pathutil
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +268,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -342,6 +328,7 @@ files:
 - lib/bridgetown-core/commands/concerns/build_options.rb
 - lib/bridgetown-core/commands/concerns/configuration_overridable.rb
 - lib/bridgetown-core/commands/concerns/summarizable.rb
+- lib/bridgetown-core/commands/configure.rb
 - lib/bridgetown-core/commands/console.rb
 - lib/bridgetown-core/commands/doctor.rb
 - lib/bridgetown-core/commands/new.rb
@@ -349,7 +336,9 @@ files:
 - lib/bridgetown-core/commands/registrations.rb
 - lib/bridgetown-core/commands/serve.rb
 - lib/bridgetown-core/commands/serve/servlet.rb
+- lib/bridgetown-core/component.rb
 - lib/bridgetown-core/concerns/data_accessible.rb
+- lib/bridgetown-core/concerns/front_matter_importer.rb
 - lib/bridgetown-core/concerns/layout_placeable.rb
 - lib/bridgetown-core/concerns/liquid_renderable.rb
 - lib/bridgetown-core/concerns/publishable.rb
@@ -362,13 +351,29 @@ files:
 - lib/bridgetown-core/concerns/site/writable.rb
 - lib/bridgetown-core/concerns/validatable.rb
 - lib/bridgetown-core/configuration.rb
+- lib/bridgetown-core/configurations/.keep
+- lib/bridgetown-core/configurations/bt-postcss.rb
+- lib/bridgetown-core/configurations/bt-postcss/postcss.config.js
+- lib/bridgetown-core/configurations/minitesting.rb
+- lib/bridgetown-core/configurations/netlify.rb
+- lib/bridgetown-core/configurations/netlify/netlify.sh
+- lib/bridgetown-core/configurations/netlify/netlify.toml
+- lib/bridgetown-core/configurations/purgecss.rb
+- lib/bridgetown-core/configurations/stimulus.rb
+- lib/bridgetown-core/configurations/swup.rb
+- lib/bridgetown-core/configurations/tailwindcss.rb
+- lib/bridgetown-core/configurations/tailwindcss/css_imports.css
+- lib/bridgetown-core/configurations/tailwindcss/postcss.config.js
+- lib/bridgetown-core/configurations/turbo.rb
 - lib/bridgetown-core/converter.rb
 - lib/bridgetown-core/converters/erb_templates.rb
 - lib/bridgetown-core/converters/identity.rb
 - lib/bridgetown-core/converters/liquid_templates.rb
 - lib/bridgetown-core/converters/markdown.rb
 - lib/bridgetown-core/converters/markdown/kramdown_parser.rb
+- lib/bridgetown-core/converters/ruby_templates.rb
 - lib/bridgetown-core/converters/smartypants.rb
+- lib/bridgetown-core/current.rb
 - lib/bridgetown-core/deprecator.rb
 - lib/bridgetown-core/document.rb
 - lib/bridgetown-core/drops/bridgetown_drop.rb
@@ -377,6 +382,8 @@ files:
 - lib/bridgetown-core/drops/drop.rb
 - lib/bridgetown-core/drops/excerpt_drop.rb
 - lib/bridgetown-core/drops/page_drop.rb
+- lib/bridgetown-core/drops/relations_drop.rb
+- lib/bridgetown-core/drops/resource_drop.rb
 - lib/bridgetown-core/drops/site_drop.rb
 - lib/bridgetown-core/drops/static_file_drop.rb
 - lib/bridgetown-core/drops/unified_payload_drop.rb
@@ -384,10 +391,10 @@ files:
 - lib/bridgetown-core/entry_filter.rb
 - lib/bridgetown-core/errors.rb
 - lib/bridgetown-core/excerpt.rb
-- lib/bridgetown-core/external.rb
 - lib/bridgetown-core/filters.rb
 - lib/bridgetown-core/filters/condition_helpers.rb
 - lib/bridgetown-core/filters/date_filters.rb
+- lib/bridgetown-core/filters/from_liquid.rb
 - lib/bridgetown-core/filters/grouping_filters.rb
 - lib/bridgetown-core/filters/url_filters.rb
 - lib/bridgetown-core/frontmatter_defaults.rb
@@ -404,24 +411,31 @@ files:
 - lib/bridgetown-core/log_adapter.rb
 - lib/bridgetown-core/log_writer.rb
 - lib/bridgetown-core/mime.types
+- lib/bridgetown-core/model/base.rb
+- lib/bridgetown-core/model/builder_origin.rb
+- lib/bridgetown-core/model/origin.rb
+- lib/bridgetown-core/model/repo_origin.rb
 - lib/bridgetown-core/page.rb
-- lib/bridgetown-core/page_without_a_file.rb
-- lib/bridgetown-core/path_manager.rb
 - lib/bridgetown-core/plugin.rb
 - lib/bridgetown-core/plugin_manager.rb
 - lib/bridgetown-core/publisher.rb
 - lib/bridgetown-core/reader.rb
-- lib/bridgetown-core/readers/collection_reader.rb
 - lib/bridgetown-core/readers/data_reader.rb
 - lib/bridgetown-core/readers/defaults_reader.rb
 - lib/bridgetown-core/readers/layout_reader.rb
 - lib/bridgetown-core/readers/page_reader.rb
 - lib/bridgetown-core/readers/plugin_content_reader.rb
 - lib/bridgetown-core/readers/post_reader.rb
-- lib/bridgetown-core/readers/static_file_reader.rb
 - lib/bridgetown-core/regenerator.rb
 - lib/bridgetown-core/related_posts.rb
 - lib/bridgetown-core/renderer.rb
+- lib/bridgetown-core/resource/base.rb
+- lib/bridgetown-core/resource/destination.rb
+- lib/bridgetown-core/resource/permalink_processor.rb
+- lib/bridgetown-core/resource/relations.rb
+- lib/bridgetown-core/resource/taxonomy_term.rb
+- lib/bridgetown-core/resource/taxonomy_type.rb
+- lib/bridgetown-core/resource/transformer.rb
 - lib/bridgetown-core/ruby_template_view.rb
 - lib/bridgetown-core/site.rb
 - lib/bridgetown-core/static_file.rb
@@ -438,16 +452,14 @@ files:
 - lib/bridgetown-core/url.rb
 - lib/bridgetown-core/utils.rb
 - lib/bridgetown-core/utils/ansi.rb
-- lib/bridgetown-core/utils/exec.rb
-- lib/bridgetown-core/utils/internet.rb
-- lib/bridgetown-core/utils/platforms.rb
+- lib/bridgetown-core/utils/require_gems.rb
 - lib/bridgetown-core/utils/ruby_exec.rb
-- lib/bridgetown-core/utils/thread_event.rb
-- lib/bridgetown-core/utils/win_tz.rb
+- lib/bridgetown-core/utils/ruby_front_matter.rb
 - lib/bridgetown-core/version.rb
 - lib/bridgetown-core/watcher.rb
 - lib/site_template/.gitignore
 - lib/site_template/Gemfile.erb
+- lib/site_template/README.md
 - lib/site_template/bridgetown.config.yml
 - lib/site_template/frontend/javascript/index.js.erb
 - lib/site_template/frontend/styles/index.css

data/lib/bridgetown-core/external.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module Bridgetown
-  module External
-    class << self
-      #
-      # Require a gem or file if it's present, otherwise silently fail.
-      #
-      # names - a string gem name or array of gem names
-      #
-      def require_if_present(names)
-        Array(names).each do |name|
-          require name
-        rescue LoadError
-          Bridgetown.logger.debug "Couldn't load #{name}. Skipping."
-          yield(name, version_constraint(name)) if block_given?
-          false
-        end
-      end
-
-      #
-      # The version constraint required to activate a given gem.
-      #
-      # Returns a String version constraint in a parseable form for
-      # RubyGems.
-      def version_constraint
-        "> 0"
-      end
-
-      #
-      # Require a gem or gems. If it's not present, show a very nice error
-      # message that explains everything and is much more helpful than the
-      # normal LoadError.
-      #
-      # names - a string gem name or array of gem names
-      #
-      def require_with_graceful_fail(names)
-        Array(names).each do |name|
-          Bridgetown.logger.debug "Requiring:", name.to_s
-          require name
-        rescue LoadError => e
-          Bridgetown.logger.error "Dependency Error:", <<~MSG
-            Yikes! It looks like you don't have #{name} or one of its dependencies installed.
-            In order to use Bridgetown as currently configured, you'll need to install this gem.
-
-            If you've run Bridgetown with `bundle exec`, ensure that you have included the #{name}
-            gem in your Gemfile as well.
-
-            The full error message from Ruby is: '#{e.message}'
-
-            If you run into trouble, you can find helpful resources at https://www.bridgetownrb.com/docs/community/
-          MSG
-          raise Bridgetown::Errors::MissingDependencyException, name
-        end
-      end
-    end
-  end
-end