bridgetown-plugin-tailwindcss 0.1.1 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d5e2e373904f9caa02ee47316ab35c76744ebca284ced01dc71b2d7fad4f3cc
-  data.tar.gz: 4e62c17fa8e0b04aa4408b26f92fbd8218fa41cdf2c7decf62e5e17bac0601f7
+  metadata.gz: 6907ae8359a1375066abb794044ba83dacd561ddfd981200134e9958b02e36dc
+  data.tar.gz: d6a1ba20c529991a1c8778b54c3de218dc6710f69070066b7a8a8ccb38e17851
 SHA512:
-  metadata.gz: 55121446f16f24522967ce1d954f074d12a7d2b10e73a6285965f3439f3310190a2f593716eefe6daf2493d76afd12bca70ab2688f72ca8d48cc4501f0772c01
-  data.tar.gz: 843ec500c453cc1975a5980c3409c1530ecd38781ada5f3d71cbb330759aab32bffb393a50a8e616fda5c3b9c2ab5122125cf22318ce924e1e572d8576f40d63
+  metadata.gz: 3cbc34000352ca5d2e28d5357ab44cde6c6f3d4971df7d7e9947272a45b955a516b720f5a05df82ea97e3dd8cecc2d615b4fccef37f7e30aa99f3246a77becf2
+  data.tar.gz: ccbd01c59e859158372c934a08024934f4943e154824bcc3a6f4b4739804d42f25c4bf6a59057e23b3e872578a74a6dee40c9d596e747fd997bb3106043e2cba

data/Rakefile

@@ -9,10 +9,14 @@ 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

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)/!) }

data/lib/bridgetown-plugin-tailwindcss.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require "bridgetown"
-require 'bridgetown-plugin-tailwindcss/command.rb'
-require 'bridgetown-plugin-tailwindcss/utils.rb'
+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,104 +1,170 @@
-require 'bridgetown'
-require_relative 'utils'
+# frozen_string_literal: true
 
-class TailwindInit < Bridgetown::Command
-  ACTIONS = TailwindCss::Utils::Actions.new
+require "bridgetown"
+require_relative "utils"
 
-  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'
+module Bridgetown
+  module Commands
+    class TailwindInit < Bridgetown::Command
+      ACTIONS = TailwindCss::Utils::Actions.new
 
-        c.action do |args, options|
-          Bridgetown::Commands::TailwindInit.new.run
+      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
+        private
 
-    def run
-      write_files
-    end
+        def run
+          write_files
+        end
 
+        def write_files
+          webpack_config = File.expand_path("webpack.config.js")
+          tailwind_config = File.expand_path("tailwind.config.js")
 
-    def write_files
-      webpack_config = File.expand_path("webpack.config.js")
-      tailwind_config = File.expand_path("tailwind.config.js")
+          ACTIONS.create_file(webpack_config, webpack_file_contents)
+          ACTIONS.create_file(tailwind_config, tailwind_config_contents)
+          prepend_to_stylesheet
+        end
 
-      ACTIONS.create_file(webpack_config, webpack_file_contents)
-      ACTIONS.create_file(tailwind_config, tailwind_config_contents)
-      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
 
-      ACTIONS.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
+            const path = require("path");
+            const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+            const ManifestPlugin = require("webpack-manifest-plugin");
 
-    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"),
-                  ],
-                },
+            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",
               },
-            },
-            {
-              loader: "postcss-loader",
-              options: {
-                ident: "postcss",
-                plugins: [
-                  require("postcss-import"),
-                  require("tailwindcss"),
-                  require("autoprefixer"),
+              resolve: {
+                extensions: [".js", ".jsx"],
+              },
+              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,4 +1,6 @@
-require 'thor'
+# frozen_string_literal: true
+
+require "thor"
 
 module TailwindCss
   module Utils
@@ -10,9 +12,14 @@ module TailwindCss
     class Bump < Thor
       include Thor::Actions
 
-      VERSION_REGEX = /(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)/
+      RUBY_VERSION_REGEX = %r!(.*VERSION.?=.*)!.freeze
+      NPM_VERSION_REGEX = %r!(.*"version":.*)!.freeze
+      VERSION_LINE = Regexp.union(RUBY_VERSION_REGEX, NPM_VERSION_REGEX)
+      VERSION_REGEX = %r!(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)!.freeze
+      GSUB_REGEX = %r!(?<version>#{VERSION_LINE})#{VERSION_REGEX}!.freeze
 
-      no_commands {
+      # rubocop:disable Metrics/BlockLength
+      no_commands do
         def current_version
           VERSION
         end
@@ -20,44 +27,58 @@ module TailwindCss
         def bump_version_to_string(string)
           say("Bumping from #{VERSION} to #{string}", :red)
 
+          match = GSUB_REGEX.match(File.read(file))
+          gsub_string = "#{match[:version]}#{string}"
           version_files.each do |file|
-            gsub_file(file, VERSION_REGEX, string)
+            gsub_file(file, GSUB_REGEX, gsub_string)
           end
         end
 
-        def bump_version(type, version: VERSION, value: nil)
-          say(version_change(type, version: version, value: value), :red)
-
+        def bump_version(type, version: VERSION)
+          say(version_change(type, version: version), :red)
 
           version_files.each do |file|
-            gsub_file(file, VERSION_REGEX,
-                      to_version(type, version: version, value: value))
+            match = GSUB_REGEX.match(File.read(file))
+            gsub_string = "#{match[:version]}#{to_version(type, version: version)}"
+
+            gsub_file(file, GSUB_REGEX,
+                      gsub_string)
           end
         end
 
         private
 
+        def gsub_match(file)
+          GSUB_REGEX.match(File.read(file))
+        end
+
         def version_files
-          @package_json = File.expand_path("package.json")
-          @version_file = File.expand_path(File.join(__dir__, "version.rb"))
+          package_json = File.expand_path("package.json")
+          version_file = File.expand_path(File.join(__dir__, "version.rb"))
 
-          [ @package_json, @version_file ]
+          [package_json, version_file]
         end
 
-        def to_version(type, version: nil, value: nil)
+        # ef version_replacement
+        #   match = GSUB_REGEX.match(File.readlines
+        # end
+
+        def to_version(type, version: nil)
           from = version
           match = VERSION_REGEX.match(from)
 
           groups = {
             major: match[:major],
             minor: match[:minor],
-            patch: match[:patch]
+            patch: match[:patch],
           }
 
-          raise "\nYou gave #{type} but the only accepted types are
-                #{groups.keys}" unless groups.keys.include?(type)
+          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
+          groups[type] = (groups[type].to_i + 1).to_s
 
           bump_to_zero(type, groups)
 
@@ -74,10 +95,11 @@ module TailwindCss
           groups[:minor] = "0"
         end
 
-        def version_change(type, version: nil, value: nil)
-          "Bumping from #{version} to #{to_version(type, version: version, value: value)}"
+        def version_change(type, version: nil)
+          "Bumping from #{version} to #{to_version(type, version: version)}"
         end
-      }
+      end
+      # rubocop:enable Metrics/BlockLength
     end
   end
 end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TailwindCss
-  VERSION = "0.1.1"
+  VERSION = "0.1.12"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bridgetown-plugin-tailwindcss",
-  "version": "0.1.1",
+  "version": "0.1.12",
   "main": "frontend/javascript/index.js",
   "repository": {
     "type": "git",
@@ -13,9 +13,9 @@
   "files": [
     "frontend"
   ],
-  "devDependencies": {
-    "postcss-import": "^0.1.1",
-    "postcss-loader": "^0.1.1",
-    "tailwindcss": "^0.1.1"
+  "dependencies": {
+    "postcss-import": "^12.0.1",
+    "postcss-loader": "^3.0.0",
+    "tailwindcss": "^1.4.6"
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-plugin-tailwindcss
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.12
 platform: ruby
 authors:
-- Bridgetown Team
+- Konnor Rogers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-31 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown
@@ -115,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 description: 
-email: maintainers@bridgetownrb.com
+email: konnor7414@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -136,11 +136,11 @@ files:
 - package.json
 - tags
 - yarn.lock
-homepage: https://github.com/bridgetownrb/bridgetown-plugin-tailwindcss
+homepage: https://github.com/paramagicdev/bridgetown-plugin-tailwindcss
 licenses:
 - MIT
 metadata:
-  yarn-add: bridgetown-plugin-tailwindcss@0.1.1
+  yarn-add: bridgetown-plugin-tailwindcss@0.1.12
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -159,5 +159,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Sample code for creating new Bridgetown plugins
+summary: A plugin to add tailwindcss to a site
 test_files: []