opal-sprockets 0.4.9.1.0.3.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4219e230743e17009790fafebb6ab1ff5dc149bb1c1ef84c92818d455bd8d25f
-  data.tar.gz: a864f139a015e995b14013252a95734f6fb87358ce9bbf9822e53c15aa350ed9
+  metadata.gz: 3b7553caf49b2308f3315be681e7b7ab68d57eaf46b391927e6b1b5942aa8b4e
+  data.tar.gz: 846dd949a0c534c4053b0a298c927bbb101aa5788a7480ba7a855c902a1f599f
 SHA512:
-  metadata.gz: 7a9bfe6e8905b81daca542ce0013e3ba00337846fd34cf9bda3e6efd31b819bf4ee70320d66e9c55518ae5c581a54a4ad8f11e6fa2c49ed93ed3124a7d201ccc
-  data.tar.gz: 3b16bfcda0c2742af3f9e7155be2d07084e13af2e7045477a7f0616e25987c9e7198eb15332dea624841b539411b2aa013da713ea94d523dafca4752cb2dfc1f
+  metadata.gz: b0ed4adf7cab6d38ad475a2393a66ab65fefd0d9522a1aff5acd25fb107f6d56794508dc4fb774da2871fd6d52bb1e8e5823a53fa28dee973239d7585f1c84a5
+  data.tar.gz: 6e96b8ea2acdbd21f38ab91670d8f4c0cd2ed4b4ad3fb0d1c49f78eb45469241efb221bb5a72c0181654012796be7f9673789889c61391f19cfe3d6f688a71e6

data/.github/workflows/build.yml

@@ -0,0 +1,26 @@
+on:
+  - push
+  - pull_request
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ 'ubuntu-latest' ]
+        ruby: [ "3.0", "2.7", "2.6", "2.5" ]
+        opal: [ "1.0.3", "1.1.0" ]
+
+    runs-on: ${{ matrix.os }}
+
+    env:
+      OPAL_VERSION: ${{ matrix.opal }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Setup project
+        run: bin/setup
+      - name: Run test
+        run: bin/rake

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [1.0.0](https://github.com/opal/opal-sprockets/compare/v0.4.9.1.0.3.7...v1.0.0)
+
+*19 February 2021*
+
+- Bump the supported sprockets version to v4
+- Add support for Opal v1.1
+- Only support Ruby comments in directive preprocessor (no one should have ever used "//", ["/*", or "*/")
+- Fix the namespaces and move everything under Opal::Sprockets (the legacy namespaces will be dropped in version 1.1)
+- The version schema has been simplified, not expecting sprockets to have major earthquakes like it was for v4
+
+
 ## [v0.4.9](https://github.com/opal/opal-sprockets/compare/v0.4.8.1.0.3.7...v0.4.9.1.0.3.7)
 
 *11 September 2020*

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "opal"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/rake

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+gem install bundler --conservative
+
+bundle update

data/lib/opal/environment.rb

@@ -0,0 +1,4 @@
+warn "Opal::Environment is deprecated, please switch to Opal::Sprockets::Environment.", uplevel: 1
+
+require 'opal/sprockets/environment'
+Opal::Environment = Opal::Sprockets::Environment

data/lib/opal/processor.rb

@@ -0,0 +1,4 @@
+warn "Opal::Processor is deprecated, please switch to Opal::Sprockets::Processor.", uplevel: 1
+
+require 'opal/sprockets/processor'
+Opal::Processor = Opal::Sprockets::Processor

data/lib/opal/sprockets.rb

@@ -1,87 +1,19 @@
 require 'opal'
-require 'opal/sprockets/processor'
-require 'opal/sprockets/erb'
-require 'opal/sprockets/server'
+require 'opal/sprockets/version'
 
 module Opal
   module Sprockets
-    # Bootstraps modules loaded by sprockets on `Opal.modules` marking any
-    # non-Opal asset as already loaded.
-    #
-    # @example
-    #
-    #   Opal::Sprockets.load_asset('application')
-    #
-    # @example Will output the following JavaScript:
-    #
-    #   Opal.loaded("jquery.self", "yet_another_carousel.self");
-    #   Opal.require("opal", "application");
-    #
-    # @param name [String] The logical name of the main asset to be loaded (without extension)
-    #
-    # @return [String] JavaScript code
-    def self.load_asset(*names)
-      if names.last.is_a?(::Sprockets::Environment)
-        unless @load_asset_warning_displayed
-          @load_asset_warning_displayed = true
-          warn "Passing a sprockets environment to Opal::Sprockets.load_asset no more needed.\n  #{caller(1, 3).join("\n  ")}"
-        end
-        names.pop
-      end
-
-      names = names.map { |name| name.sub(/(\.(js|rb|opal))*\z/, '') }
-      stubbed = ::Opal::Config.stubbed_files.to_a
-
-      loaded = 'typeof(OpalLoaded) === "undefined" ? [] : OpalLoaded'
-      loaded = "#{stubbed.to_json}.concat(#{loaded})" if stubbed.any?
-
-      [
-        "Opal.loaded(#{loaded});",
-        *names.map { |name| "Opal.require(#{name.to_json});" }
-      ].join("\n")
-    end
-
-    # Mark an asset as already loaded.
-    # This is useful for requiring JavaScript files which are not managed by Opal's laoding system.
-    #
-    # @param [String] name The "logical name" of the asset
-    # @return [String] JavaScript code
-    def self.loaded_asset(name)
-      %{if (typeof(OpalLoaded) === 'undefined') OpalLoaded = []; OpalLoaded.push(#{name.to_json});}
-    end
-
-    # Generate a `<script>` tag for Opal assets.
-    #
-    # @param [String] name     The logical name of the asset to be loaded (without extension)
-    # @param [Hash]   options  The options about sprockets
-    # @option options [Sprockets::Environment] :sprockets  The sprockets instance
-    # @option options [String]                 :prefix     The prefix String at which is mounted Sprockets, e.g. '/assets'
-    # @option options [Boolean]                :debug      Wether to enable debug mode along with sourcemaps support
-    #
-    # @return a string of HTML code containing `<script>` tags.
-    def self.javascript_include_tag(name, options = {})
-      sprockets = options.fetch(:sprockets)
-      prefix    = options.fetch(:prefix)
-      debug     = options.fetch(:debug)
-
-      # Avoid double slashes
-      prefix = prefix.chop if prefix.end_with? '/'
-
-      asset = sprockets[name]
-      raise "Cannot find asset: #{name}" if asset.nil?
-      scripts = []
-
-      if debug
-        asset.to_a.map do |dependency|
-          scripts << %{<script src="#{prefix}/#{dependency.digest_path}?body=1"></script>}
-        end
-      else
-        scripts << %{<script src="#{prefix}/#{name}.js"></script>}
-      end
-
-      scripts << %{<script>#{load_asset('opal', name)}</script>}
-
-      scripts.join "\n"
-    end
+    require 'opal/sprockets/assets_helper'
+    require 'opal/sprockets/mime_types'
+    extend AssetsHelper
+    extend MimeTypes
+
+    require 'opal/sprockets/environment'
+    require 'opal/sprockets/erb'
+    require 'opal/sprockets/processor'
+    require 'opal/sprockets/server'
   end
+
+  autoload :Processor, 'opal/processor'
+  autoload :Environment, 'opal/environment'
 end

data/lib/opal/sprockets/assets_helper.rb

@@ -0,0 +1,78 @@
+module Opal::Sprockets::AssetsHelper
+  # Bootstraps modules loaded by sprockets on `Opal.modules` marking any
+  # non-Opal asset as already loaded.
+  #
+  # @example
+  #
+  #   Opal::Sprockets.load_asset('application')
+  #
+  # @example Will output the following JavaScript:
+  #
+  #   Opal.loaded("jquery.self", "yet_another_carousel.self");
+  #   Opal.require("opal", "application");
+  #
+  # @param name [String] The logical name of the main asset to be loaded (without extension)
+  #
+  # @return [String] JavaScript code
+  def load_asset(*names)
+    if names.last.is_a?(::Sprockets::Environment)
+      unless @load_asset_warning_displayed
+        @load_asset_warning_displayed = true
+        warn "Passing a sprockets environment to Opal::Sprockets.load_asset no more needed.\n  #{caller(1, 3).join("\n  ")}"
+      end
+      names.pop
+    end
+
+    names = names.map { |name| name.sub(/(\.(js|rb|opal))*\z/, '') }
+    stubbed = ::Opal::Config.stubbed_files.to_a
+
+    loaded = 'typeof(OpalLoaded) === "undefined" ? [] : OpalLoaded'
+    loaded = "#{stubbed.to_json}.concat(#{loaded})" if stubbed.any?
+
+    [
+      "Opal.loaded(#{loaded});",
+      *names.map { |name| "Opal.require(#{name.to_json});" }
+    ].join("\n")
+  end
+
+  # Mark an asset as already loaded.
+  # This is useful for requiring JavaScript files which are not managed by Opal's laoding system.
+  #
+  # @param [String] name The "logical name" of the asset
+  # @return [String] JavaScript code
+  def loaded_asset(name)
+    %{if (typeof(OpalLoaded) === 'undefined') OpalLoaded = []; OpalLoaded.push(#{name.to_json});}
+  end
+
+  # Generate a `<script>` tag for Opal assets.
+  #
+  # @param [String] name     The logical name of the asset to be loaded (without extension)
+  # @param [Hash]   options  The options about sprockets
+  # @option options [Sprockets::Environment] :sprockets  The sprockets instance
+  # @option options [String]                 :prefix     The prefix String at which is mounted Sprockets, e.g. '/assets'
+  # @option options [Boolean]                :debug      Wether to enable debug mode along with sourcemaps support
+  #
+  # @return a string of HTML code containing `<script>` tags.
+  def javascript_include_tag(name, options = {})
+    sprockets = options.fetch(:sprockets)
+    prefix    = options.fetch(:prefix)
+    debug     = options.fetch(:debug)
+
+    # Avoid double slashes
+    prefix = prefix.chop if prefix.end_with? '/'
+
+    asset = sprockets[name, accept: "application/javascript", pipeline: debug ? :debug : nil]
+    raise "Cannot find asset: #{name}" if asset.nil?
+    scripts = []
+
+    if debug
+      scripts << %{<script src="#{prefix}/#{asset.digest_path}"></script>}
+    else
+      scripts << %{<script src="#{prefix}/#{name}.js"></script>}
+    end
+
+    scripts << %{<script>#{load_asset('opal', name)}</script>}
+
+    scripts.join "\n"
+  end
+end

data/lib/opal/sprockets/environment.rb

@@ -2,22 +2,20 @@ require 'sprockets'
 require 'opal/sprockets/processor'
 require 'opal/sprockets/erb'
 
-module Opal
-  class Environment < ::Sprockets::Environment
-    def initialize *args
-      super
-      append_opal_paths
-    end
+class Opal::Sprockets::Environment < ::Sprockets::Environment
+  def initialize *args
+    super
+    append_opal_paths
+  end
 
-    def use_gem gem_name
-      Opal.use_gem gem_name
-      append_opal_paths
-    end
+  def use_gem gem_name
+    Opal.use_gem gem_name
+    append_opal_paths
+  end
 
-    private
+  private
 
-    def append_opal_paths
-      Opal.paths.each { |p| append_path p }
-    end
+  def append_opal_paths
+    Opal.paths.each { |p| append_path p }
   end
 end

data/lib/opal/sprockets/erb.rb

@@ -1,23 +1,19 @@
 require 'tilt'
 require 'sprockets'
 require 'opal/sprockets/processor'
+require 'opal/erb'
 
-module Opal
-  module ERB
-    class Processor < ::Opal::Processor
-      def initialize_engine
-        super
-        require_template_library 'opal/erb'
-      end
-
-      def evaluate(context, locals, &block)
-        compiler = Opal::ERB::Compiler.new(@data, context.logical_path.sub(/#{REGEXP_START}templates\//, ''))
-        @data = compiler.prepared_source
-        super
-      end
-    end
+class Opal::Sprockets::ERB < ::Opal::Sprockets::Processor
+  def call
+    compiler = Opal::ERB::Compiler.new(@data, logical_path.sub(/#{Opal::REGEXP_START}templates\//, ''))
+    @data = compiler.prepared_source
+    super
   end
+
+  # @deprecated
+  ::Opal::ERB::Processor = self
 end
 
-Tilt.register 'opalerb', Opal::ERB::Processor
-Sprockets.register_engine '.opalerb', Opal::ERB::Processor, mime_type: 'application/javascript', silence_deprecation: true
+Sprockets.register_mime_type 'application/html+javascript+ruby', extensions: ['.opalerb', '.opal.erb', '.html.opal.erb']
+Sprockets.register_transformer 'application/html+javascript+ruby', 'application/javascript', Opal::ERB::Processor
+Opal::Sprockets.register_mime_type 'application/html+javascript+ruby'

data/lib/opal/sprockets/mime_types.rb

@@ -0,0 +1,19 @@
+module Opal::Sprockets::MimeTypes
+  def register_mime_type(mime_type)
+    mime_types << mime_type
+  end
+
+  def mime_types
+    @mime_types ||= []
+  end
+
+  def sprockets_extnames_regexp(sprockets, opal_only: false)
+    opal_extnames = sprockets.mime_types.map do |type, hash|
+      hash[:extensions] if !opal_only || Opal::Sprockets.mime_types.include?(type)
+    end.compact.flatten
+
+    opal_extnames << ".js" unless opal_only
+
+    Regexp.union(opal_extnames.map { |i| /#{Regexp.escape(i)}\z/ })
+  end
+end

data/lib/opal/sprockets/processor.rb

@@ -3,158 +3,147 @@ require 'base64'
 require 'tilt/opal'
 require 'sprockets'
 require 'opal/builder'
-require 'opal/sprockets/path_reader'
+require 'opal/sprockets'
+
+# Internal: The Processor class is used to make ruby files (with .rb or .opal
+#   extensions) available to any sprockets based server. Processor will then
+#   get passed any ruby source file to build.
+class Opal::Sprockets::Processor
+  @@cache_key = nil
+  def self.cache_key
+    @@cache_key ||= ['Opal', Opal::VERSION, Opal::Config.config].to_json.freeze
+  end
 
-module Opal
-  # Internal: The Processor class is used to make ruby files (with .rb or .opal
-  #   extensions) available to any sprockets based server. Processor will then
-  #   get passed any ruby source file to build.
-  class Processor < TiltTemplate
+  def self.reset_cache_key!
     @@cache_key = nil
-    def self.cache_key
-      @@cache_key ||= ['Opal', Opal::VERSION, Opal::Config.config].to_json.freeze
+  end
+
+  def self.call(input)
+    data, map, dependencies, required = input[:cache].fetch([self.cache_key, input[:filename], input[:data]]) do
+      new(input).call
     end
 
-    def self.reset_cache_key!
-      @@cache_key = nil
+    if map
+      map = ::Sprockets::SourceMapUtils.combine_source_maps(input[:metadata][:map], map)
     end
 
-    def evaluate(context, locals, &block)
-      return super unless context.is_a? ::Sprockets::Context
+    {
+      data: data,
+      map: map,
+      dependencies: input[:metadata][:dependencies].to_a + dependencies.to_a,
+      required: input[:metadata][:required].to_a + required.to_a,
+    }
+  end
 
-      @sprockets = sprockets = context.environment
+  def initialize(input)
+    @input = input
+    @sprockets = input[:environment]
+    @context = sprockets.context_class.new(input)
+    @data = input[:data]
+  end
 
-      # In Sprockets 3 logical_path has an odd behavior when the filename is "index"
-      # thus we need to bake our own logical_path
-      filename = context.respond_to?(:filename) ? context.filename : context.pathname.to_s
-      root_path_regexp = Regexp.escape(context.root_path)
-      logical_path = filename.gsub(%r{^#{root_path_regexp}/?(.*?)#{sprockets_extnames_regexp}}, '\1')
+  attr_reader :input, :sprockets, :context, :data
 
-      compiler_options = self.compiler_options.merge(file: logical_path)
+  # In Sprockets 3 logical_path has an odd behavior when the filename is "index"
+  # thus we need to bake our own logical_path
+  def logical_path
+    @logical_path ||= context.filename.gsub(%r{^#{Regexp.escape(context.root_path)}/?(.*?)}, '\1')
+  end
 
-      compiler = Compiler.new(data, compiler_options)
-      result = compiler.compile
+  def call
+    compiler_options = Opal::Config.compiler_options.merge(requirable: true, file: logical_path)
 
-      process_requires(compiler.requires, context)
-      process_required_trees(compiler.required_trees, context)
+    compiler = Opal::Compiler.new(data, compiler_options)
+    result = compiler.compile
 
-      if Opal::Config.source_map_enabled
-        map_data = compiler.source_map.as_json
-        # Opal 0.11 doesn't fill sourcesContent
-        add_sources_content_if_missing(map_data, data)
-        "#{result}\n#{to_data_uri_comment(map_data.to_json)}"
-      else
-        result.to_s
-      end
-    end
+    process_requires(compiler.requires, context)
+    process_required_trees(compiler.required_trees, context)
 
-    def self.sprockets_extnames_regexp(sprockets)
-      joined_extnames = (['.js']+sprockets.engines.keys).map { |ext| Regexp.escape(ext) }.join('|')
-      Regexp.new("(#{joined_extnames})*$")
+    if Opal::Config.source_map_enabled
+      map = compiler.source_map.as_json.transform_keys!(&:to_s)
+      map["sources"][0] = input[:filename]
+      map = ::Sprockets::SourceMapUtils.format_source_map(map, input)
     end
 
-    def sprockets_extnames_regexp
-      @sprockets_extnames_regexp ||= self.class.sprockets_extnames_regexp(@sprockets)
-    end
+    [result.to_s, map , context.metadata[:dependencies], context.metadata[:required]]
+  end
 
-    def process_requires(requires, context)
-      requires.each do |required|
-        required = required.to_s.sub(sprockets_extnames_regexp, '')
-        context.require_asset required unless ::Opal::Config.stubbed_files.include? required
-      end
+  def sprockets_extnames_regexp
+    @sprockets_extnames_regexp ||= Opal::Sprockets.sprockets_extnames_regexp(@sprockets)
+  end
+
+  def process_requires(requires, context)
+    requires.each do |required|
+      required = required.to_s.sub(sprockets_extnames_regexp, '')
+      context.require_asset required unless ::Opal::Config.stubbed_files.include? required
     end
+  end
 
-    # Internal: Add files required with `require_tree` as asset dependencies.
-    #
-    # Mimics (v2) Sprockets::DirectiveProcessor#process_require_tree_directive
-    def process_required_trees(required_trees, context)
-      return if required_trees.empty?
+  # Internal: Add files required with `require_tree` as asset dependencies.
+  #
+  # Mimics (v2) Sprockets::DirectiveProcessor#process_require_tree_directive
+  def process_required_trees(required_trees, context)
+    return if required_trees.empty?
 
-      # This is the root dir of the logical path, we need this because
-      # the compiler gives us the path relative to the file's logical path.
-      dirname = File.dirname(file).gsub(/#{Regexp.escape File.dirname(context.logical_path)}#{REGEXP_END}/, '')
-      dirname = Pathname(dirname)
+    # This is the root dir of the logical path, we need this because
+    # the compiler gives us the path relative to the file's logical path.
+    dirname = File.dirname(input[:filename]).gsub(/#{Regexp.escape File.dirname(context.logical_path)}#{Opal::REGEXP_END}/, '')
+    dirname = Pathname(dirname)
 
-      required_trees.each do |original_required_tree|
-        required_tree = Pathname(original_required_tree)
+    required_trees.each do |original_required_tree|
+      required_tree = Pathname(original_required_tree)
 
-        unless required_tree.relative?
-          raise ArgumentError, "require_tree argument must be a relative path: #{required_tree.inspect}"
-        end
+      unless required_tree.relative?
+        raise ArgumentError, "require_tree argument must be a relative path: #{required_tree.inspect}"
+      end
 
-        required_tree = dirname.join(file, '..', required_tree)
+      required_tree = dirname.join(input[:filename], '..', required_tree)
 
-        unless required_tree.directory?
-          raise ArgumentError, "require_tree argument must be a directory: #{{source: original_required_tree, pathname: required_tree}.inspect}"
-        end
+      unless required_tree.directory?
+        raise ArgumentError, "require_tree argument must be a directory: #{{source: original_required_tree, pathname: required_tree}.inspect}"
+      end
 
-        context.depend_on required_tree.to_s
+      context.depend_on required_tree.to_s
 
-        environment = context.environment
+      environment = context.environment
 
-        processor = ::Sprockets::DirectiveProcessor.new
-        processor.instance_variable_set('@dirname', File.dirname(file))
-        processor.instance_variable_set('@environment', environment)
-        path = processor.__send__(:expand_relative_dirname, :require_tree, original_required_tree)
-        absolute_paths = environment.__send__(:stat_sorted_tree_with_dependencies, path).first.map(&:first)
+      processor = ::Sprockets::DirectiveProcessor.new
+      processor.instance_variable_set('@dirname', File.dirname(input[:filename]))
+      processor.instance_variable_set('@environment', environment)
+      path = processor.__send__(:expand_relative_dirname, :require_tree, original_required_tree)
+      absolute_paths = environment.__send__(:stat_sorted_tree_with_dependencies, path).first.map(&:first)
 
-        absolute_paths.each do |path|
-          path = Pathname(path)
-          pathname = path.relative_path_from(dirname).to_s
+      absolute_paths.each do |path|
+        path = Pathname(path)
+        pathname = path.relative_path_from(dirname).to_s
+        pathname_noext = pathname.sub(sprockets_extnames_regexp, '')
 
-          if name.to_s == file  then next
-          elsif path.directory? then context.depend_on(path.to_s)
-          else context.require_asset(pathname)
-          end
+        if path.to_s == logical_path then next
+        elsif ::Opal::Config.stubbed_files.include?(pathname_noext) then next
+        elsif path.directory? then context.depend_on(path.to_s)
+        else context.require_asset(pathname_noext)
         end
       end
     end
+  end
 
-    # @deprecated
-    def self.stubbed_files
-      warn "Deprecated: `::Opal::Processor.stubbed_files' is deprecated, use `::Opal::Config.stubbed_files' instead"
-      puts caller(5)
-      ::Opal::Config.stubbed_files
-    end
-
-    # @deprecated
-    def self.stub_file(name)
-      warn "Deprecated: `::Opal::Processor.stub_file' is deprecated, use `::Opal::Config.stubbed_files << #{name.inspect}.to_s' instead"
-      puts caller(5)
-      ::Opal::Config.stubbed_files << name.to_s
-    end
-
-
-    private
-
-    def add_sources_content_if_missing(data, content)
-      data[:sourcesContent] = data.delete(:sourcesContent) || data.delete('sourcesContent') || [content]
-    end
+  private
 
-    def to_data_uri_comment(map_to_json)
-      "//# sourceMappingURL=data:application/json;base64,#{Base64.encode64(map_to_json).delete("\n")}"
-    end
+  def to_data_uri_comment(map_to_json)
+    "//# sourceMappingURL=data:application/json;base64,#{Base64.encode64(map_to_json).delete("\n")}"
+  end
 
-    def stubbed_files
-      ::Opal::Config.stubbed_files
-    end
+  def stubbed_files
+    ::Opal::Config.stubbed_files
   end
-end
 
-module Opal::Sprockets::Processor
   module PlainJavaScriptLoader
     def self.call(input)
       sprockets = input[:environment]
-      asset = OpenStruct.new(input)
-
-      opal_extnames = sprockets.engines.map do |ext, engine|
-        ext if engine <= ::Opal::Processor
-      end.compact
 
-      path_extnames     = -> path  { File.basename(path).scan(/\.[^.]+/) }
-      processed_by_opal = -> asset { (path_extnames[asset.filename] & opal_extnames).any? }
+      opal_extnames_regexp = Opal::Sprockets.sprockets_extnames_regexp(sprockets, opal_only: true)
 
-      if processed_by_opal[asset]
+      if input[:filename] =~ opal_extnames_regexp
         input[:data]
       else
         "#{input[:data]}\n#{Opal::Sprockets.loaded_asset(input[:name])}"
@@ -163,7 +152,15 @@ module Opal::Sprockets::Processor
   end
 end
 
-Sprockets.register_engine '.rb',  Opal::Processor, mime_type: 'application/javascript', silence_deprecation: true
-Sprockets.register_engine '.opal',  Opal::Processor, mime_type: 'application/javascript', silence_deprecation: true
-Sprockets.register_postprocessor 'application/javascript', Opal::Sprockets::Processor::PlainJavaScriptLoader
+Sprockets.register_mime_type 'application/ruby', extensions: ['.rb', '.opal', '.js.rb', '.js.opal']
+Sprockets.register_transformer 'application/ruby', 'application/javascript', Opal::Sprockets::Processor
+Opal::Sprockets.register_mime_type 'application/ruby'
+
+Sprockets.register_mime_type 'application/ruby+ruby', extensions: ['.rb.erb', '.opal.erb', '.js.rb.erb', '.js.opal.erb']
+Sprockets.register_transformer 'application/ruby+ruby', 'application/ruby', Sprockets::ERBProcessor
+Opal::Sprockets.register_mime_type 'application/ruby+ruby'
 
+Sprockets.register_preprocessor 'application/ruby', Sprockets::DirectiveProcessor.new(comments: ["#"])
+Sprockets.register_preprocessor 'application/ruby+ruby', Sprockets::DirectiveProcessor.new(comments: ["#"])
+
+Sprockets.register_postprocessor 'application/javascript', Opal::Sprockets::Processor::PlainJavaScriptLoader