bridgetown-core 0.21.2 → 1.0.0.alpha2

data/lib/site_template/README.md

@@ -18,9 +18,9 @@ Welcome to your new Bridgetown website! You can update this README file to provi
 - [Ruby](https://www.ruby-lang.org/en/downloads/)
   - `>= 2.5`
 - [Bridgetown Gem](https://rubygems.org/gems/bridgetown)
-  - `gem install bundler bridgetown -N`
+  - `gem install bridgetown -N`
 - [Node](https://nodejs.org)
-  - `>= 10.13`
+  - `>= 12`
 - [Yarn](https://yarnpkg.com)
 
 ## Install
@@ -33,7 +33,7 @@ bundle install && yarn install
 
 ## Development
 
-To start your site in development mode, run `yarn start` and navigate to [localhost:4000](https://localhost:4000/)!
+To start your site in development mode, run `bin/bridgetown 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.
 
@@ -41,13 +41,13 @@ Use a [theme](https://github.com/topics/bridgetown-theme), add some [plugins](ht
 
 ```sh
 # running locally
-yarn start
+bin/bridgetown start
 
 # build & deploy to production
-yarn deploy
+bin/bridgetown deploy
 
 # load the site up within a Ruby console (IRB)
-bundle exec bridgetown console
+bin/bridgetown console
 ```
 
 > Learn more: [Bridgetown CLI Documentation](https://www.bridgetownrb.com/docs/command-line-usage)

data/lib/site_template/Rakefile

@@ -0,0 +1,49 @@
+require "bridgetown"
+
+Bridgetown.load_tasks
+
+#
+# Standard set of tasks, which you can customize if you wish:
+#
+desc "Build the Bridgetown site for deployment"
+task :deploy => [:clean, "frontend:build"] do
+  Bridgetown::Commands::Build.start
+end
+
+desc "Build the site in a test environment"
+task :test do
+  ENV["BRIDGETOWN_ENV"] = "test"
+  Bridgetown::Commands::Build.start
+end
+
+desc "Runs the clean command"
+task :clean do
+  Bridgetown::Commands::Clean.start
+end
+
+namespace :frontend do
+  desc "Build the frontend with Webpack for deployment"
+  task :build do
+    sh "yarn run webpack-build"
+  end
+
+  desc "Watch the frontend with Webpack during development"
+  task :dev do
+    sh "yarn run webpack-dev --color"
+  rescue Interrupt
+  end
+end
+
+#
+# Add your own Rake tasks here! You can use `environment` as a prerequisite
+# in order to write automations or other commands requiring a loaded site.
+#
+# task :my_task => :environment do
+#   puts site.root_dir
+#   automation do
+#     say_status :rake, "I'm a Rake tast =) #{site.config.url}"
+#   end
+# end
+
+# Run rake without specifying any command to execute a deploy build by default.
+task default: :deploy

data/lib/site_template/bridgetown.config.yml

@@ -4,11 +4,10 @@
 # which you are expected to set up once and rarely edit after that.
 #
 # For technical reasons, this file is *NOT* reloaded automatically when you use
-# 'bundle exec bridgetown serve'. If you change this file, please restart the
-# server process.
+# `bin/bridgetown start`. If you change this file, please restart the server process.
 #
 # For reloadable site metadata like title, SEO description, social media
-# handles, etc., take a look at src/_data/site_metadata.yml
+# handles, etc., take a look at `src/_data/site_metadata.yml`
 #
 # If you need help with YAML syntax, here are some quick references for you:
 # https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml

data/lib/site_template/config/puma.rb

@@ -0,0 +1,27 @@
+# Puma is a fast, concurrent web server for Ruby & Rack
+#
+# Learn more at: https://puma.io
+#
+port ENV.fetch("BRIDGETOWN_PORT") { 4000 }
+
+# You can adjust the number of workers (separate processes) and threads
+# (per process) based on your production system
+#
+if ENV["BRIDGETOWN_ENV"] == "production"
+  workers ENV.fetch("BRIDGETOWN_CONCURRENCY") { 4 }
+end
+
+max_threads_count = ENV.fetch("BRIDGETOWN_MAX_THREADS") { 5 }
+min_threads_count = ENV.fetch("BRIDGETOWN_MIN_THREADS") { max_threads_count }
+threads min_threads_count, max_threads_count
+
+# Preload the application for maximum performance
+#
+preload_app!
+
+# Use the Bridgetown logger format
+#
+require "bridgetown-core/rack/logger"
+log_formatter do |msg|
+  Bridgetown::Rack::Logger.message_with_prefix msg
+end

data/lib/site_template/config.ru

@@ -0,0 +1,7 @@
+# This file is used by Rack-based servers during the Bridgetown boot process.
+
+require "bridgetown-core/rack/boot"
+
+Bridgetown::Rack.boot
+
+run RodaApp.freeze.app # see server/roda_app.rb

data/lib/site_template/frontend/javascript/index.js.erb

@@ -1,8 +1,8 @@
-<% if options["use-postcss"] %>
+<%- if options["use-postcss"] -%>
 import "index.css"
-<% else %>
+<%- else -%>
 import "index.scss"
-<% end %>
+<%- end -%>
 
 // Import all javascript files from src/_components
 const componentsContext = require.context("bridgetownComponents", true, /.js$/)

data/lib/site_template/package.json.erb

@@ -3,35 +3,30 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "build": "bundle exec bridgetown build",
-    "serve": "bundle exec bridgetown serve",
-    "clean": "bundle exec bridgetown clean",
     "webpack-build": "webpack --mode production",
-    "webpack-dev": "webpack --mode development -w",
-    "deploy": "yarn clean && yarn webpack-build && yarn build",
-    "sync": "node sync.js",
-    "start": "node start.js"
+    "webpack-dev": "webpack --mode development -w"
   },
   "devDependencies": {
-    "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"] %>
+    <%- if options["use-postcss"] -%>
     "postcss": "^8.3.0",
     "postcss-flexbugs-fixes": "^4.1.0",
     "postcss-loader": "^4.3.0",
     "postcss-preset-env": "^6.7.0",
-    <% else %>
+    <%- else -%>
     "sass": "^1.32.8",
     "sass-loader": "^8.0.2",
-    <% end %>
+    <%- end -%>
     "webpack": "^5.39.1",
     "webpack-cli": "^4.7.2",
     "webpack-manifest-plugin": "^3.1.1",
     "webpack-merge": "^5.8.0"
+  },
+  "resolutions": {
+    "postcss-focus-within": "^4.0.0"
   }
 }

data/lib/site_template/server/roda_app.rb

@@ -0,0 +1,22 @@
+# Roda is a simple Rack-based framework with a flexible architecture based
+# on the concept of a routing tree. Bridgetown uses it for its development
+# server, but you can also run it in production for fast, dynamic applications.
+#
+# Learn more at: http://roda.jeremyevans.net
+
+# Uncomment to use the file-based routing for Bridgetown SSR:
+# require "bridgetown-routes"
+
+class RodaApp < Bridgetown::Rack::Roda
+  # Add additional Roda configuration here if needed
+
+  # Uncomment to use Bridgetown SSR:
+  # plugin :bridgetown_ssr
+  # plugin :bridgetown_routes
+
+  route do |r|
+    # Load all files in server/routes and src/_routes if "bridgetown-routes" is loaded
+    # (see server/routes/hello.rb.sample)
+    Bridgetown::Rack::Routes.start! self
+  end
+end

data/lib/site_template/server/routes/hello.rb.sample

@@ -0,0 +1,10 @@
+# Rename this file to hello.rb to try out
+
+class Routes::Hello < Bridgetown::Rack::Routes
+  route do |r|
+    # route: GET /hello/:name
+    r.get "hello", String do |name|
+      { hello: "friend #{name}" }
+    end
+  end
+end

data/lib/site_template/src/_components/head.liquid

@@ -1,9 +1,10 @@
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 {% capture page_title %}{{ title | strip_html | strip_newlines }}{% endcapture %}
-<title>{% if page_title != "" %}{{ page_title | escape }} | {{ metadata.title | escape }}{% else %}{{ metadata.title | escape }}: {{ metadata.tagline | escape }}{% endif %}</title>
+<title>{% if page_title != "Index" %}{{ page_title | escape }} | {{ metadata.title | escape }}{% else %}{{ metadata.title | escape }}: {{ metadata.tagline | escape }}{% endif %}</title>
 
 <meta name="description" content="{{ metadata.description }}" />
 
 <link rel="stylesheet" href="{% webpack_path css %}" />
 <script src="{% webpack_path js %}" defer></script>
+{% live_reload_dev_js %}

data/lib/site_template/src/about.md

@@ -1,7 +1,6 @@
 ---
 layout: page
 title: About
-permalink: /about/
 ---
 
 This is the basic Bridgetown site template. You can find out more info about customizing your Bridgetown site, as well as basic Bridgetown usage documentation at [bridgetownrb.com](https://bridgetownrb.com/)

data/lib/site_template/src/posts.md

@@ -1,13 +1,12 @@
 ---
 layout: page
 title: Posts
-permalink: /posts/
 ---
 
 <ul>
-  {% for post in site.posts %}
+  {% for post in collections.posts.resources %}
     <li>
-      <a href="{{ post.url }}">{{ post.title }}</a>
+      <a href="{{ post.relative_url }}">{{ post.title }}</a>
     </li>
   {% endfor %}
 </ul>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 1.0.0.alpha2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -220,6 +220,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rack-indifferent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: roda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.46'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.46'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -298,6 +340,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubocop.yml"
 - ".yardopts"
 - Rakefile
 - bin/bridgetown
@@ -323,6 +366,7 @@ files:
 - lib/bridgetown-core/commands/registrations.rb
 - lib/bridgetown-core/commands/serve.rb
 - lib/bridgetown-core/commands/serve/servlet.rb
+- lib/bridgetown-core/commands/start.rb
 - lib/bridgetown-core/commands/webpack.rb
 - lib/bridgetown-core/commands/webpack/enable-postcss.rb
 - lib/bridgetown-core/commands/webpack/setup.rb
@@ -330,7 +374,6 @@ files:
 - 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
 - lib/bridgetown-core/concerns/layout_placeable.rb
 - lib/bridgetown-core/concerns/liquid_renderable.rb
@@ -341,8 +384,8 @@ files:
 - lib/bridgetown-core/concerns/site/localizable.rb
 - lib/bridgetown-core/concerns/site/processable.rb
 - lib/bridgetown-core/concerns/site/renderable.rb
+- lib/bridgetown-core/concerns/site/ssr.rb
 - 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
@@ -369,13 +412,10 @@ files:
 - lib/bridgetown-core/core_ext/psych.rb
 - lib/bridgetown-core/current.rb
 - lib/bridgetown-core/deprecator.rb
-- lib/bridgetown-core/document.rb
 - lib/bridgetown-core/drops/bridgetown_drop.rb
 - lib/bridgetown-core/drops/collection_drop.rb
-- lib/bridgetown-core/drops/document_drop.rb
 - lib/bridgetown-core/drops/drop.rb
-- lib/bridgetown-core/drops/excerpt_drop.rb
-- lib/bridgetown-core/drops/page_drop.rb
+- lib/bridgetown-core/drops/generated_page_drop.rb
 - lib/bridgetown-core/drops/relations_drop.rb
 - lib/bridgetown-core/drops/resource_drop.rb
 - lib/bridgetown-core/drops/site_drop.rb
@@ -384,7 +424,6 @@ files:
 - lib/bridgetown-core/drops/url_drop.rb
 - lib/bridgetown-core/entry_filter.rb
 - lib/bridgetown-core/errors.rb
-- lib/bridgetown-core/excerpt.rb
 - lib/bridgetown-core/filters.rb
 - lib/bridgetown-core/filters/condition_helpers.rb
 - lib/bridgetown-core/filters/date_filters.rb
@@ -392,6 +431,7 @@ files:
 - lib/bridgetown-core/filters/grouping_filters.rb
 - lib/bridgetown-core/filters/url_filters.rb
 - lib/bridgetown-core/frontmatter_defaults.rb
+- lib/bridgetown-core/generated_page.rb
 - lib/bridgetown-core/generator.rb
 - lib/bridgetown-core/generators/prototype_generator.rb
 - lib/bridgetown-core/helpers.rb
@@ -408,20 +448,20 @@ files:
 - lib/bridgetown-core/model/base.rb
 - lib/bridgetown-core/model/builder_origin.rb
 - lib/bridgetown-core/model/origin.rb
+- lib/bridgetown-core/model/plugin_origin.rb
 - lib/bridgetown-core/model/repo_origin.rb
-- lib/bridgetown-core/page.rb
 - lib/bridgetown-core/plugin.rb
 - lib/bridgetown-core/plugin_manager.rb
 - lib/bridgetown-core/publisher.rb
+- lib/bridgetown-core/rack/boot.rb
+- lib/bridgetown-core/rack/logger.rb
+- lib/bridgetown-core/rack/roda.rb
+- lib/bridgetown-core/rack/routes.rb
+- lib/bridgetown-core/rack/static_indexes.rb
 - lib/bridgetown-core/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/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
@@ -438,14 +478,17 @@ files:
 - lib/bridgetown-core/tags/highlight.rb
 - lib/bridgetown-core/tags/include.rb
 - lib/bridgetown-core/tags/link.rb
+- lib/bridgetown-core/tags/live_reload_dev_js.rb
 - lib/bridgetown-core/tags/post_url.rb
 - lib/bridgetown-core/tags/render_content.rb
 - lib/bridgetown-core/tags/t.rb
 - lib/bridgetown-core/tags/webpack_path.rb
 - lib/bridgetown-core/tags/with.rb
+- lib/bridgetown-core/tasks/bridgetown_tasks.rake
 - lib/bridgetown-core/url.rb
 - lib/bridgetown-core/utils.rb
 - lib/bridgetown-core/utils/ansi.rb
+- lib/bridgetown-core/utils/aux.rb
 - lib/bridgetown-core/utils/require_gems.rb
 - lib/bridgetown-core/utils/ruby_exec.rb
 - lib/bridgetown-core/utils/ruby_front_matter.rb
@@ -455,8 +498,10 @@ files:
 - lib/site_template/.gitignore
 - lib/site_template/Gemfile.erb
 - lib/site_template/README.md
+- lib/site_template/Rakefile
 - lib/site_template/bridgetown.config.yml
-- lib/site_template/config/.keep
+- lib/site_template/config.ru
+- lib/site_template/config/puma.rb
 - lib/site_template/frontend/javascript/index.js.erb
 - lib/site_template/frontend/styles/index.css
 - lib/site_template/frontend/styles/index.scss
@@ -464,6 +509,8 @@ files:
 - lib/site_template/plugins/builders/.keep
 - lib/site_template/plugins/site_builder.rb
 - lib/site_template/postcss.config.js.erb
+- lib/site_template/server/roda_app.rb
+- lib/site_template/server/routes/hello.rb.sample
 - lib/site_template/src/404.html
 - lib/site_template/src/_components/footer.liquid
 - lib/site_template/src/_components/head.liquid
@@ -479,8 +526,6 @@ files:
 - lib/site_template/src/images/.keep
 - lib/site_template/src/index.md
 - lib/site_template/src/posts.md
-- lib/site_template/start.js
-- lib/site_template/sync.js
 homepage: https://www.bridgetownrb.com
 licenses:
 - MIT

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

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Bridgetown
-  # TODO: to be retired once the Resource engine is made official
-  module DataAccessible
-    # Returns the contents as a String.
-    def to_s
-      output || content || ""
-    end
-
-    # Accessor for data properties by Liquid.
-    #
-    # property - The String name of the property to retrieve.
-    #
-    # Returns the String value or nil if the property isn't included.
-    def [](property)
-      data[property]
-    end
-  end
-end

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

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-module Bridgetown
-  # TODO: to be retired once the Resource engine is made official
-  module Validatable
-    # Read the YAML frontmatter.
-    #
-    # base - The String path to the dir containing the file.
-    # name - The String filename of the file.
-    # opts - optional parameter to File.read, default at site configs
-    #
-    # Returns nothing.
-    # rubocop:disable Metrics/AbcSize
-    def read_yaml(base, name, opts = {})
-      filename = File.join(base, name)
-
-      begin
-        self.content = File.read(@path || site.in_source_dir(base, name),
-                                 **Utils.merged_file_read_opts(site, opts))
-        if content =~ Document::YAML_FRONT_MATTER_REGEXP
-          self.content = $POSTMATCH
-          self.data = YAMLParser.load(Regexp.last_match(1))&.with_dot_access
-        end
-      rescue Psych::SyntaxError => e
-        Bridgetown.logger.warn "YAML Exception reading #{filename}: #{e.message}"
-        raise e if site.config["strict_front_matter"]
-      rescue StandardError => e
-        Bridgetown.logger.warn "Error reading file #{filename}: #{e.message}"
-        raise e if site.config["strict_front_matter"]
-      end
-
-      self.data ||= HashWithDotAccess::Hash.new
-
-      validate_data! filename
-      validate_permalink! filename
-
-      self.data
-    end
-    # rubocop:enable Metrics/AbcSize
-
-    # FIXME: why doesn't Document validate data too?
-    def validate_data!(filename)
-      unless self.data.is_a?(Hash)
-        raise Errors::InvalidYAMLFrontMatterError,
-              "Invalid YAML front matter in #{filename}"
-      end
-    end
-
-    # FIXME: Layouts don't have permalinks...d'oh
-    def validate_permalink!(filename)
-      if self.data["permalink"]&.to_s&.empty?
-        raise Errors::InvalidPermalinkError, "Invalid permalink in #{filename}"
-      end
-    end
-  end
-end