condenser 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a967b71ab1e04eacf66137cb05bd987e7e7ef54cae5007948f716f588d71abe
-  data.tar.gz: 63c7f2dec0f7daf42d9a825b00f84e6dfbfd1b81a118a352020fb1837078c917
+  metadata.gz: 8a3307e3793ca525115048d1d418cccdd1ec5727171475fc4909a15b178ac14b
+  data.tar.gz: b991118f195efe01eaae6960862c1101e273f86f3bb1a3ccad009c3ad98f213d
 SHA512:
-  metadata.gz: de6af2acb1b5f697c87cc1c7a1a08a5de12d7c85a8512d413d99b46afb12e705ee80037cd2fcc50d6c12b208f7c84c8c9782d36f7102cea316ae93ca9e12f290
-  data.tar.gz: 9875317bc0268fc9d11a970c7ffd82ce139cd468541b63af06a2135e1c370e4ffa867391a93d82864034b1d0c26dcf340d8218bd1c3495bb5abd8245d6a22e1d
+  metadata.gz: ce1137d43308c657fffaff3620a6a6095cf961d697a7c56c85dc685821f637b8e6efe73bfa341ae810b467170fa4ccc6b8e8a7a76cca1e42f24e4e112b47418d
+  data.tar.gz: ffc9df1b3a0222888272d7bcff193854ca4eae42d379d974cbf377cd2302aca24bc839ba82de5ae49efa965e64b455523e19cb06845b936e47c1a115d30f16f8

data/lib/condenser.rb

@@ -11,11 +11,13 @@ require 'condenser/encoding_utils'
 require 'condenser/asset'
 require 'condenser/manifest'
 
+require 'active_support/benchmarkable'
 
 class Condenser
-  
+
+  include ActiveSupport::Benchmarkable
   prepend Environment, Pipeline, Resolve
-  
+
   autoload :BabelProcessor,   'condenser/processors/rollup_processor'
   autoload :RollupProcessor,  'condenser/processors/babel_processor'
   autoload :UglifyMinifier,   'condenser/minifiers/uglify_minifier'

data/lib/condenser/asset.rb

@@ -8,6 +8,7 @@ class Condenser
   class Asset
     
     include EncodingUtils
+    include ActiveSupport::Benchmarkable
     
     attr_reader :environment, :filename, :content_types, :source_file, :source_path
     attr_reader :linked_assets, :content_types_digest
@@ -124,9 +125,14 @@ class Condenser
       Digest::SHA1.base64digest(JSON.generate(key))
     end
     
+    def logger
+      @environment.logger
+    end
+    
     def process
       return if @processed
       
+      benchmark "Processing Asset #{self.filename}", level: :info do
       result = @environment.cache.fetch_if(Proc.new { "process/#{cache_key}" }, "dependencies/#{cache_key(false)}") do
         @environment.build do
           
@@ -154,7 +160,10 @@ class Condenser
             data[:processors] << templator_klass.name
             @environment.load_processors(templator_klass)
             
-            templator.call(@environment, data)
+            benchmark "Preprocessing #{data[:filename]} with #{templator.name}", level: :info do
+              templator.call(@environment, data)
+            end
+            
             data[:filename] = data[:filename].gsub(/\.#{extensions.last}$/, '')
           end
           
@@ -174,9 +183,10 @@ class Condenser
               processor_klass = (processor.is_a?(Class) ? processor : processor.class)
               data[:processors] << processor_klass.name
               @environment.load_processors(processor_klass)
-              
-              @environment.logger.info { "Preprocessing #{self.filename} with #{processor.name}" }
-              processor.call(@environment, data)
+
+              benchmark "Preprocessing #{self.filename} with #{processor.name}", level: :info do
+                processor.call(@environment, data)
+              end
             end
           end
       
@@ -234,9 +244,11 @@ class Condenser
       load_processors
 
       @processed = true
+      end
     end
     
     def export
+      benchmark "Exporting Asset #{self.filename}", level: :info do
       @environment.build do
         result = @environment.cache.fetch("export/#{cache_key}") do
           process
@@ -252,8 +264,19 @@ class Condenser
             linked_assets: [],
             dependencies: []
           }
-          @environment.exporters[content_type]&.call(@environment, data)
-          @environment.minifier_for(content_type)&.call(@environment, data)
+          
+          if exporter = @environment.exporters[content_type]
+            benchmark "Preprocessing #{data[:filename]} with #{exporter.name}", level: :info do
+              exporter.call(@environment, data)
+            end
+          end
+
+          if minifier = @environment.minifier_for(content_type)
+            benchmark "Preprocessing #{data[:filename]} with #{minifier.name}", level: :info do
+              minifier.call(@environment, data)
+            end
+          end
+          
           data[:digest] = @environment.digestor.digest(data[:source])
           data[:digest_name] = @environment.digestor.name.sub(/^.*::/, '').downcase
           data
@@ -261,6 +284,7 @@ class Condenser
       
         Export.new(@environment, result)
       end
+      end
     end
     
     def to_s

data/lib/condenser/minifiers/uglify_minifier.rb

@@ -1,13 +1,11 @@
 require File.expand_path('../../processors/node_processor', __FILE__)
 
+# From npm install uglify-js
 class Condenser::UglifyMinifier < Condenser::NodeProcessor
 
   class Error < StandardError
   end
   
-  # From npm install uglify-js
-  UGLIFY_SOURCE = File.expand_path('../node_modules', __FILE__)
-  
   def self.call(environment, input)
     new.call(environment, input)
   end
@@ -30,8 +28,7 @@ class Condenser::UglifyMinifier < Condenser::NodeProcessor
     }.merge(@options)
     
     result = exec_runtime(<<-JS)
-      module.paths.push("#{UGLIFY_SOURCE}")
-      const UglifyJS = require("uglify-js");
+      const UglifyJS = require("#{File.expand_path('../node_modules', __FILE__)}/uglify-js");
       const source = #{JSON.generate(input[:filename] => input[:source])}
       const options = #{JSON.generate(opts)};
 

data/lib/condenser/processors/babel_processor.rb

@@ -17,11 +17,11 @@ class Condenser::BabelProcessor < Condenser::NodeProcessor
       ast: false,
       compact: false,
       plugins: [
-        ['babel-plugin-transform-class-extended-hook', {}],
-        ["@babel/plugin-proposal-class-properties", {}],
-        ['@babel/plugin-transform-runtime', { corejs: 3 }],
+        ["#{File.expand_path('../node_modules', __FILE__)}/babel-plugin-transform-class-extended-hook", {}],
+        ["#{File.expand_path('../node_modules', __FILE__)}/@babel/plugin-proposal-class-properties", {}],
+        ["#{File.expand_path('../node_modules', __FILE__)}/@babel/plugin-transform-runtime", { corejs: 3 }],
       ],
-      presets: [["@babel/preset-env", {
+      presets: [["#{File.expand_path('../node_modules', __FILE__)}/@babel/preset-env", {
         "modules": false,
         "targets": { "browsers": "> 1% and not dead" }
       } ]],
@@ -42,9 +42,7 @@ class Condenser::BabelProcessor < Condenser::NodeProcessor
     }.merge(@options)
     
     result = exec_runtime(<<-JS)
-      module.paths.push("#{File.expand_path('../node_modules', __FILE__)}")
-    
-      const babel = require('@babel/core');
+      const babel = require("#{File.expand_path('../node_modules', __FILE__)}/@babel/core");
       const source = #{JSON.generate(input[:source])};
       const options = #{JSON.generate(opts).gsub(/"@?babel[\/-][^"]+"/) { |m| "require(#{m})"}};
       

data/lib/condenser/processors/rollup_processor.rb

@@ -4,6 +4,8 @@ require File.expand_path('../node_processor', __FILE__)
 
 class Condenser::RollupProcessor < Condenser::NodeProcessor
 
+  include ActiveSupport::Benchmarkable
+
   ROLLUP_VERSION = '0.56.1'
   
   def self.call(environment, input)
@@ -13,6 +15,10 @@ class Condenser::RollupProcessor < Condenser::NodeProcessor
   def initialize(options = {})
     @options = options.merge({}).freeze
   end
+  
+  def logger
+    @environment.logger
+  end
 
   def call(environment, input)
     @environment = environment
@@ -71,9 +77,9 @@ class Condenser::RollupProcessor < Condenser::NodeProcessor
           buffer = emitMessages(buffer);
         });
         
-        const rollup = require("rollup");
-        const commonjs = require('rollup-plugin-commonjs');
-        const nodeResolve = require('rollup-plugin-node-resolve');
+        const rollup = require("#{File.expand_path('../node_modules', __FILE__)}/rollup");
+        const commonjs = require('#{File.expand_path('../node_modules', __FILE__)}/rollup-plugin-commonjs');
+        const nodeResolve = require('#{File.expand_path('../node_modules', __FILE__)}/rollup-plugin-node-resolve');
         var rid = 0;
         var renderStack = {};
         var nodeResolver = null;
@@ -196,9 +202,9 @@ class Condenser::RollupProcessor < Condenser::NodeProcessor
         end
         
         messages.each do |message|
-          # puts message
           message = JSON.parse(message)
           
+          benchmark "Rollup #{message['method']}(#{message['args'].map(&:inspect).join(', ')})", level: :info do
           ret = case message['method']
           when 'resolve'
             importee, importer = message['args']
@@ -286,6 +292,7 @@ class Condenser::RollupProcessor < Condenser::NodeProcessor
           end
 
           io.write(JSON.generate({rid: message['rid'], return: ret}))
+          end
         end
       end
     rescue Errno::EPIPE, EOFError

data/lib/condenser/resolve.rb

@@ -95,9 +95,9 @@ class Condenser
       end
     end
 
-    def find(filename, base=nil, **kargs)
+    def find(filename, base=nil, accept: nil, ignore: [])
       build do
-        resolve(filename, base, **kargs).first
+        @build_cache["find/#{[filename, base, accept].join('-')}"] ||= resolve(filename, base, accept: accept, ignore: ignore).first
       end
     end
     

data/lib/condenser/transformers/ejs.rb

@@ -32,13 +32,13 @@ class Condenser::EjsTransformer < Condenser::NodeProcessor
         ast: false,
         compact: false,
         plugins: [
-          ['babel-plugin-transform-class-extended-hook', {}],
-          ["@babel/plugin-proposal-class-properties", {}],
-          ['@babel/plugin-transform-runtime', {
+          ["#{File.expand_path('../../processors/node_modules', __FILE__)}/babel-plugin-transform-class-extended-hook", {}],
+          ["#{File.expand_path('../../processors/node_modules', __FILE__)}/@babel/plugin-proposal-class-properties", {}],
+          ["#{File.expand_path('../../processors/node_modules', __FILE__)}/@babel/plugin-transform-runtime", {
                 corejs: 3,
           }],
         ],
-        presets: [["@babel/preset-env", {
+        presets: [["#{File.expand_path('../../processors/node_modules', __FILE__)}/@babel/preset-env", {
           "modules": false,
           "targets": { "browsers": "> 1% and not dead" }
         } ]],
@@ -46,9 +46,7 @@ class Condenser::EjsTransformer < Condenser::NodeProcessor
       }
 
       result = exec_runtime(<<-JS)
-        module.paths.push("#{File.expand_path('../../processors/node_modules', __FILE__)}")
-
-        const babel = require('@babel/core');
+        const babel = require("#{File.expand_path('../../processors/node_modules', __FILE__)}/@babel/core");
         const source = #{JSON.generate(input[:source])};
         const options = #{JSON.generate(opts).gsub(/"@?babel[\/-][^"]+"/) { |m| "require(#{m})"}};
 

data/lib/condenser/version.rb

@@ -1,3 +1,3 @@
 class Condenser
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: condenser
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Jon Bracy