isomorfeus-asset-manager 0.13.4 → 0.13.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57c6e9cbf3cca3ff51230dc1d5d138d41d0c52c22a3dac313ef74d0103e2021c
-  data.tar.gz: 0f2aecd3cced8363965e0514bd8e64dcfa82df116e9ade38bb340d873b70bc27
+  metadata.gz: 21a755b3c964b1e4463ac86d3a107bfa96cf1e3711013f3d27ab360805e54a52
+  data.tar.gz: a61345d86fd03993f9eeb0f27528731285135a200208e3065c0e2cd2737bcb5a
 SHA512:
-  metadata.gz: '079db8abd836f1d0a720ffa0b6905d31cb7c22e78ca4b8be079d4b58762dd4fa4c70438831bd3bb312acc678dfcda0fcd1c4033126f8df52aff38bfec66e9327'
-  data.tar.gz: bf2092bd1ca8f2d19b150ada7eb6efb054fda1d9dcf295866146b9e9ea19e24ab223f8f49110cb6b388fce819a262d737ac110aded218966c1592abcd4635b26
+  metadata.gz: 7847d671507e887ae60b0577b3b9bbe2811dc004ca5ada5392d04df064e9bb58f1d80fd6af79d5d20d6611788d27351e5b5e467d155039ad07b0e19e917aa4ef
+  data.tar.gz: 55e4afab66c907df3655198dd52271be34d8f2a43b77ebc3dc4881a48df64bb29980c05013057c71a5653105b431922dbbad063f3573413b280ac1534e5b3fa8

data/lib/isomorfeus/asset_manager/asset.rb

@@ -64,7 +64,7 @@ module Isomorfeus
           @css_size = @css.size
           unless @target == :node
             @css_gz = Zlib::gzip(b, level: Zlib::BEST_COMPRESSION)
-            @css_gz_size = @bundle_gz.size
+            @css_gz_size = @css_gz.size
           end
         end
         @css
@@ -93,7 +93,7 @@ module Isomorfeus
       end
 
       def touch
-        @mtime = Time.now
+        @mtime = (Time.now.to_f * (10 ** 9)).to_i
       end
 
       def to_s
@@ -112,7 +112,7 @@ module Isomorfeus
             hmr_ws.onmessage = function(event) {
               let update = JSON.parse(event.data);
               if (typeof update.error !== 'undefined') { console.error(update.error); return; }
-              let start_index = '/* Generated by Opal 1.2.0 */\\nOpal.modules[\\"'.length;
+              let start_index = 'Opal.modules[\\"'.length;
               let end_index = update.javascript.indexOf('"', start_index);
               let opal_module_name = update.javascript.substr(start_index, end_index - start_index);
               console.log('Updating ', opal_module_name);

data/lib/isomorfeus/asset_manager/config.rb

@@ -8,7 +8,7 @@ module Isomorfeus
       attr_accessor :root
       attr_accessor :app_root
       attr_accessor :assets_path
-      attr_accessor :assets_websocket_path 
+      attr_accessor :assets_websocket_path
       attr_accessor :asset_manager_tmpdir
       attr_accessor :asset_manager_hmr_channel
       attr_accessor :asset_manager_hmr_dirs
@@ -19,24 +19,24 @@ module Isomorfeus
       def add_web_js_import(*args)
         Isomorfeus.assets['web.js'].add_js_import(*args)
       end
-  
+
       def add_ssr_js_import(*args)
         Isomorfeus.assets['ssr.js'].add_js_import(*args)
       end
-  
+
       def add_common_js_import(*args)
         Isomorfeus.assets['web.js'].add_js_import(*args)
         Isomorfeus.assets['ssr.js'].add_js_import(*args)
       end
-  
+
       def add_web_ruby_import(*args)
         Isomorfeus.assets['web.js'].add_ruby_import(*args)
       end
-  
+
       def add_ssr_ruby_import(*args)
         Isomorfeus.assets['ssr.js'].add_ruby_import(*args)
       end
-  
+
       def add_common_ruby_import(*args)
         Isomorfeus.assets['web.js'].add_ruby_import(*args)
         Isomorfeus.assets['ssr.js'].add_ruby_import(*args)
@@ -66,7 +66,7 @@ module Isomorfeus
 
   self.hmr_listener = nil
   self.asset_manager_hmr_channel = :isomorfeus_asset_manager_module_updates
-  self.asset_manager_hmr_dirs = %w[channels, components, data, operations, policies]
+  self.asset_manager_hmr_dirs = %w[channels components data operations policies]
   self.assets_websocket_path = '/_assets_websocket'
   self.assets_path = '/assets'
   self.assets = {

data/lib/isomorfeus/asset_manager/rack_middleware.rb

@@ -18,7 +18,7 @@ module Isomorfeus
           @assets_path_size = @assets_path.size
         end
       rescue Exception => e
-        STDERR.puts "#{e.message}\n#{e.backtrace.join("\n")}\n"
+        STDERR.puts "#{e.message}\n#{e.backtrace&.join("\n")}\n"
       end
 
       def call(env)
@@ -41,7 +41,7 @@ module Isomorfeus
                   return [200, headers, asset.bundle_gz]
                 else
                   headers[Rack::CONTENT_LENGTH] = asset.bundle_size
-                  return [200, {}, asset.bundle]
+                  return [200, headers, asset.bundle]
                 end
               end
             end
@@ -51,7 +51,7 @@ module Isomorfeus
             asset_key = path_info[@assets_path_size..-5]
             asset = Isomorfeus.assets[asset_key]
             if asset && asset.target != :node
-              asset_manager.transition(asset_key, asset)
+              asset_manager.transition(asset_key, asset) unless asset.bundled?
               headers = {}
               headers['Last-Modified'] = asset.mtime
               headers[Rack::CONTENT_TYPE] = 'application/json'
@@ -61,7 +61,7 @@ module Isomorfeus
                 return [200, headers, asset.bundle_map_gz]
               else
                 headers[Rack::CONTENT_LENGTH] = asset.bundle_map_size
-                return [200, {}, asset.bundle_map]
+                return [200, headers, asset.bundle_map]
               end
             end
 
@@ -80,7 +80,7 @@ module Isomorfeus
                 return [200, headers, asset.css_gz]
               else
                 headers[Rack::CONTENT_LENGTH] = asset.css_size
-                return [200, {}, asset.css]
+                return [200, headers, asset.css]
               end
             end
 
@@ -89,7 +89,7 @@ module Isomorfeus
             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)
+              asset_manager.transition(asset_key, asset) unless asset.bundled?
               headers = {}
               headers['Last-Modified'] = asset.mtime
               headers[Rack::CONTENT_TYPE] = 'application/json'
@@ -99,7 +99,7 @@ module Isomorfeus
                 return [200, headers, asset.css_map_gz]
               else
                 headers[Rack::CONTENT_LENGTH] = asset.css_map_size
-                return [200, {}, asset.css_map]
+                return [200, headers, asset.css_map]
               end
             end
           end
@@ -115,7 +115,7 @@ module Isomorfeus
           @app.call(env)
         end
       rescue Exception => e
-        STDERR.puts "#{e.message}\n#{e.backtrace.join("\n")}\n"
+        STDERR.puts "#{e.message}\n#{e.backtrace&.join("\n")}\n"
         @app.call(env)
       end
 

data/lib/isomorfeus/asset_manager/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   class AssetManager
-    VERSION = '0.13.4'
+    VERSION = '0.13.8'
   end
 end

data/lib/isomorfeus/asset_manager.rb

@@ -1,5 +1,44 @@
 module Isomorfeus
   class AssetManager
+    @@app_common_imports = false
+    @@app_web_imports = false
+    @@app_ssr_imports = false
+
+    def self.add_app_imports
+      imports_path = File.expand_path(File.join(Isomorfeus.app_root, 'imports'))
+      if Dir.exist?(imports_path)
+        unless @@app_common_imports
+          common_imports_file = File.join(imports_path, 'common.js')
+          if File.exist?(common_imports_file)
+            Isomorfeus.add_common_js_import(common_imports_file)
+            @@app_common_imports = true
+          end
+        end
+        unless @@app_web_imports
+          web_imports_file = File.join(imports_path, 'web.js')
+          if File.exist?(web_imports_file)
+            Isomorfeus.add_web_js_import(web_imports_file)
+            @@app_web_imports = true
+          end
+        end
+        unless @@app_ssr_imports
+          ssr_imports_file = File.join(imports_path, 'ssr.js')
+          if File.exist?(ssr_imports_file)
+            Isomorfeus.add_ssr_js_import(ssr_imports_file)
+            @@app_ssr_imports
+          end
+        end
+      end
+    end
+
+    def self.last_updated
+      @last_updated
+    end
+
+    def self.last_updated=(l)
+      @last_updated = l
+    end
+
     def initialize
       Isomorfeus.set_node_paths
 
@@ -9,19 +48,10 @@ module Isomorfeus
       FileUtils.mkdir_p(@imports_path)
       FileUtils.mkdir_p(@output_path)
       @server_path = File.join(Isomorfeus.app_root, 'server')
+      self.class.add_app_imports
 
       @context = ExecJS.permissive_compile(init_js)
 
-      imports_path = File.expand_path(File.join(Isomorfeus.app_root, 'imports'))
-      if Dir.exist?(imports_path)
-        common_imports_file = File.join(imports_path, 'common.js')
-        Isomorfeus.add_common_js_import(common_imports_file) if File.exist?(common_imports_file)
-        web_imports_file = File.join(imports_path, 'web.js')
-        Isomorfeus.add_web_js_import(web_imports_file) if File.exist?(web_imports_file)
-        ssr_imports_file = File.join(imports_path, 'ssr.js')
-        Isomorfeus.add_ssr_js_import(ssr_imports_file) if File.exist?(ssr_imports_file)
-      end
-
       init_hmr_listener if Isomorfeus.development? && !Isomorfeus.hmr_listener
     end
 
@@ -29,6 +59,7 @@ module Isomorfeus
       return if !Isomorfeus.development? && asset.bundled?
       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))
         asset.touch
         build_ruby_and_save(asset_key, asset)
         save_imports(asset_key, asset)
@@ -131,8 +162,10 @@ module Isomorfeus
           listen_dirs << listen_dir if Dir.exist?(listen_dir)
         end
       end
+      am_class = self.class
       Isomorfeus.hmr_listener = Listen.to(*listen_dirs) do |modified, added, _|
         (modified + added).each do |file|
+          am_class.last_updated = (Time.now.to_f * (10 ** 9)).to_i
           next if file.start_with?(@server_path)
           begin
             update = compile_ruby(file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-asset-manager
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.13.8
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isomorfeus-iodine