jekyll-webpack 0.2.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8950c117cac046785121b78e1211c96c2f4ff14f1982cc5864c007600abe74c
-  data.tar.gz: 7d54401b026fe77b989e7c3f03930e4d356cfeef071cf61e7044fc7cd01cf5d2
+  metadata.gz: 33dede3fdb6014a97d8f77a9db5dd151ca0c9ba9a11c7a3fc9a5bcb3c24b150d
+  data.tar.gz: 6c523b04a532a1edb0565e2ec31b1e70f37c6fbf4349b3e19d13c22c77e873ee
 SHA512:
-  metadata.gz: 663677f25c77ec5bdd8695eee148ebe5257fbc5f23bffd90bb3a4f9bd26e42c25d55adef1aab2a9c22711440ad786dc2b9624b676b5645d08a78237520cfd842
-  data.tar.gz: fa519caed15b050b873cae81b437d000d75423cbf980c9a10db8215cc5cd684e68dd09965dec92e5f9cd7f05d808b880c4365f35c01b4c41dc063d8edc7f908f
+  metadata.gz: d291a385e04da5a17b60b783e8c4e617d38cbcb36a9b4985600cc32cb54fface89764e06623e0b5d2a66c6fec6df7a7719d8f499e3817fc0b937f8efbcad667f
+  data.tar.gz: 0f587a0f0b3ca7439b978a20f57f395620435739f7b594374416d5c6abe926a03837a6efdb8fe1b541cbf9363e150184ba748a86ca7479ece1e2fcd9cac83d04

data/.gitignore

@@ -8,6 +8,7 @@
 /tmp/
 /spec/fixtures/.jekyll-cache/
 /spec/fixtures/_site/
+/spec/fixtures/dist/
 /spec/fixtures/node_modules/
 /*.gem
 

data/Gemfile.lock

@@ -1,32 +1,32 @@
 PATH
   remote: .
   specs:
-    jekyll-webpack (0.1.2)
+    jekyll-webpack (0.2.3)
       jekyll
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     coderay (1.1.3)
     colorator (1.1.0)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.4.4)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.13.0)
-    formatador (0.2.5)
+    ffi (1.15.3)
+    formatador (0.3.0)
     forwardable-extended (2.6.0)
-    guard (2.16.2)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -35,36 +35,36 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     http_parser.rb (0.6.0)
-    i18n (1.8.3)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jekyll (4.1.0)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
       jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
       mercenary (~> 0.4.0)
       pathutil (~> 0.9)
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
+      terminal-table (~> 2.0)
     jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.2.1)
+    kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.2.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.5)
+    lumberjack (1.2.8)
     mercenary (0.4.0)
     method_source (1.0.0)
     nenv (0.3.0)
@@ -73,36 +73,36 @@ GEM
       shellany (~> 0.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rake (12.3.3)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.4)
-    rouge (3.19.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rexml (3.2.5)
+    rouge (3.26.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
     shellany (0.0.1)
-    terminal-table (1.8.0)
+    terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (1.0.1)
+    thor (1.1.0)
     unicode-display_width (1.7.0)
 
 PLATFORMS
@@ -118,4 +118,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.1.3
+   2.2.3

data/README.md

@@ -6,8 +6,6 @@ This plugin will allow you to build your assets with Webpack _after_ Jekyll has
 
 This adds Webpack at a sane point in the build pipeline and will also allow you to parameterize your webpack and other JS config files by prepending them with front matter, before the compilation occurs. You can see a functioning example in the `spec/fixtures` folder:-
 
-There is a `_data/tailwind.yml` file in the fixure site that's picked up by adding a frontmatter declaration in `tailwind.config.js`. This Tailwind config is in turn picked up by the outputted webpack config and parsed when webpack runs.
-
 
 ## Installation
 
@@ -29,7 +27,18 @@ And add the following to your site's `_config.yml`
 
 ```yml
 plugins:
-  - jekyll-webpack
+  - jekyll/webpack
+```
+
+NOTE the `/` - the `-` variant is not available yet.
+
+ALSO NOTE - it's probably advisable to place this plugin as the very last one in the build pipe. EG:-
+
+```yml
+plugins:
+  - jekyll-otherplug
+  ...
+  - jekyll/webpack
 ```
 
 ## Usage
@@ -38,6 +47,53 @@ In your root Jekyll project folder you need to have Webpack installed, so:-
 
 `yarn add webpack webpack-cli --dev`
 
+And the basic JS entrypoint `mkdir src && touch src/index.js`
+
+And you're away! Just run the `jekyll serve` or `jekyll build` commands with whatever env you need.
+
+## Config
+
+### Configuring JS config files
+
+There is a `_data/tailwind.yml` file in the fixure site that's picked up by adding a frontmatter declaration in `tailwind.config.js`. This Tailwind config is in turn picked up by the outputted webpack config and parsed when webpack runs.
+
+### Cleanup
+If you wish to clean out unused source files after webpack has run that got included in the compiled site, you need to add an entry into your `_config.yml` like:
+
+``` yml
+// _config.yml
+
+webpack:
+  cleanup_files: src
+
+// or an array
+
+webpack:
+  cleanup_files:
+    - src
+    - node_modules
+```
+
+### Dest inclusion (excluding
+If want to ensure that webpack only runs in a specific site dest (eg `_site` only, and no subdirectories) you can pass a single path value or an inclusion list of paths you want webpack to run in, at config time, by modifiying the `_config.yml` like so:
+
+``` yml
+// _config.yml
+
+webpack:
+  only_in: _site
+
+// or as a list
+webpack:
+  only_in:
+    - _site
+    - _build
+```
+
+### Example `_config.yml`
+You can have a look at the possible configuration options in the fixtures config file at `spec/fixtures/_config.yml` in this repo.
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then `cd spec/fixtures && yarn` to install required JS dependencies for specs. 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/lib/jekyll/webpack.rb

@@ -11,15 +11,48 @@ module Jekyll
     def self.build(site)
       site_dest = site.dest
 
+      only_in = site.config.dig('webpack', 'only_in')
+      if only_in
+        entries = []
+        array_or_scalar(only_in) { |entry| entries << site_dest.end_with?(entry) }
+        return unless entries.any? true
+      end
+
       stdout, stderr, status = Open3.capture3(
         "../node_modules/.bin/webpack",
         chdir: File.expand_path(site_dest)
       )
 
-      runtime_error = stdout =~ /error/i
+      runtime_error = stdout =~ /ERROR in|SyntaxError/
 
       raise Error, stderr if stderr.size > 0
       raise Error, stdout if !runtime_error.nil?
+
+      cleanup(site)
+    end
+
+    def self.cleanup(site)
+      cleanup_files = site.config.dig('webpack', 'cleanup_files')
+
+      if cleanup_files
+        array_or_scalar(cleanup_files) do |dest_for_clean|
+          if Dir.exists?(File.expand_path(dest_for_clean, site.dest))
+            FileUtils.rm_rf(File.expand_path(dest_for_clean, site.dest))
+          end
+        end
+      end
+    end
+
+    private
+
+    def self.array_or_scalar(value)
+      if Array === value
+        value.each do |entry|
+          yield entry
+        end
+      else
+        yield value
+      end
     end
   end
 end

data/lib/jekyll/webpack/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Webpack
-    VERSION = "0.2.0"
+    VERSION = "0.2.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-webpack
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.4
 platform: ruby
 authors:
 - Steve Martin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -137,7 +137,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/tevio/jekyll-webpack
   source_code_uri: https://github.com/mml/jekyll-webpack
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,8 +152,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Compile assets with webpack
 test_files: []