condenser 1.2 → 1.3

data/lib/condenser/transformers/svg_transformer.rb

@@ -0,0 +1,19 @@
+class Condenser::SVGTransformer
+  
+  autoload :Base, File.expand_path('../svg_transformer/base', __FILE__)
+  autoload :Tag, File.expand_path('../svg_transformer/tag', __FILE__)
+  autoload :Template, File.expand_path('../svg_transformer/template', __FILE__)
+  autoload :TemplateError, File.expand_path('../svg_transformer/template_error', __FILE__)
+  autoload :Value, File.expand_path('../svg_transformer/value', __FILE__)
+  autoload :VarGenerator, File.expand_path('../svg_transformer/var_generator', __FILE__)
+  
+  def self.setup(env)
+  end
+
+  def self.call(environment, input)
+    input[:source] = Condenser::SVGTransformer::Template.new(input[:source]).to_module
+  end
+
+end
+
+

data/lib/condenser/version.rb

@@ -1,3 +1,3 @@
 class Condenser
-  VERSION = '1.2'
+  VERSION = '1.3'
 end

data/lib/condenser.rb

@@ -19,19 +19,25 @@ class Condenser
   autoload :RollupProcessor,  'condenser/processors/rollup_processor'
   autoload :JSAnalyzer,       'condenser/processors/js_analyzer'
   autoload :PurgeCSSProcessor,'condenser/processors/purgecss_processor'
+  autoload :CSSMediaCombinerProcessor,'condenser/processors/css_media_combiner_processor'
   autoload :NodeProcessor,    'condenser/processors/node_processor'
   autoload :UglifyMinifier,   'condenser/minifiers/uglify_minifier'
   autoload :TerserMinifier,   'condenser/minifiers/terser_minifier'
   autoload :Erubi,            'condenser/templating_engine/erb'
+  autoload :Sass,             'condenser/transformers/sass'
   autoload :SassMinifier,     'condenser/minifiers/sass_minifier'
-  autoload :SassTransformer,  'condenser/transformers/sass_transformer'
+  autoload :DartSassTransformer, 'condenser/transformers/dart_sass_transformer'
+  autoload :DartScssTransformer, 'condenser/transformers/dart_sass_transformer'
+  autoload :SassTransformer,     'condenser/transformers/sass_transformer'
   autoload :ScssTransformer,  'condenser/transformers/sass_transformer'
-  autoload :EjsTemplare,      'condenser/templating_engine/ejs'
+  autoload :EjsTemplate,      'condenser/templating_engine/ejs'
   autoload :JstTransformer,   'condenser/transformers/jst_transformer'
+  autoload :SVGTransformer,   'condenser/transformers/svg_transformer'
   autoload :FileWriter,       'condenser/writers/file_writer'
   autoload :ZlibWriter,       'condenser/writers/zlib_writer'
   autoload :BrotliWriter,     'condenser/writers/brotli_writer'
   autoload :BuildCache,       'condenser/build_cache'
+  autoload :ParseHelpers,     'condenser/helpers/parse_helpers'
   
   def self.configure(&block)
     instance_eval(&block)
@@ -56,8 +62,8 @@ class Condenser
       configure(&block)
     elsif pipeline != false
       self.configure do
-        # register_preprocessor 'application/javascript', Condenser::JSAnalyzer
-        register_preprocessor 'application/javascript', Condenser::BabelProcessor
+        register_preprocessor 'application/javascript', Condenser::JSAnalyzer
+        # register_preprocessor 'application/javascript', Condenser::BabelProcessor
         register_exporter     'application/javascript', Condenser::RollupProcessor
         register_minifier     'application/javascript', Condenser::UglifyMinifier
         
@@ -132,6 +138,9 @@ Condenser.configure do
   # CSS
   register_mime_type 'text/css', extension: '.css', charset: :css
   
+  # PDF
+  register_mime_type 'application/pdf', extensions: %w(.pdf)
+  
   # SASS
   register_mime_type 'text/sass', extensions: %w(.sass .css.sass)
   # register_transformer  'text/sass', 'text/css', SassProcessor
@@ -145,12 +154,15 @@ Condenser.configure do
   
   # EJS
   register_mime_type 'application/ejs', extensions: '.ejs', charset: :unicode
-  register_template  'application/ejs', Condenser::EjsTemplare
+  register_template  'application/ejs', Condenser::EjsTemplate
   
   # JST
   register_mime_type    'application/jst', extensions: '.jst', charset: :unicode
   register_transformer  'application/jst', 'application/javascript', Condenser::JstTransformer
   
+  # SVG
+  register_transformer  'image/svg+xml', 'application/javascript', Condenser::SVGTransformer
+  
   # Writers
   register_mime_type 'application/gzip',    extensions: %w(.gz .gzip)
   register_mime_type 'application/brotli',  extension: %w(.br)

data/test/cache_test.rb

@@ -142,7 +142,7 @@ class CacheTest < ActiveSupport::TestCase
 
   end
 
-  test 'a dependency is supurceeded by a new file' do
+  test 'a dependency is superceeded by a new file' do
     Dir.mkdir(File.join(@path, 'a'))
     Dir.mkdir(File.join(@path, 'b'))
     @env.clear_path
@@ -221,6 +221,21 @@ class CacheTest < ActiveSupport::TestCase
     CSS
   end
 
+  test '2a new dependency for a glob call is reflected in the next call' do
+    file "dir/a.svg", "<svg>test</svg>"
+    file 'test.scss', 'body { background: image-url("dir/a.svg") }'
+
+    assert_exported_file 'test.css', 'text/css', <<~CSS
+      body{background:url(/assets/dir/a-01a4bd3cb9faa518c5df2d2fcc8e6cd0ba24cfc3e9438dd01455ab1e59a39068.svg)}
+    CSS
+
+    file "dir/a.svg", "<svg>tests</svg>"
+
+    assert_exported_file 'test.css', 'text/css', <<~CSS
+      body{background:url(/assets/dir/a-1d7d038c7ace080963e116cbb962075a38d5e5dc68c6ff688e42d213dd432256.svg)}
+    CSS
+  end
+  
   test 'a dependency is removed for a glob call when one of it dependencies is delted' do
     file "css/a.scss", "body { color: blue; }"
     file "css/b.scss", "body { color: green; }"
@@ -237,7 +252,7 @@ class CacheTest < ActiveSupport::TestCase
     CSS
   end
 
-  test 'a dependency is added then changed should flush the parent' do
+  test 'a dependency is added then changed should flush the parent (JS)' do
     file 'a.js', "console.log('a');\n"
     file 'b.js', <<~JS
       export default function b () { console.log('b'); }
@@ -265,4 +280,33 @@ class CacheTest < ActiveSupport::TestCase
       !function(){"use strict";console.log("a"),console.log("c")}();
     JS
   end
+
+  test 'a dependency is added then changed should flush the parent (CSS)' do
+    file 'a.scss', "body { background: aqua; }"
+    file 'b.scss', <<~JS
+      body { background: blue; }
+    JS
+
+    assert_exported_file 'a.css', 'text/css', <<~JS
+      body{background:aqua}
+    JS
+
+    file 'a.scss', <<~JS
+      @import "b";
+      body { background: aqua; }
+    JS
+
+    assert_exported_file 'a.css', 'text/css', <<~JS
+      body{background:blue}body{background:aqua}
+    JS
+
+    file 'b.scss', <<~JS
+      body { background: green; }
+    JS
+
+    assert_exported_file 'a.css', 'text/css', <<~JS
+      body{background:green}body{background:aqua}
+    JS
+  end
+
 end

data/test/dependency_test.rb

@@ -17,7 +17,7 @@ class DependencyTest < ActiveSupport::TestCase
     JS
 
     asset = @env.find('name.js')
-    assert_equal asset.instance_variable_get(:@process_dependencies), ["models/*.js","helpers/*.js"]
+    assert_equal asset.instance_variable_get(:@process_dependencies).to_a, ["models/*.js","helpers/*.js"]
 
 
     assert_file 'name.js', 'application/javascript', <<~JS
@@ -54,7 +54,7 @@ class DependencyTest < ActiveSupport::TestCase
     JS
 
     asset = @env.find('name.js')
-    assert_equal asset.instance_variable_get(:@process_dependencies), ["models/*.js","helpers/*.js"]
+    assert_equal asset.instance_variable_get(:@process_dependencies).to_a, ["models/*.js","helpers/*.js"]
 
 
     assert_file 'name.js', 'application/javascript', <<~JS

data/test/manifest_test.rb

@@ -66,6 +66,40 @@ class ManifestTest < ActiveSupport::TestCase
     assert_equal asset.path, data['application.js']['path']
   end
 
+  test "compile asset dependencies includes the dependencies" do
+    file 'foo.svg', <<-SVG
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+        <path d="M6 18L18 6M6 6l12 12" />
+      </svg>
+    SVG
+    
+    file 'test.scss', <<-SCSS
+      body {
+        background: asset-url("foo.svg");
+      }
+    SCSS
+    
+    manifest = Condenser::Manifest.new(@env, File.join(@dir, 'manifest.json'))
+
+    main_digest_path = @env['test.css'].path
+    dep_digest_path = @env['foo.svg'].path
+
+    assert !File.exist?("#{@dir}/#{main_digest_path}")
+    assert !File.exist?("#{@dir}/#{dep_digest_path}")
+
+    manifest.compile('test.css')
+    assert File.directory?(manifest.dir)
+    assert File.file?(manifest.filename)
+
+    assert File.exist?("#{@dir}/manifest.json")
+    assert File.exist?("#{@dir}/#{main_digest_path}")
+    assert File.exist?("#{@dir}/#{dep_digest_path}")
+
+    data = JSON.parse(File.read(manifest.filename))
+    assert_equal main_digest_path, data['test.css']['path']
+    assert_equal dep_digest_path, data['foo.svg']['path']
+  end
+  
   # TODO:
   # test "compile asset with aliased index links" do
   #   manifest = Sprockets::Manifest.new(@env, File.join(@dir, 'manifest.json'))

data/test/minifiers/terser_minifier_test.rb

@@ -4,7 +4,6 @@ class TerserMinifierTest < ActiveSupport::TestCase
 
   def setup
     super
-    @env.unregister_preprocessor('application/javascript', Condenser::BabelProcessor)
     @env.unregister_exporter('application/javascript', Condenser::RollupProcessor)
     @env.register_minifier('application/javascript', Condenser::TerserMinifier)
   end

data/test/minifiers/uglify_minifier_test.rb

@@ -4,7 +4,6 @@ class UglifyMinifierTest < ActiveSupport::TestCase
 
   def setup
     super
-    @env.unregister_preprocessor('application/javascript', Condenser::BabelProcessor)
     @env.unregister_exporter('application/javascript', Condenser::RollupProcessor)
   end
 

data/test/postprocessors/css_media_combiner_test.rb

@@ -0,0 +1,107 @@
+require 'test_helper'
+
+class MediaCombinerTest < ActiveSupport::TestCase
+  
+  def setup
+    super
+    @env.register_postprocessor('text/css', Condenser::CSSMediaCombinerProcessor)
+    @env.unregister_minifier('text/css')
+  end
+  
+  test 'combine media queries' do
+    file 'main.css', <<~CSS
+      .test{
+        display: block;
+      }
+      @media only screen and (max-width: 100px) {
+        .test {
+          display: inline-block;
+          color: blue;
+        }
+      }
+      @media only screen and (max-width: 500px) {
+        .test {
+          display: inline;
+        }
+      }
+      
+      .test2{
+        display: block;
+      }
+      @media only screen and (max-width: 100px) {
+        .test2 {
+          display: inline-block;
+        }
+      }
+    CSS
+
+    assert_exported_file 'main.css', 'text/css', <<~FILE
+    .test{
+      display: block;
+    }
+
+
+
+    .test2{
+      display: block;
+    }
+    @media only screen and (max-width: 100px) {
+      .test {
+        display: inline-block;
+        color: blue;
+      }
+
+      .test2 {
+        display: inline-block;
+      }
+    }@media only screen and (max-width: 500px) {
+      .test {
+        display: inline;
+      }
+    }
+    FILE
+  end
+  
+  test 'single line css' do
+    file 'main.css', <<~CSS
+      .test{display: block;} @media only screen and (max-width: 100px) {.test {display: inline-block;}}@media only screen and (max-width: 500px) {.test {display: inline;}}.test2{display: block;}@media only screen and (max-width: 100px) {.test2 {display: inline-block;}}
+    CSS
+
+    assert_exported_file 'main.css', 'text/css', <<~FILE
+    .test{display: block;} .test2{display: block;}@media only screen and (max-width: 100px) {.test {display: inline-block;}.test2 {display: inline-block;}}@media only screen and (max-width: 500px) {.test {display: inline;}}
+    FILE
+  end
+
+
+  test 'keyframes' do
+    file 'main.css', <<~CSS
+    .trobber {
+    animation: throb 1s infinite;
+    }
+    @keyframes throb {
+        0% {
+            opacity: 1;
+        }
+        100%{
+            opacity: 0;
+        }
+    }
+    CSS
+
+    assert_exported_file 'main.css', 'text/css', <<~FILE
+    .trobber {
+    animation: throb 1s infinite;
+    }
+    @keyframes throb {
+        0% {
+            opacity: 1;
+        }
+        100%{
+            opacity: 0;
+        }
+    }
+    FILE
+  end
+
+
+end

data/test/postprocessors/purgecss_test.rb

@@ -79,5 +79,67 @@ class PurgeCSSTest < ActiveSupport::TestCase
     }
     FILE
   end
+  
+  test 'purge from html with class with /' do
+    file 'main.css', <<~CSS
+      .test{
+        display: block;
+      }
+      .test2-1\\/2{
+        display: inline;
+      }
+    CSS
+    file 'index.html', <<~HTML
+      <div class="test2-1/2"></div>
+    HTML
+
+    assert_exported_file 'main.css', 'text/css', <<~FILE
+    .test2-1\\/2{
+      display: inline;
+    }
+    FILE
+  end
+  
+  test 'purge from html with nested tag' do
+    file 'main.css', <<~CSS
+      .test pre{
+        display: block;
+      }
+    CSS
+    file 'index.html', <<~HTML
+      <div class="test">
+        <pre>Test</pre>
+      </div>
+    HTML
+
+    assert_exported_file 'main.css', 'text/css', <<~FILE
+    .test pre{
+      display: block;
+    }
+    FILE
+  end
+  
+  test 'purge from html with nested tags' do
+    file 'main.css', <<~CSS
+      code { 
+        background: gray;
+      }
+      pre code{
+        background: none;
+      }
+    CSS
+    file 'index.html', <<~HTML
+      <pre><code>Test</code></pre>
+    HTML
+
+    assert_exported_file 'main.css', 'text/css', <<~FILE
+    code { 
+      background: gray;
+    }
+    pre code{
+      background: none;
+    }
+    FILE
+  end
 
 end