isomorfeus-asset-manager 0.14.10 → 0.14.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd67d5e589186012d44384e22c24ecc58f6d91ea8d5596aed46c8d6a130b9275
-  data.tar.gz: 8981272264e96d66ace7e1f942c3c985bf9f99d7ef0cb4da836c2ecad5f3f87f
+  metadata.gz: 78b774bc55cc59e8fee7021c0cad65221b01885e932f7881cf6f006e45898400
+  data.tar.gz: 76c7b73948ed055aeeca30847e307ef1e7ef7174075463abbfff04555e032df3
 SHA512:
-  metadata.gz: db8bb45d6f08592354a67591edaf1c463dc57b3aea3d6fac6b61eb00ca4ac3eda700a20934e48b4fb90d18983af81ac5f1a5faea181aaa5f59ff2c2ce986ab86
-  data.tar.gz: 21ba109c1c94ec3b1a13ccf647ebb6ba92a3c2b1eeb3fa266d973b05569b5b065ffb6246997ec1cf6e94374a09979f8ac643fd36791270702ca4157cd7df848d
+  metadata.gz: 9e05e0fdb8f88f717638ba1aece5332d737e7e7e16f0262519386eebb4e92b21af5e31176e76dabed2d19afed09a3b8652922c0365c49625cac3e4827e72f722
+  data.tar.gz: 8a67ce45a8dad7badc69a5e4cff9d617ff0f5bd9e9316d369fc335e190793110696f684ac2289dd31874eeaba25d06e63dcd9f1d543870b7197d61168d813b96

data/lib/isomorfeus/asset_manager/asset.rb

@@ -5,6 +5,7 @@ module Isomorfeus
       attr_reader :bundle_gz, :bundle_gz_size
       attr_reader :bundle_map, :bundle_map_size
       attr_reader :bundle_map_gz, :bundle_map_gz_size
+      attr_reader :bundle_ruby_modules
       attr_reader :css, :css_size
       attr_reader :css_gz, :css_gz_size
       attr_reader :css_map, :css_map_size
@@ -52,6 +53,22 @@ module Isomorfeus
         @bundle_map
       end
 
+      def bundle_ruby_modules=(m)
+        @bundled = true
+        @bundle_ruby_modules = m
+        if !Isomorfeus.production? && @target != :node
+          @bundle_ruby_modules.each do |key, mod_hash|
+            mod_hash[:js_size] = mod_hash[:js].size
+            mod_hash[:js_gz] = Zlib::gzip(mod_hash[:js], level: Zlib::BEST_COMPRESSION)
+            mod_hash[:js_gz_size] = mod_hash[:js_gz].size
+            mod_hash[:map_size] = mod_hash[:map].size
+            mod_hash[:map_gz] = Zlib::gzip(mod_hash[:map], level: Zlib::BEST_COMPRESSION)
+            mod_hash[:map_gz_size] = mod_hash[:map_gz].size
+          end
+        end
+        @bundle_ruby_modules
+      end
+
       def bundled?
         @bundled
       end
@@ -92,6 +109,16 @@ module Isomorfeus
         @ruby_imports.map(&:module_name)
       end
 
+      def ruby_imports_to_s(asset_name)
+        s = @ruby_imports.size - 1
+        return '' if s < 0
+        js = "async function iam_load_ruby_modules() {\n"
+        @ruby_imports.each do |import|
+          js << '  await ' << import.to_dev_s(asset_name)
+        end
+        js << "}\niam_load_ruby_modules();\n"
+      end
+
       def touch
         @mtime = (Time.now.to_f * (10 ** 9)).to_i
       end
@@ -144,7 +171,7 @@ module Isomorfeus
             // Isomorfeus Asset Manager HMR code end
             JAVASCRIPT
           end
-          js << "#{@ruby_imports.map(&:to_s).join("\n")}"
+          js << "#{@ruby_imports.map(&:to_s).join("\n")}" if Isomorfeus.production? || target == :node
         end
         js
       end

data/lib/isomorfeus/asset_manager/rack_middleware.rb

@@ -25,8 +25,93 @@ module Isomorfeus
         path_info = env['PATH_INFO']
         if path_info.start_with?(@assets_path)
 
+          if !Isomorfeus.production?
+            if path_info.end_with?('.rb.js')
+              asset_key_module_name = path_info[@assets_path_size..-7]
+              asset_key, module_name = asset_key_module_name.split('/')
+              asset_key += '.js'
+              if Isomorfeus.assets.key?(asset_key)
+                asset = Isomorfeus.assets[asset_key]
+                if asset && asset.target != :node
+                  asset_manager.transition(asset_key, asset)
+                  if asset.bundle_ruby_modules.key?(module_name)
+                    headers = {}
+                    headers['Last-Modified'] = asset.mtime
+                    headers[Rack::CONTENT_TYPE] = 'application/javascript'
+                    if should_gzip?(env)
+                      headers['Content-Encoding'] = "gzip"
+                      headers[Rack::CONTENT_LENGTH] = asset.bundle_ruby_modules[module_name][:js_gz_size]
+                      return [200, headers, asset.bundle_ruby_modules[module_name][:js_gz]]
+                    else
+                      headers[Rack::CONTENT_LENGTH] = asset.bundle_ruby_modules[module_name][:js_size]
+                      return [200, headers, asset.bundle_ruby_modules[module_name][:js]]
+                    end
+                  end
+                end
+              end
+
+            elsif path_info.end_with?('.rb.js.map')
+              asset_key_module_name = path_info[@assets_path_size..-11]
+              asset_key, module_name = asset_key_module_name.split('/')
+              asset_key += '.js'
+              asset = Isomorfeus.assets[asset_key]
+              if asset && asset.target != :node
+                asset_manager.transition(asset_key, asset) unless asset.bundled?
+                if asset.bundle_ruby_modules.key?(module_name)
+                  headers = {}
+                  headers['Last-Modified'] = asset.mtime
+                  headers[Rack::CONTENT_TYPE] = 'application/json'
+                  if should_gzip?(env)
+                    headers['Content-Encoding'] = "gzip"
+                    headers[Rack::CONTENT_LENGTH] = asset.bundle_ruby_modules[module_name][:map_gz_size]
+                    return [200, headers, asset.bundle_ruby_modules[module_name][:map_gz]]
+                  else
+                    headers[Rack::CONTENT_LENGTH] = asset.bundle_ruby_modules[module_name][:map_size]
+                    return [200, headers, asset.bundle_ruby_modules[module_name][:map]]
+                  end
+                end
+              end
+
+            elsif path_info.end_with?('.js.map')
+              asset_key = path_info[@assets_path_size..-5]
+              asset = Isomorfeus.assets[asset_key]
+              if asset && asset.target != :node
+                asset_manager.transition(asset_key, asset) unless asset.bundled?
+                headers = {}
+                headers['Last-Modified'] = asset.mtime
+                headers[Rack::CONTENT_TYPE] = 'application/json'
+                if should_gzip?(env)
+                  headers['Content-Encoding'] = "gzip"
+                  headers[Rack::CONTENT_LENGTH] = asset.bundle_map_gz_size
+                  return [200, headers, asset.bundle_map_gz]
+                else
+                  headers[Rack::CONTENT_LENGTH] = asset.bundle_map_size
+                  return [200, headers, asset.bundle_map]
+                end
+              end
+
+            elsif path_info.end_with?('.css.map')
+              # get css source map
+              asset_key = path_info[@assets_path_size..-9] + '.js'
+              asset = Isomorfeus.assets[asset_key]
+              if asset && asset.target != :node
+                asset_manager.transition(asset_key, asset) unless asset.bundled?
+                headers = {}
+                headers['Last-Modified'] = asset.mtime
+                headers[Rack::CONTENT_TYPE] = 'application/json'
+                if should_gzip?(env)
+                  headers['Content-Encoding'] = "gzip"
+                  headers[Rack::CONTENT_LENGTH] = asset.css_map_gz_size
+                  return [200, headers, asset.css_map_gz]
+                else
+                  headers[Rack::CONTENT_LENGTH] = asset.css_map_size
+                  return [200, headers, asset.css_map]
+                end
+              end
+            end
+          end
+
           if path_info.end_with?('.js')
-            # get js
             asset_key = path_info[@assets_path_size..-1]
             if Isomorfeus.assets.key?(asset_key)
               asset = Isomorfeus.assets[asset_key]
@@ -46,25 +131,6 @@ module Isomorfeus
               end
             end
 
-          elsif path_info.end_with?('.js.map')
-            # get js source map
-            asset_key = path_info[@assets_path_size..-5]
-            asset = Isomorfeus.assets[asset_key]
-            if asset && asset.target != :node
-              asset_manager.transition(asset_key, asset) unless asset.bundled?
-              headers = {}
-              headers['Last-Modified'] = asset.mtime
-              headers[Rack::CONTENT_TYPE] = 'application/json'
-              if should_gzip?(env)
-                headers['Content-Encoding'] = "gzip"
-                headers[Rack::CONTENT_LENGTH] = asset.bundle_map_gz_size
-                return [200, headers, asset.bundle_map_gz]
-              else
-                headers[Rack::CONTENT_LENGTH] = asset.bundle_map_size
-                return [200, headers, asset.bundle_map]
-              end
-            end
-
           elsif path_info.end_with?('.css')
             # get css
             asset_key = path_info[@assets_path_size..-5] + '.js'
@@ -83,25 +149,6 @@ module Isomorfeus
                 return [200, headers, asset.css]
               end
             end
-
-          elsif path_info.end_with?('.css.map')
-            # get css source map
-            asset_key = path_info[@assets_path_size..-9] + '.js'
-            asset = Isomorfeus.assets[asset_key]
-            if asset && asset.target != :node
-              asset_manager.transition(asset_key, asset) unless asset.bundled?
-              headers = {}
-              headers['Last-Modified'] = asset.mtime
-              headers[Rack::CONTENT_TYPE] = 'application/json'
-              if should_gzip?(env)
-                headers['Content-Encoding'] = "gzip"
-                headers[Rack::CONTENT_LENGTH] = asset.css_map_gz_size
-                return [200, headers, asset.css_map_gz]
-              else
-                headers[Rack::CONTENT_LENGTH] = asset.css_map_size
-                return [200, headers, asset.css_map]
-              end
-            end
           end
 
           return [404, {}, 'not found']

data/lib/isomorfeus/asset_manager/ruby_import.rb

@@ -14,7 +14,11 @@ module Isomorfeus
       end
 
       def to_s
-        "import(\"./#{@module_name}.js\");\n"
+        "import(\"./#{@module_name}.rb.js\");\n"
+      end
+
+      def to_dev_s(asset_name)
+        "import(\"#{Isomorfeus.assets_path}/#{asset_name}/#{@module_name}.rb.js\");\n"
       end
 
       private

data/lib/isomorfeus/asset_manager/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   class AssetManager
-    VERSION = '0.14.10'
+    VERSION = '0.14.11'
   end
 end

data/lib/isomorfeus/asset_manager.rb

@@ -60,21 +60,29 @@ module Isomorfeus
       asset.mutex.synchronize do
         return if !Isomorfeus.development? && asset.bundled?
         return if Isomorfeus.development? && asset.bundled? && (self.class.last_updated.nil? || (asset.mtime > self.class.last_updated))
+        start = Time.now
+        puts "Isomorfeus Asset Manager bundling #{asset_key} ..."
         asset.touch
-        build_ruby_and_save(asset_key, asset)
+        asset_name = asset_key[0..-4]
+        asset.bundle_ruby_modules = build_ruby_and_save(asset_key, asset_name, asset)
         save_imports(asset_key, asset)
         run_esbuild(asset_key, asset, analyze)
-        asset.bundle = bundled_asset(asset_key)
-        asset.bundle_map = bundled_asset_map(asset_key) unless Isomorfeus.production?
+        asset.bundle = bundled_asset(asset_key, asset_name, asset)
         asset.css = bundled_css(asset_key)
-        asset.css_map = bundled_css_map(asset_key) unless Isomorfeus.production?
+        unless Isomorfeus.production?
+          asset.bundle_map = bundled_asset_map(asset_key)
+          asset.css_map = bundled_css_map(asset_key)
+        end
+        puts "Isomorfeus Asset Manager bundling #{asset_key} took #{Time.now - start}s"
       end
     end
 
     private
 
-    def bundled_asset(asset_key)
-      File.read(File.join(@output_path, asset_key))
+    def bundled_asset(asset_key, asset_name, asset)
+      res = File.read(File.join(@output_path, asset_key))
+      res << asset.ruby_imports_to_s(asset_name) if !Isomorfeus.production? && asset.target != :node
+      res
     end
 
     def bundled_asset_map(asset_key)
@@ -95,20 +103,24 @@ module Isomorfeus
       File.write(File.join(@imports_path, asset_key), asset.to_s)
     end
 
-    def build_ruby_and_save(asset_key, asset)
+    def build_ruby_and_save(asset_key, asset_name, asset)
+      rb = {}
       asset.ruby_imports.each do |ruby_import|
-        out_file = File.join(@imports_path, ruby_import.module_name + '.js')
+        module_name = ruby_import.module_name
+        out_file = File.join(@imports_path, module_name + '.rb.js')
         next if !Isomorfeus.development? && File.exist?(out_file)
-        js_map_path = File.join(@imports_path, ruby_import.module_name + '.js.map')
         result = Opal::Builder.build(ruby_import.resolved_path, { esm: true })
-        FileUtils.mkdir_p(File.join(*[@imports_path].concat(ruby_import.module_name.split('/')[0...-1]))) if ruby_import.module_name.include?('/')
-        js = result.to_s
-        unless Isomorfeus.production?
-          js << "\n//# sourceMappingURL=file://#{js_map_path}\n"
-          File.write(js_map_path, result.source_map)
+        rb[module_name] = { js: result.to_s }
+        if !Isomorfeus.production? && asset.target != :node
+          rb[module_name][:js] << "\n//# sourceMappingURL=#{Isomorfeus.assets_path}/#{asset_name}/#{module_name}.rb.js.map\n"
+          rb[module_name][:map] = Oj.dump(result.source_map.as_json, mode: :strict)
+        else
+          FileUtils.mkdir_p(File.join(*[@imports_path].concat(module_name.split('/')[0...-1]))) if module_name.include?('/')
+          File.write(out_file, rb[module_name][:js])
+          rb[module_name][:js] = nil
         end
-        File.write(out_file, js)
       end
+      rb
     end
 
     def compile_ruby(file)
@@ -142,7 +154,7 @@ module Isomorfeus
       <<~JAVASCRIPT
       'use strict';
       const path = require('path');
-      var esbuild_r;
+      let esbuild_r;
       try { esbuild_r = require('esbuild'); }
       catch { esbuild_r = require('esbuild-wasm'); }
       const esbuild = esbuild_r;
@@ -190,7 +202,6 @@ module Isomorfeus
     # possible future improvement
     # loader: {
     #   '.png': 'dataurl',
-    #   '.svg': 'text',
     # },
     def run_esbuild(asset_key, asset, analyze = false)
       resolve_paths = ENV['NODE_PATH'].split(Gem.win_platform? ? ';' : ':')
@@ -205,7 +216,7 @@ module Isomorfeus
         format: '#{asset.target == :node ? 'cjs' : 'iife'}',
         legalComments: 'linked',
         loader: { '.svg': 'text' },
-        metafile: true,
+        metafile: #{analyze ? 'true' : 'false'},
         minify: #{Isomorfeus.production? ? 'true' : 'false'},
         nodePaths: #{resolve_paths},
         outdir: global.output_path,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-asset-manager
 version: !ruby/object:Gem::Version
-  version: 0.14.10
+  version: 0.14.11
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isomorfeus-iodine