bridgetown-core 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0906f551762562da1c9663539e264598ff83e4047206e443f333a12cfc3a59a4'
-  data.tar.gz: bd8d4b58c92d6fbb7709e5022e4cd114dcea6c4de9cfb73e6992666585035f01
+  metadata.gz: 73f4610f5a38cc797e719301a59ce3c40ceef246702f3f20f6608a01cb05b23f
+  data.tar.gz: 749f92dfd628f60c5cce698b009aa6aed110fc48daa921b523b50f2617d7987e
 SHA512:
-  metadata.gz: eb2a4a8592cb90a72d68c4f9cef2551c5fd2101699f2e39fe15f5ac0cc9ae6e3465128651a03a1de4cad327699001b8e5774c073612e5a533585f7152bf6518c
-  data.tar.gz: 0d81b4b78a7877ab1ad308ceb9de3a723a05d42b8685392586524d3a1028704c3b6ad30deb6e82c413f915f80b188589cf7a48a590965cf69cafe47bc80ed250
+  metadata.gz: b1707b9be0641a5814fb6817633c5013e38aeb7293fb353e4cb6f9cde1cab7d09c3f91f3237fbcf435659f2cc61c8345d4c43162252b04308847c56233704df7
+  data.tar.gz: 3e859ebb2c76bacacbb87c53f803277042560d6e9579911912504b5dd470f22a8be314ad440134fd97c8558d8757b0d7ba6988466804031934d7aedfc6ea6afc

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

@@ -26,8 +26,8 @@ module Bridgetown
           # Adjust verbosity quickly
           Bridgetown.logger.adjust_verbosity(options)
 
-          Bridgetown.logger.info "#", "Your Bridgetown #{Bridgetown::VERSION}" \
-                                      " build is about to begin…"
+          Bridgetown.logger.info "Starting:", "Bridgetown v#{Bridgetown::VERSION.magenta}" \
+                                      " (codename \"#{Bridgetown::CODE_NAME.yellow}\")"
 
           options = configuration_from_options(options)
           @site = Bridgetown::Site.new(options)
@@ -66,7 +66,8 @@ module Bridgetown
                                  (incremental ? "enabled" : "disabled. Enable with --incremental")
           Bridgetown.logger.info "Generating…"
           process_site(@site)
-          Bridgetown.logger.info "Done! 🎉", "Completed in #{(Time.now - t).round(3)} seconds."
+          Bridgetown.logger.info "Done! 🎉", "#{"Completed".green} in less than" \
+                                 " #{(Time.now - t).ceil(2)} seconds."
         end
 
         # Private: Watch for file changes and rebuild the site.

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

@@ -24,9 +24,10 @@ module Bridgetown
         # TODO: is there a way to add a unit test for this command?
         # rubocop:disable Style/GlobalVars, Metrics/AbcSize, Metrics/MethodLength
         def process(options)
-          Bridgetown.logger.info "Starting Bridgetown #{Bridgetown::VERSION} console…"
+          Bridgetown.logger.info "Starting:", "Bridgetown v#{Bridgetown::VERSION}" \
+                                      " (codename \"#{Bridgetown::CODE_NAME}\")" \
+                                      " console…"
           site = Bridgetown::Site.new(configuration_from_options(options))
-          Bridgetown.logger.info "Loading site…"
           site.reset
           site.read
           site.generate
@@ -37,7 +38,7 @@ module Bridgetown
           irb = IRB::Irb.new(workspace)
           IRB.conf[:MAIN_CONTEXT] = irb.context
           eval("site = $BRIDGETOWN_SITE", workspace.binding, __FILE__, __LINE__)
-          Bridgetown.logger.info "", "Now loaded as " + "site".cyan + " variable."
+          Bridgetown.logger.info "Console:", "Now loaded as " + "site".cyan + " variable."
 
           trap("SIGINT") do
             irb.signal_handle

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

@@ -15,6 +15,7 @@ module Bridgetown
 
             c.option "force", "--force", "Force creation even if PATH already exists"
             c.option "skip-bundle", "--skip-bundle", "Skip 'bundle install'"
+            c.option "skip-yarn", "--skip-yarn", "Skip 'yarn install'"
 
             c.action do |args, options|
               Bridgetown::Commands::New.process(args, options)
@@ -109,32 +110,41 @@ module Bridgetown
           "src/_posts/0000-00-00-welcome-to-bridgetown.md.erb"
         end
 
-        # After a new blog has been created, print a success notification and
-        # then automatically execute bundle install from within the new blog dir
-        # unless the user opts to generate a blank blog or skip 'bundle install'.
-        # rubocop:disable Metrics/AbcSize #
+        # After a new site has been created, print a success notification and
+        # then automatically execute bundle install from within the new site dir
+        # unless the user opts to skip 'bundle install'.
+        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength #
         def after_install(path, cli_path, options = {})
-          unless options["blank"] || options["skip-bundle"]
+          logger = Bridgetown.logger
+          git_init path
+
+          unless options["skip-bundle"]
             begin
               require "bundler"
               bundle_install path
             rescue LoadError
-              Bridgetown.logger.info "Could not load Bundler. Bundle install skipped."
+              logger.info "Could not load Bundler. Bundle install skipped."
             end
           end
 
-          git_init path
+          yarn_install path unless options["skip-yarn"]
+
+          yarn_start = "yarn start"
 
-          Bridgetown.logger.info "Success!".green, "🎉 Your new Bridgetown site was" \
-                                  " generated in #{cli_path.cyan}."
-          Bridgetown.logger.info "Execute cd #{cli_path.cyan} to get started."
-          Bridgetown.logger.info "You'll probably also want to #{"yarn install".cyan}" \
-                                  " to load in your frontend assets."
-          Bridgetown.logger.info "Check out our online documentation for" \
-                                  " next steps: #{DOCSURL.cyan}"
-          Bridgetown.logger.info "Bundle install skipped." if options["skip-bundle"]
+          logger.info "Success!".green, "🎉 Your new Bridgetown site was" \
+                      " generated in #{cli_path.cyan}."
+          if options["skip-yarn"]
+            logger.info "You can now #{"cd".cyan} #{cli_path.cyan} to get started."
+            logger.info "You'll probably also want to #{"yarn install".cyan}" \
+                        " to load in your frontend assets."
+          else
+            logger.info "You can now #{"cd".cyan} and run #{yarn_start.cyan} to get started."
+          end
+          logger.info "Then check out our online documentation for" \
+                      " next steps: #{DOCSURL.cyan}"
+          logger.info "Bundle install skipped." if options["skip-bundle"]
         end
-        # rubocop:enable Metrics/AbcSize #
+        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength #
 
         def bundle_install(path)
           Bridgetown.logger.info "Running bundle install in #{path.cyan}..."
@@ -159,6 +169,22 @@ module Bridgetown
           end
         rescue SystemCallError
         end
+
+        def yarn_install(path)
+          Bridgetown.logger.info "Running yarn install in #{path.cyan}..."
+          Dir.chdir(path) do
+            _process, output = Bridgetown::Utils::Exec.run("yarn", "install")
+            output.to_s.each_line do |line|
+              next if line.to_s.empty? ||
+                line.strip.start_with?("warning ") ||
+                line.include?("No lockfile found")
+
+              Bridgetown.logger.info("Yarn:".green, line.strip)
+            end
+          end
+        rescue SystemCallError
+          Bridgetown.logger.info "Could not load yarn. yarn install skipped."
+        end
       end
     end
   end

data/lib/bridgetown-core/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.11.2"
+  VERSION = "0.12.0"
+  CODE_NAME = "Lovejoy"
 end

data/lib/bridgetown-core/watcher.rb

@@ -125,7 +125,8 @@ module Bridgetown
     def process(site, time)
       begin
         site.process
-        Bridgetown.logger.info "Done! 🎉", "Completed in #{(Time.now - time).round(3)} seconds."
+        Bridgetown.logger.info "Done! 🎉", "#{"Completed".green} in less than" \
+                               " #{(Time.now - time).ceil(2)} seconds."
       rescue StandardError => e
         Bridgetown.logger.warn "Error:", e.message
         Bridgetown.logger.warn "Error:", "Run bridgetown build --trace for more information."

data/lib/site_template/package.json

@@ -3,9 +3,13 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "build": "webpack --mode production",
-    "deploy": "yarn build && bundle exec bridgetown build",
-    "dev": "webpack --mode development -w"
+    "build": "bundle exec bridgetown build",
+    "serve": "bundle exec bridgetown serve",
+    "webpack-build": "webpack --mode production",
+    "webpack-dev": "webpack --mode development -w",
+    "deploy": "yarn webpack-build && yarn build",
+    "sync": "node sync.js",
+    "start": "node start.js"
   },
   "devDependencies": {
     "@babel/core": "^7.9.0",
@@ -13,6 +17,8 @@
     "@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": "^3.4.2",
     "file-loader": "^6.0.0",
     "mini-css-extract-plugin": "^0.9.0",

data/lib/site_template/start.js

@@ -0,0 +1,17 @@
+const concurrently = require('concurrently');
+
+// By default, configure Bridgetown to use port 4001 so Browsersync can use 4000
+// See also Browsersync settings in sync.js
+const port = 4001
+
+/////////////////
+// Concurrently
+/////////////////
+concurrently([
+  { command: "yarn webpack-dev", name: "Webpack", prefixColor: "yellow"},
+  { command: "sleep 4; yarn serve --port " + port, name: "Bridgetown", prefixColor: "green"},
+  { command: "sleep 8; yarn sync", name: "Live", prefixColor: "blue"}
+], {
+  restartTries: 3,
+  killOthers: ['failure', 'success'],
+}).then(() => {}, () => {});

data/lib/site_template/sync.js

@@ -0,0 +1,35 @@
+const browserSync = require("browser-sync").create();
+
+// You can change these configuration values:
+const proxy = "http://localhost:4001"
+const port = 4000
+const uiPort = 4002
+
+////////////////
+// Browsersync
+////////////////
+browserSync.init({
+  open: false,
+  notify: false,
+  proxy: proxy,
+  port: port,
+  files: "output/index.html",
+  ghostMode: {
+    clicks: false,
+    forms: false,
+    scroll: false,
+  },
+  reloadDelay: 0,
+  injectChanges: false,
+  ui: {
+    port: uiPort
+  },
+  snippetOptions: {
+    rule: {
+      match: /<\/head>/i,
+      fn: function (snippet, match) {
+        return snippet + match;
+      },
+    },
+  },
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -281,7 +281,9 @@ files:
 - lib/site_template/frontend/javascript/index.js
 - lib/site_template/frontend/styles/index.scss
 - lib/site_template/package.json
+- lib/site_template/plugins/.keep
 - lib/site_template/src/404.html
+- lib/site_template/src/_components/.keep
 - lib/site_template/src/_data/site_metadata.yml
 - lib/site_template/src/_includes/footer.html
 - lib/site_template/src/_includes/head.html
@@ -293,6 +295,8 @@ files:
 - lib/site_template/src/_posts/0000-00-00-welcome-to-bridgetown.md.erb
 - lib/site_template/src/about.md
 - lib/site_template/src/index.md
+- lib/site_template/start.js
+- lib/site_template/sync.js
 - lib/site_template/webpack.config.js
 homepage: https://bridgetownrb.com
 licenses: