jekyll-js-converter 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dbb1d9c51749616f197d23c0210a5f9cca4e46235a9ef8f0d64528903090d08
-  data.tar.gz: 9d79b25157ea3579e0338fe6d9f74149ae5be2769b3d0a15f4c2cfc1e379205e
+  metadata.gz: 8f975186d3b4d088fb3ee18595c6b6f43b1226defb8f44d06e2683663c60a611
+  data.tar.gz: fd7abf2439a6a69133cdd2c0e55ed3f30fa8d8e2dc95698d1b1314cb934e4a60
 SHA512:
-  metadata.gz: f4d31d5caff7f8eb48e6b1653ee6ffbcabaf853f6202355fd51370cdf53e0c634b5cc75972782b3348f10986c57483555ef662da6e0317491419d2febd171389
-  data.tar.gz: 38a3249861d2afad8e7e0284812c647fc4b67f59e79c6d37d2c7b8b89ef6e9d2d4c8b2615d4a48f01bf6cb57960d27a7190578e7c57b952c88a917452c70ccd7
+  metadata.gz: '086d6cef9f35f63debb0ff5a0bfead0c11cc69e45f1e543ba3191cd6a619a7d3f7a45b8ebe465348de2ee2bec04b3d2d1155f7f52645fbca394ce589f91f1941'
+  data.tar.gz: ee944a5a249415e7308a67488a6d2e0bc44a7f2a71153301444da9dd18265c03d0529be0b2d02125acc751dd06c08b3973c1aa39a2df0ea0b1888ccd51636a82

data/lib/jekyll-js-converter.rb

@@ -7,4 +7,20 @@ module JekyllJsConverter
       @javascript_path ||= path_for '_javascript'
     end
   end
+
+  Jekyll::Hooks.register :pages, :pre_render do |page|
+    if page.is_a?(Jekyll::Page)
+      page.converters.each do |converter|
+        converter.associate_page(page) if converter.is_a?(Jekyll::Converters::Js)
+      end
+    end
+  end
+
+  Jekyll::Hooks.register :pages, :post_render do |page|
+    if page.is_a?(Jekyll::Page)
+      page.converters.each do |converter|
+        converter.dissociate_page(page) if converter.is_a?(Jekyll::Converters::Js)
+      end
+    end
+  end
 end

data/lib/jekyll-js-converter/version.rb

@@ -1,3 +1,3 @@
 module JekyllJsConverter
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/jekyll/converters/js.rb

@@ -1,4 +1,5 @@
 require 'uglifier'
+require 'jekyll/js_source_map_page'
 
 module Jekyll
   module Converters
@@ -8,21 +9,16 @@ module Jekyll
       safe true
       priority :low
 
-      def initialize(config = {})
-        @site = Jekyll.sites.last
-        super
+      def associate_page(page)
+        @page = page
+        @site = @page.site
+        @source_map_page = JsSourceMapPage.new(@page)
       end
 
-      def matches(ext)
-        ext =~ /^\.js$/i
-      end
-
-      def output_ext(ext)
-        '.js'
-      end
-
-      def safe?
-        !!@config['safe']
+      def dissociate_page(page)
+        @page = nil
+        @site = nil
+        @source_map_page = nil
       end
 
       def javascript_config
@@ -60,21 +56,66 @@ module Jekyll
         end
       end
 
+      def matches(ext)
+        ext =~ /^\.js$/i
+      end
+
+      def output_ext(ext)
+        '.js'
+      end
+
+      def safe?
+        !!@config['safe']
+      end
+
       def convert(content)
-        config = Jekyll::Utils.symbolize_hash_keys(
-          Jekyll::Utils.deep_merge_hashes(
-            { :uglifer => {} },
-            javascript_config
+        if generate_source_map?
+          config = Jekyll::Utils.symbolize_hash_keys(
+            Jekyll::Utils.deep_merge_hashes(
+              { :uglifer => {
+                  :source_map => {
+                    :map_url => @source_map_page.name,
+                    :sources_content => true,
+                    :filename => @page.name
+                  }
+                }
+              },
+              javascript_config
+            )
+          )
+
+          uglified, source_map = Uglifier.new(config[:uglifer]).compile_with_map(insert_imports(content))
+
+          @source_map_page.source_map(source_map)
+          @site.pages << @source_map_page
+
+          uglified
+        else
+          config = Jekyll::Utils.symbolize_hash_keys(
+            Jekyll::Utils.deep_merge_hashes(
+              { :uglifer => {} },
+              javascript_config
+            )
           )
-        )
 
-        Uglifier.new(config[:uglifer]).compile(insert_imports(content))
+          Uglifier.new(config[:uglifer]).compile(insert_imports(content))
+        end
       end
 
       private
 
+      def generate_source_map?
+        if @page.nil? || source_map_option.eql?(:never)
+          false
+        elsif source_map_option.eql?(:always)
+          true
+        else
+          :development == source_map_option == Jekyll.env.to_sym
+        end
+      end
+
       def insert_imports(content)
-        content.enum_for(:scan, /^\W*=\s*(\w+)\W+([\w\/\\\-\.:]+)\W*$/).map {
+        content.enum_for(:scan, /^\/\/=\s*(\w+)\s+([\w\/\\\-\.:]+)\W*$/).map {
           { directive: Regexp.last_match[1],
             path: Regexp.last_match[2],
             insert_at: Regexp.last_match.end(0) }
@@ -109,6 +150,10 @@ module Jekyll
 
         content
       end
+
+      def source_map_option
+        javascript_config.fetch('source_map', :always).to_sym
+      end
     end
   end
 end

data/lib/jekyll/js_source_map_page.rb

@@ -0,0 +1,29 @@
+module Jekyll
+  class JsSourceMapPage < Page
+    def initialize(js_page)
+      @site = js_page.site
+      @dir  = js_page.dir
+      @data = js_page.data
+      @name = js_page.basename + '.js.map'
+
+      process(@name)
+      Jekyll::Hooks.trigger :pages, :post_init, self
+    end
+
+    def source_map(map)
+      self.content = map
+    end
+
+    def ext
+      '.map'
+    end
+
+    def asset_file?
+      true
+    end
+
+    def inspect
+      "#<#{self.class} @name=#{name.inspect}>"
+    end
+  end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-js-converter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - David Susco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: jekyll
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +89,7 @@ files:
 - lib/jekyll-js-converter.rb
 - lib/jekyll-js-converter/version.rb
 - lib/jekyll/converters/js.rb
+- lib/jekyll/js_source_map_page.rb
 homepage: https://github.com/dsusco/jekyll-js-converter
 licenses:
 - MIT
@@ -122,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A JavaScript converter for Jekyll.