jekyll-js-converter 0.0.5 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dbb1d9c51749616f197d23c0210a5f9cca4e46235a9ef8f0d64528903090d08
-  data.tar.gz: 9d79b25157ea3579e0338fe6d9f74149ae5be2769b3d0a15f4c2cfc1e379205e
+  metadata.gz: 1a7d061dea9f28995d3038724a26ed29c6c6cdae0656d105ce6a36c68fde5b52
+  data.tar.gz: 2f76e7e429cc3dcc1bc31e055f8a3112f846c8929b74e34ed5cabc74a0cd900b
 SHA512:
-  metadata.gz: f4d31d5caff7f8eb48e6b1653ee6ffbcabaf853f6202355fd51370cdf53e0c634b5cc75972782b3348f10986c57483555ef662da6e0317491419d2febd171389
-  data.tar.gz: 38a3249861d2afad8e7e0284812c647fc4b67f59e79c6d37d2c7b8b89ef6e9d2d4c8b2615d4a48f01bf6cb57960d27a7190578e7c57b952c88a917452c70ccd7
+  metadata.gz: 8f50bfb3976bfdd1fb284586dd337694794294861a8fae62c357161c7ba90b7355696e2c9697fe969a99b65deda085b5db685756bcd7af6d6464d4a8334fa8e1
+  data.tar.gz: 3502b12bcd960b6dbc0fa090e303c5cabc695700d171740148179051bcd5cd2002c59f9971e703d020532e36d98105e0e3acd6a0f23e4b7478e3b25623b706c7

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,15 @@ module Jekyll
       safe true
       priority :low
 
-      def initialize(config = {})
-        @site = Jekyll.sites.last
-        super
+      def associate_page(page)
+        @page = page
+        @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
@@ -35,19 +30,19 @@ module Jekyll
 
       def load_paths
         @load_paths ||= begin
-          paths = [Jekyll.sanitized_path(@site.source, javascript_dir)]
-          paths += javascript_config['load_paths'].map { |load_path| File.expand_path(load_path) } rescue []
+          paths = [Jekyll.sanitized_path(site.source, javascript_dir)]
+          paths += javascript_config['load_paths'].map { |load_path| File.expand_path(load_path, site.source) } rescue []
 
           if safe?
-            paths.map! { |path| Jekyll.sanitized_path(@site.source, path) }
+            paths.map! { |path| Jekyll.sanitized_path(site.source, path) }
           end
 
-          Dir.chdir(@site.source) do
+          Dir.chdir(site.source) do
             paths = paths.flat_map { |path| Dir.glob(path) }
 
             paths.map! do |path|
               if safe?
-                Jekyll.sanitized_path(site_source, path)
+                Jekyll.sanitized_path(site.source, path)
               else
                 File.expand_path(path)
               end
@@ -55,26 +50,71 @@ module Jekyll
           end
 
           paths.uniq!
-          paths << @site.theme.javascript_path
+          paths << site.theme.javascript_path if site.theme&.javascript_path
           paths.select { |path| File.directory?(path) }
         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(
+              { :uglifier => {
+                  :source_map => {
+                    :map_url => @source_map_page.name,
+                    :sources_content => true,
+                    :filename => @page.name
+                  }
+                }
+              },
+              javascript_config
+            )
+          )
+
+          uglified, source_map = Uglifier.new(config[:uglifier]).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(
+              { :uglifier => {} },
+              javascript_config
+            )
           )
-        )
 
-        Uglifier.new(config[:uglifer]).compile(insert_imports(content))
+          Uglifier.new(config[:uglifier]).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 && 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 +149,14 @@ module Jekyll
 
         content
       end
+
+      def site
+        @site ||= @page.nil? ? Jekyll.sites.last : @page.site
+      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

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

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

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-js-converter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.1
 platform: ruby
 authors:
 - David Susco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2022-05-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.