condenser 1.3 → 1.5

data/test/processors/rollup_test.rb

@@ -7,6 +7,17 @@ class RollupTest < ActiveSupport::TestCase
     @env.unregister_minifier('application/javascript')
   end
   
+  test 'file is exported as module' do
+    file 'main.js', <<~JS
+      console.log( cube( 5 ) ); // 125
+    JS
+    
+    asset = assert_exported_file 'main.js', 'application/javascript', <<~FILE
+      console.log( cube( 5 ) ); // 125
+    FILE
+    assert_equal "module", asset.type
+  end
+  
   test 'import file' do
     file 'main.js', <<~JS
       import { cube } from './math.js';
@@ -28,17 +39,12 @@ class RollupTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'main.js', 'application/javascript', <<~FILE
-      (function () {
-        'use strict';
-
         // This function gets included
         function cube ( x ) {
           return x * x * x;
         }
 
         console.log( cube( 5 ) ); // 125
-
-      })();
     FILE
   end
   
@@ -55,16 +61,11 @@ class RollupTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'main.js', 'application/javascript', <<~FILE
-      (function () {
-        'use strict';
-
-        function cube ( x ) {
-          return 2 * x * x;
-        }
-
-        console.log( cube( 5 ) ); // 125
+      function cube ( x ) {
+        return 2 * x * x;
+      }
 
-      })();
+      console.log( cube( 5 ) ); // 125
     FILE
   end
 
@@ -89,16 +90,11 @@ class RollupTest < ActiveSupport::TestCase
     @env.append_path File.join(@path, 'a')
 
     assert_exported_file 'main.js', 'application/javascript', <<~FILE
-      (function () {
-        'use strict';
-
         function cube ( x ) {
           return x * x * x;
         }
 
         console.log( cube( 5 ) ); // 125
-
-      })();
     FILE
   end
 
@@ -122,20 +118,15 @@ class RollupTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'main.js', 'application/javascript', <<~FILE
-      (function () {
-        'use strict';
-
-        window.cube = function ( x ) {
-          return x * x * x;
-        };
-
-        window.square = function ( x ) {
-          return x * x;
-        };
+      window.cube = function ( x ) {
+        return x * x * x;
+      };
 
-        console.log( square(cube( 5 )) );
+      window.square = function ( x ) {
+        return x * x;
+      };
 
-      })();
+      console.log( square(cube( 5 )) );
     FILE
   end
 
@@ -164,26 +155,21 @@ class RollupTest < ActiveSupport::TestCase
     JS
 
     assert_exported_file 'main.js', 'application/javascript', <<~FILE
-      (function () {
-        'use strict';
-
-        function cube ( x ) {
-          return x * x * x;
-        }
-
-        function square ( x ) {
-          return x * x;
-        }
+      function cube ( x ) {
+        return x * x * x;
+      }
 
-        var maths = [cube, square];
+      function square ( x ) {
+        return x * x;
+      }
 
-        var x = 1;
-        for (var i = 0; i < maths.length; i++) {
-          x = maths[i](x);
-        }
-        console.log(x);
+      const 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
@@ -208,16 +194,11 @@ class RollupTest < ActiveSupport::TestCase
 
 
     assert_exported_file 'main.js', 'application/javascript', <<~FILE
-      (function () {
-      	'use strict';
-
-      	class Base { }
-
-      	class Lower extends Base { }
+      class Base { }
 
-      	console.log( Base, Lower );
+      class Lower extends Base { }
 
-      })();
+      console.log( Base, Lower );
     FILE
   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
@@ -84,16 +94,11 @@ class ResolveTest < ActiveSupport::TestCase
     @env.append_path File.join(@path, 'a')
 
     assert_exported_file('main.js', 'application/javascript', <<~JS)
-      (function () {
-        'use strict';
-
-        function cube ( x ) {
-          return x * x * x;
-        }
-
-        console.log( cube( 5 ) ); // 125
+      function cube ( x ) {
+        return x * x * x;
+      }
 
-      })();
+      console.log( cube( 5 ) ); // 125
     JS
   end
   

data/test/server_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 require 'rack/builder'
 require 'rack/test'
+require 'rack/lint'
 
 class ServerTest < ActiveSupport::TestCase
   include Rack::Test::Methods
@@ -27,10 +28,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 +55,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 cube(c){return c*c*c}console.log(cube(5));
     JS
   end
 
@@ -73,7 +74,7 @@ class ServerTest < ActiveSupport::TestCase
   test "serve source with etag headers" do
     get "/assets/foo.js"
 
-    digest = '9001f422e9c91516f6e130be56dd77aa313c52bb7dd18e4bb085067162c9fa70'
+    digest = 'b603d946eb2b396ca4ecf65c223daff659dbe6f1cfeac235b7c61d3ba6964cae'
     assert_equal "\"#{digest}\"", last_response.headers['ETag']
   end
 
@@ -107,8 +108,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 '"b603d946eb2b396ca4ecf65c223daff659dbe6f1cfeac235b7c61d3ba6964cae"', 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 +168,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 '"b603d946eb2b396ca4ecf65c223daff659dbe6f1cfeac235b7c61d3ba6964cae"', last_response.headers['ETag']
+    assert_equal '15', last_response.headers['Content-Length']
   end
 
   test "precondition failed with if-match is a mismatch" do
@@ -253,7 +254,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("日本語")}();
+      var japanese="日本語";console.log(japanese);
     JS
   end
 

data/test/test_helper.rb

@@ -53,9 +53,10 @@ class ActiveSupport::TestCase
     assert_equal json, jbuild(&block)
   end
   
-  def file(name, source)
-    dir = name.include?('/') ? File.join(@path, File.dirname(name)) : @path
-    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)
@@ -78,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)
@@ -88,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

@@ -132,8 +132,8 @@ class CondenserDartSCSSTest < ActiveSupport::TestCase
     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)
+    assert_equal ["a.scss", "b.scss", "d.scss"], asset.process_dependencies.map(&:filename)
+    assert_equal ["a.scss", "b.scss", "d.scss"], asset.export_dependencies.map(&:filename)
   end
   
 end

data/test/transformers/scss_test.rb

@@ -118,8 +118,8 @@ class CondenserSCSSTest < ActiveSupport::TestCase
     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)
+    assert_equal ["a.scss", "b.scss", "d.scss"], asset.process_dependencies.map(&:filename)
+    assert_equal ["a.scss", "b.scss", "d.scss"], asset.export_dependencies.map(&:filename)
   end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condenser
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.5'
 platform: ruby
 authors:
 - Jon Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-06 00:00:00.000000000 Z
+date: 2025-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -31,9 +31,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,9 +38,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -318,7 +312,6 @@ files:
 - lib/condenser/minifiers/node_modules/uglify-js/tools/exports.js
 - lib/condenser/minifiers/node_modules/uglify-js/tools/node.js
 - lib/condenser/minifiers/node_modules/uglify-js/tools/props.html
-- lib/condenser/minifiers/package-lock.json
 - lib/condenser/minifiers/sass_minifier.rb
 - lib/condenser/minifiers/terser_minifier.rb
 - lib/condenser/minifiers/uglify_minifier.rb
@@ -365,6 +358,7 @@ files:
 - test/postprocessors/purgecss_test.rb
 - test/preprocessor/babel_test.rb
 - test/preprocessor/js_analyzer_test.rb
+- test/processors/rollup/dynamic_import_test.rb
 - test/processors/rollup_test.rb
 - test/resolve_test.rb
 - test/server_test.rb
@@ -391,14 +385,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: A Rack-based asset packaging system
@@ -416,6 +410,7 @@ test_files:
 - test/postprocessors/purgecss_test.rb
 - test/preprocessor/babel_test.rb
 - test/preprocessor/js_analyzer_test.rb
+- test/processors/rollup/dynamic_import_test.rb
 - test/processors/rollup_test.rb
 - test/resolve_test.rb
 - test/server_test.rb

data/lib/condenser/minifiers/package-lock.json

@@ -1,25 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-    },
-    "uglify-js": {
-      "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.4.tgz",
-      "integrity": "sha512-tinYWE8X1QfCHxS1lBS8yiDekyhSXOO6R66yNOCdUJeojxxw+PX2BHAz/BWyW7PQ7pkiWVxJfIEbiDxyLWvUGg==",
-      "requires": {
-        "commander": "~2.20.3",
-        "source-map": "~0.6.1"
-      }
-    }
-  }
-}