sprockets-commoner 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7413c6a1d1cd9cd4e4d2a3edf3c2d0482672cce
-  data.tar.gz: c9504e240f43982f261bb8aa23cc20b961f246af
+  metadata.gz: c0f64fc540ae4a4e9d1e7113bebd91a5453598e7
+  data.tar.gz: 10254542506d4e61dc2f055b43951781c1601b15
 SHA512:
-  metadata.gz: 695aaa8c418489ab2f6a4fcca64b0e858c77ad1cd1ec3718e9f8a4a6e496c65f40fefa7b6c304144f3eb935c9e9f1c7c73380f021516e567bbf44cb8e49a5913
-  data.tar.gz: 86378f61500f8a7de324dc441dee9ff7a46c824425fe68cfa946e41166eb68f908a7fdb439b728bfe98f5207db7390dfd5e6a03aa03efc014196bde013a1649b
+  metadata.gz: d52f46af8d4abb7b4b9241556217505a2ba5acc9f072ca09a0cb0a2f722fcace33a78e9531b7210e652d277669c877e384c797fb66a7ba3befef924f6a7cc066
+  data.tar.gz: 6dfd607e5b3593bd3c04d3d1e834a7d02e0611f6821f03af59a51db743ec42dd2b4554fb5bd4897d3e37a556a4d8e8777ce975ff68c698b3a30899c4f79ff4a3

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

@@ -70,11 +70,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.1.2'
+    VERSION = '0.1.3'
   end
 end

metadata

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