bridgetown-plugin-tailwindcss 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ce91a98c46bff19d557ae368e8f28cdd6abffb27acb37e1a24614e9b0e649a
-  data.tar.gz: 9244712044140697ca0278d98ccf8f300b1d5d219c35bca39b7eec4a4708282e
+  metadata.gz: 9986754f4c6f0a83586367fd810524cff649bef87c142982f717716c61b376c3
+  data.tar.gz: 582319a24342772b910fb4c548aa386ac7f36354ddbad01007e26d1f3c8109f7
 SHA512:
-  metadata.gz: 1f50d417e22fc75c27c7f401f8f3b837b94976e6fce3c8843fd56e419106d34c1cf8a15bfbabf90261dab13c4d53f28d95fe965ca234cde5afff219c5cf6791c
-  data.tar.gz: b7a664a5d0970ef790e2148afd38038fa5c98d1d1eb6078be0d687497dc1700f22f8ec64398e443ef447f98f29bb8406d202b9a6d77f10f5b8be79b040e96b58
+  metadata.gz: bd7a4d92bd480318bf7a09fe1d0ad78a92acedcf37e64fbe889e9c807776e863c7e9031ac83d45e58ecbbc81ee35bd365282ecb17e7a0f1ea249940a53ddefa6
+  data.tar.gz: 7781f8c310ab4834f86fb03f3b7560682f04add80d5c49b914b154d89f3f5b9166a44f574450bbd00f066fb87cc779fb2582bcdaeb1e96f6b6777fa993873f00

data/Gemfile

@@ -4,3 +4,5 @@ source "https://rubygems.org"
 gemspec
 
 gem "bridgetown", ENV["BRIDGETOWN_VERSION"] if ENV["BRIDGETOWN_VERSION"]
+
+gem "thor", "~> 1.0"

data/Rakefile

@@ -2,16 +2,47 @@
 
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "./lib/bridgetown-plugin-tailwindcss/utils"
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 task :test => :spec
 
-task :release do
+task :deploy do
   Rake.sh "./script/release"
 end
 
+task :format do
+  Rake.sh "./script/fmt -a"
+end
+
+
+namespace :bump do
+  task :current do
+    puts TailwindCss::Utils::Bump.new.current_version
+  end
+
+  task :set do
+    question = "What would you like to set your version to? IE: [2.1.0] :"
+    value = TailwindCss::Utils::Actions.new.ask(question)
+
+    TailwindCss::Utils::Bump.new.bump_version_to_string(value)
+  end
+
+  task :major do
+    TailwindCss::Utils::Bump.new.bump_version(:major)
+  end
+
+  task :minor do
+    TailwindCss::Utils::Bump.new.bump_version(:minor)
+  end
+
+  task :patch do
+    TailwindCss::Utils::Bump.new.bump_version(:patch)
+  end
+end
+
 def filelist(*strings)
   Rake::FileList.new(strings) do |fl|
     fl.exclude(/node_modules/)

data/bridgetown-plugin-tailwindcss.gemspec

@@ -5,10 +5,10 @@ require_relative "lib/bridgetown-plugin-tailwindcss/version"
 Gem::Specification.new do |spec|
   spec.name          = "bridgetown-plugin-tailwindcss"
   spec.version       = TailwindCss::VERSION
-  spec.author        = "Bridgetown Team"
-  spec.email         = "maintainers@bridgetownrb.com"
-  spec.summary       = "Sample code for creating new Bridgetown plugins"
-  spec.homepage      = "https://github.com/bridgetownrb/bridgetown-plugin-tailwindcss"
+  spec.author        = "Konnor Rogers"
+  spec.email         = "konnor7414@gmail.com"
+  spec.summary       = "A plugin to add tailwindcss to a site"
+  spec.homepage      = "https://github.com/paramagicdev/bridgetown-plugin-tailwindcss"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|script|spec|features|frontend)/!) }
@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.5.0"
 
   spec.add_dependency "bridgetown", ">= 0.14", "< 2.0"
+  spec.add_dependency "thor", "~> 1.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "nokogiri", "~> 1.6"

data/lib/bridgetown-plugin-tailwindcss.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 require "bridgetown"
-require "bridgetown-plugin-tailwindcss/builder"
+require "bridgetown-plugin-tailwindcss/command.rb"
+require "bridgetown-plugin-tailwindcss/utils.rb"
 
 Bridgetown::PluginManager.new_source_manifest(
-  origin: TailwindCss,
+  origin: TailwindCss
 )

data/lib/bridgetown-plugin-tailwindcss/command.rb

@@ -1,115 +1,170 @@
-require 'bridgetown'
-require 'utils'
-
-class Command < Bridgetown::Command
-  include Utils
-
-  class << self
-    def init_with_program(prog)
-      prog.command(:init) do |c|
-        c.syntax "init"
-        c.description 'Initialize config for Tailwind'
-        # c.option 'path', '--path', 'Choose the path to install tailwind'
-
-        c.action do |args, options|
-          generate_tailwind
+# frozen_string_literal: true
+
+require "bridgetown"
+require_relative "utils"
+
+module Bridgetown
+  module Commands
+    class TailwindInit < Bridgetown::Command
+      ACTIONS = TailwindCss::Utils::Actions.new
+
+      class << self
+        def init_with_program(prog)
+          prog.command(:tailwind_init) do |c|
+            c.syntax "tailwind_init"
+            c.description "Initialize config for Tailwind"
+            # c.option 'path', '--path', 'Choose the path to install tailwind'
+
+            c.action do |_args, _options|
+              run
+            end
+          end
         end
-      end
-    end
-
-    private
-
-    def generate_tailwind
-      install_tailwind
-      write_files
-    end
 
-    def install_tailwind
-      yarn_add = "yarn add -D"
-      packages = "tailwindcss postcss-import postcss-loader"
-      Bridgetown::Utils::Exec.run(yarn_add, packages)
-    end
+        private
 
-    def write_files
-      webpack_config = File.expand_path("webpack.config.js")
-      tailwind_config = File.expand_path("tailwind.config.js")
+        def run
+          write_files
+        end
 
-      File.open(webpack_config) do |f|
-        f.write(webpack_file_contents)
-      end
+        def write_files
+          webpack_config = File.expand_path("webpack.config.js")
+          tailwind_config = File.expand_path("tailwind.config.js")
 
-      File.open(tailwind_config) do |f|
-        f.write(tailwind_config_contents)
-      end
+          ACTIONS.create_file(webpack_config, webpack_file_contents)
+          ACTIONS.create_file(tailwind_config, tailwind_config_contents)
+          prepend_to_stylesheet
+        end
 
-      prepend_to_stylesheet
-    end
+        def prepend_to_stylesheet
+          frontend_stylesheet = File.join("frontend", "styles", "index.scss")
+          frontend_stylesheet = File.expand_path(frontend_stylesheet)
 
-    def prepend_to_stylesheet
-      frontend_stylesheet = File.join("frontend", "styles", "index.scss")
-      frontend_stylesheet = File.expand_path(frontend_stylesheet)
+          return unless File.exist?(frontend_stylesheet)
 
-      return unless File.exist?(frontend_stylesheet)
+          ACTIONS.prepend_to_file(frontend_stylesheet, import_tailwind_contents)
+        end
 
-      prepend_to_file(frontend_stylesheet, import_tailwind_contents)
-    end
+        def import_tailwind_contents
+          <<~IMPORT
+            @import 'tailwindcss/base';
+            @import 'tailwindcss/components';
+            @import 'tailwindcss/utilities';
 
-    def import_tailwind_contents
-      <<~IMPORT
-        @import 'tailwindcss/base';
-        @import 'tailwindcss/components';
-        @import 'tailwindcss/utilities';
-      IMPORT
-    end
+          IMPORT
+        end
 
-    def tailwind_config_contents
-      <<~TAILWIND
-        module.exports = {
-          purge: {
-            enabled: true,
-            content: ['./src/**/*.html'],
-          },
-          theme: {
-            extend: {},
-          },
-          variants: {},
-          plugins: [],
-        }
-      TAILWIND
-    end
+        def tailwind_config_contents
+          <<~TAILWIND
+            module.exports = {
+              purge: {
+                enabled: true,
+                content: ['./src/**/*.html'],
+              },
+              theme: {
+                extend: {},
+              },
+              variants: {},
+              plugins: [],
+            }
+          TAILWIND
+        end
 
-    def webpack_file_contents
-      <<~WEBPACK
-        {
-          test: /\.(s[ac]|c)ss$/,
-          use: [
-            MiniCssExtractPlugin.loader,
-            "css-loader",
-            {
-              loader: "sass-loader",
-              options: {
-                sassOptions: {
-                  includePaths: [
-                    path.resolve(__dirname, "src/_components"),
-                    path.resolve(__dirname, "src/_includes"),
-                  ],
-                },
+        def webpack_file_contents
+          <<~WEBPACK
+            const path = require("path");
+            const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+            const ManifestPlugin = require("webpack-manifest-plugin");
+
+            module.exports = {
+              entry: "./frontend/javascript/index.js",
+              devtool: "source-map",
+              // Set some or all of these to true if you want more verbose logging:
+              stats: {
+                modules: false,
+                builtAt: false,
+                timings: false,
+                children: false,
+              },
+              output: {
+                path: path.resolve(__dirname, "output", "_bridgetown", "static", "js"),
+                filename: "all.[contenthash].js",
+              },
+              resolve: {
+                extensions: [".js", ".jsx"],
               },
-            },
-            {
-              loader: "postcss-loader",
-              options: {
-                ident: "postcss",
-                plugins: [
-                  require("postcss-import"),
-                  require("tailwindcss"),
-                  require("autoprefixer"),
+              plugins: [
+                new MiniCssExtractPlugin({
+                  filename: "../css/all.[contenthash].css",
+                }),
+                new ManifestPlugin({
+                  fileName: path.resolve(__dirname, ".bridgetown-webpack", "manifest.json"),
+                }),
+              ],
+              module: {
+                rules: [
+                  {
+                    test: /\.(js|jsx)/,
+                    use: {
+                      loader: "babel-loader",
+                      options: {
+                        presets: ["@babel/preset-env"],
+                        plugins: [
+                          "@babel/plugin-proposal-class-properties",
+                          [
+                            "@babel/plugin-transform-runtime",
+                            {
+                              helpers: false,
+                            },
+                          ],
+                        ],
+                      },
+                    },
+                  },
+                  {
+                    test: /\.(s[ac]|c)ss$/,
+                    use: [
+                      MiniCssExtractPlugin.loader,
+                      "css-loader",
+                      {
+                        loader: "sass-loader",
+                        options: {
+                          sassOptions: {
+                            includePaths: [
+                              path.resolve(__dirname, "src/_components"),
+                              path.resolve(__dirname, "src/_includes"),
+                            ],
+                          },
+                        },
+                      },
+                    ],
+                  },
+                  {
+                    loader: "postcss-loader",
+                    options: {
+                      ident: "postcss",
+                      plugins: [
+                        require("postcss-import"),
+                        require("tailwindcss"),
+                        require("autoprefixer"),
+                      ],
+                    },
+                  },
+                  {
+                    test: /\.woff2?$|\.ttf$|\.eot$|\.svg$/,
+                    loader: "file-loader",
+                    options: {
+                      outputPath: "../fonts",
+                      publicPath: "../fonts",
+                    },
+                  },
                 ],
               },
-            },
-          ],
-        },
-      WEBPACK
+            };
+
+          WEBPACK
+        end
+      end
     end
   end
 end

data/lib/bridgetown-plugin-tailwindcss/utils.rb

@@ -1,10 +1,88 @@
-module Utils
-  def prepend_to_file(file, str)
-    File.open(file, 'w') do |open_file|
-      open_file.puts(str)
-      File.foreach(file) do |line|
-        open_file.puts(line)
+# frozen_string_literal: true
+
+require "thor"
+
+module TailwindCss
+  module Utils
+    class Actions < Thor
+      include Thor::Actions
+    end
+    # @see https://ruby-doc.org/core-2.7.1/Regexp.html#class-Regexp-label-Capturing
+    # capture groups
+    class Bump < Thor
+      include Thor::Actions
+
+      VERSION_REGEX = %r!(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)!.freeze
+
+      # rubocop:disable Metrics/BlockLength
+      no_commands do
+        def current_version
+          VERSION
+        end
+
+        def bump_version_to_string(string)
+          say("Bumping from #{VERSION} to #{string}", :red)
+
+          version_files.each do |file|
+            gsub_file(file, VERSION_REGEX, string)
+          end
+        end
+
+        def bump_version(type, version: VERSION, value: nil)
+          say(version_change(type, version: version, value: value), :red)
+
+          version_files.each do |file|
+            gsub_file(file, VERSION_REGEX,
+                      to_version(type, version: version, value: value))
+          end
+        end
+
+        private
+
+        def version_files
+          @package_json = File.expand_path("package.json")
+          @version_file = File.expand_path(File.join(__dir__, "version.rb"))
+
+          [@package_json, @version_file]
+        end
+
+        def to_version(type, version: nil, value: nil)
+          from = version
+          match = VERSION_REGEX.match(from)
+
+          groups = {
+            major: match[:major],
+            minor: match[:minor],
+            patch: match[:patch],
+          }
+
+          unless groups.key?(type)
+            raise "\nYou gave #{type} but the only accepted types are
+                  #{groups.keys}"
+          end
+
+          groups[type] = value || (groups[type].to_i + 1).to_s
+
+          bump_to_zero(type, groups)
+
+          "#{groups[:major]}.#{groups[:minor]}.#{groups[:patch]}"
+        end
+
+        def bump_to_zero(type, groups)
+          return if type == :patch
+
+          groups[:patch] = "0"
+
+          return if type == :minor
+
+          groups[:minor] = "0"
+        end
+
+        def version_change(type, version: nil, value: nil)
+          "Bumping from #{version} to #{to_version(type, version: version, value: value)}"
+        end
       end
+      # rubocop:enable Metrics/BlockLength
     end
   end
 end