sprockets-commoner 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e07853296174bca18616b5f0a8021b4830b33de
-  data.tar.gz: f3a207b0a0b047889f21c1d75d5a3f1b2d491822
+  metadata.gz: a1b9fda2acf409f31fb052204e5319eecc1b9ed2
+  data.tar.gz: 8b5eee7b0be2cce4141b62388fd83fdf99b0c41d
 SHA512:
-  metadata.gz: 081005224d924d04f646d027e6c618efc591bc157533f21b805ff48ec85ec7ccc199ffe4aaa4561d12fed8ab22ecaa067758b8f343d18ef75f864e4531a44a47
-  data.tar.gz: 1d24a89e58c518190f34c6192c3a132d7f53235d533b518080afcbb02cef51afa1acf3a300c5f2964acbeddff95683d2d2ee37b8a2be0dd6a208cf632ba4e84d
+  metadata.gz: b77a61c55a9dcbf6c7f9f81a7bd48d926519f8b5e56fedcc07eace32841cc1e6e5ca31079faf4e0b91a1aac9797ee912e2dfd7c345a2f3b8d15e7920ab93fc13
+  data.tar.gz: 589434178aa3f2156952ec3aadf726bc1617cbe75a8ec3124940a7a4b973e04300bb9ced705a18ed6c498c00f55c4fcf4fb911495963505495da7bc627e086ca

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.2.3
+
+* Only avoid imports that won't be processed by Commoner if we actually use the module.
+
 ## v0.2.2
 
 * Don't cache Babel output as this can lead to bugs.
@@ -15,6 +19,10 @@
 
 * Add support for requiring JSON files.
 
+## v0.1.3
+
+* Backport fixes from v0.2.3
+
 ## v0.1.2
 
 * Backport fixes from v0.2.2

data/js/babel-plugin-sprockets-commoner-internal/index.js

@@ -116,7 +116,7 @@ module.exports = function (context) {
     return '__commoner_module__' + escapedPath;
   }
 
-  function resolveTarget(file, path) {
+  function resolveTarget(file, path, ensureTargetIsProcessed) {
     var name = void 0;
     if (opts.globals != null && (name = opts.globals[path]) != null) {
       return name;
@@ -135,10 +135,13 @@ module.exports = function (context) {
       }
 
       if (/\.coffee$/.test(resolvedPath)) {
-        // If it's a coffee script file, look for global variable assignments
+        // If it's a coffee script file, look for global variable assignments.
         return findDeclarationInCoffeeFile(resolvedPath);
       } else {
-        // Otherwise we just look for the module by referencing its Special Identifier™
+        if (ensureTargetIsProcessed) {
+          file.metadata.targetsToProcess.push(resolvedPath);
+        }
+        // Otherwise we just look for the module by referencing its Special Identifier™.
         return pathToIdentifier(resolvedPath);
       }
     }
@@ -160,14 +163,14 @@ module.exports = function (context) {
         return;
       }
 
-      var name = resolveTarget(state.file, target);
+      var name = resolveTarget(state.file, target, true);
       if (name === false) {
         path.get('init').replaceWith(t.objectExpression([]));
-        return;
+      } else {
+        path.scope.rename(name);
+        path.scope.rename(path.node.id.name, name);
+        path.remove();
       }
-      path.scope.rename(name);
-      path.scope.rename(path.node.id.name, name);
-      path.remove();
     },
     CallExpression: function CallExpression(path, state) {
       if (!isRequire(path)) {
@@ -179,14 +182,15 @@ module.exports = function (context) {
         return;
       }
 
-      var replacement = resolveTarget(state.file, target);
       switch (path.parent.type) {
       case "ExpressionStatement":
-        // We just need to know there's a dependency, we can remove it then
+        // We just need to know there's a dependency, we can remove the `require` call.
+        resolveTarget(state.file, target, false);
         path.remove();
         break;
       default:
-        // Otherwise we just look for the module by referencing its Special Identifier™
+        // Otherwise we just look for the module by referencing its Special Identifier™.
+        var replacement = resolveTarget(state.file, target, true);
         if (replacement === false) {
           path.replaceWith(t.objectExpression([]));
         } else {
@@ -202,6 +206,9 @@ module.exports = function (context) {
       if (file.metadata.required == null) {
         file.metadata.required = [];
       }
+      if (file.metadata.targetsToProcess == null) {
+        file.metadata.targetsToProcess = [];
+      }
     },
 
     visitor: {

data/lib/sprockets/commoner/processor.rb

@@ -11,7 +11,6 @@ module Sprockets
       PACKAGE_JSON = 'package.json'.freeze
       JS_PACKAGE_PATH = File.expand_path('../../../js', __dir__)
       ALLOWED_EXTENSIONS = /\.js(?:on)?(?:\.erb)?\z/
-      COFFEE_EXTENSION = /\.coffee(:?\.erb)?\z/
 
       dependencies babel: 'babel-core', commoner: 'babel-plugin-sprockets-commoner-internal'
 
@@ -70,11 +69,16 @@ module Sprockets
 
         result = transform(input[:data], options(input), paths: @env.paths)
 
+        if result['metadata'].has_key?('targetsToProcess')
+          result['metadata']['targetsToProcess'].each do |t|
+            unless should_process?(t)
+              raise ExcludedFileError, "#{t} was imported from #{filename} but this file won't be processed by Sprockets::Commoner"
+            end
+          end
+        end
+
         if result['metadata'].has_key?('required')
           result['metadata']['required'].each do |r|
-            unless COFFEE_EXTENSION =~ r || should_process?(r)
-              raise ExcludedFileError, "#{r} was imported from #{filename} but this file won't be processed by Sprockets::Commoner"
-            end
             asset = resolve(r, accept: input[:content_type], pipeline: :self)
             @required.insert(insertion_index, asset)
           end

data/lib/sprockets/commoner/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Commoner
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-commoner
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Bouke van der Bijl