isomorfeus-asset-manager 0.13.1 → 0.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff9a8f0e408ac39900fbdf2f84af35b829a5decf60412dcc536594b7be6ce0d4
-  data.tar.gz: be5a5258bc3759bb902f04798108e9ea2928d6b75934d0c3f05b299e37d2ba8a
+  metadata.gz: cdcf458b09fa1d032dc66f6c8fc61094b95ac6782ee15c4036c74fd68e830276
+  data.tar.gz: 1de06150024171c6d2ab5aab2f74d09d3ebaed3607ffbc589e332907b5f39ef2
 SHA512:
-  metadata.gz: d37d573ff6f236997f01ec48692f933be8836ceb8fddad64660a043a45193c6d8b13b697ecc08f23eb946e4698b378916151dc65bfc73834122ff8800a5bbae9
-  data.tar.gz: 1d8940b0fb0a25ebb35219d551e5529697e3888be12b9d7506600624bc427e436eb7b9d4004e380e1a2280eb38ad777700285a5fa39c6f44469fcc9e94ea6a61
+  metadata.gz: 0bae40a9732cd8ab15b1d3033b86a7d31da6dfe74dc5b068b4e7ff502988f39bfc9c950780d01e8d10be59f3b4408d910ce7addf51b7d5285f2045e8cd45e848
+  data.tar.gz: 40838f081519fdc24fa2d36b8a791f3dde4abda3a47bb3a5c3b6dfe18e0774a2d3acc5b9c1bf6fad4cfbce07041e76bc20102bc7d753b38b1d81f4a9907ef367

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 = @bundle_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
@@ -24,29 +24,70 @@ module Isomorfeus
       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, {}, 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, {}, 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, {}, 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, {}, 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

data/lib/isomorfeus/asset_manager/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   class AssetManager
-    VERSION = '0.13.1'
+    VERSION = '0.13.5'
   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

@@ -24,7 +24,7 @@ module Isomorfeus
 
       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 +35,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 +50,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 +103,7 @@ module Isomorfeus
             end
           end
         end
-        raise "Asset Manager: error bundling '#{asset_key}'" 
+        raise "Asset Manager: error bundling '#{asset_key}'"
       end
     end
 

data/node_modules/.package-lock.json

@@ -4,9 +4,9 @@
   "requires": true,
   "packages": {
     "node_modules/esbuild-wasm": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.13.9.tgz",
-      "integrity": "sha512-qMLSYVSlm6ZrV1OqXYPHelniJns2DbUI0MxwZyNGrym/arrEX19T2xfJvzujLHXVShBRHEMLgplJkNtQ2NXapQ==",
+      "version": "0.13.13",
+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.13.13.tgz",
+      "integrity": "sha512-oy0ULEK7Vjb61nBbvdeuZwuASexHtUJsMK4+Z9ge+O6Oq1nq/yUlpefMXl5LUpgWUQViNCxlEz536xvYIsTO5w==",
       "bin": {
         "esbuild": "bin/esbuild"
       },