sprockets 3.7.2 → 4.0.0.beta1

data/lib/rake/sprocketstask.rb

@@ -124,7 +124,7 @@ module Rake
         end
       end
 
-      task :clobber => ["clobber_#{name}"]
+      task clobber: ["clobber_#{name}"]
 
       desc name == :assets ? "Clean old assets" : "Clean old #{name} assets"
       task "clean_#{name}" do
@@ -133,7 +133,7 @@ module Rake
         end
       end
 
-      task :clean => ["clean_#{name}"]
+      task clean: ["clean_#{name}"]
     end
 
     private

data/lib/sprockets.rb

@@ -4,7 +4,6 @@ require 'sprockets/cache'
 require 'sprockets/environment'
 require 'sprockets/errors'
 require 'sprockets/manifest'
-require 'sprockets/deprecation'
 
 module Sprockets
   require 'sprockets/processor_utils'
@@ -23,21 +22,19 @@ module Sprockets
     dependencies: Set.new.freeze,
     dependency_resolvers: {}.freeze,
     digest_class: Digest::SHA256,
-    engine_mime_types: {}.freeze,
-    engines: {}.freeze,
     mime_exts: {}.freeze,
     mime_types: {}.freeze,
     paths: [].freeze,
     pipelines: {}.freeze,
+    pipeline_exts: {}.freeze,
     postprocessors: Hash.new { |h, k| [].freeze }.freeze,
     preprocessors: Hash.new { |h, k| [].freeze }.freeze,
-    registered_transformers: Hash.new { |h, k| {}.freeze }.freeze,
-    root: File.expand_path('..', __FILE__).freeze,
+    registered_transformers: [].freeze,
+    root: __dir__.dup.freeze,
     transformers: Hash.new { |h, k| {}.freeze }.freeze,
     version: "",
     gzip_enabled: true
   }.freeze
-  self.computed_config = {}
 
   @context_class = Context
 
@@ -48,6 +45,7 @@ module Sprockets
   # Common asset text types
   register_mime_type 'application/javascript', extensions: ['.js'], charset: :unicode
   register_mime_type 'application/json', extensions: ['.json'], charset: :unicode
+  register_mime_type 'application/ruby', extensions: ['.rb']
   register_mime_type 'application/xml', extensions: ['.xml']
   register_mime_type 'text/css', extensions: ['.css'], charset: :css
   register_mime_type 'text/html', extensions: ['.html', '.htm'], charset: :html
@@ -80,26 +78,44 @@ module Sprockets
   register_mime_type 'application/x-font-opentype', extensions: ['.otf']
   register_mime_type 'application/x-font-ttf', extensions: ['.ttf']
   register_mime_type 'application/font-woff', extensions: ['.woff']
+  register_mime_type 'application/font-woff2', extensions: ['.woff2']
+
+  require 'sprockets/source_map_processor'
+  register_mime_type 'application/js-sourcemap+json', extensions: ['.js.map']
+  register_mime_type 'application/css-sourcemap+json', extensions: ['.css.map']
+  register_transformer 'application/javascript', 'application/js-sourcemap+json', SourceMapProcessor
+  register_transformer 'text/css', 'application/css-sourcemap+json', SourceMapProcessor
 
   register_pipeline :source do |env|
     []
   end
 
-  register_pipeline :self do |env, type, file_type, engine_extnames|
-    env.self_processors_for(type, file_type, engine_extnames)
+  register_pipeline :self do |env, type, file_type|
+    env.self_processors_for(type, file_type)
+  end
+
+  register_pipeline :default do |env, type, file_type|
+    # TODO: Hack for to inject source map transformer
+    if (type == "application/js-sourcemap+json" && file_type != "application/js-sourcemap+json") ||
+        (type == "application/css-sourcemap+json" && file_type != "application/css-sourcemap+json")
+      [SourceMapProcessor]
+    else
+      env.default_processors_for(type, file_type)
+    end
   end
 
-  register_pipeline :default do |env, type, file_type, engine_extnames|
-    env.default_processors_for(type, file_type, engine_extnames)
+  require 'sprockets/source_map_comment_processor'
+  register_pipeline :debug do
+    [SourceMapCommentProcessor]
   end
 
+  require 'sprockets/preprocessors/default_source_map'
+  register_preprocessor 'text/css', Preprocessors::DefaultSourceMap.new
+  register_preprocessor 'application/javascript', Preprocessors::DefaultSourceMap.new
+
   require 'sprockets/directive_processor'
-  register_preprocessor 'text/css', DirectiveProcessor.new(
-    comments: ["//", ["/*", "*/"]]
-  )
-  register_preprocessor 'application/javascript', DirectiveProcessor.new(
-    comments: ["//", ["/*", "*/"]] + ["#", ["###", "###"]]
-  )
+  register_preprocessor 'text/css', DirectiveProcessor.new(comments: ["//", ["/*", "*/"]])
+  register_preprocessor 'application/javascript', DirectiveProcessor.new(comments: ["//", ["/*", "*/"]])
 
   require 'sprockets/bundle'
   register_bundle_processor 'application/javascript', Bundle
@@ -108,46 +124,77 @@ module Sprockets
   register_bundle_metadata_reducer '*/*', :data, proc { "" }, :concat
   register_bundle_metadata_reducer 'application/javascript', :data, proc { "" }, Utils.method(:concat_javascript_sources)
   register_bundle_metadata_reducer '*/*', :links, :+
+  register_bundle_metadata_reducer '*/*', :map, SourceMapUtils.method(:concat_source_maps)
 
   require 'sprockets/closure_compressor'
   require 'sprockets/sass_compressor'
+  require 'sprockets/sassc_compressor'
+  require 'sprockets/jsminc_compressor'
   require 'sprockets/uglifier_compressor'
   require 'sprockets/yui_compressor'
   register_compressor 'text/css', :sass, SassCompressor
+  register_compressor 'text/css', :sassc, SasscCompressor
   register_compressor 'text/css', :scss, SassCompressor
+  register_compressor 'text/css', :scssc, SasscCompressor
   register_compressor 'text/css', :yui, YUICompressor
   register_compressor 'application/javascript', :closure, ClosureCompressor
+  register_compressor 'application/javascript', :jsmin, JSMincCompressor
+  register_compressor 'application/javascript', :jsminc, JSMincCompressor
   register_compressor 'application/javascript', :uglifier, UglifierCompressor
   register_compressor 'application/javascript', :uglify, UglifierCompressor
   register_compressor 'application/javascript', :yui, YUICompressor
 
+  # Babel, TheFuture™ is now
+  require 'sprockets/babel_processor'
+  register_mime_type 'application/ecmascript-6', extensions: ['.es6'], charset: :unicode
+  register_transformer 'application/ecmascript-6', 'application/javascript', BabelProcessor
+  register_preprocessor 'application/ecmascript-6', DirectiveProcessor.new(comments: ["//", ["/*", "*/"]])
+
   # Mmm, CoffeeScript
   require 'sprockets/coffee_script_processor'
-  Deprecation.silence do
-    register_engine '.coffee', CoffeeScriptProcessor, mime_type: 'application/javascript', silence_deprecation: true
-  end
+  register_mime_type 'text/coffeescript', extensions: ['.coffee', '.js.coffee']
+  register_transformer 'text/coffeescript', 'application/javascript', CoffeeScriptProcessor
+  register_preprocessor 'text/coffeescript', DirectiveProcessor.new(comments: ["#", ["###", "###"]])
 
-  # JST engines
+  # JST processors
   require 'sprockets/eco_processor'
   require 'sprockets/ejs_processor'
   require 'sprockets/jst_processor'
-  Deprecation.silence do
-    register_engine '.jst', JstProcessor, mime_type: 'application/javascript', silence_deprecation: true
-    register_engine '.eco', EcoProcessor, mime_type: 'application/javascript', silence_deprecation: true
-    register_engine '.ejs', EjsProcessor, mime_type: 'application/javascript', silence_deprecation: true
-  end
+  register_mime_type 'text/eco', extensions: ['.eco', '.jst.eco']
+  register_mime_type 'text/ejs', extensions: ['.ejs', '.jst.ejs']
+  register_transformer 'text/eco', 'application/javascript+function', EcoProcessor
+  register_transformer 'text/ejs', 'application/javascript+function', EjsProcessor
+  register_transformer 'application/javascript+function', 'application/javascript', JstProcessor
 
-  # CSS engines
+  # CSS processors
   require 'sprockets/sass_processor'
-  Deprecation.silence do
-    register_engine '.sass', SassProcessor, mime_type: 'text/css', silence_deprecation: true
-    register_engine '.scss', ScssProcessor, mime_type: 'text/css', silence_deprecation: true
-  end
+  register_mime_type 'text/sass', extensions: ['.sass', '.css.sass']
+  register_mime_type 'text/scss', extensions: ['.scss', '.css.scss']
+  register_transformer 'text/sass', 'text/css', SassProcessor
+  register_transformer 'text/scss', 'text/css', ScssProcessor
+  register_preprocessor 'text/sass', DirectiveProcessor.new(comments: ["//", ["/*", "*/"]])
+  register_preprocessor 'text/scss', DirectiveProcessor.new(comments: ["//", ["/*", "*/"]])
   register_bundle_metadata_reducer 'text/css', :sass_dependencies, Set.new, :+
 
-  # Other
+  # ERB
   require 'sprockets/erb_processor'
-  register_engine '.erb', ERBProcessor, mime_type: 'text/plain', silence_deprecation: true
+  register_transformer_suffix(%w(
+    application/ecmascript-6
+    application/javascript
+    application/json
+    application/xml
+    text/coffeescript
+    text/css
+    text/html
+    text/plain
+    text/sass
+    text/scss
+    text/yaml
+  ), 'application/\2+ruby', '.erb', ERBProcessor)
+
+  register_mime_type 'application/html+ruby', extensions: ['.html.erb', '.erb', '.rhtml'], charset: :html
+  register_mime_type 'application/xml+ruby', extensions: ['.xml.erb', '.rxml']
+
 
   register_dependency_resolver 'environment-version' do |env|
     env.version
@@ -165,5 +212,3 @@ module Sprockets
   depend_on 'environment-version'
   depend_on 'environment-paths'
 end
-
-require 'sprockets/legacy'

data/lib/sprockets/asset.rb

@@ -13,8 +13,7 @@ module Sprockets
     # attributes - Hash of ivars
     #
     # Returns Asset.
-    def initialize(environment, attributes = {})
-      @environment  = environment
+    def initialize(attributes = {})
       @attributes   = attributes
       @content_type = attributes[:content_type]
       @filename     = attributes[:filename]
@@ -22,7 +21,6 @@ module Sprockets
       @load_path    = attributes[:load_path]
       @logical_path = attributes[:logical_path]
       @metadata     = attributes[:metadata]
-      @mtime        = attributes[:mtime]
       @name         = attributes[:name]
       @source       = attributes[:source]
       @uri          = attributes[:uri]
@@ -80,14 +78,6 @@ module Sprockets
       metadata[:links] || Set.new
     end
 
-    # Public: Get all internally required assets that were concated into this
-    # asset.
-    #
-    # Returns Array of String asset URIs.
-    def included
-      metadata[:included]
-    end
-
     # Public: Return `String` of concatenated source.
     #
     # Returns String.
@@ -120,22 +110,22 @@ module Sprockets
     end
     alias_method :bytesize, :length
 
+    # Public: Returns String byte digest of source.
+    def digest
+      metadata[:digest]
+    end
+
     # Public: Returns String hexdigest of source.
     def hexdigest
-      DigestUtils.pack_hexdigest(metadata[:digest])
+      DigestUtils.pack_hexdigest(digest)
     end
 
-    # Deprecated: Returns String hexdigest of source.
-    #
-    # In 4.x this will be changed to return a raw Digest byte String.
-    alias_method :digest, :hexdigest
-
     # Pubic: ETag String of Asset.
     alias_method :etag, :hexdigest
 
     # Public: Returns String base64 digest of source.
     def base64digest
-      DigestUtils.pack_base64digest(metadata[:digest])
+      DigestUtils.pack_base64digest(digest)
     end
 
     # Public: A "named information" URL for subresource integrity.
@@ -166,9 +156,6 @@ module Sprockets
         f.write source
       end
 
-      # Set mtime correctly
-      File.utime(mtime, mtime, filename)
-
       nil
     end
 

data/lib/sprockets/autoload.rb

@@ -1,10 +1,13 @@
 module Sprockets
   module Autoload
+    autoload :Babel, 'sprockets/autoload/babel'
     autoload :Closure, 'sprockets/autoload/closure'
     autoload :CoffeeScript, 'sprockets/autoload/coffee_script'
     autoload :Eco, 'sprockets/autoload/eco'
     autoload :EJS, 'sprockets/autoload/ejs'
+    autoload :JSMinC, 'sprockets/autoload/jsminc'    
     autoload :Sass, 'sprockets/autoload/sass'
+    autoload :SassC, 'sprockets/autoload/sassc'
     autoload :Uglifier, 'sprockets/autoload/uglifier'
     autoload :YUI, 'sprockets/autoload/yui'
   end

data/lib/sprockets/autoload/babel.rb

@@ -0,0 +1,7 @@
+require 'babel/transpiler'
+
+module Sprockets
+  module Autoload
+    Babel = ::Babel
+  end
+end

data/lib/sprockets/autoload/jsminc.rb

@@ -0,0 +1,7 @@
+require 'jsminc'
+
+module Sprockets
+  module Autoload
+    JSMinC = ::JSMinC
+  end
+end

data/lib/sprockets/autoload/sassc.rb

@@ -0,0 +1,7 @@
+require 'sassc'
+
+module Sprockets
+  module Autoload
+    SassC = ::SassC
+  end
+end

data/lib/sprockets/babel_processor.rb

@@ -0,0 +1,58 @@
+require 'sprockets/autoload'
+require 'sprockets/path_utils'
+require 'sprockets/source_map_utils'
+require 'json'
+
+module Sprockets
+  class BabelProcessor
+    VERSION = '1'
+
+    def self.instance
+      @instance ||= new
+    end
+
+    def self.call(input)
+      instance.call(input)
+    end
+
+    def initialize(options = {})
+      @options = options.merge({
+        'blacklist' => (options['blacklist'] || []) + ['useStrict'],
+        'sourceMap' => true
+      }).freeze
+
+      @cache_key = [
+        self.class.name,
+        Autoload::Babel::Transpiler::VERSION,
+        Autoload::Babel::Source::VERSION,
+        VERSION,
+        @options
+      ].freeze
+    end
+
+    def call(input)
+      data = input[:data]
+
+      result = input[:cache].fetch(@cache_key + [input[:filename]] + [data]) do
+        opts = {
+          'sourceRoot' => input[:load_path],
+          'moduleRoot' => nil,
+          'filename' => input[:filename],
+          'filenameRelative' => PathUtils.split_subpath(input[:load_path], input[:filename])
+        }.merge(@options)
+
+        if opts['moduleIds'] && opts['moduleRoot']
+          opts['moduleId'] ||= File.join(opts['moduleRoot'], input[:name])
+        elsif opts['moduleIds']
+          opts['moduleId'] ||= input[:name]
+        end
+        Autoload::Babel::Transpiler.transform(data, opts)
+      end
+
+      map = SourceMapUtils.decode_json_source_map(JSON.generate(result['map']))
+      map = SourceMapUtils.combine_source_maps(input[:metadata][:map], map["mappings"])
+
+      { data: result['code'], map: map }
+    end
+  end
+end

data/lib/sprockets/base.rb

@@ -5,18 +5,18 @@ require 'sprockets/configuration'
 require 'sprockets/digest_utils'
 require 'sprockets/errors'
 require 'sprockets/loader'
-require 'sprockets/path_digest_utils'
 require 'sprockets/path_dependency_utils'
+require 'sprockets/path_digest_utils'
 require 'sprockets/path_utils'
 require 'sprockets/resolve'
 require 'sprockets/server'
-require 'sprockets/loader'
+require 'sprockets/source_map_utils'
 require 'sprockets/uri_tar'
 
 module Sprockets
   # `Base` class for `Environment` and `Cached`.
   class Base
-    include PathUtils, PathDependencyUtils, PathDigestUtils, DigestUtils
+    include PathUtils, PathDependencyUtils, PathDigestUtils, DigestUtils, SourceMapUtils
     include Configuration
     include Server
     include Resolve, Loader
@@ -60,17 +60,17 @@ module Sprockets
     end
 
     # Find asset by logical path or expanded path.
-    def find_asset(path, options = {})
-      uri, _ = resolve(path, options.merge(compat: false))
+    def find_asset(*args)
+      uri, _ = resolve(*args)
       if uri
         load(uri)
       end
     end
 
-    def find_all_linked_assets(path, options = {})
-      return to_enum(__method__, path, options) unless block_given?
+    def find_all_linked_assets(*args)
+      return to_enum(__method__, *args) unless block_given?
 
-      asset = find_asset(path, options)
+      asset = find_asset(*args)
       return unless asset
 
       yield asset

data/lib/sprockets/bower.rb

@@ -17,7 +17,7 @@ module Sprockets
       candidates, deps = super
 
       # bower.json can only be nested one level deep
-      if !logical_path.index('/')
+      if !logical_path.index('/'.freeze)
         dirname = File.join(load_path, logical_path)
 
         if directory?(dirname)
@@ -27,7 +27,9 @@ module Sprockets
           if filename
             deps << build_file_digest_uri(filename)
             read_bower_main(dirname, filename) do |path|
-              candidates << path
+              if file?(path)
+                candidates << path
+              end
             end
           end
         end

data/lib/sprockets/bundle.rb

@@ -17,7 +17,7 @@ module Sprockets
       type = input[:content_type]
       dependencies = Set.new(input[:metadata][:dependencies])
 
-      processed_uri, deps = env.resolve(input[:filename], accept: type, pipeline: :self, compat: false)
+      processed_uri, deps = env.resolve(input[:filename], accept: type, pipeline: :self)
       dependencies.merge(deps)
 
       find_required = proc { |uri| env.load(uri).metadata[:required] }