bridgetown-core 1.0.0 → 1.1.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdb62333635d80ceb9561a0cd9be68f0220ea729c8ac4505bb8e4460894075e1
-  data.tar.gz: f7377127b4d64846e694d8ba4c032706ed161ea1595cf8dbf3eca3d2b6e4692d
+  metadata.gz: afc674e5aa40d66a2b9e4f24c0aad39108f47e70c8d4756cbfa86623ed2dc7e0
+  data.tar.gz: 4bf462c506c3fcdd09a4750bedae19cb2ee4ff429b57a6266dd56d62645d4926
 SHA512:
-  metadata.gz: 051a34337053c1370745d37a7cc3def36e1623193e4c03e0b1006d06280303ad5442c289465185314f916dbcf2aa1b1123990ca196041b03bf3804a03b36f695
-  data.tar.gz: d5adcc3f8c7c7938bbc220329c002c7cea281f4e21f8ea2bab685dabaffe48c5acca3998482d1e0ec6d0c7c172751c0c6b34481821f51b5d1ccc687b137e55a5
+  metadata.gz: 5baaa3f133d0e1cbd5e7e972645f107361088d9d11b5bebb38374573d898b67a07b318b4d19e1e5731a696dafe88a3b2ded6ba1c068b869e5bad750200905417
+  data.tar.gz: 4a88c972c98f54ac8b98538fec81f907797cb423f6fa89907cab21a58c29d5961b5e6bf156a3d2846a6d2fd831656696fa9a2afd76d2c2a6f3f5b62663db2c8d

data/.rubocop.yml

@@ -11,12 +11,17 @@ AllCops:
     - vendor/**/*
     - tmp/**/*
     - test/source/**/*
-    - test/resources/src/_pages/*.rb
+    - test/resources/src/**/*.rb
+    - lib/bridgetown-core/commands/base.rb
+    - lib/bridgetown-core/commands/plugins.rb
+    - lib/bridgetown-core/configurations/ruby2js/**/*
+    - lib/bridgetown-core/rack/roda.rb
     - lib/site_template/TEMPLATES/**/*
     - lib/site_template/Rakefile
     - lib/site_template/config.ru
     - lib/site_template/config/**/*
     - lib/site_template/plugins/site_builder.rb
+    - lib/site_template/server/roda_app.rb
 
 Lint/ConstantDefinitionInBlock:
   Exclude:

data/bridgetown-core.gemspec

@@ -44,7 +44,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("kramdown-parser-gfm",   "~> 1.0")
   s.add_runtime_dependency("liquid",                "~> 5.0")
   s.add_runtime_dependency("listen",                "~> 3.0")
-  s.add_runtime_dependency("rack-indifferent",      ">= 1.2.0")
   s.add_runtime_dependency("rake",                  ">= 13.0")
   s.add_runtime_dependency("roda",                  "~> 3.46")
   s.add_runtime_dependency("rouge",                 "~> 3.0")

data/lib/bridgetown-core/collection.rb

@@ -20,11 +20,11 @@ module Bridgetown
     end
 
     def builtin?
-      label.in? %w(posts pages data).freeze
+      @is_builtin ||= label.in?(%w(posts pages data).freeze)
     end
 
     def data?
-      label == "data"
+      @is_data ||= label == "data"
     end
 
     # Fetch the Resources in this collection.
@@ -215,7 +215,7 @@ module Bridgetown
     # Used by Resource's permalink processor
     # @return [String]
     def default_permalink
-      metadata.fetch("permalink", "/:collection/:path/")
+      metadata.fetch("permalink", "/:locale/:collection/:path/")
     end
 
     # Extract options for this collection from the site configuration.
@@ -270,32 +270,29 @@ module Bridgetown
 
     # Read in resource from repo path
     # @param full_path [String]
-    def read_resource(full_path, manifest: nil) # rubocop:todo Metrics/AbcSize
-      scheme = manifest ? "plugin" : "repo"
-      id = +"#{scheme}://#{label}.collection/"
-      id += "#{manifest.origin}/" if manifest
-      id += Addressable::URI.escape(
-        Pathname(full_path).relative_path_from(
-          manifest ? Pathname(manifest.content) : Pathname(site.source)
-        ).to_s
-      ).gsub("#", "%23")
-      model = Bridgetown::Model::Base.find(id)
-
-      if model.attributes.key?(:locale) && model.locale.to_sym == :multi
+    def read_resource(full_path, manifest: nil)
+      model_relative_path = relative_model_path_for(full_path, manifest: manifest)
+      model = Bridgetown::Model::Base.find(model_id_from_relative_path(model_relative_path,
+                                                                       manifest: manifest))
+
+      if model_is_multi_locale?(model, model_relative_path)
         site.config.available_locales.each do |locale|
           model.locale = locale
-          add_model_resource model
+          add_resource_from_model model
         end
         return
       end
 
-      add_model_resource model
+      add_resource_from_model model
     end
 
-    def add_model_resource(model)
-      resource = model.to_resource.read!
-      resources << resource if site.config.unpublished || resource.published?
+    # @param model [Bridgetown::Model::Base]
+    def add_resource_from_model(model)
+      model.to_resource.read!.tap do |resource|
+        resources << resource if resource.publishable?
+      end
     end
+    alias_method :add_model_resource, :add_resource_from_model
 
     def sort_resources!
       if metadata["sort_by"].is_a?(String)
@@ -346,8 +343,8 @@ module Bridgetown
     end
 
     def order_with_warning(sort_key, resource, order)
-      Bridgetown.logger.warn "Sort warning:", "'#{sort_key}' not defined in" \
-                                              " #{resource.relative_path}"
+      Bridgetown.logger.warn "Sort warning:", "'#{sort_key}' not defined in " \
+                                              "#{resource.relative_path}"
       order
     end
 
@@ -365,5 +362,25 @@ module Bridgetown
         self
       )
     end
+
+    def relative_model_path_for(full_path, manifest: nil)
+      Pathname(full_path).relative_path_from(
+        manifest ? Pathname(manifest.content) : Pathname(site.source)
+      ).to_s
+    end
+
+    def model_id_from_relative_path(model_relative_path, manifest: nil)
+      scheme = manifest ? "plugin" : "repo"
+      id = +"#{scheme}://#{label}.collection/"
+      id += "#{manifest.origin}/" if manifest
+      id += Addressable::URI.escape(model_relative_path).gsub("#", "%23")
+      id
+    end
+
+    def model_is_multi_locale?(model, model_relative_path)
+      (model.attributes.key?(:locale) && model.locale.to_sym == :multi) ||
+        File.extname(File.basename(model_relative_path, ".*")) == ".multi" ||
+        site.frontmatter_defaults.all(model_relative_path, label.to_sym)["locale"].to_s == "multi"
+    end
   end
 end

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

@@ -58,9 +58,9 @@ module Bridgetown
         automation_command = args.empty? ? "bridgetown.automation.rb" : args[0]
 
         if args.empty? && !File.exist?("bridgetown.automation.rb")
-          raise ArgumentError, "You must specify a path or a URL," \
-                               " or add bridgetown.automation.rb to the" \
-                               " current folder."
+          raise ArgumentError, "You must specify a path or a URL, " \
+                               "or add bridgetown.automation.rb to the " \
+                               "current folder."
         end
 
         Bridgetown.with_unbundled_env do

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

@@ -22,8 +22,8 @@ module Bridgetown
                    desc: "Watch for changes and rebuild"
 
       def self.print_startup_message
-        Bridgetown.logger.info "Starting:", "Bridgetown v#{Bridgetown::VERSION.magenta}" \
-                                            " (codename \"#{Bridgetown::CODE_NAME.yellow}\")"
+        Bridgetown.logger.info "Starting:", "Bridgetown v#{Bridgetown::VERSION.magenta} " \
+                                            "(codename \"#{Bridgetown::CODE_NAME.yellow}\")"
       end
 
       # Build your bridgetown site
@@ -45,8 +45,8 @@ module Bridgetown
         @site = Bridgetown::Site.new(config_options)
 
         if config_options.fetch("skip_initial_build", false)
-          Bridgetown.logger.warn "Build Warning:", "Skipping the initial build." \
-                                                   " This may result in an out-of-date site."
+          Bridgetown.logger.warn "Build Warning:", "Skipping the initial build. " \
+                                                   "This may result in an out-of-date site."
         else
           build_site(config_options)
         end
@@ -77,8 +77,8 @@ module Bridgetown
         end
         Bridgetown.logger.info "Generating…"
         @site.process
-        Bridgetown.logger.info "Done! 🎉", "#{"Completed".bold.green} in less than" \
-                                          " #{(Time.now - t).ceil(2)} seconds."
+        Bridgetown.logger.info "Done! 🎉", "#{"Completed".bold.green} in less than " \
+                                          "#{(Time.now - t).ceil(2)} seconds."
 
         return unless config_options[:using_puma]
 

data/lib/bridgetown-core/commands/concerns/actions.rb

@@ -54,7 +54,8 @@ module Bridgetown
 
       def add_bridgetown_plugin(gemname, version: nil)
         version = " -v \"#{version}\"" if version
-        run "bundle add #{gemname}#{version} -g bridgetown_plugins"
+        run "bundle add #{gemname}#{version} -g bridgetown_plugins",
+            env: { "BUNDLE_GEMFILE" => File.join(destination_root, "Gemfile") }
       rescue SystemExit
         say_status :run, "Gem not added due to bundler error", :red
       end
@@ -79,7 +80,7 @@ module Bridgetown
 
       def determine_remote_filename(arg)
         if arg.end_with?(".rb")
-          arg.split("/").yield_self do |segments|
+          arg.split("/").then do |segments|
             arg.sub!(%r!/#{segments.last}$!, "")
             segments.last
           end

data/lib/bridgetown-core/commands/concerns/build_options.rb

@@ -21,8 +21,8 @@ module Bridgetown
                            desc: "Destination directory (defaults to output)"
         klass.class_option :root_dir,
                            aliases: "-r",
-                           desc: "The top-level root folder" \
-                                 " where config files are located"
+                           desc: "The top-level root folder " \
+                                 "where config files are located"
         klass.class_option :plugins_dir,
                            aliases: "-p",
                            type: :array,

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

@@ -60,7 +60,7 @@ module Bridgetown
 
       def configurations
         inside self.class.source_root do
-          return Dir.glob("*.rb").map { |file| file.sub(".rb", "") }
+          return Dir.glob("*.rb").map { |file| file.sub(".rb", "") }.sort
         end
       end
 

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

@@ -64,9 +64,9 @@ module Bridgetown
         require "irb/ext/save-history"
         require "amazing_print" unless options[:"bypass-ap"]
 
-        Bridgetown.logger.info "Starting:", "Bridgetown v#{Bridgetown::VERSION.magenta}" \
-                                            " (codename \"#{Bridgetown::CODE_NAME.yellow}\")" \
-                                            " console…"
+        Bridgetown.logger.info "Starting:", "Bridgetown v#{Bridgetown::VERSION.magenta} " \
+                                            "(codename \"#{Bridgetown::CODE_NAME.yellow}\") " \
+                                            "console…"
         Bridgetown.logger.info "Environment:", Bridgetown.environment.cyan
         site = Bridgetown::Site.new(configuration_with_overrides(options))
 
@@ -80,8 +80,8 @@ module Bridgetown
         IRB.conf[:MAIN_CONTEXT] = irb.context
         Bridgetown.logger.info "Console:", "Your site is now available as #{"site".cyan}"
         Bridgetown.logger.info "",
-                               "You can also access #{"collections".cyan} or perform a" \
-                               " #{"reload!".cyan}"
+                               "You can also access #{"collections".cyan} or perform a " \
+                               "#{"reload!".cyan}"
 
         trap("SIGINT") do
           irb.signal_handle

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

@@ -62,8 +62,8 @@ module Bridgetown
           next unless paths.size > 1
 
           conflicting_urls = true
-          Bridgetown.logger.warn "Conflict:", "The URL '#{url}' is the destination" \
-                                              " for the following pages: #{paths.join(", ")}"
+          Bridgetown.logger.warn "Conflict:", "The URL '#{url}' is the destination " \
+                                              "for the following pages: #{paths.join(", ")}"
         end
         conflicting_urls
       end
@@ -77,8 +77,8 @@ module Bridgetown
           urls_only_differ_by_case = true
           Bridgetown.logger.warn(
             "Warning:",
-            "The following URLs only differ by case. On a case-insensitive file system one of the" \
-            " URLs will be overwritten by the other: #{real_urls.join(", ")}"
+            "The following URLs only differ by case. On a case-insensitive file system one of " \
+            "the URLs will be overwritten by the other: #{real_urls.join(", ")}"
           )
         end
         urls_only_differ_by_case
@@ -121,7 +121,7 @@ module Bridgetown
       def url_exists?(url)
         return true unless url.nil? || url.empty?
 
-        Bridgetown.logger.warn "Warning:", "You didn't set an URL in the config file, "\
+        Bridgetown.logger.warn "Warning:", "You didn't set an URL in the config file, " \
                                            "you may encounter problems with some plugins."
         false
       end
@@ -132,7 +132,7 @@ module Bridgetown
       # Addressable::URI#parse only raises a TypeError
       # https://git.io/vFfbx
       rescue TypeError
-        Bridgetown.logger.warn "Warning:", "The site URL does not seem to be valid, "\
+        Bridgetown.logger.warn "Warning:", "The site URL does not seem to be valid, " \
                                            "check the value of `url` in your config file."
         false
       end
@@ -140,7 +140,7 @@ module Bridgetown
       def url_absolute(url)
         return true if url.is_a?(String) && Addressable::URI.parse(url).absolute?
 
-        Bridgetown.logger.warn "Warning:", "Your site URL does not seem to be absolute, "\
+        Bridgetown.logger.warn "Warning:", "Your site URL does not seem to be absolute, " \
                                            "check the value of `url` in your config file."
         false
       end

data/lib/bridgetown-core/commands/esbuild/esbuild.defaults.js.erb

@@ -11,11 +11,33 @@
 const path = require("path")
 const fsLib = require("fs")
 const fs = fsLib.promises
+const { pathToFileURL, fileURLToPath } = require("url")
 const glob = require("glob")
 const postcss = require("postcss")
 const postCssImport = require("postcss-import")
 const readCache = require("read-cache")
 
+// Detect if an NPM package is available
+const moduleAvailable = name => {
+  try {
+    require.resolve(name)
+    return true
+  } catch (e) { }
+  return false
+}
+
+// Generate a Source Map URL (used by the Sass plugin)
+const generateSourceMappingURL = sourceMap => {
+  const data = Buffer.from(JSON.stringify(sourceMap), "utf-8").toString("base64")
+  return `/*# sourceMappingURL=data:application/json;charset=utf-8;base64,${data} */`
+}
+
+// Import Sass if available
+let sass
+if (moduleAvailable("sass")) {
+  sass = require("sass")
+}
+
 // Glob plugin derived from:
 // https://github.com/thomaschaaf/esbuild-plugin-import-glob
 // https://github.com/xiaohui-zhangxh/jsbundling-rails/commit/b15025dcc20f664b2b0eb238915991afdbc7cb58
@@ -61,24 +83,23 @@ const importGlobPlugin = () => ({
   },
 })
 
-const postCssPlugin = (options) => ({
+// Plugin for PostCSS
+const postCssPlugin = (options, configuration) => ({
   name: "postcss",
   async setup(build) {
     // Process .css files with PostCSS
-    build.onLoad({ filter: /\.(css)$/ }, async (args) => {
+    build.onLoad({ filter: (configuration.filter || /\.css$/) }, async (args) => {
       const additionalFilePaths = []
       const css = await fs.readFile(args.path, "utf8")
 
       // Configure import plugin so PostCSS can properly resolve `@import`ed CSS files
       const importPlugin = postCssImport({
-        filter: itemPath => {
-          // We'll want to track any imports later when in watch mode
-          additionalFilePaths.push(path.resolve(path.dirname(args.path), itemPath))
-          return true
-        },
+        filter: itemPath => !itemPath.startsWith("/"), // ensure it doesn't try to import source-relative paths
         load: async filename => {
           let contents = await readCache(filename, "utf-8")
           const filedir = path.dirname(filename)
+          // We'll want to track any imports later when in watch mode:          
+          additionalFilePaths.push(filename)
 
           // We need to transform `url(...)` in imported CSS so the filepaths are properly
           // relative to the entrypoint. Seems icky to have to hack this! C'est la vie...
@@ -106,6 +127,65 @@ const postCssPlugin = (options) => ({
   },
 })
 
+// Plugin for Sass
+const sassPlugin = (options) => ({
+  name: "sass",
+  async setup(build) {
+    // Process .scss and .sass files with Sass
+    build.onLoad({ filter: /\.(sass|scss)$/ }, async (args) => {
+      if (!sass) {
+        console.error("error: Sass is not installed. Try running `yarn add sass` and then building again.")
+        return
+      }
+
+      const modulesFolder = pathToFileURL("node_modules/")
+
+      const localOptions = {
+        importers: [{
+          // An importer that redirects relative URLs starting with "~" to
+          // `node_modules`.
+          findFileUrl(url) {
+            if (!url.startsWith('~')) return null
+            return new URL(url.substring(1), modulesFolder)
+          }
+        }],
+        sourceMap: true,
+        ...options
+      }
+      const result = sass.compile(args.path, localOptions)
+
+      const watchPaths = result.loadedUrls
+        .filter((x) => x.protocol === "file:" && !x.pathname.startsWith(modulesFolder.pathname))
+        .map((x) => x.pathname)
+
+      let cssOutput = result.css.toString()
+
+      if (result.sourceMap) {
+        const basedir = process.cwd()
+        const sourceMap = result.sourceMap
+
+        const promises = sourceMap.sources.map(async source => {
+          const sourceFile = await fs.readFile(fileURLToPath(source), "utf8")
+          return sourceFile
+        })
+        sourceMap.sourcesContent = await Promise.all(promises)
+
+        sourceMap.sources = sourceMap.sources.map(source => {
+          return path.relative(basedir, fileURLToPath(source))
+        })
+
+        cssOutput += '\n' + generateSourceMappingURL(sourceMap)
+      }
+
+      return {
+        contents: cssOutput,
+        loader: "css",
+        watchFiles: [args.path, ...watchPaths],
+      }
+    })
+  },
+})
+
 // Set up defaults and generate frontend bundling manifest file
 const bridgetownPreset = (outputFolder) => ({
   name: "bridgetownPreset",
@@ -151,9 +231,9 @@ const bridgetownPreset = (outputFolder) => ({
           // We have an entrypoint!
           manifest[stripPrefix(value.entryPoint)] = outputPath
           entrypoints.push([outputPath, fileSize(key)])
-        } else if (key.match(/index(\.js)?\.[^-.]*\.css/) && inputs.find(item => item.endsWith("index.css"))) {
+        } else if (key.match(/index(\.js)?\.[^-.]*\.css/) && inputs.find(item => item.match(/\.(s?css|sass)$/))) {
           // Special treatment for index.css
-          manifest[stripPrefix(inputs.find(item => item.endsWith("index.css")))] = outputPath
+          manifest[stripPrefix(inputs.find(item => item.match(/\.(s?css|sass)$/)))] = outputPath
           entrypoints.push([outputPath, fileSize(key)])
         } else if (inputs.length > 0) {
           // Naive implementation, we'll just grab the first input and hope it's accurate
@@ -182,9 +262,12 @@ const postCssConfig = postcssrc.sync()
 module.exports = (outputFolder, esbuildOptions) => {
   esbuildOptions.plugins = esbuildOptions.plugins || []
   // Add the PostCSS & glob plugins to the top of the plugin stack
-  esbuildOptions.plugins.unshift(postCssPlugin(postCssConfig))
+  esbuildOptions.plugins.unshift(postCssPlugin(postCssConfig, esbuildOptions.postCssPluginConfig || {}))
+  if (esbuildOptions.postCssPluginConfig) delete esbuildOptions.postCssPluginConfig
   esbuildOptions.plugins.unshift(importGlobPlugin())
-  // Add the Bridgetown preset to the bottom of the plugin stack
+  // Add the Sass plugin
+  esbuildOptions.plugins.push(sassPlugin(esbuildOptions.sassOptions || {}))
+  // Add the Bridgetown preset
   esbuildOptions.plugins.push(bridgetownPreset(outputFolder))
 
   // esbuild, take it away!
@@ -200,7 +283,7 @@ module.exports = (outputFolder, esbuildOptions) => {
       ".ttf": "file",
       ".eot": "file",
     },
-    resolveExtensions: [".tsx",".ts",".jsx",".js",".css",".json",".js.rb"],
+    resolveExtensions: [".tsx", ".ts", ".jsx", ".js", ".css", ".scss", ".sass", ".json", ".js.rb"],
     nodePaths: ["frontend/javascript", "frontend/styles"],
     watch: process.argv.includes("--watch"),
     minify: process.argv.includes("--minify"),

data/lib/bridgetown-core/commands/esbuild/migrate-from-webpack.rb

@@ -2,11 +2,6 @@
 
 # rubocop:disable Layout/LineLength
 
-if package_json["devDependencies"].key?("sass")
-  say "Unable to migrate, project uses Sass. Please migrate to PostCSS first before migrating to esbuild."
-  return
-end
-
 remove_file "webpack.config.js"
 remove_file "config/webpack.defaults.js"
 
@@ -16,7 +11,7 @@ default_postcss_config = File.expand_path("../../../site_template/postcss.config
 template default_postcss_config, "postcss.config.js"
 
 unless Bridgetown.environment.test?
-  required_packages = %w(esbuild glob postcss postcss-flexbugs-fixes postcss-preset-env postcss-import postcss-load-config)
+  required_packages = %w(esbuild glob postcss postcss-flexbugs-fixes postcss-preset-env postcss-import postcss-load-config@3.1.4)
   redundant_packages = %w(esbuild-loader webpack webpack-cli webpack-manifest-plugin webpack-merge css-loader file-loader mini-css-extract-plugin postcss-loader)
 
   say "Installing required packages"

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

@@ -43,7 +43,7 @@ module Bridgetown
                    desc: "Skip 'yarn install'"
       class_option :"use-sass",
                    type: :boolean,
-                   desc: "(Webpack only) Create a Sass configuration instead of using PostCSS"
+                   desc: "Set up a Sass configuration for your stylesheet"
 
       DOCSURL = "https://bridgetownrb.com/docs"
 
@@ -62,19 +62,14 @@ module Bridgetown
       def new_site
         raise ArgumentError, "You must specify a path." if args.empty?
 
-        if frontend_bundling_option != "webpack" && options["use-sass"]
-          raise ArgumentError,
-                "To install Sass, you must choose Webpack (-e webpack) as your frontend bundler"
-        end
-
         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 try again with `--force` to proceed and" \
-            " overwrite any files."
+            "Ensure #{new_site_path} is empty or else try again with `--force` to proceed and " \
+            "overwrite any files."
           )
         end
 
@@ -98,7 +93,11 @@ module Bridgetown
       end
 
       def postcss_option
-        !(frontend_bundling_option == "webpack" && options["use-sass"])
+        !options["use-sass"]
+      end
+
+      def disable_postcss?
+        options["use-sass"] && options["frontend-bundling"] == "webpack"
       end
 
       def create_site(new_site_path)
@@ -116,6 +115,7 @@ module Bridgetown
         template("frontend/javascript/index.js.erb", "frontend/javascript/index.js")
         template("src/index.md.erb", "src/index.md")
         template("src/posts.md.erb", "src/posts.md")
+        copy_file("frontend/styles/syntax-highlighting.css")
 
         case options["templates"]
         when "erb"
@@ -126,11 +126,11 @@ module Bridgetown
           setup_liquid_templates
         end
 
+        postcss_option ? configure_postcss : configure_sass
+
         if frontend_bundling_option == "esbuild"
-          configure_postcss
           invoke(Esbuild, ["setup"], {})
         else
-          postcss_option ? configure_postcss : configure_sass
           invoke(Webpack, ["setup"], {})
         end
       end
@@ -165,6 +165,7 @@ module Bridgetown
       end
 
       def configure_sass
+        template("postcss.config.js.erb", "postcss.config.js") unless disable_postcss?
         copy_file("frontend/styles/index.css", "frontend/styles/index.scss")
       end
 
@@ -193,18 +194,18 @@ module Bridgetown
         logger = Bridgetown.logger
         bt_start = "bin/bridgetown start"
         logger.info ""
-        logger.info "Success!".green, "🎉 Your new Bridgetown site was" \
-                                      " generated in #{cli_path.cyan}."
+        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."
+          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} #{cli_path.cyan} and run #{bt_start.cyan}" \
-                      " to get started."
+          logger.info "You can now #{"cd".cyan} #{cli_path.cyan} and run #{bt_start.cyan} " \
+                      "to get started."
         end
-        logger.info "Then check out our online documentation for" \
-                    " next steps: #{DOCSURL.cyan}"
+        logger.info "Then check out our online documentation for " \
+                    "next steps: #{DOCSURL.cyan}"
 
         if @skipped_bundle
           logger.info "Bundle install skipped.".yellow