bridgetown-core 0.18.2 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306a26e30d93c885f8e9580f31df3f10757b8d686337ac851a33c354689be225
-  data.tar.gz: 2e258edc76ea89224865c9cbc48d9ae5fcd9dacd2070d99953c6f567644237ac
+  metadata.gz: 5a0a5aeb69553f660c93b0f0a4026696fb075fbbaee350dab4591d43efc2268d
+  data.tar.gz: 97a706bb02102be600a8b5462612249c2ee4cf366ee5f994b70c6047f7746c00
 SHA512:
-  metadata.gz: 9a03b2aaabcf0066e0cb634c95f9b5819db23b472887e1048b78e589c9815615986ed8bb943b77f8d272221448608a95f489d6db21508703dbf3123ec31623a1
-  data.tar.gz: 2fc8d22203172c03db70520f430292833360c0eb39c91dde1a8d17d498c726295a8bc7183310468f981e5d236fa31a26fc3a564beb6e8179922d3975db6f876e
+  metadata.gz: bb0ce9658edcf29ecd07cab05c0b3dd97cac66d710d7447257e16ce1df584d9257cd4cb9d0aaadac54a829918084ef00c90540d0b97d3437d4467719b8052130
+  data.tar.gz: d051bf13d11a911562854c3190a206c0a6b2b6c824be1ecf2786dde0766eb25b1fef8d0910b13795a574d2945bacbe175f818d85e68b52676788639285eec778

data/bridgetown-core.gemspec

@@ -52,4 +52,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("terminal-table",        "~> 1.8")
   s.add_runtime_dependency("thor",                  "~> 1.0")
   s.add_runtime_dependency("tilt",                  "~> 2.0")
+  s.add_runtime_dependency("webrick",               "~> 1.7")
 end

data/lib/bridgetown-core.rb

@@ -29,8 +29,12 @@ require "csv"
 require "json"
 
 # 3rd party
+require "active_support"
+require "active_support/core_ext/hash/keys"
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/string/inflections"
+require "active_support/core_ext/string/inquiry"
+require "active_support/core_ext/string/starts_ends_with"
 require "hash_with_dot_access"
 require "pathutil"
 require "addressable/uri"
@@ -44,12 +48,30 @@ require "i18n"
 require "faraday"
 require "thor"
 
+module HashWithDotAccess
+  class Hash # :nodoc:
+    def to_liquid
+      to_h.to_liquid
+    end
+  end
+end
+
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 # Create our little String subclass for Ruby Front Matter
 class Rb < String; end
 SafeYAML::OPTIONS[:whitelisted_tags] = ["!ruby/string:Rb"]
 
+if RUBY_VERSION.start_with?("3.0")
+  # workaround for Ruby 3 preview 2, maybe can remove later
+  # rubocop:disable Style/GlobalVars
+  old_verbose = $VERBOSE
+  $VERBOSE = nil
+  SafeYAML::SafeToRubyVisitor.const_set(:INITIALIZE_ARITY, 2)
+  $verbose = old_verbose
+  # rubocop:enable Style/GlobalVars
+end
+
 module Bridgetown
   # internal requires
   autoload :Cleaner,             "bridgetown-core/cleaner"
@@ -118,7 +140,7 @@ module Bridgetown
     # Tells you which Bridgetown environment you are building in so
     #   you can skip tasks if you need to.
     def environment
-      ENV["BRIDGETOWN_ENV"] || "development"
+      (ENV["BRIDGETOWN_ENV"] || "development").inquiry
     end
     alias_method :env, :environment
 

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

@@ -28,6 +28,9 @@ module Bridgetown
       class_option :"skip-yarn",
                    type: :boolean,
                    desc: "Skip 'yarn install'"
+      class_option :"use-postcss",
+                   type: :boolean,
+                   desc: "Create an empty PostCSS configuration instead of using Sass"
 
       DOCSURL = "https://bridgetownrb.com/docs"
 
@@ -47,6 +50,8 @@ module Bridgetown
         raise ArgumentError, "You must specify a path." if args.empty?
 
         new_site_path = File.expand_path(args.join(" "), Dir.pwd)
+        @site_name = new_site_path.split(File::SEPARATOR).last
+
         if preserve_source_location?(new_site_path, options)
           say_status :conflict, "#{new_site_path} exists and is not empty.", :red
           Bridgetown.logger.abort_with "Ensure #{new_site_path} is empty or else " \
@@ -67,7 +72,7 @@ module Bridgetown
       end
 
       def create_site(new_site_path)
-        directory ".", ".", exclude_pattern: %r!\.erb|DS_Store$!
+        directory ".", ".", exclude_pattern: %r!\.erb|DS_Store$|\.(s[ac]|c)ss$!
         FileUtils.chmod_R "u+w", new_site_path
 
         template(
@@ -75,6 +80,20 @@ module Bridgetown
           "src/_posts/#{Time.now.strftime("%Y-%m-%d")}-welcome-to-bridgetown.md"
         )
         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
+      end
+
+      def configure_sass
+        copy_file("frontend/styles/index.scss")
+      end
+
+      def configure_postcss
+        template("postcss.config.js.erb", "postcss.config.js")
+        copy_file("frontend/styles/index.css")
       end
 
       # After a new site has been created, print a success notification and

data/lib/bridgetown-core/converters/erb_templates.rb

@@ -101,6 +101,8 @@ module Bridgetown
       #
       # @return [String] The converted content.
       def convert(content, convertible)
+        return content if convertible.data[:template_engine] != "erb"
+
         erb_view = Bridgetown::ERBView.new(convertible)
 
         erb_renderer = Tilt::ErubiTemplate.new(
@@ -123,10 +125,13 @@ module Bridgetown
         if convertible.data[:template_engine] == "erb" ||
             (convertible.data[:template_engine].nil? &&
               @config[:template_engine] == "erb")
+          convertible.data[:template_engine] = "erb"
           return true
         end
 
-        super(ext)
+        super(ext).tap do |ext_matches|
+          convertible.data[:template_engine] = "erb" if ext_matches
+        end
       end
 
       def output_ext(ext)

data/lib/bridgetown-core/converters/liquid_templates.rb

@@ -23,7 +23,10 @@ module Bridgetown
       #
       # @return [String] The converted content.
       def convert(content, convertible)
+        return content if convertible.data[:template_engine] != "liquid"
+
         self.class.cached_partials ||= {}
+        @payload = nil
 
         @site = convertible.site
         if convertible.is_a?(Bridgetown::Layout)
@@ -53,9 +56,14 @@ module Bridgetown
       # rubocop: enable Metrics/AbcSize
 
       def matches(ext, convertible)
-        return true if convertible.render_with_liquid?
+        if convertible.render_with_liquid?
+          convertible.data[:template_engine] = "liquid"
+          return true
+        end
 
-        super(ext)
+        super(ext).tap do |ext_matches|
+          convertible.data[:template_engine] = "liquid" if ext_matches
+        end
       end
 
       def output_ext(ext)

data/lib/bridgetown-core/filters.rb

@@ -126,8 +126,8 @@ module Bridgetown
     # @return [String] a link unreadable for bots but will be recovered on focus or mouseover
     def obfuscate_link(input, prefix = "mailto")
       link = "<a href=\"#{prefix}:#{input}\">#{input}</a>"
-      script = "<script type=\"text/javascript\">document.currentScript.insertAdjacentHTML("
-      script += "beforebegin', '#{rot47(link)}'.replace(/[!-~]/g,"
+      script = "<script type=\"text/javascript\">document.currentScript.insertAdjacentHTML('"
+      script += "beforebegin', '#{rot47(link).gsub(%r!\\!, '\\\\\\')}'.replace(/[!-~]/g,"
       script += "function(c){{var j=c.charCodeAt(0);if((j>=33)&&(j<=126)){"
       script += "return String.fromCharCode(33+((j+ 14)%94));}"
       script += "else{return String.fromCharCode(j);}}}));</script>"

data/lib/bridgetown-core/page_without_a_file.rb

@@ -7,6 +7,9 @@ module Bridgetown
   # The class instance is basically just a bare-bones entity with just
   # attributes "dir", "name", "path", "url" defined on it.
   class PageWithoutAFile < Page
+    Bridgetown.logger.warn "NOTICE: the PageWithoutAFile class is deprecated and" \
+                           " will be removed in Bridgetown 0.20."
+
     def read_yaml(*)
       @data ||= {}
     end

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

@@ -6,7 +6,7 @@ module Bridgetown
 
     def initialize(site)
       @site = site
-      @layouts = {}
+      @layouts = HashWithDotAccess::Hash.new
     end
 
     def read

data/lib/bridgetown-core/ruby_template_view.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "digest"
-require "active_support/core_ext/hash/keys"
 
 module Bridgetown
   class RubyTemplateView

data/lib/bridgetown-core/utils/ruby_exec.rb

@@ -20,14 +20,14 @@ module Bridgetown
             v.each do |nested_k, nested_v|
               next unless nested_v.is_a?(Rb)
 
-              Bridgetown.logger.warn("Executing inline Ruby…", convertible.relative_path)
+              Bridgetown.logger.debug("Executing inline Ruby…", convertible.relative_path)
               convertible.data[k][nested_k] = run(nested_v, convertible, renderer)
-              Bridgetown.logger.warn("Inline Ruby completed!", convertible.relative_path)
+              Bridgetown.logger.debug("Inline Ruby completed!", convertible.relative_path)
             end
           else
-            Bridgetown.logger.warn("Executing inline Ruby…", convertible.relative_path)
+            Bridgetown.logger.debug("Executing inline Ruby…", convertible.relative_path)
             convertible.data[k] = run(v, convertible, renderer)
-            Bridgetown.logger.warn("Inline Ruby completed!", convertible.relative_path)
+            Bridgetown.logger.debug("Inline Ruby completed!", convertible.relative_path)
           end
         end
       end

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.18.2"
-  CODE_NAME = "Taylor Street"
+  VERSION = "0.19.0"
+  CODE_NAME = "Arbor Lodge"
 end

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

@@ -0,0 +1,11 @@
+<% if options["use-postcss"] %>
+import "index.css"
+<% else %>
+import "index.scss"
+<% end %>
+
+// Import all javascript files from src/_components
+const componentsContext = require.context("bridgetownComponents", true, /.js$/)
+componentsContext.keys().forEach(componentsContext)
+
+console.info("Bridgetown is loaded!")

data/lib/site_template/frontend/styles/index.css

@@ -0,0 +1,19 @@
+:root {
+  --body-background: #fafafa;
+  --body-color: #444;  
+}
+
+body {
+  background: var(--body-background);
+  color: var(--body-color);
+  font-family: sans-serif;
+}
+
+h1, nav, footer {
+  text-align: center;
+}
+
+main {
+  margin: 4rem auto;
+  max-width: 60rem;
+}

data/lib/site_template/{package.json → package.json.erb}

@@ -1,13 +1,14 @@
 {
-  "name": "new-bridgetown-site",
+  "name": "<%= @site_name %>",
   "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 webpack-build && yarn build",
+    "deploy": "yarn clean && yarn webpack-build && yarn build",
     "sync": "node sync.js",
     "start": "node start.js"
   },
@@ -20,14 +21,20 @@
     "babel-loader": "^8.1.0",
     "browser-sync": "^2.26.7",
     "concurrently": "^5.2.0",
-    "css-loader": "^3.4.2",
-    "file-loader": "^6.0.0",
-    "mini-css-extract-plugin": "^0.9.0",
+    "css-loader": "^4.3.0",
+    "file-loader": "^6.2.0",
+    "mini-css-extract-plugin": "^1.3.1",
+    <% if options["use-postcss"] %>
+    "postcss": "^8.1.9",
+    "postcss-flexbugs-fixes": "^4.1.0",
+    "postcss-loader": "^4.1.0",
+    "postcss-preset-env": "^6.7.0",
+    <% else %>
     "node-sass": "^4.13.1",
-    "sass-loader": "^8.0.2",
-    "style-loader": "^1.1.3",
-    "webpack": "^4.42.1",
+    "sass-loader": "^8.0.2",    
+    <% end %>
+    "webpack": "^4.44.2",
     "webpack-cli": "^3.3.11",
-    "webpack-manifest-plugin": "^2.2.0"
+    "webpack-manifest-plugin": "^2.1.0"
   }
 }

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

@@ -0,0 +1,11 @@
+module.exports = {  
+  plugins: {
+    'postcss-flexbugs-fixes': {},
+    'postcss-preset-env': {
+      autoprefixer: {
+        flexbox: 'no-2009'
+      },
+      stage: 3
+    }
+  }
+}

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

@@ -1,3 +1,3 @@
 <footer>
-  Contact me at {{ metadata.email }}
+  Contact me at <a href="mailto:{{ metadata.email }}">{{ metadata.email }}</a>
 </footer>

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

@@ -23,4 +23,4 @@ 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 Community Forum](https://community.bridgetownrb.com).
+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 → webpack.config.js.erb}

@@ -18,6 +18,14 @@ module.exports = {
   },
   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({
@@ -48,6 +56,21 @@ module.exports = {
           },
         },
       },
+      <% if options["use-postcss"] %>
+      {
+        test: /\.(s[ac]|c)ss$/,
+        use: [
+          MiniCssExtractPlugin.loader,
+          {
+            loader: "css-loader",
+            options: {
+              importLoaders: 1
+            }
+          },
+          "postcss-loader"
+        ],
+      },      
+      <% else %>
       {
         test: /\.(s[ac]|c)ss$/,
         use: [
@@ -65,6 +88,7 @@ module.exports = {
           },
         ],
       },
+      <% end %>
       {
         test: /\.woff2?$|\.ttf$|\.eot$|\.svg$/,
         loader: "file-loader",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.19.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -304,6 +304,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: Bridgetown is a Webpack-aware, Ruby-powered static site generator for
   the modern Jamstack era
 email: maintainers@bridgetownrb.com
@@ -435,11 +449,13 @@ files:
 - lib/site_template/.gitignore
 - lib/site_template/Gemfile.erb
 - lib/site_template/bridgetown.config.yml
-- lib/site_template/frontend/javascript/index.js
+- lib/site_template/frontend/javascript/index.js.erb
+- lib/site_template/frontend/styles/index.css
 - lib/site_template/frontend/styles/index.scss
-- lib/site_template/package.json
+- lib/site_template/package.json.erb
 - lib/site_template/plugins/builders/.keep
 - lib/site_template/plugins/site_builder.rb
+- lib/site_template/postcss.config.js.erb
 - lib/site_template/src/404.html
 - lib/site_template/src/_components/footer.liquid
 - lib/site_template/src/_components/head.liquid
@@ -457,7 +473,7 @@ files:
 - lib/site_template/src/posts.md
 - lib/site_template/start.js
 - lib/site_template/sync.js
-- lib/site_template/webpack.config.js
+- lib/site_template/webpack.config.js.erb
 homepage: https://www.bridgetownrb.com
 licenses:
 - MIT

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

@@ -1,3 +0,0 @@
-import "../styles/index.scss"
-
-console.info("Bridgetown is loaded!")