bridgetown-plugin-tailwindcss 0.1.5 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9986754f4c6f0a83586367fd810524cff649bef87c142982f717716c61b376c3
-  data.tar.gz: 582319a24342772b910fb4c548aa386ac7f36354ddbad01007e26d1f3c8109f7
+  metadata.gz: 6907ae8359a1375066abb794044ba83dacd561ddfd981200134e9958b02e36dc
+  data.tar.gz: d6a1ba20c529991a1c8778b54c3de218dc6710f69070066b7a8a8ccb38e17851
 SHA512:
-  metadata.gz: bd7a4d92bd480318bf7a09fe1d0ad78a92acedcf37e64fbe889e9c807776e863c7e9031ac83d45e58ecbbc81ee35bd365282ecb17e7a0f1ea249940a53ddefa6
-  data.tar.gz: 7781f8c310ab4834f86fb03f3b7560682f04add80d5c49b914b154d89f3f5b9166a44f574450bbd00f066fb87cc779fb2582bcdaeb1e96f6b6777fa993873f00
+  metadata.gz: 3cbc34000352ca5d2e28d5357ab44cde6c6f3d4971df7d7e9947272a45b955a516b720f5a05df82ea97e3dd8cecc2d615b4fccef37f7e30aa99f3246a77becf2
+  data.tar.gz: ccbd01c59e859158372c934a08024934f4943e154824bcc3a6f4b4739804d42f25c4bf6a59057e23b3e872578a74a6dee40c9d596e747fd997bb3106043e2cba

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

@@ -12,7 +12,11 @@ module TailwindCss
     class Bump < Thor
       include Thor::Actions
 
+      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
 
       # rubocop:disable Metrics/BlockLength
       no_commands do
@@ -23,30 +27,43 @@ 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)
 
@@ -61,7 +78,7 @@ module TailwindCss
                   #{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)
 
@@ -78,8 +95,8 @@ 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

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

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bridgetown-plugin-tailwindcss",
-  "version": "0.1.5",
+  "version": "0.1.12",
   "main": "frontend/javascript/index.js",
   "repository": {
     "type": "git",
@@ -14,8 +14,8 @@
     "frontend"
   ],
   "dependencies": {
-    "postcss-import": "^0.1.5",
-    "postcss-loader": "^0.1.5",
-    "tailwindcss": "^0.1.5"
+    "postcss-import": "^12.0.1",
+    "postcss-loader": "^3.0.0",
+    "tailwindcss": "^1.4.6"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-plugin-tailwindcss
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.12
 platform: ruby
 authors:
 - Konnor Rogers
@@ -140,7 +140,7 @@ homepage: https://github.com/paramagicdev/bridgetown-plugin-tailwindcss
 licenses:
 - MIT
 metadata:
-  yarn-add: bridgetown-plugin-tailwindcss@0.1.5
+  yarn-add: bridgetown-plugin-tailwindcss@0.1.12
 post_install_message: 
 rdoc_options: []
 require_paths: