jekyll-js-converter 0.0.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f975186d3b4d088fb3ee18595c6b6f43b1226defb8f44d06e2683663c60a611
-  data.tar.gz: fd7abf2439a6a69133cdd2c0e55ed3f30fa8d8e2dc95698d1b1314cb934e4a60
+  metadata.gz: 01a1eeed7b7f346b0419859c5c4f59cd735c311f4f80ab1571147abf0d82cf66
+  data.tar.gz: 004070e0d99a326d423b20bf8bb3691c98e05d7e1089f7262304c3740317e297
 SHA512:
-  metadata.gz: '086d6cef9f35f63debb0ff5a0bfead0c11cc69e45f1e543ba3191cd6a619a7d3f7a45b8ebe465348de2ee2bec04b3d2d1155f7f52645fbca394ce589f91f1941'
-  data.tar.gz: ee944a5a249415e7308a67488a6d2e0bc44a7f2a71153301444da9dd18265c03d0529be0b2d02125acc751dd06c08b3973c1aa39a2df0ea0b1888ccd51636a82
+  metadata.gz: 27142c7333b1ba84a3dea919ff2f3614e23b8d4f783f8c7280b97e55e6d9266924e0af3ddc1be79ba0ee6f9368013a2e70918ce18c03a9204d4dc25ca6cd86cb
+  data.tar.gz: a91ec043fbcc3c279616f47e462f8574dbbcc355962c4534605749653e9f77983bdcd79455424c9a6d8c77a602afa3527eb3b50413510cbf6958b42c620e779a

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

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

data/lib/jekyll/converters/js.rb

@@ -11,7 +11,6 @@ module Jekyll
 
       def associate_page(page)
         @page = page
-        @site = @page.site
         @source_map_page = JsSourceMapPage.new(@page)
       end
 
@@ -31,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
@@ -51,7 +50,7 @@ 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
@@ -60,7 +59,7 @@ module Jekyll
         ext =~ /^\.js$/i
       end
 
-      def output_ext(ext)
+      def output_ext(ext = '')
         '.js'
       end
 
@@ -87,7 +86,7 @@ module Jekyll
           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
+          site.pages << @source_map_page
 
           uglified
         else
@@ -110,7 +109,7 @@ module Jekyll
         elsif source_map_option.eql?(:always)
           true
         else
-          :development == source_map_option == Jekyll.env.to_sym
+          :development == source_map_option && source_map_option == Jekyll.env.to_sym
         end
       end
 
@@ -151,6 +150,10 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-js-converter
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
 platform: ruby
 authors:
 - David Susco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uglifier