bridgetown-core 1.2.0.beta2 → 1.2.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a6cae1de973325e00001b6c9a9f2a27879d24164727195ae53744dcc10f7f4a
-  data.tar.gz: 1ee4e7b77a9e25946d9daa7fc7204637559c35691b6f64475245427a49184596
+  metadata.gz: 4b1d92b4942102e7a3aba18f3a617d905bdb13bf7193a816cd444e26340935c7
+  data.tar.gz: 6fdc5319169d9b2cc712680c0d73c12ea71364610172f7af5764d068c555457e
 SHA512:
-  metadata.gz: bfdaa601767fc44f50c11ebc40008e7b661f9dbae9aa192e3a44fe22e8fbcb5271e8cfd33f414421950eb19de4a7532ae19ffd48a31fde8a9f001385dce2c057
-  data.tar.gz: 1125afb5db05a07d62d4c656053d6815740aab2ee8b6050b35da33d34961cbfc6a5d970cccf2293690077b847b8c5026c819416a685ee00670fd6cf86b1406a6
+  metadata.gz: 7e82b661568cedb825c2de4c327b759169dad229e23a64bd256d28fa37cd64108901143ff882afe3b9db7393427a3863a33017bf414ccbe53c5ea12d148ba2cb
+  data.tar.gz: 2f957ec8ade498fcce3667604779db33f4a5b71778e8c5d449afec3c56b224aa8c034d0c5eb0894d68c23b049a0db9a36c9db84bf05e76a1c1dd5dc59acc7683

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

@@ -52,13 +52,50 @@ module Bridgetown
         end
       end
 
-      def add_bridgetown_plugin(gemname, version: nil)
-        version = " -v \"#{version}\"" if version
-        run "bundle add #{gemname}#{version} -g bridgetown_plugins",
+      def add_gem(gemname, group: nil, version: nil)
+        options = +""
+        options += " -v \"#{version}\"" if version
+        options += " -g #{group}" if group
+        run "bundle add #{gemname}#{options}",
             env: { "BUNDLE_GEMFILE" => File.join(destination_root, "Gemfile") }
       rescue SystemExit
         say_status :run, "Gem not added due to bundler error", :red
       end
+      alias_method :add_bridgetown_plugin, :add_gem
+
+      def add_initializer(name, data = "")
+        say_status :initializer, name
+        data = yield if block_given?
+        data = data.indent(2).lstrip
+        data += "\n" unless data.chars.last == "\n"
+
+        init_file = File.join("config", "initializers.rb")
+        unless File.exist?(init_file)
+          create_file("config/initializers.rb", verbose: true) do
+            File.read(File.expand_path("../../../site_template/config/initializers.rb", __dir__))
+          end
+        end
+
+        inject_into_file init_file, %(  init :"#{name}"#{data}),
+                         before: %r!^end$!, verbose: false, force: false
+      end
+
+      def ruby_configure(name, data = "")
+        say_status :configure, name
+        data = yield if block_given?
+        data = data.indent(2)
+        data += "\n" unless data.chars.last == "\n"
+
+        init_file = File.join("config", "initializers.rb")
+        unless File.exist?(init_file)
+          create_file("config/initializers.rb", verbose: true) do
+            File.read(File.expand_path("../../../site_template/config/initializers.rb", __dir__))
+          end
+        end
+
+        inject_into_file init_file, data,
+                         before: %r!^end$!, verbose: false, force: false
+      end
 
       def add_yarn_for_gem(gemname)
         say_status :add_yarn, gemname

data/lib/bridgetown-core/configuration.rb

@@ -147,6 +147,8 @@ module Bridgetown
       dsl.instance_variable_set(:@context, context)
       dsl.instance_exec(dsl, &init_init.block)
 
+      setup_load_paths! appending: true
+
       self
     end
 
@@ -323,16 +325,18 @@ module Bridgetown
       self
     end
 
-    def setup_load_paths! # rubocop:todo Metrics
-      self[:root_dir] = File.expand_path(self[:root_dir])
-      self[:source] = File.expand_path(self[:source], self[:root_dir])
-      self[:destination] = File.expand_path(self[:destination], self[:root_dir])
-
-      if self[:plugins_use_zeitwerk]
-        autoload_paths.unshift({
-          path: self[:plugins_dir],
-          eager: true,
-        })
+    def setup_load_paths!(appending: false) # rubocop:todo Metrics
+      unless appending
+        self[:root_dir] = File.expand_path(self[:root_dir])
+        self[:source] = File.expand_path(self[:source], self[:root_dir])
+        self[:destination] = File.expand_path(self[:destination], self[:root_dir])
+
+        if self[:plugins_use_zeitwerk]
+          autoload_paths.unshift({
+            path: self[:plugins_dir],
+            eager: true,
+          })
+        end
       end
 
       autoload_paths.map! do |load_path|

data/lib/bridgetown-core/configurations/lit/esbuild-plugins.js

@@ -3,7 +3,7 @@
 // any additional configuration to the `plugins` array below.
 
 // This plugin will let you import `.lit.css` files as sidecar stylesheets.
-// Read https://edge.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation.
+// Read https://www.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation.
 const { litCssPlugin } = require("esbuild-plugin-lit-css")
 const postcssrc = require("postcss-load-config")
 const postcss = require("postcss")

data/lib/bridgetown-core/configurations/lit.rb

@@ -11,9 +11,9 @@ end
 
 say_status :lit, "Installing Lit + SSR Plugin..."
 
-add_bridgetown_plugin "bridgetown-lit-renderer", version: "2.0.0.beta3"
+add_gem "bridgetown-lit-renderer"
 
-run "yarn add lit esbuild-plugin-lit-css bridgetown-lit-renderer@2.0.0-beta3"
+run "yarn add lit esbuild-plugin-lit-css bridgetown-lit-renderer"
 
 copy_file in_templates_dir("lit-ssr.config.js"), "config/lit-ssr.config.js"
 copy_file in_templates_dir("lit-components-entry.js"), "config/lit-components-entry.js"
@@ -35,7 +35,7 @@ gsub_file "esbuild.config.js", %r{const esbuildOptions = {}\n} do |_match|
     const esbuildOptions = {
       plugins: [...plugins],
       // Uncomment the following to opt into `.global.css` & `.lit.css` nomenclature.
-      // Read https://edge.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation.
+      // Read https://www.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation.
       /*
       postCssPluginConfig: {
         filter: /(?:index|\.global)\.css$/,
@@ -56,7 +56,7 @@ unless found_match
       //
       // You might also want to include the following in your esbuild config to opt into
       // `.global.css` & `.lit.css` nomenclature.
-      // Read https://edge.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation.
+      // Read https://www.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation.
       /*
       postCssPluginConfig: {
         filter: /(?:index|\.global)\.css$/,
@@ -78,10 +78,12 @@ insert_into_file "frontend/javascript/index.js",
                  before: 'import components from "bridgetownComponents/**/*.{js,jsx,js.rb,css}"' do
   <<~JS
     // To opt into `.global.css` & `.lit.css` nomenclature, change the `css` extension below to `global.css`.
-    // Read https://edge.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation.
+    // Read https://www.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation.
   JS
 end
 
+add_initializer :"bridgetown-lit-renderer"
+
 if found_match
   say_status :lit, "Lit is now configured!"
   say_status :lit,
@@ -92,4 +94,4 @@ else
 end
 
 say "Check out the example `happy-days.lit.js` file in `src/_components`", :blue
-say 'For further reading, check out "https://edge.bridgetownrb.com/docs/components/lit"', :blue
+say 'For further reading, check out "https://www.bridgetownrb.com/docs/components/lit"', :blue

data/lib/bridgetown-core/configurations/tailwindcss.rb

@@ -1,77 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable all
-
-unless File.exist?("postcss.config.js")
-  error_message = "#{"postcss.config.js".bold} not found. Please configure postcss in your project."
-
-  @logger.error "\nError:".red, "🚨 #{error_message}"
-  @logger.info "\nRun #{"bridgetown webpack enable-postcss".bold.blue} to set it up.\n"
-
-  return
-end
-
-say_status :tailwind, "Installing Tailwind CSS..."
-
-confirm = ask "This configuration will ovewrite your existing #{"postcss.config.js".bold.white}. Would you like to continue? [Yn]"
-return unless confirm.casecmp?("Y")
-
-run "yarn add -D tailwindcss"
-run "npx tailwindcss init"
-
-gsub_file "tailwind.config.js", "content: [],", <<~JS.strip
-  content: [
-      './src/**/*.{html,md,liquid,erb,serb,rb}',
-      './frontend/javascript/**/*.js',
-    ],
-JS
-
-copy_file in_templates_dir("postcss.config.js"), "postcss.config.js", force: true
-
-if File.exist?("frontend/styles/index.css")
-  prepend_to_file "frontend/styles/index.css",
-                  File.read(in_templates_dir("css_imports.css"))
-else
-  say "\nPlease add the following lines to your CSS index file:"
-  say File.read(in_templates_dir("/css_imports.css"))
-end
-
-create_file "frontend/styles/jit-refresh.css", "/* #{Time.now.to_i} */"
-
-insert_into_file "Rakefile",
-                  after: %r{  task :(build|dev) do\n} do
-  <<-JS
-    sh "touch frontend/styles/jit-refresh.css"
-  JS
-end
-
-if File.exist?(".gitignore")
-  append_to_file ".gitignore" do
-    <<~FILES
-
-      frontend/styles/jit-refresh.css
-    FILES
-  end
-end
-
-create_builder "tailwind_jit.rb" do
-  <<~RUBY
-    class Builders::TailwindJit < SiteBuilder
-      def build
-        hook :site, :pre_reload do |_, paths|
-          # Don't trigger refresh if it's a frontend-only change
-          next if paths.length == 1 && paths.first.ends_with?("manifest.json")
-
-          # Save out a comment file to trigger Tailwind's JIT
-          refresh_file = site.in_root_dir("frontend", "styles", "jit-refresh.css")
-          File.write refresh_file, "/* \#{Time.now.to_i} */"
-          throw :halt # don't continue the build, wait for watcher rebuild
-        end
-      end
-    end
-  RUBY
-end
-
-say_status :tailwind, "Tailwind CSS is now configured."
-
-# rubocop:enable all
+say_status :tailwind, "The Tailwind CSS automation now lives in its own community-maintained repo:"
+say "https://github.com/bridgetownrb/tailwindcss-automation"
+say ""
+say "Tailwind CSS not installed."

data/lib/bridgetown-core/rack/roda.rb

@@ -47,6 +47,8 @@ module Bridgetown
 
       SiteContext = Struct.new(:registers) # for use by Liquid-esque URL helpers
 
+      plugin :method_override
+      plugin :all_verbs
       plugin :hooks
       plugin :common_logger, Bridgetown::Rack::Logger.new($stdout), method: :info
       plugin :json

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "1.2.0.beta2"
+  VERSION = "1.2.0.beta3"
   CODE_NAME = "Bonny Slope"
 end

data/lib/bridgetown-core.rb

@@ -136,7 +136,7 @@ module Bridgetown
     alias_method :env, :environment
 
     def begin!
-      ENV["RACK_ENV"] = ENV["BRIDGETOWN_ENV"]
+      ENV["RACK_ENV"] ||= environment
 
       Bridgetown::Current.preloaded_configuration = Bridgetown::Configuration::Preflight.new
       Bridgetown::PluginManager.setup_bundler

data/lib/roda/plugins/method_override.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+class Roda
+  module RodaPlugins
+    # This is a simplified Roda plugin version of the Rack middleware:
+    # https://github.com/rack/rack/blob/v2.2.2/lib/rack/method_override.rb
+    module MethodOverride
+      def self.configure(app, opts = {})
+        app.opts[:method_override_param] = opts[:method_override_param] || "_method"
+      end
+
+      module RequestMethods
+        HTTP_METHODS = %w(GET HEAD PUT POST DELETE OPTIONS PATCH LINK UNLINK).freeze
+        HTTP_METHOD_OVERRIDE_HEADER = "HTTP_X_HTTP_METHOD_OVERRIDE"
+        ALLOWED_METHODS = %w(POST).freeze
+
+        def initialize(scope, env)
+          super
+          return unless _allowed_methods.include?(env[Rack::REQUEST_METHOD])
+
+          method = _method_override(env)
+          return unless HTTP_METHODS.include?(method)
+
+          env[Rack::RACK_METHODOVERRIDE_ORIGINAL_METHOD] = env[Rack::REQUEST_METHOD]
+          env[Rack::REQUEST_METHOD] = method
+        end
+
+        private
+
+        def _method_override(env)
+          method = _method_override_param ||
+            env[HTTP_METHOD_OVERRIDE_HEADER]
+          method.to_s.upcase
+        end
+
+        def _allowed_methods
+          ALLOWED_METHODS
+        end
+
+        def _method_override_param
+          params[scope.class.opts[:method_override_param]]
+        end
+      end
+    end
+
+    register_plugin :method_override, MethodOverride
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta2
+  version: 1.2.0.beta3
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-08 00:00:00.000000000 Z
+date: 2022-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -441,8 +441,6 @@ files:
 - lib/bridgetown-core/configurations/shoelace.rb
 - lib/bridgetown-core/configurations/stimulus.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/configurations/turbo/turbo_transitions.js
 - lib/bridgetown-core/configurations/vercel.rb
@@ -548,6 +546,7 @@ files:
 - lib/roda/plugins/bridgetown_boot.rb
 - lib/roda/plugins/bridgetown_ssr.rb
 - lib/roda/plugins/initializers.rb
+- lib/roda/plugins/method_override.rb
 - lib/site_template/.gitignore
 - lib/site_template/Gemfile.erb
 - lib/site_template/README.md

data/lib/bridgetown-core/configurations/tailwindcss/css_imports.css

@@ -1,9 +0,0 @@
-/* If you need to add @import statements, do so up here */
-
-@import "jit-refresh.css"; /* triggers frontend rebuilds */
-
-/* Set up Tailwind imports */
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-

data/lib/bridgetown-core/configurations/tailwindcss/postcss.config.js

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