sprockets-commoner 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ff180d659ed6740f08d3ea240c4c839134bd40a
-  data.tar.gz: 707b8cbd232bb7feb41abc8f4e95b64fae3088d8
+  metadata.gz: 4b1327821fb74f7b7ad9a60cef8d479982d1b87e
+  data.tar.gz: 4b4b0f98e15ddf7b753de081de21fa9d38cf2bef
 SHA512:
-  metadata.gz: a29bdeff52324bb60dfd150ca2037853e62b942541d0cb191bd69fef86c8cf1bca186674926a74637e4d020b8d40b87a91cbc9bb0ea9a1d3649228216e6bc3fc
-  data.tar.gz: ba509adca807ef8b90d02ffee2f798a4244af127698c18dff86313bcebf33f010d86d52be7d784c66f30400ee0ea480368ff85250ff6c7ecf6a9dbcdc6cbed30
+  metadata.gz: 1a2f95fc8ab129da96a52f21f4229f050a1b1b65b6ecfbdafdb994e9a80835b298c9a116168f037d009cd1d1e9422d655984238589aa7ba8cec4865294f0f46f
+  data.tar.gz: 1af98e196a45aac1d2b8410d58f7351088e9224fde68c54ff95c1318c6a04c80115b2026b2bc501e11cfdfece8c9a22a63a7d16485b2790cbec6f38da4db7c1b

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 node_modules
 npm-debug.log
+yarn.lock

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.6.4
+
+* Add support for ExecJS.
+
 ## v0.6.2
 
 * Add support for Sprockets 4

data/Gemfile

@@ -1,3 +1,13 @@
 source 'https://rubygems.org'
 
+group :development, :test do
+  gem 'sprockets', github: 'rails/sprockets'
+end
+
+group :development do
+  gem 'pry'
+  gem 'pry-rescue'
+  gem 'pry-stack_explorer'
+end
+
 gemspec

data/README.md

@@ -17,7 +17,7 @@
 ### Requirements
 
 1. Ruby v2+.
-2. Rails/Any other application that uses Sprockets.
+2. Rails 4+/Any other application that uses Sprockets 3+.
 2. NPM v3+. We only support version 3 because commoner doesn't do any sort of deduplication of dependencies, so you could end up with a huge bundle if you don't want out. We only test against version 3, so you will definitely run into issues when running version 2.
 3. We recommend and support version 4+ of Node.js.
 
@@ -37,7 +37,7 @@ console.log(_.map([1, 2, 3], function(n) { return n * 3; }));
 ### Enabling Babel transforms
 
 1. Install any Babel plugins or presets you want to use. We'll use the default ES2015 preset; `npm install babel-preset-es2015`.
-1. Add a `.babelrc` with you required configuration. We just need to do `echo '{presets: ["es2015"]}' > .babelrc`.
+1. Add a `.babelrc` with you required configuration. We just need to do `echo '{"presets": ["es2015"]}' > .babelrc`.
 1. Use any feature you want! For example, let's use `import` and arrow functions in our `application.js`:
 
 ```javascript
@@ -57,11 +57,11 @@ By default, commoner will process any file under the application root directory.
 Rails.application.config.assets.configure do |env|
   Sprockets::Commoner::Processor.configure(env,
     # include, exclude, and babel_exclude patterns can be path prefixes or regexes.
-    # Explicitely list paths to include. The default is `[env.root]`
+    # Explicitly list paths to include. The default is `[env.root]`
     include: ['app/assets/javascripts/subdirectory'],
     # List files to ignore and not process require calls or apply any Babel transforms to. Default is ['vendor/bundle'].
     exclude: ['vendor/bundle', /ignored/],
-    # Anything listed in babel_exclude has its require calls resolved, but no transforms listed in .babelrcs applied.
+    # Anything listed in babel_exclude has its require calls resolved, but no transforms listed in .babelrc applied.
     # Default is [/node_modules/]
     babel_exclude: [/node_modules/]
   )

data/bin/setup

@@ -4,12 +4,15 @@ set -euo pipefail
 gem install bundler --version '1.11.2'
 bundle check || bundle install -j 4
 
-for path in "./test/fixtures" "./test/fixtures/vendor-stub" "./js/babel-plugin-sprockets-commoner-internal" "./test/fixtures/root-node-modules" "./test/demo"; do
+for path in "./test/fixtures" "./test/fixtures/vendor-stub" "./test/fixtures/root-node-modules" "./test/demo"; do
   pushd "$path" >/dev/null
-  npm install
+  yarn install
   popd >/dev/null
 done
+pushd "./js/babel-plugin-sprockets-commoner-internal"
+npm install
+popd>/dev/null
 
 pushd "./test/demo"
 bundle check || bundle install -j 4
-popd
+popd>/dev/null

data/circle.yml

@@ -6,7 +6,12 @@ machine:
 
 dependencies:
   override:
+    - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+    - echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+    - sudo apt-get update && sudo apt-get install yarn
     - bin/setup
+  cache_directories:
+    - ~/.cache/yarn
 
 test:
   override:

data/lib/sprockets/commoner.rb

@@ -5,6 +5,9 @@ require 'sprockets/commoner/bundle'
 
 module Sprockets
   module Commoner
+    def self.sprockets4?
+      @@sprockets4 ||= Gem::Version.new(Sprockets::VERSION) >= Gem::Version.new('4.0.0.beta')
+    end
   end
 
   register_postprocessor 'application/javascript', ::Sprockets::Commoner::Processor

data/lib/sprockets/commoner/bundle.rb

@@ -29,17 +29,16 @@ function(helpers, globalIdentifiers) {
 JS
 
       PRELUDE = <<-JS.freeze
-!function() {
+!function(global) {
 var __commoner_initialize_module__ = function(f) {
   var module = {exports: {}};
   f.call(module.exports, module, module.exports);
   return module.exports;
 };
-var global = window;
 JS
 
       OUTRO = <<-JS.freeze
-}();
+}(typeof global != 'undefined' ? global : typeof window != 'undefined' ? window : this);
 JS
       def initialize(root)
         super(root, 'NODE_PATH' => JS_PACKAGE_PATH)
@@ -63,10 +62,10 @@ JS
         assets_missing = input[:metadata][:commoner_required] - assets_in_bundle
 
         global_identifiers = assets_missing.map do |filename|
-          uri, _ = if Sprockets::VERSION < '4'
-            env.resolve(filename, accept: input[:content_type], pipeline: :self, compat: false)
-          else
+          uri, _ = if Commoner.sprockets4?
             env.resolve(filename, accept: input[:content_type], pipeline: :self)
+          else
+            env.resolve(filename, accept: input[:content_type], pipeline: :self, compat: false)
           end
           asset = env.load(uri)
           # Retrieve the global variable the file is exposed through
@@ -78,9 +77,26 @@ JS
         used_helpers = input[:metadata][:commoner_used_helpers].to_a
         header_code = generate_header(used_helpers, global_identifiers)
         {
-          data: "#{PRELUDE}#{header_code}\n#{input[:data]}#{OUTRO}"
+          data: "#{PRELUDE}#{header_code}\n#{input[:data]}#{OUTRO}",
+          map:  shift_map(input[:metadata][:map], PRELUDE.lines.count + header_code.lines.count),
         }
       end
+
+      private
+
+      def shift_map(map, offset)
+        return unless map && Commoner.sprockets4?
+        index_map = Sprockets::SourceMapUtils.make_index_map(map)
+        index_map.merge({
+          "sections" => index_map["sections"].map { |section|
+            section.merge({
+              "offset" => section["offset"].merge({
+                "line" => section["offset"]["line"] + offset
+              })
+            })
+          }
+        })
+      end
     end
   end
 end

data/lib/sprockets/commoner/processor.rb

@@ -104,10 +104,13 @@ module Sprockets
           @dependencies << "commoner-environment-variable:#{env}"
         end
 
+        map = process_map(input[:metadata][:map], result['map'], input)
+
         {
           data: result['code'],
           dependencies: @dependencies,
           required: Set.new(@required),
+          map: map,
 
           commoner_global_identifier: result['metadata']['globalIdentifier'],
           commoner_required: commoner_required,
@@ -117,6 +120,13 @@ module Sprockets
       end
 
       private
+        def process_map(oldmap, map, input)
+          if Commoner.sprockets4?
+            formatted_map = Sprockets::SourceMapUtils.format_source_map(map, input)
+            Sprockets::SourceMapUtils.combine_source_maps(oldmap, formatted_map)
+          end
+        end
+
         def compute_cache_key
           package_file = File.join(@root, 'node_modules', 'babel-core', 'package.json')
           raise Schmooze::DependencyError, 'Cannot determine babel version as babel-core has not been installed' unless File.exist?(package_file)
@@ -197,7 +207,6 @@ module Sprockets
         end
 
         def options(input)
-          # TODO(bouk): Fix sourcemaps. Sourcemaps are only available in Sprockets v4
           {
             'ast' => false,
             'babelrc' => !match_any?(self.babel_exclude, input[:filename]),
@@ -205,6 +214,7 @@ module Sprockets
             'filenameRelative' => PathUtils.split_subpath(input[:load_path], input[:filename]),
             'moduleRoot' => nil,
             'sourceRoot' => @env.root,
+            'sourceMaps' => Commoner.sprockets4?,
           }
         end
 

data/lib/sprockets/commoner/railtie.rb

@@ -3,7 +3,8 @@ module Sprockets
     class Railtie < ::Rails::Railtie
       initializer 'sprockets-commoner' do
         # We need to disable debugging because otherwise Rails will include each file individually, while we need everything to be bundled up together into a single file.
-        config.assets.debug = false
+        # ^ Not applicable to sprockets 4+
+        config.assets.debug = false unless Commoner.sprockets4?
         config.assets.paths << 'node_modules'
       end
     end

data/lib/sprockets/commoner/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Commoner
-    VERSION = '0.6.3'
+    VERSION = '0.6.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-commoner
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Bouke van der Bijl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Use Babel in Sprockets to compile modules for the browser