jekyll-js-converter 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35ce19874bece0b15749342809e2be5c3ca1c61986c9e9fe50511e173d9a00a8
-  data.tar.gz: 6e8fa014a1e3a5c9d95bcfff49560e1462dd6a154003205e392852789fd14832
+  metadata.gz: 01a1eeed7b7f346b0419859c5c4f59cd735c311f4f80ab1571147abf0d82cf66
+  data.tar.gz: 004070e0d99a326d423b20bf8bb3691c98e05d7e1089f7262304c3740317e297
 SHA512:
-  metadata.gz: b348d0d6275cdfd5f8f9d380c88758fa88dcf623c9cdf715151de1a40d8493c0086e8d9b70c68abf1d1bb593c1c5bba9b0a045b6c7b8cd3badc1482b4e8c7246
-  data.tar.gz: 3e83022159c18365ca3d2141e6c0c7ad972edc76d850862b6b7dc8a6dd298a24c0077bbb9704885ed9f86273ff930e2d6839725ddfd16fc964097f694404a12b
+  metadata.gz: 27142c7333b1ba84a3dea919ff2f3614e23b8d4f783f8c7280b97e55e6d9266924e0af3ddc1be79ba0ee6f9368013a2e70918ce18c03a9204d4dc25ca6cd86cb
+  data.tar.gz: a91ec043fbcc3c279616f47e462f8574dbbcc355962c4534605749653e9f77983bdcd79455424c9a6d8c77a602afa3527eb3b50413510cbf6958b42c620e779a

data/lib/jekyll-js-converter.rb

@@ -2,4 +2,25 @@ require 'jekyll-js-converter/version'
 require 'jekyll/converters/js'
 
 module JekyllJsConverter
+  class Jekyll::Theme
+    def javascript_path
+      @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.2'
+  VERSION = '1.0.0'
 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,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 if @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(
+              { :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 && 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) }
@@ -86,17 +126,21 @@ module Jekyll
             import_content = load_paths.reduce([]) { |files, load_path|
               glob = case match[:directive]
               when 'import'
-                match[:path] += '.js' unless match[:path].end_with?('.js')
-                File.join(load_path, '**', match[:path])
+                if (match[:path] =~ URI::regexp).nil?
+                  match[:path] += '.js' unless match[:path].end_with?('.js')
+                  Dir.glob(File.join(load_path, '**', match[:path]))
+                else
+                  [match[:path]]
+                end
               when 'import_directory'
-                File.join(load_path, '**', match[:path], '*.js')
+                Dir.glob(File.join(load_path, '**', match[:path], '*.js'))
               when 'import_tree'
-                File.join(load_path, '**', match[:path], '**', '*.js')
+                Dir.glob(File.join(load_path, '**', match[:path], '**', '*.js'))
               end
 
-              files + Dir.glob(glob)
+              files + glob
             }.uniq.reduce('') { |import_content, file|
-              import_content += File.read(file)
+              import_content += (file =~ URI::regexp).nil? ? File.read(file) : Net::HTTP.get(URI(file))
             }
 
             content.insert(match[:insert_at], "\n#{insert_imports(import_content)}")
@@ -105,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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-js-converter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - David Susco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-30 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,7 +89,7 @@ files:
 - lib/jekyll-js-converter.rb
 - lib/jekyll-js-converter/version.rb
 - lib/jekyll/converters/js.rb
-- lib/jekyll/theme.rb
+- lib/jekyll/js_source_map_page.rb
 homepage: https://github.com/dsusco/jekyll-js-converter
 licenses:
 - MIT

data/lib/jekyll/theme.rb

@@ -1,7 +0,0 @@
-module Jekyll
-  class Theme
-    def javascript_path
-      @javascript_path ||= path_for '_javascript'
-    end
-  end
-end