isomorfeus-asset-manager 0.13.3 → 0.13.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca011238408ac3f1a13c4aeae9a32a7897eda12c1680d54773cf8c48b501302
-  data.tar.gz: 8fdd2a8f8ffe4d2ee2e2544db17a33b42f83df77498c53898356c5563ae859f1
+  metadata.gz: be010df3a50e5e269faac6199f11ae7ac6908af167c5abdb6dd51ce2c346bf3b
+  data.tar.gz: c693e47aa3df6073524bfd8795f62ddc270c9699084d318097396c0fc8b82030
 SHA512:
-  metadata.gz: fc65d991ab1aa2ddb8da5118cb9d29cb505d9a51f5ec864fb667ec62e288541b1d26898ee549d4d0336bdbb21a67005630bd2220b3d0c6a502dca635645b100c
-  data.tar.gz: fd042923175fe0e57bb8bbe455ca3c7d98e3d781a89728f40a91a8eaa1f6d87c4cab0d2450283021403e3ae1642eebe2a81e7afb1b1bfef9c0eb75127c92dba6
+  metadata.gz: e14e3dcfe2cb812a581ba6715d3bf1b0c3365f54fe4133bacd602b1acdcb31602ad91fa33f687e2b5e756ed7f0b7c8e18884d8e0b5bad4bf31e55f4b2066f5f5
+  data.tar.gz: 809cb32e666acbdb5eddb810352694b9ea54184d991c2b7631bc08b5d630d86aef9be41e039bb868dbf397b4e11b19cab725e903abd415f51b93e9793b47cb18

data/lib/isomorfeus/asset_manager/asset.rb

@@ -3,8 +3,12 @@ module Isomorfeus
     class Asset
       attr_reader :bundle, :bundle_size
       attr_reader :bundle_gz, :bundle_gz_size
-      attr_reader :bundle_map
-      attr_reader :bundle_map_gz
+      attr_reader :bundle_map, :bundle_map_size
+      attr_reader :bundle_map_gz, :bundle_map_gz_size
+      attr_reader :css, :css_size
+      attr_reader :css_gz, :css_gz_size
+      attr_reader :css_map, :css_map_size
+      attr_reader :css_map_gz, :css_map_gz_size
       attr_reader :mtime, :ruby_imports, :target
       attr_reader :mutex
 
@@ -13,6 +17,7 @@ module Isomorfeus
         raise "Unknown asset target!" unless %i[browser node].include?(target)
         @target = target
         @bundled = false
+        @css_bundled = false
         @ruby_compiled = false
         @js_imports = []
         @ruby_imports = []
@@ -26,21 +31,24 @@ module Isomorfeus
         @ruby_imports << Isomorfeus::AssetManager::RubyImport.new(*args)
       end
 
-      def bundle=(b)  
+      def bundle=(b)
         @bundled = true
         @bundle = b
         @bundle_size = @bundle.size
         unless @target == :node
-          @bundle_gz = Zlib::gzip(b, level: Zlib::BEST_COMPRESSION) 
+          @bundle_gz = Zlib::gzip(b, level: Zlib::BEST_COMPRESSION)
           @bundle_gz_size = @bundle_gz.size
         end
         @bundle
       end
 
-      def bundle_map=(m)  
+      def bundle_map=(m)
         @bundled = true
         @bundle_map = m
-        @bundle_map_gz = Zlib::gzip(m, level: Zlib::BEST_COMPRESSION) unless @target == :node
+        unless @target == :node
+          @bundle_map_gz = Zlib::gzip(m, level: Zlib::BEST_COMPRESSION)
+          @bundle_map_gz_size = @bundle_map_gz.size
+        end
         @bundle_map
       end
 
@@ -48,6 +56,38 @@ module Isomorfeus
         @bundled
       end
 
+      def css=(b)
+        @bundled = true
+        if b
+          @has_css = true
+          @css = b
+          @css_size = @css.size
+          unless @target == :node
+            @css_gz = Zlib::gzip(b, level: Zlib::BEST_COMPRESSION)
+            @css_gz_size = @css_gz.size
+          end
+        end
+        @css
+      end
+
+      def css_map=(m)
+        @bundled = true
+        if m
+          @has_css = true
+          @css_map = m
+          @css_map_size = @css_map.size
+          unless @target == :node
+            @css_map_gz = Zlib::gzip(m, level: Zlib::BEST_COMPRESSION)
+            @css_map_gz_size = @css_map_gz.size
+          end
+        end
+        @css_map
+      end
+
+      def has_css?
+        @has_css
+      end
+
       def ruby_modules
         @ruby_imports.map(&:module_name)
       end
@@ -79,7 +119,7 @@ module Isomorfeus
               if (typeof Opal !== 'undefined' && typeof Opal.require_table !== "undefined" && Opal.require_table['corelib/module']) {
                 try {
                   eval(update.javascript);
-                  if (Opal.require_table[opal_module_name]) { Opal.load.call(Opal, opal_module_name); } 
+                  if (Opal.require_table[opal_module_name]) { Opal.load.call(Opal, opal_module_name); }
                   else { Opal.require.call(Opal, opal_module_name); }
                   Opal.Isomorfeus.$force_render();
                 } catch (e) { console.error(e); return; }

data/lib/isomorfeus/asset_manager/rack_middleware.rb

@@ -9,7 +9,7 @@ module Isomorfeus
       def initialize(app)
         @app = app
         @asset_manager = Isomorfeus::AssetManager.new
-        @compressible_types = %w[application/javascript text/javascript]
+        @compressible_types = %w[application/javascript text/javascript text/css]
         if Isomorfeus.assets_path.end_with?('/')
           @assets_path = Isomorfeus.assets_path
           @assets_path_size = @assets_path.size
@@ -18,35 +18,76 @@ 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)
         path_info = env['PATH_INFO']
         if path_info.start_with?(@assets_path)
-          asset_key = path_info[@assets_path_size..-1]
 
-          # get js
-          if Isomorfeus.assets.key?(asset_key)
+          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]
+              if asset && asset.target != :node
+                asset_manager.transition(asset_key, asset)
+                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_gz_size
+                  return [200, headers, asset.bundle_gz]
+                else
+                  headers[Rack::CONTENT_LENGTH] = asset.bundle_size
+                  return [200, headers, asset.bundle]
+                end
+              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'
             asset = Isomorfeus.assets[asset_key]
             if asset && asset.target != :node
               asset_manager.transition(asset_key, asset)
               headers = {}
               headers['Last-Modified'] = asset.mtime
-              headers[Rack::CONTENT_TYPE] = 'application/javascript'
+              headers[Rack::CONTENT_TYPE] = 'text/css'
               if should_gzip?(env)
                 headers['Content-Encoding'] = "gzip"
-                headers[Rack::CONTENT_LENGTH] = asset.bundle_gz_size
-                return [200, headers, asset.bundle_gz]
+                headers[Rack::CONTENT_LENGTH] = asset.css_gz_size
+                return [200, headers, asset.css_gz]
               else
-                headers[Rack::CONTENT_LENGTH] = asset.bundle_size
-                return [200, {}, asset.bundle]
-              end              
+                headers[Rack::CONTENT_LENGTH] = asset.css_size
+                return [200, headers, asset.css]
+              end
             end
-          
-          # get source map
-          elsif asset_key.end_with?('.js.map')
-            asset = Isomorfeus.assets[asset_key[0..-5]]
+
+          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 = {}
@@ -54,15 +95,16 @@ module Isomorfeus
               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]
+                headers[Rack::CONTENT_LENGTH] = asset.css_map_gz_size
+                return [200, headers, asset.css_map_gz]
               else
-                headers[Rack::CONTENT_LENGTH] = asset.bundle_map.size
-                return [200, {}, asset.bundle_map]
-              end 
+                headers[Rack::CONTENT_LENGTH] = asset.css_map_size
+                return [200, headers, asset.css_map]
+              end
             end
           end
 
+          return [404, {}, 'not found']
         # hot reloading subscription
         elsif Isomorfeus.development? && path_info == Isomorfeus.assets_websocket_path
           if env['rack.upgrade?'] == :websocket
@@ -73,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.3'
+    VERSION = '0.13.7'
   end
 end

data/lib/isomorfeus/asset_manager/view_helper.rb

@@ -4,6 +4,10 @@ module Isomorfeus
       def script_tag(path)
         "<script type=\"application/javascript\" src=\"#{Isomorfeus.assets_path}/#{path}\"></script>"
       end
+
+      def stylesheet_tag(path)
+        "<link rel=\"stylesheet\" type=\"text/css\" href=\"#{Isomorfeus.assets_path}/#{path}\">"
+      end
     end
   end
 end

data/lib/isomorfeus/asset_manager.rb

@@ -1,5 +1,36 @@
 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 initialize
       Isomorfeus.set_node_paths
 
@@ -9,22 +40,13 @@ 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
-  
+
     def transition(asset_key, asset, analyze: false)
       return if !Isomorfeus.development? && asset.bundled?
       asset.mutex.synchronize do
@@ -35,6 +57,8 @@ module Isomorfeus
         run_esbuild(asset_key, asset, analyze)
         asset.bundle = bundled_asset(asset_key)
         asset.bundle_map = bundled_asset_map(asset_key) unless Isomorfeus.production?
+        asset.css = bundled_css(asset_key)
+        asset.css_map = bundled_css_map(asset_key) unless Isomorfeus.production?
       end
     end
 
@@ -48,6 +72,16 @@ module Isomorfeus
       File.read(File.join(@output_path, asset_key + '.map'))
     end
 
+    def bundled_css(asset_key)
+      filename = File.join(@output_path, asset_key[0..-4] + '.css')
+      File.read(filename) if File.exist?(filename)
+    end
+
+    def bundled_css_map(asset_key)
+      filename = File.join(@output_path, asset_key[0..-4] + '.css.map')
+      File.read(filename) if File.exist?(filename)
+    end
+
     def save_imports(asset_key, asset)
       File.write(File.join(@imports_path, asset_key), asset.to_s)
     end
@@ -91,7 +125,7 @@ module Isomorfeus
             end
           end
         end
-        raise "Asset Manager: error bundling '#{asset_key}'" 
+        raise "Asset Manager: error bundling '#{asset_key}'"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-asset-manager
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.7
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isomorfeus-iodine
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement