condenser 1.2 → 1.4

data/test/preprocessor/js_analyzer_test.rb

@@ -4,8 +4,6 @@ class JSAnalyzerTest < ActiveSupport::TestCase
   
   def setup
     super
-    @env.unregister_preprocessor 'application/javascript', Condenser::BabelProcessor
-    @env.register_preprocessor 'application/javascript', Condenser::JSAnalyzer
     @env.unregister_minifier('application/javascript')
   end
   
@@ -250,4 +248,39 @@ class JSAnalyzerTest < ActiveSupport::TestCase
     assert_equal ['a.js', 'b.js'], asset.export_dependencies.map(&:filename)
   end
   
+  test "dependency tracking for a export from" do
+    file 'c.js', <<~JS
+    function c() { return 'ok'; }
+    
+    export {c}
+    JS
+    
+    file 'b.js', <<~JS
+    export {c} from 'c';
+    
+    JS
+    
+    file 'a.js', <<~JS
+    import {c} from 'b'
+    
+    console.log(c());
+    JS
+
+    asset = assert_file 'a.js', 'application/javascript'
+    assert_equal ['/a.js', '/b.js', '/c.js'], asset.all_export_dependencies.map { |path| path.delete_prefix(@path) }
+  end
+  
+  test 'exporting a nested object' do
+    file 't.js', <<~JS
+      export default {
+          registry: {
+              boolean: true,
+              integer: 1
+          }
+      };
+    JS
+    
+    asset = assert_file 't.js', 'application/javascript'
+  end
+
 end

data/test/processors/rollup_test.rb

@@ -31,15 +31,14 @@ class RollupTest < ActiveSupport::TestCase
       (function () {
         'use strict';
 
-        // This function isn't used anywhere, so
-
-        function cube(x) {
+        // This function gets included
+        function cube ( x ) {
           return x * x * x;
         }
 
-        console.log(cube(5)); // 125
+        console.log( cube( 5 ) ); // 125
 
-      }());
+      })();
     FILE
   end
   
@@ -59,13 +58,13 @@ class RollupTest < ActiveSupport::TestCase
       (function () {
         'use strict';
 
-        function cube(x) {
+        function cube ( x ) {
           return 2 * x * x;
         }
 
-        console.log(cube(5)); // 125
+        console.log( cube( 5 ) ); // 125
 
-      }());
+      })();
     FILE
   end
 
@@ -93,13 +92,13 @@ class RollupTest < ActiveSupport::TestCase
       (function () {
         'use strict';
 
-        function cube(x) {
+        function cube ( x ) {
           return x * x * x;
         }
 
-        console.log(cube(5)); // 125
+        console.log( cube( 5 ) ); // 125
 
-      }());
+      })();
     FILE
   end
 
@@ -126,17 +125,17 @@ class RollupTest < ActiveSupport::TestCase
       (function () {
         'use strict';
 
-        window.cube = function (x) {
+        window.cube = function ( x ) {
           return x * x * x;
         };
 
-        window.square = function (x) {
+        window.square = function ( x ) {
           return x * x;
         };
 
-        console.log(square(cube(5)));
+        console.log( square(cube( 5 )) );
 
-      }());
+      })();
     FILE
   end
 
@@ -168,27 +167,58 @@ class RollupTest < ActiveSupport::TestCase
       (function () {
         'use strict';
 
-        function cube(x) {
+        function cube ( x ) {
           return x * x * x;
         }
 
-        function square(x) {
+        function square ( x ) {
           return x * x;
         }
 
         var maths = [cube, square];
 
         var x = 1;
-
         for (var i = 0; i < maths.length; i++) {
           x = maths[i](x);
         }
-
         console.log(x);
 
-      }());
+      })();
     FILE
     $d = false
   end
 
+  test 'import the same file via relative require and full path' do
+    file "#{@npm_path}/module/base.js", <<~JS
+      export default class Base { };
+    JS
+    
+    file "#{@npm_path}/module/base/other.js", <<~JS
+      import Base from '../base';
+      
+      export default class Lower extends Base { };
+    JS
+    
+    file 'main.js', <<~JS
+      import Other from 'module/base/other';
+      import Base from 'module/base';
+
+      console.log( Base, Other );
+    JS
+
+
+    assert_exported_file 'main.js', 'application/javascript', <<~FILE
+      (function () {
+      	'use strict';
+
+      	class Base { }
+
+      	class Lower extends Base { }
+
+      	console.log( Base, Lower );
+
+      })();
+    FILE
+  end
+
 end

data/test/resolve_test.rb

@@ -35,6 +35,16 @@ class ResolveTest < ActiveSupport::TestCase
     assert_equal ['test', '*', ['.js'], ['application/javascript']], @env.decompose_path('test/*.js')
     assert_equal ['test/*', '*', ['.js'], ['application/javascript']], @env.decompose_path('test/*/*.js')
     assert_equal ['test/**', '*', ['.js'], ['application/javascript']], @env.decompose_path('test/**/*.js')
+    
+    assert_equal ['a', 'test', ['.js'], ['application/javascript']], @env.decompose_path('./test.js', 'a/b.js')
+    assert_equal [nil, 'test', ['.js'], ['application/javascript']], @env.decompose_path('./test.js', 'b.js')
+    assert_equal ['a/folder', 'test', ['.js'], ['application/javascript']], @env.decompose_path('./folder/test.js', 'a/b.js')
+    assert_equal ['folder', 'test', ['.js'], ['application/javascript']], @env.decompose_path('./folder/test.js', 'b.js')
+    
+    assert_equal [nil, 'test', ['.js'], ['application/javascript']], @env.decompose_path('../test.js', 'a/b.js')
+    assert_equal ["/", 'test', ['.js'], ['application/javascript']], @env.decompose_path('../test.js', '/a/b.js')
+    assert_equal ["folder", 'test', ['.js'], ['application/javascript']], @env.decompose_path('../folder/test.js', 'a/b.js')
+    assert_equal ["/folder", 'test', ['.js'], ['application/javascript']], @env.decompose_path('../folder/test.js', '/a/b.js')
   end
   
   test 'resolve' do
@@ -83,7 +93,6 @@ class ResolveTest < ActiveSupport::TestCase
     @env.append_path File.join(@path, 'b')
     @env.append_path File.join(@path, 'a')
 
-    
     assert_exported_file('main.js', 'application/javascript', <<~JS)
       (function () {
         'use strict';
@@ -94,7 +103,7 @@ class ResolveTest < ActiveSupport::TestCase
 
         console.log( cube( 5 ) ); // 125
 
-      }());
+      })();
     JS
   end
   
@@ -111,15 +120,15 @@ class ResolveTest < ActiveSupport::TestCase
   end
   
   test 'resolve a file.*' do
-    file 'file.js', 'console.log(1);'
-    file 'file.scss', 'body { background: red; }'
-    file 'test/file.scss', 'body { background: green; }'
+    file 'foo.js', 'console.log(1);'
+    file 'foo.scss', 'body { background: red; }'
+    file 'test/foo.scss', 'body { background: green; }'
 
-    assert_equal %w(file.js file.scss), @env.resolve('file.*').map(&:filename)
-    assert_equal %w(file.css file.js),  @env.resolve('file.*', accept: ['text/css', 'application/javascript']).map(&:filename)
+    assert_equal %w(foo.js foo.scss), @env.resolve('foo.*').map(&:filename)
+    assert_equal %w(foo.css foo.js),  @env.resolve('foo.*', accept: ['text/css', 'application/javascript']).map(&:filename)
 
-    assert_equal %w(file.js file.scss test/file.scss), @env.resolve('**/file.*').map(&:filename)
-    assert_equal %w(file.css file.js test/file.css), @env.resolve('**/file.*', accept: ['text/css', 'application/javascript']).map(&:filename)
+    assert_equal %w(foo.js foo.scss test/foo.scss), @env.resolve('**/foo.*').map(&:filename)
+    assert_equal %w(foo.css foo.js test/foo.css), @env.resolve('**/foo.*', accept: ['text/css', 'application/javascript']).map(&:filename)
   end
   
 end

data/test/server_test.rb

@@ -27,10 +27,10 @@ class ServerTest < ActiveSupport::TestCase
   test "serve single source file" do
     get "/assets/foo.js"
     assert_equal 200, last_response.status
-    assert_equal "43", last_response.headers['Content-Length']
+    assert_equal "15", last_response.headers['Content-Length']
     assert_equal "Accept-Encoding", last_response.headers['Vary']
     assert_equal <<~JS.strip, last_response.body
-      !function(){"use strict";console.log(1)}();
+      console.log(1);
     JS
   end
 
@@ -54,7 +54,7 @@ class ServerTest < ActiveSupport::TestCase
 
     get "/assets/main.js"
     assert_equal <<~JS.strip, last_response.body
-      !function(){"use strict";var o;console.log((o=5)*o*o)}();
+      !function(){var o;console.log((o=5)*o*o)}();
     JS
   end
 
@@ -73,7 +73,7 @@ class ServerTest < ActiveSupport::TestCase
   test "serve source with etag headers" do
     get "/assets/foo.js"
 
-    digest = '9001f422e9c91516f6e130be56dd77aa313c52bb7dd18e4bb085067162c9fa70'
+    digest = '35c146f76e129477c64061bc84511e1090f3d4d8059713e6663dd4b35b1f7642'
     assert_equal "\"#{digest}\"", last_response.headers['ETag']
   end
 
@@ -107,8 +107,8 @@ class ServerTest < ActiveSupport::TestCase
       'HTTP_IF_NONE_MATCH' => "nope"
 
     assert_equal 200, last_response.status
-    assert_equal '"9001f422e9c91516f6e130be56dd77aa313c52bb7dd18e4bb085067162c9fa70"', last_response.headers['ETag']
-    assert_equal '43', last_response.headers['Content-Length']
+    assert_equal '"35c146f76e129477c64061bc84511e1090f3d4d8059713e6663dd4b35b1f7642"', last_response.headers['ETag']
+    assert_equal '15', last_response.headers['Content-Length']
   end
 
   test "not modified partial response with fingerprint and if-none-match etags match" do
@@ -167,8 +167,8 @@ class ServerTest < ActiveSupport::TestCase
       'HTTP_IF_MATCH' => etag
 
     assert_equal 200, last_response.status
-    assert_equal '"9001f422e9c91516f6e130be56dd77aa313c52bb7dd18e4bb085067162c9fa70"', last_response.headers['ETag']
-    assert_equal '43', last_response.headers['Content-Length']
+    assert_equal '"35c146f76e129477c64061bc84511e1090f3d4d8059713e6663dd4b35b1f7642"', last_response.headers['ETag']
+    assert_equal '15', last_response.headers['Content-Length']
   end
 
   test "precondition failed with if-match is a mismatch" do
@@ -224,7 +224,12 @@ class ServerTest < ActiveSupport::TestCase
     assert_equal "pass", last_response.headers['X-Cascade']
   end
 
-  test "re-throw JS exceptions in the browser" do
+  test "re-throw JS exceptions in the browser when using babel" do
+    @env.unregister_preprocessor('application/javascript', Condenser::JSAnalyzer)
+    @env.register_preprocessor 'application/javascript', Condenser::BabelProcessor.new(@path,
+      presets: [ ['@babel/preset-env', { modules: false, targets: { browsers: 'firefox > 41' } }] ]
+    )
+    
     file 'error.js', "var error = {;"
 
     get "/assets/error.js"
@@ -248,7 +253,7 @@ class ServerTest < ActiveSupport::TestCase
     JS
     get "/assets/%E6%97%A5%E6%9C%AC%E8%AA%9E.js"
     assert_equal <<~JS.strip, last_response.body
-      !function(){"use strict";console.log("日本語")}();
+      console.log("日本語");
     JS
   end
 

data/test/templates/ejs_test.rb

@@ -4,7 +4,6 @@ class CondenserEJSTest < ActiveSupport::TestCase
 
   def setup
     super
-    @env.unregister_preprocessor('application/javascript', Condenser::BabelProcessor)
     @env.unregister_exporter('application/javascript', Condenser::RollupProcessor)
   end
   
@@ -15,14 +14,10 @@ class CondenserEJSTest < ActiveSupport::TestCase
       import { escape } from 'ejs';
       export default function (locals) {
         var __output = [],
-            __append = __output.push.bind(__output);
-      
+          __append = __output.push.bind(__output);
         __append("1");
-      
         __append(escape(1 + 1));
-      
         __append("3\\n");
-      
         return __output.join("");
       }
     JS
@@ -35,14 +30,10 @@ class CondenserEJSTest < ActiveSupport::TestCase
       import { escape } from 'ejs';
       export default function (locals) {
         var __output = [],
-            __append = __output.push.bind(__output);
-      
+          __append = __output.push.bind(__output);
         __append("1");
-      
         __append(escape(locals.input));
-      
         __append("3\\n");
-      
         return __output.join("");
       }
     JS

data/test/templates/erb_test.rb

@@ -2,11 +2,6 @@ require 'test_helper'
 
 class CondenserErubiTest < ActiveSupport::TestCase
 
-  def setup
-    super
-    @env.unregister_preprocessor('application/javascript', Condenser::BabelProcessor)
-  end
-  
   test 'find' do
     file 'test.js.erb', "1<%= 1 + 1 %>3\n"
     

data/test/test_helper.rb

@@ -39,6 +39,7 @@ class ActiveSupport::TestCase
     @env.unregister_writer(Condenser::BrotliWriter)
     @env.context_class.class_eval do
       def asset_path(path, options = {})
+        path = environment.find!(path, options).path
         "/assets/#{path}"
       end
     end
@@ -52,9 +53,10 @@ class ActiveSupport::TestCase
     assert_equal json, jbuild(&block)
   end
   
-  def file(name, source)
-    dir = File.join(@path, File.dirname(name))
-    path = File.join(@path, name)
+  def file(name, source, base: nil)
+    base ||= @path
+    dir = name.include?('/') ? File.join(base, File.dirname(name)) : base
+    path = File.join(base, name)
     
     FileUtils.mkdir_p(dir)
     if File.exist?(path)
@@ -62,6 +64,7 @@ class ActiveSupport::TestCase
       sleep(1 - stat) if stat < 1
     end
     File.write(path, source)
+    sleep 0.25 if @env.build_cache.listening
   end
   
   def rm(name)
@@ -76,6 +79,7 @@ class ActiveSupport::TestCase
     assert_equal path.delete_prefix('/'),     asset.filename
     assert_equal Array(mime_types),           asset.content_types
     assert_equal(source.rstrip, asset.source.rstrip) if !source.nil?
+    asset
   end
   
   def assert_exported_file(path, mime_types, source=nil)
@@ -86,6 +90,7 @@ class ActiveSupport::TestCase
     assert_equal path,                        asset.filename
     assert_equal Array(mime_types),           asset.content_types
     assert_equal(source.rstrip, asset.source.rstrip) if !source.nil?
+    asset
   end
 
 end

data/test/transformers/dart_scss_test.rb

@@ -0,0 +1,139 @@
+require 'test_helper'
+
+class CondenserDartSCSSTest < ActiveSupport::TestCase
+
+  def setup
+    super
+    @env.clear_pipeline
+    @env.register_transformer 'text/scss', 'text/css', Condenser::DartScssTransformer
+  end
+
+  test 'find' do
+    file 'test.scss', <<~SCSS
+    body {
+      background-color: green;
+
+      &:hover {
+        background-color: blue;
+      }
+    }
+    SCSS
+
+    assert_file 'test.css', 'text/css', <<~CSS
+    body {
+      background-color: green;
+    }
+    body:hover {
+      background-color: blue;
+    }
+    CSS
+  end
+
+  test 'scss import globing' do
+    file "c/dir/a.scss", "body { color: blue; }"
+    file "c/dir/b.scss", "body { color: green; }"
+
+    file 'c/test.scss', '@import "./dir/*"'
+
+    assert_file 'c/test.css', 'text/css', <<~CSS
+    body {
+      color: blue;
+    }
+
+    body {
+      color: green;
+    }
+    CSS
+
+    file 'c/test2.scss', '@import "c/dir/*"'
+
+    assert_file 'c/test2.css', 'text/css', <<~CSS
+    body {
+      color: blue;
+    }
+
+    body {
+      color: green;
+    }
+    CSS
+  end
+
+  test "url functions" do
+    file 'a.scss', <<~SCSS
+      body {
+        color: green; }
+    SCSS
+
+    file 'test.scss', <<~SCSS
+    @import 'a';
+
+    div {
+       url: asset-url("foo.svg");
+       url: image-url("foo.png");
+       url: video-url("foo.mov");
+       url: audio-url("foo.mp3");
+       url: font-url("foo.woff2");
+       url: font-url("foo.woff");
+       url: javascript-url("foo.js");
+       url: stylesheet-url("foo.css");
+    }
+    SCSS
+
+    file 'foo.svg', ''
+    file 'foo.png', ''
+    file 'foo.mov', ''
+    file 'foo.mp3', ''
+    file 'foo.woff2', ''
+    file 'foo.woff', ''
+    file 'foo.js', ''
+    file 'foo.css', ''
+
+    assert_file 'test.css', 'text/css', <<~CSS
+    body {
+      color: green;
+    }
+
+    div {
+      url: url(/assets/foo-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.svg);
+      url: url(/assets/foo-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.png);
+      url: url(/assets/foo-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.mov);
+      url: url(/assets/foo-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.mp3);
+      url: url(/assets/foo-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.woff2);
+      url: url(/assets/foo-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.woff);
+      url: url(/assets/foo-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.js);
+      url: url(/assets/foo-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.css);
+    }
+    CSS
+
+    asset = @env.find('test.css')
+    assert_equal ["a.scss", "foo.svg", "foo.png", "foo.mov", "foo.mp3", "foo.woff2", "foo.woff", "foo.js", "foo.css"], asset.process_dependencies.map(&:filename)
+    assert_equal ["a.scss", "foo.svg", "foo.png", "foo.mov", "foo.mp3", "foo.woff2", "foo.woff", "foo.js", "foo.css"], asset.export_dependencies.map(&:filename)
+  end
+
+  test "sass dependencies" do
+    file 'd.scss', <<~SCSS
+      $secondary-color: #444;
+    SCSS
+
+    file 'a.scss', <<~SCSS
+      @import 'd';
+      $primary-color: #333;
+    SCSS
+
+    file 'b.scss', <<~SCSS
+      body {
+        color: $primary-color;
+      }
+    SCSS
+
+    file 'c.scss', <<~SCSS
+      @import 'a';
+      @import 'b';
+    SCSS
+
+    asset = @env.find('c.css')
+    assert_equal ["a.scss", "d.scss", "b.scss"], asset.process_dependencies.map(&:filename)
+    assert_equal ["a.scss", "d.scss", "b.scss"], asset.export_dependencies.map(&:filename)
+  end
+  
+end