jekyll-assets 3.0.7 → 3.0.8

data/lib/jekyll/assets/tag.rb

@@ -204,8 +204,8 @@ module Jekyll
         env = ctx.registers[:site].sprockets
 
         env.logger.error e.message
-        env.logger.efile env.strip_paths(e.backtrace.first)
-        env.logger.error "error from file #{args[:argv1]}"
+        env.logger.err_file env.strip_paths(e.backtrace.first)
+        env.logger.error "error from file #{args[:argv1]}" if args
         raise e.class, "Sass Error"
       end
     end

data/lib/jekyll/assets/utils.rb

@@ -5,16 +5,37 @@
 module Jekyll
   module Assets
     module Utils
+      def self.old_sprockets?
+        @old_sprockets ||= begin
+          Gem::Version.new(Sprockets::VERSION) < Gem::Version.new("4.0.beta")
+        end
+      end
+
+      # --
+      def self.new_uglifier?
+        require "uglifier"
+        modern_supported_version = "4.0.0"
+        Gem::Version.new(Uglifier::VERSION) >= Gem::Version
+          .new(modern_supported_version)
+      rescue LoadError
+        return true
+      end
+
+      # --
       def self.activate(gem)
-        return unless Gem::Specification.find_all_by_name(gem)&.any? ||
-            Gem::Specification.find_by_path(gem)&.any?
+        spec = Gem::Specification
+        return unless spec.find_all_by_name(gem)&.any? || \
+            spec.find_by_path(gem)&.any?
 
         require gem
         if block_given?
           yield
         end
+
+        true
       end
 
+      # --
       def self.html_fragment(*a)
         Nokogiri::HTML.fragment(*a) do |c|
           c.options = Nokogiri::XML::ParseOptions::NONET | \
@@ -37,6 +58,7 @@ module Jekyll
         end
       end
 
+      # --
       def raw_precompiles
         asset_config[:raw_precompile].each_with_object([]) do |v, a|
           if v.is_a?(Hash)
@@ -89,9 +111,8 @@ module Jekyll
       # --
       def url_asset(url, type:)
         name = File.basename(url)
-        old_ = Env.old_sprockets?
 
-        Url.new(*[old_ ? self : nil, {
+        Url.new(*[Utils.old_sprockets? ? self : nil, {
           name: name,
           filename: url,
           content_type: type,
@@ -148,25 +169,21 @@ module Jekyll
         case true
         when obj.is_a?(Hash) || obj.is_a?(Liquid::Tag::Parser)
           obj.each_key.with_object(obj) do |k, o|
-            if o[k].is_a?(String)
-              then o[k] = parse_liquid(o[k], {
-                ctx: ctx,
-              })
-            end
+            o[k] = parse_liquid(o[k], {
+              ctx: ctx,
+            })
           end
         when obj.is_a?(Array)
           obj.map do |v|
-            if v.is_a?(String)
-              then v = parse_liquid(v, {
-                ctx: ctx,
-              })
-            end
-
-            v
+            parse_liquid(v, {
+              ctx: ctx,
+            })
           end
-        else
+        when obj.is_a?(String)
           ctx.registers[:site].liquid_renderer.file("(asset:var)")
             .parse(obj).render!(ctx)
+        else
+          obj
         end
       end
 
@@ -317,7 +334,7 @@ module Jekyll
           end
         end
       rescue ExecJS::RuntimeUnavailable
-        nil
+        false
       end
     end
   end

data/lib/jekyll/assets/version.rb

@@ -4,6 +4,6 @@
 
 module Jekyll
   module Assets
-    VERSION = "3.0.7"
+    VERSION = "3.0.8"
   end
 end

data/lib/jekyll/assets/writer.rb

@@ -2,45 +2,42 @@
 # Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
-module SprocketsExportersFileExporterPatches
-  def skip?(logger)
-    return true if File.exist?(target)
-    logger.debug "Writing asset to #{target}"
-    false
-  end
-
-  # --
-  def call
-    before_hook(asset, env: environment)
-    after_hook(out = super, {
-      env: environment, asset: asset
-    })
+if defined?(Sprockets::Exporters)
+  module SprocketsWriterPatches
+    def skip?(logger)
+      return true if File.exist?(target)
+      logger.debug "Writing asset to #{target}"
+      false
+    end
 
-    out
-  end
+    # --
+    def call
+      before_hook(asset, env: environment)
+      after_hook(out = super, {
+        env: environment, asset: asset
+      })
 
-  # --
-  private
-  def before_hook(asset, env:)
-    Jekyll::Assets::Hook.trigger :asset, :before_write do |v|
-      v.call(asset, env)
+      out
     end
-  end
 
-  # --
-  private
-  def after_hook(out, asset:, env:)
-    Jekyll::Assets::Hook.trigger :asset, :after_write do |v|
-      v.call(out, asset, env)
+    # --
+    private
+    def before_hook(asset, env:)
+      Jekyll::Assets::Hook.trigger :asset, :before_write do |v|
+        v.call(asset, env)
+      end
     end
-  end
-end
 
-# --
-module Sprockets
-  module Exporters
-    class FileExporter
-      prepend SprocketsExportersFileExporterPatches
+    # --
+    private
+    def after_hook(out, asset:, env:)
+      Jekyll::Assets::Hook.trigger :asset, :after_write do |v|
+        v.call(out, asset, env)
+      end
     end
   end
+
+  # --
+  Sprockets::Exporters::FileExporter.send \
+    :prepend, SprocketsWriterPatches
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Jordon Bedwell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -202,6 +202,9 @@ files:
 - Rakefile
 - lib/jekyll-assets.rb
 - lib/jekyll/assets.rb
+- lib/jekyll/assets/compressors/sassc.rb
+- lib/jekyll/assets/compressors/scss.rb
+- lib/jekyll/assets/compressors/uglify.rb
 - lib/jekyll/assets/config.rb
 - lib/jekyll/assets/context.rb
 - lib/jekyll/assets/default.rb
@@ -213,10 +216,6 @@ files:
 - lib/jekyll/assets/html.rb
 - lib/jekyll/assets/logger.rb
 - lib/jekyll/assets/manifest.rb
-- lib/jekyll/assets/map.rb
-- lib/jekyll/assets/map/css.rb
-- lib/jekyll/assets/map/javascript.rb
-- lib/jekyll/assets/map/writer.rb
 - lib/jekyll/assets/patches/asset.rb
 - lib/jekyll/assets/patches/cached.rb
 - lib/jekyll/assets/patches/find_asset.rb
@@ -224,6 +223,7 @@ files:
 - lib/jekyll/assets/patches/obsolete.rb
 - lib/jekyll/assets/patches/site.rb
 - lib/jekyll/assets/plugins.rb
+- lib/jekyll/assets/plugins/alternates.rb
 - lib/jekyll/assets/plugins/bootstrap.rb
 - lib/jekyll/assets/plugins/font-awesome.rb
 - lib/jekyll/assets/plugins/frontmatter.rb
@@ -250,6 +250,10 @@ files:
 - lib/jekyll/assets/plugins/proxy/magick.rb
 - lib/jekyll/assets/plugins/proxy/optim.rb
 - lib/jekyll/assets/plugins/searcher.rb
+- lib/jekyll/assets/plugins/srcmap.rb
+- lib/jekyll/assets/plugins/srcmap/css.rb
+- lib/jekyll/assets/plugins/srcmap/javascript.rb
+- lib/jekyll/assets/plugins/srcmap/writer.rb
 - lib/jekyll/assets/proxy.rb
 - lib/jekyll/assets/reader.rb
 - lib/jekyll/assets/tag.rb
@@ -277,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Assets for Jekyll

data/lib/jekyll/assets/map.rb

@@ -1,57 +0,0 @@
-# Frozen-string-literal: true
-# Copyright: 2012 - 2018 - MIT License
-# Encoding: utf-8
-
-require_relative "map/css"
-require_relative "map/javascript"
-require_relative "map/writer"
-require "pathutil"
-
-module Jekyll
-  module Assets
-    module Map
-      NAME = "%<name>s.map"
-      DIR_NAME = "source-maps"
-      DIR = Pathutil.new(DIR_NAME)
-      EXT = ".map"
-
-      # --
-      # @return [String] the map name.
-      # Take the path, and attach the map extension.
-      # @note this just saves logic.
-      # --
-      def self.map_path(env:, asset:)
-        [
-          path({
-            asset: asset,
-            env: env,
-          }),
-          EXT,
-        ].join
-      end
-
-      # --
-      # @note this is used for anything in source-maps.
-      # Strip the filename and return a relative sourcemap path.
-      # @return [Pathutil] the path.
-      # --
-      def self.path(env:, asset:)
-        DIR.join(env.strip_paths(asset.is_a?(Sprockets::Asset) ?
-          asset.filename : asset))
-      end
-
-      # --
-      def self.register_on(instance)
-        return unless instance.asset_config[:source_maps]
-        unless instance.asset_config[:compression]
-          instance.logger.warn "Compression is ignored w/ SourceMaps"
-        end
-
-        # Register everything, so we can get this party started.
-        [Writer, JavaScript, CSS].map { |v| v.register_on(instance) }
-        instance.css_compressor, instance.js_compressor =
-          :source_map, :source_map
-      end
-    end
-  end
-end

data/lib/jekyll/assets/map/css.rb

@@ -1,43 +0,0 @@
-# Frozen-string-literal: true
-# Copyright: 2012 - 2018 - MIT License
-# Encoding: utf-8
-
-require "sprockets"
-
-module Jekyll
-  module Assets
-    module Map
-      class CSS < Sprockets::SassCompressor
-        def call(input)
-          out = super(input)
-          env = input[:environment]
-          asset = env.find_asset!(input[:filename], pipeline: :source)
-          path = asset.filename.sub(env.jekyll.in_source_dir + "/", "")
-          url = Map.map_path(asset: asset, env: env)
-          url = env.prefix_url(url)
-
-          out.update({
-            data: <<~CSS
-              #{out[:data].strip}
-              /*# sourceMappingURL=#{url} */
-              /*# sourceURL=#{path} */
-            CSS
-          })
-        end
-
-        def self.register_on(instance)
-          content_type = "text/css"
-          instance.register_compressor content_type,
-            :source_map, CSS
-        end
-      end
-
-      # --
-      # We load late in some cases.
-      # You can also register it in a Hook.
-      # Globally Register it.
-      # --
-      CSS.register_on(Sprockets)
-    end
-  end
-end

data/lib/jekyll/assets/map/javascript.rb

@@ -1,43 +0,0 @@
-# Frozen-string-literal: true
-# Copyright: 2012 - 2018 - MIT License
-# Encoding: utf-8
-
-require "sprockets"
-
-module Jekyll
-  module Assets
-    module Map
-      class JavaScript < Sprockets::UglifierCompressor
-        def call(input)
-          out = super(input)
-          env = input[:environment]
-          asset = env.find_asset!(input[:filename], pipeline: :source)
-          path = asset.filename.sub(env.jekyll.in_source_dir + "/", "")
-          url = Map.map_path(asset: asset, env: env)
-          url = env.prefix_url(url)
-
-          out.update({
-            data: <<~TXT
-              #{input[:data].strip}
-              //# sourceMappingURL=#{url}
-              //# sourceURL=#{path}
-            TXT
-          })
-        end
-
-        def self.register_on(instance)
-          content_type = "application/javascript"
-          instance.register_compressor(content_type,
-            :source_map, self)
-        end
-      end
-
-      # --
-      # We load late in some cases.
-      # You can also register it in a Hook.
-      # Globally Register it.
-      # --
-      JavaScript.register_on(Sprockets)
-    end
-  end
-end

data/lib/jekyll/assets/map/writer.rb

@@ -1,192 +0,0 @@
-# Frozen-string-literal: true
-# Copyright: 2012 - 2018 - MIT License
-# Encoding: utf-8
-
-require "sprockets"
-require "pathutil"
-
-module Jekyll
-  module Assets
-    module Map
-      class Writer < Sprockets::Exporters::Base
-        alias env environment
-
-        def skip?(_)
-          !env.asset_config[:source_maps] ||
-            !asset.metadata[:map]
-        end
-
-        # --
-        def call
-          clean_file!
-          clean_sources!
-          write_map!
-          write_src!
-        end
-
-        # --
-        # Provides our custom manifest key, full of files.
-        # @note We push everything from the file we are writing to the maps.
-        # @return [Array<String>]
-        # --
-        def files
-          @files ||= begin
-            key = "sourceMapFiles"
-            out = env.manifest.data[key] ||= []
-            unless Manifest.keep_keys.include?(key)
-              Manifest.keep_keys << key
-            end
-
-            out
-          end
-        end
-
-        # --
-        def self.register_on(instance)
-          instance.register_exporter("*/*", self)
-        end
-
-        # --
-        # @return [HashWithIndifferentAccess]
-        # @note do not modify the original map.
-        # Provides a modifible SourceMap
-        # --
-        private
-        def map
-          @map ||= asset.metadata[:map]
-            .with_indifferent_access
-        end
-
-        # --
-        # @return [HashWithIndifferentAccess]
-        # @note this is frozen so you can't modify.
-        # Provides an unmodifiable SourceMap
-        # --
-        private
-        def original_map
-          @original_map ||= asset.metadata[:map]
-            .with_indifferent_access.freeze
-        end
-
-        # --
-        # @note something like _assets/*
-        # Makes sure that the name sits in the asset path.
-        # @return [String]
-        # --
-        private
-        def clean_file!
-          map[:file] = base.join(map[:file]).to_s
-        end
-
-        # --
-        private
-        def clean_sources!
-          if map[:sources]
-            then map[:sources] = map[:sources].map do |v|
-              base.join(strip_src(v))
-            end
-          else
-            map[:sections].each do |v|
-              v[:map][:sources] = v[:map][:sources].map do |vv|
-                base.join(strip_src(vv))
-              end
-            end
-          end
-
-          map
-        end
-
-        # --
-        private
-        def strip_src(path)
-          path = Pathutil.new(path)
-          base = path.basename.gsub(%r!\.source!, "")
-          return path.dirname.join(base).to_s unless path.dirname == "."
-          base.to_s if path.dirname == "."
-        end
-
-        # --
-        # @note we shim this on name.
-        # Privates the base directory in the source.
-        # @return [String]
-        # --
-        private
-        def base
-          Pathutil.new(asset.filename.sub(env.jekyll
-            .in_source_dir + "/", "")).dirname
-        end
-
-        # --
-        # rubocop:disable Layout/BlockEndNewline
-        # rubocop:disable Layout/MultilineBlockLayout
-        # rubocop:disable Style/BlockDelimiters
-        # --
-        private
-        def map_files
-          return original_map[:sources] if original_map.key?(:sources)
-          original_map[:sections].map { |v| v[:map][:sources] \
-            if v.key?(:map) }.flatten.compact
-        end
-
-        # --
-        # rubocop:enable Layout/BlockEndNewline
-        # rubocop:enable Layout/MultilineBlockLayout
-        # rubocop:enable Style/BlockDelimiters
-        # --
-        private
-        def write_map!
-          path = Map.map_path(asset: asset, env: env)
-          write(env.in_dest_dir(path)) do |f|
-            files.push(path)
-            f.write(map.to_json)
-            files.uniq!
-          end
-        end
-
-        # --
-        private
-        def strip_base(asset)
-          return asset if asset.is_a?(Sprockets::Asset)
-          asset.sub(base + "/", "")
-        end
-
-        # --
-        private
-        def write_src!
-          [asset_path, map_files].flatten.compact.uniq.each do |v|
-            next unless (v = env.find_asset(strip_base(v), pipeline: :source))
-            path = map_path(v.filename)
-
-            write(environment.in_dest_dir(path)) do |f|
-              f.write(v.source)
-              files.push(path.to_s)
-                .uniq!
-            end
-          end
-        end
-
-        # --
-        private
-        def asset_path
-          base.join(env.strip_paths(@asset.filename)).to_s
-        end
-
-        # --
-        private
-        def map_path(file)
-          asset = base.join(env.strip_paths(file))
-          Map.path({
-            asset: asset, env: env
-          })
-        end
-      end
-
-      # --
-      # We load late in some cases.
-      # You can also register it in a Hook.
-      # Globally Register it.
-      # --
-      Writer.register_on(Sprockets)
-    end
-  end
-end