jekyll-postcss 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1cfaea0a05a10e083038206f5834b33df1b64c845c444aba901a7966e3a505d
-  data.tar.gz: 7a0a5f58661e27b29bf050056a186d599249e08e509c6610bbf441ab23454d68
+  metadata.gz: 40a31b02e606d19f4ad21d91e81bd795664bc41d7bfff60e7b4c7c85e17689ad
+  data.tar.gz: e4a7b58085f0068b69b8e9e669570de8ccc59c488a3ccd9bb5c6cf91109ee11a
 SHA512:
-  metadata.gz: 5a589cb99ed995104b7b277e043ca0b98532790536585015f3910e69444e8d87bd3b2c4009c0187be1a03674ccffa65735c4b1977fdbc4b82088237839acae30
-  data.tar.gz: 67f350a07a6aeb95f456e96ca738f2c19d777812ce6304d14fbc1b0943c398b41d980f41f5db02e0c78220a12088577cc73f734c114ab37e7dc330621a4bd87b
+  metadata.gz: d5457966cfe09b1a8a96ae0185a91f587fc6316b5753d714e87c9dea4a8a9f5744674b0215b7d788df51abbaad29562e986a804fd623ade77f186f76364891f9
+  data.tar.gz: 24e2c81a3efb38fab5190745fce7b31af5083311d12db6e226383fe562655ded4a4b326e1cc8db271449194315dd70fcdf9f1ebce61c0b5410baefab8c83a3cc

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.0
+
+- Update rake
+- Performance improvement
+
 ## 0.2.2
 
 - Use `Array.unshift` instead of `Array.prepend` to support older Ruby versions

data/README.md

@@ -24,27 +24,41 @@ plugins:
 
 ## Usage
 
-Make sure you have [postcss-cli](https://github.com/postcss/postcss-cli) installed and has its binary located at `./node_modules/.bin/postcss`.
+Make sure you have [postcss](https://github.com/postcss/postcss) installed.
 
 Add your PostCSS plugins to a `postcss.config.js` file in the root of your repository.
 
 ```javascript
 // postcss.config.js
 
-module.exports {
+module.exports = {
   plugins: [
     require("autoprefixer") // example of plugin you might use
+    ...(process.env.JEKYLL_ENV == "production" // example of only using a plugin in production
+      ? [require("cssnano")({ preset: "default" })]
+      : [])
   ]
 };
 ```
 
 All files with the `.css` extension will now be processed by PostCSS.
 
-
 ### Note
 
 `jekyll-postcss` will cache your styles to avoid rebuilding when nothing has changed.
 
+Also note that your `.css` files still need to have a [front matter](https://jekyllrb.com/docs/step-by-step/03-front-matter/) for them to be processed by Jekyll.
+
+```
+---
+---
+
+/* Example using Tailwind */
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/bin/command

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+script_status="running"
+
+# Start the program in the background
+exec "$@" &
+pid1=$!
+
+shutdown(){
+    local pid1=$1
+    local pid2=$2
+
+    if [ $script_status = "running" ]; then
+        script_status="shutting down"
+        wait "$pid1"
+        ret=$?
+        kill -KILL "$pid2"
+        exit $ret
+    fi
+}
+
+# Silence warnings from here on
+exec >/dev/null 2>&1
+
+# Read from stdin in the background and
+# kill running program when stdin closes
+exec 0<&0 "$(
+    while read -r; do :; done
+    kill -KILL "$pid1"
+)" &
+pid2=$!
+
+# Clean up
+trap 'shutdown $pid1 $pid2' INT HUP TERM
+shutdown "$pid1" "$pid2"
+

data/bin/postcss

@@ -0,0 +1,31 @@
+#!/usr/bin/env node
+
+const postcss = require(require.resolve("postcss", {paths: [process.cwd()]}));
+const config = require(`${process.cwd()}/postcss.config.js`);
+const net = require("net");
+
+const server = net.createServer((c) => {
+  c.on('data', (data) => {
+    postcss(config.plugins)
+      .process(JSON.parse(data).raw_content, {from: "stdin"})
+      .then(result => {
+        const packet = { compiled_css: result.toString() };
+        c.write(`${JSON.stringify(packet)}\n`);
+
+        return;
+      })
+      .catch(error => {
+        console.log("PostCSS Error!\n");
+        console.log(error.toString());
+      });
+  });
+});
+
+server.on('error', (err) => {
+  console.log("PostCSS Server Error!\n");
+  throw err;
+});
+
+server.listen(8124, () => {
+  console.log("PostCSS Server listening on port 8124...");
+});

data/jekyll-postcss.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "jekyll",
                                   ENV["JEKYLL_VERSION"] ? "~> #{ENV["JEKYLL_VERSION"]}" : ">= 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop-jekyll", "~> 0.5.1"
 end

data/lib/jekyll-postcss/socket.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "socket"
+require "json"
+
+module PostCss
+  class Socket
+    START_SCRIPT = File.expand_path("../../bin/command", __dir__)
+    POSTCSS_SCRIPT = File.expand_path("../../bin/postcss", __dir__)
+
+    def initialize
+      Thread.new do
+        system "#{START_SCRIPT} #{POSTCSS_SCRIPT}"
+      end
+
+      @postcss = nil
+      while @postcss.nil?
+        begin
+          @postcss = TCPSocket.open("localhost", 8124)
+        rescue StandardError
+          nil # Suppressing exceptions
+        end
+      end
+    end
+
+    def write(data)
+      @postcss.puts JSON.dump(:raw_content => data)
+    end
+
+    def read
+      JSON.parse(@postcss.gets.chomp)["compiled_css"]
+    end
+  end
+end

data/lib/jekyll-postcss/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module PostCss
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

data/lib/jekyll/converters/postcss.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "open3"
 require "digest"
+require_relative "../../jekyll-postcss/socket"
 
 module Jekyll
   module Converters
@@ -12,6 +12,7 @@ module Jekyll
       def initialize(config = {})
         super
 
+        @socket = config.fetch("socket") { ::PostCss::Socket.new }
         @raw_cache = nil
         @import_raw_cache = {}
         @converted_cache = nil
@@ -26,7 +27,7 @@ module Jekyll
       end
 
       def convert(content)
-        raise PostCssNotFoundError unless File.file?("./node_modules/.bin/postcss")
+        raise PostCssNotFoundError unless Dir.exist?("./node_modules/postcss")
 
         @raw_digest = Digest::MD5.hexdigest content
         @raw_import_digests = import_digests(content)
@@ -35,12 +36,9 @@ module Jekyll
           @raw_cache = @raw_digest.dup
           @import_raw_cache = @raw_import_digests.dup
 
-          compiled_css, status =
-            Open3.capture2("./node_modules/.bin/postcss", :stdin_data => content)
+          @socket.write content
 
-          raise PostCssRuntimeError unless status.success?
-
-          @converted_cache = compiled_css
+          @converted_cache = @socket.read
         end
 
         reset
@@ -75,4 +73,3 @@ module Jekyll
 end
 
 class PostCssNotFoundError < RuntimeError; end
-class PostCssRuntimeError < RuntimeError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-postcss
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Mitchell Hanberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2020-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,10 +98,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/command
 - bin/console
+- bin/postcss
 - bin/setup
 - jekyll-postcss.gemspec
 - lib/jekyll-postcss.rb
+- lib/jekyll-postcss/socket.rb
 - lib/jekyll-postcss/version.rb
 - lib/jekyll/converters/postcss.rb
 homepage: https://github.com/mhanberg/jekyll-postcss