condenser 1.0 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24f2e6a83798d231764a5940648a38a65f72c34e55e70e833292397bb98347a8
-  data.tar.gz: 384ceedcef19c3137ad969a255fe8519eb37ac20116c54879ccaa19a05a331c3
+  metadata.gz: e2b1dab33dd825d2bf0902e871c68c0334d49ee7af48ee0875132f39adce20d2
+  data.tar.gz: a3c40f6f19722d0cea00e28592cd2049db5185057b299bf697fc169c9a19c89a
 SHA512:
-  metadata.gz: 906d4e278f46053c31bd55943fab2100468f604aa43472a98993ea71350384abde3b0181f08d8357c814f020c897a359fe496397012a402602f0cdc8777695ae
-  data.tar.gz: f96cfdc8570e74939b71a4257a3b8647495aac682f49cc5a60e39f653367fbf6e73fe77cd5965e1f92b4cab899cf3262be7533158cf4760d2e7e166a244fe0e7
+  metadata.gz: c1ca10d2f7dff116d1b4d4daeba50302509c7faffed458e2312d40c391b84a407d596487102a4e306abd9a96bd435c39d0fb23add68a3608aa64014b3fffe0d7
+  data.tar.gz: 3f530d21b0ec272d51aabd96f0218dfc1a02dbb8845dbefd3d92cf1517447bc436785a102415ad9fda696df26d9769f67485f8530445eb66b48dc3318ffd8e72

data/lib/condenser.rb

@@ -18,6 +18,7 @@ class Condenser
   autoload :BabelProcessor,   'condenser/processors/babel_processor'
   autoload :RollupProcessor,  'condenser/processors/rollup_processor'
   autoload :JSAnalyzer,       'condenser/processors/js_analyzer'
+  autoload :PurgeCSSProcessor,'condenser/processors/purgecss_processor'
   autoload :NodeProcessor,    'condenser/processors/node_processor'
   autoload :UglifyMinifier,   'condenser/minifiers/uglify_minifier'
   autoload :TerserMinifier,   'condenser/minifiers/terser_minifier'

data/lib/condenser/asset.rb

@@ -159,7 +159,7 @@ class Condenser
           Digest::SHA256.file(dep.source_file).hexdigest
         ]
       end
-
+      
       @pcv = Digest::SHA1.base64digest(JSON.generate(f))
     end
     
@@ -241,6 +241,7 @@ class Condenser
               data[:processors] << processor_klass.name
               @environment.load_processors(processor_klass)
 
+              @environment.logger.info { "Pre Processing #{self.filename} with #{processor.name}" }
               processor.call(@environment, data)
             end
           end
@@ -257,6 +258,17 @@ class Condenser
               data[:content_type] << to_mime_type
             end
           end
+          
+          if @environment.postprocessors.has_key?(data[:content_type].last)
+            @environment.postprocessors[data[:content_type].last].each do |processor|
+              processor_klass = (processor.is_a?(Class) ? processor : processor.class)
+              data[:processors] << processor_klass.name
+              @environment.load_processors(processor_klass)
+
+              @environment.logger.info { "Post Processing #{self.filename} with #{processor.name}" }
+              processor.call(@environment, data)
+            end
+          end
       
           if mime_types != @content_types
             raise ContentTypeMismatch, "mime type(s) \"#{@content_types.join(', ')}\" does not match requested mime type(s) \"#{data[:mime_types].join(', ')}\""
@@ -335,6 +347,15 @@ class Condenser
           data[:digest_name] = @environment.digestor.name.sub(/^.*::/, '').downcase
           data
         end
+
+        if @environment.build_cache.listening
+          # TODO we could skip file and all their depencies here if they are
+          # already in build_cache.@export_dependencies
+          all_export_dependencies.each do |sf|
+            @environment.build_cache.instance_variable_get(:@export_dependencies)[sf]&.add(self)
+          end
+        end
+
         Export.new(@environment, data)
       end
     end

data/lib/condenser/minifiers/terser_minifier.rb

@@ -5,9 +5,8 @@ class Condenser::TerserMinifier < Condenser::NodeProcessor
     npm_install('terser')
     
     @options = options.merge({
-      warnings: true,
-      sourceMap: false,
-      keep_classnames: true
+      keep_classnames: true,
+      keep_fnames: true
     }).freeze
   end
 
@@ -28,13 +27,12 @@ class Condenser::TerserMinifier < Condenser::NodeProcessor
       const options = #{JSON.generate(opts)};
 
 
-      var result = Terser.minify(source, options);
-      if (result.error !== undefined) {
-        console.log(JSON.stringify({'error': result.error.name + ": " + result.error.message}));
-        process.exit(1);
-      } else {
+      Terser.minify(source, options).then((result) => {
         console.log(JSON.stringify(result));
-      }
+      }, (error) => {
+        console.log(JSON.stringify({'error': error.name + ": " + error.message}));
+        process.exit(1);
+      });
     JS
 
     exec_runtime_error(result['error']) if result['error']

data/lib/condenser/processors/node_processor.rb

@@ -8,6 +8,10 @@ class Condenser
     
     def self.setup(environment)
     end
+  
+    def name
+      self.class.name
+    end
 
     def self.call(environment, input)
       @instances ||= {}

data/lib/condenser/processors/purgecss_processor.rb

@@ -0,0 +1,70 @@
+require 'json'
+
+class Condenser::PurgeCSSProcessor < Condenser::NodeProcessor
+  
+  attr_accessor :options
+  
+  # Public: initialize with custom options.
+  #
+  # dir - String (path to node_modules directory)
+  # options - Hash
+  #   content - Array - html files to process
+  #       ex. [File.expand_path('./docs-src/**/*.erb'), File.expand_path('./docs-src/assets/javascripts/**/*.js')]
+  #
+  # Options are passed to PurgeCSS checkout [PurgeCSS Configurations](https://purgecss.com/configuration.html)
+  #
+  
+  def self.call(environment, input)
+    @instances ||= {}
+    @instances[environment] ||= new(environment.npm_path, {
+      content: [File.join(environment.base, '**/*.html'), File.join(environment.base, '**/*.js')]
+    })
+    @instances[environment].call(environment, input)
+  end
+  
+  
+  def initialize(dir = nil, options = {})
+    super(dir)
+    @options = options
+    npm_install('purgecss')
+  end
+  
+  def call(environment, input)
+    result = exec_runtime(<<-JS)
+      const { PurgeCSS } = require("#{File.join(npm_module_path('purgecss'))}")
+      const options = #{@options.to_json}
+      options.css = [{
+        raw: #{input[:source].inspect}
+      }]
+      if(options.safelist) {
+        options.safelist = options.safelist.map(s => {
+          if(s[0] == "/" && s[s.length - 1] == "/") {
+            return new RegExp(s.slice(1, -1))
+          }
+          return s
+        })
+      }
+      const result = new PurgeCSS().purge(options)
+      try {
+        result.then(
+          r => console.log(JSON.stringify({
+            success: r[0]
+          })),
+          function() {console.log(JSON.stringify({'error': arguments}))}
+        )
+      } catch(e) {
+        console.log(JSON.stringify({'error': [e.name, e.message, e.stack]}));
+      }
+    JS
+    if result['error']
+      if result['error'][0] == 'SyntaxError'
+        raise exec_syntax_error(result['error'][1], "/assets/#{input[:filename]}")
+      else
+        raise exec_runtime_error(result['error'][0] + ': ' + result['error'][1])
+      end
+    else
+      input[:source] = result["success"]["css"]
+    end
+  end
+
+end

data/lib/condenser/processors/rollup_processor.rb

@@ -217,8 +217,6 @@ class Condenser::RollupProcessor < Condenser::NodeProcessor
             importee = message['args'].first
             if importee == @entry
               { code: @input[:source], map: @input[:map] }
-            elsif importee.start_with?(npm_module_path)
-              { code: File.read(importee), map: nil }
             elsif importee.end_with?('*')
               importees = @environment.resolve(importee, importer ? File.dirname(@entry == importer ? @input[:source_file] : importer) : nil, accept: @input[:content_types].last)
               code = ""

data/lib/condenser/version.rb

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

data/test/cache_stores/file_store_test.rb

@@ -22,7 +22,7 @@ class CacheFileStoreTest < ActiveSupport::TestCase
 
     oldenv = @env
     begin
-      @env = Condenser.new(@path)
+      @env = Condenser.new(@path, base: @path)
       @env.cache = Condenser::Cache::FileStore.new(@cachepath)
       Condenser::Erubi.stubs(:call).never
 

data/test/cache_test.rb

@@ -237,4 +237,32 @@ class CacheTest < ActiveSupport::TestCase
     CSS
   end
 
+  test 'a dependency is added then changed should flush the parent' do
+    file 'a.js', "console.log('a');\n"
+    file 'b.js', <<~JS
+      export default function b () { console.log('b'); }
+    JS
+
+    assert_exported_file 'a.js', 'application/javascript', <<~JS
+      !function(){"use strict";console.log("a")}();
+    JS
+
+    file 'a.js', <<~JS
+      import b from 'b';
+      console.log('a');
+      b();
+    JS
+
+    assert_exported_file 'a.js', 'application/javascript', <<~JS
+      !function(){"use strict";console.log("a"),console.log("b")}();
+    JS
+
+    file 'b.js', <<~JS
+      export default function b () { console.log('c'); }
+    JS
+
+    assert_exported_file 'a.js', 'application/javascript', <<~JS
+      !function(){"use strict";console.log("a"),console.log("c")}();
+    JS
+  end
 end

data/test/minifiers/terser_minifier_test.rb

@@ -27,8 +27,8 @@ class TerserMinifierTest < ActiveSupport::TestCase
       }
     JS
     
-    @env.logger.expects(:warn).with('Dropping unused variable u [test.js:8,6]')
-    @env.logger.expects(:warn).with('Dropping unused variable bl [test.js:10,6]')
+    # @env.logger.expects(:warn).with('Dropping unused variable u [test.js:8,6]')
+    # @env.logger.expects(:warn).with('Dropping unused variable bl [test.js:10,6]')
     
     assert_exported_file 'test.js', 'application/javascript', <<~CSS
       class MyClass{fn(){console.log("Hello")}}function fa(){return console.log(1),5}

data/test/postprocessors/purgecss_test.rb

@@ -0,0 +1,83 @@
+require 'test_helper'
+
+class PurgeCSSTest < ActiveSupport::TestCase
+  
+  def setup
+    super
+    @env.register_postprocessor('text/css', Condenser::PurgeCSSProcessor)
+    @env.unregister_minifier('text/css')
+  end
+  
+  test 'purge from html' do
+    file 'main.css', <<~CSS
+      .test{
+        display: block;
+      }
+      .test2{
+        display: inline;
+      }
+    CSS
+    file 'index.html', <<~HTML
+      <div class="test2"></div>
+    HTML
+
+    assert_exported_file 'main.css', 'text/css', <<~FILE
+    .test2{
+      display: inline;
+    }
+    FILE
+  end
+  
+  test 'purge from js' do
+    file 'main.css', <<~CSS
+      .test{
+        display: block;
+      }
+      .test2{
+        display: inline;
+      }
+      .test3{
+        display: inline-block;
+      }
+    CSS
+    file 'main.js', <<~HTML
+      document.getElementById('foo').classList.add('test3', 'test2');
+    HTML
+
+    assert_exported_file 'main.css', 'text/css', <<~FILE
+    .test2{
+      display: inline;
+    }
+    .test3{
+      display: inline-block;
+    }
+    FILE
+  end
+  
+  test 'purge from js with space separated classes' do
+    file 'main.css', <<~CSS
+      .test{
+        display: block;
+      }
+      .test2{
+        display: inline;
+      }
+      .test3{
+        display: inline-block;
+      }
+    CSS
+    file 'main.js', <<~HTML
+      document.getElementById('foo').setAttribute('class', 'test3 test2');
+    HTML
+
+    assert_exported_file 'main.css', 'text/css', <<~FILE
+    .test2{
+      display: inline;
+    }
+    .test3{
+      display: inline-block;
+    }
+    FILE
+  end
+
+end

data/test/preprocessor/babel_test.rb

@@ -134,7 +134,7 @@ class CondenserBabelTest < ActiveSupport::TestCase
       	  check(typeof self == 'object' && self) ||
       	  check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
       	  // eslint-disable-next-line no-new-func
-      	  Function('return this')();
+      	  (function () { return this; })() || Function('return this')();
 
       	var fails = function (exec) {
       	  try {
@@ -622,4 +622,44 @@ class CondenserBabelTest < ActiveSupport::TestCase
     JS
   end
   
+  test 'npm modules also get babelized' do
+    file "#{@npm_path}/module/name.js", <<~JS
+      export default class { };
+    JS
+
+    file 'name.js', <<~JS
+      import C from 'module/name';
+      
+      class D extends C { }
+    JS
+
+    assert_file 'name.js', 'application/javascript', <<~JS
+      import _Reflect$construct from "@babel/runtime-corejs3/core-js-stable/reflect/construct";
+      import _classCallCheck from "@babel/runtime-corejs3/helpers/esm/classCallCheck";
+      import _inherits from "@babel/runtime-corejs3/helpers/esm/inherits";
+      import _possibleConstructorReturn from "@babel/runtime-corejs3/helpers/esm/possibleConstructorReturn";
+      import _getPrototypeOf from "@babel/runtime-corejs3/helpers/esm/getPrototypeOf";
+      
+      function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+      
+      function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !_Reflect$construct) return false; if (_Reflect$construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(_Reflect$construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+      
+      import C from 'module/name';
+      
+      var D = /*#__PURE__*/function (_C) {
+        _inherits(D, _C);
+      
+        var _super = _createSuper(D);
+      
+        function D() {
+          _classCallCheck(this, D);
+      
+          return _super.apply(this, arguments);
+        }
+      
+        return D;
+      }(C);
+    JS
+
+  end
 end

data/test/test_helper.rb

@@ -34,7 +34,7 @@ class ActiveSupport::TestCase
     @path = File.realpath(Dir.mktmpdir)
     @npm_dir = File.expand_path('../../tmp', __FILE__)
     Dir.mkdir(@npm_dir) if !Dir.exist?(@npm_dir)
-    @env = Condenser.new(@path, logger: Logger.new('/dev/null', level: :debug), npm_path: @npm_dir)
+    @env = Condenser.new(@path, logger: Logger.new('/dev/null', level: :debug), npm_path: @npm_dir, base: @path)
     @env.unregister_writer(Condenser::ZlibWriter)
     @env.unregister_writer(Condenser::BrotliWriter)
     @env.context_class.class_eval do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condenser
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.2'
 platform: ruby
 authors:
 - Jon Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -326,6 +326,7 @@ files:
 - lib/condenser/processors/babel_processor.rb
 - lib/condenser/processors/js_analyzer.rb
 - lib/condenser/processors/node_processor.rb
+- lib/condenser/processors/purgecss_processor.rb
 - lib/condenser/processors/rollup_processor.rb
 - lib/condenser/resolve.rb
 - lib/condenser/server.rb
@@ -349,6 +350,7 @@ files:
 - test/minifiers/terser_minifier_test.rb
 - test/minifiers/uglify_minifier_test.rb
 - test/pipeline_test.rb
+- test/postprocessors/purgecss_test.rb
 - test/preprocessor/babel_test.rb
 - test/preprocessor/js_analyzer_test.rb
 - test/processors/rollup_test.rb
@@ -396,6 +398,7 @@ test_files:
 - test/minifiers/terser_minifier_test.rb
 - test/minifiers/uglify_minifier_test.rb
 - test/pipeline_test.rb
+- test/postprocessors/purgecss_test.rb
 - test/preprocessor/babel_test.rb
 - test/preprocessor/js_analyzer_test.rb
 - test/processors/rollup_test.rb