isomorfeus-asset-manager 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4322f1c6ad8dff9d4df265bc44715ed4bb057e031ac81d9d3a13e8f7eef885f7
-  data.tar.gz: 3fb59bd726d4c25cd9f214b511d44759aea3e4af056e298ccd6afd70971c7ccf
+  metadata.gz: 169aeadc71daafe7fa04cdb85aea6c6c00e4827624c1a85a89bc7c0555a063c3
+  data.tar.gz: 622b5c1979563fb4d5bb7a1d064bc8cebbdb41be5626cc8d7a234e15f21bbd24
 SHA512:
-  metadata.gz: 9c73e59b221e26ff3d9e90920d02b6c6f47400e3808e36099d43d0f838090ba31d8231dbec1af43c5adddad62974a10be5b3560ed1a6e29c9adff6d38b6efda2
-  data.tar.gz: bfbef83aa44a0763209e1cedab3cc754e066e630309feea7252ff7b81e7922c7ad274e1aa00e6b628554fb38519bc644898cb5e9d740b42479b5691c8424b3cf
+  metadata.gz: 59b5412998db5107f023cde6368ca9137f328f54fda0b8e0b10b8871a2db0936371e422ee86ee35fb55c99b15fa86a0a6db3fd2f99a65d488c4dce73df25242d
+  data.tar.gz: 741c7cab68752ff9c7fb13dc4a3dfa924a9e884bb94f587b1a237ad9dbdb0239174f43b94bb8bbabd73e15e7529bd739973bff9b3640c55351f464a0658f7cfd

data/lib/isomorfeus/asset_manager/asset.rb

@@ -6,11 +6,14 @@ module Isomorfeus
       attr_reader :bundle_map
       attr_reader :bundle_map_gz
       attr_reader :mtime, :ruby_imports, :target
+      attr_reader :mutex
 
       def initialize(target = :browser)
+        @mutex = Mutex.new
         raise "Unknown asset target!" unless %i[browser node].include?(target)
         @target = target
         @bundled = false
+        @ruby_compiled = false
         @js_imports = []
         @ruby_imports = []
       end
@@ -31,7 +34,6 @@ module Isomorfeus
           @bundle_gz = Zlib::gzip(b, level: Zlib::BEST_COMPRESSION) 
           @bundle_gz_size = @bundle_gz.size
         end
-        @mtime = Time.now
         @bundle
       end
 
@@ -39,7 +41,6 @@ module Isomorfeus
         @bundled = true
         @bundle_map = m
         @bundle_map_gz = Zlib::gzip(m, level: Zlib::BEST_COMPRESSION) unless @target == :node
-        @mtime = Time.now unless @mtime
         @bundle_map
       end
 
@@ -51,6 +52,10 @@ module Isomorfeus
         @ruby_imports.map(&:module_name)
       end
 
+      def touch
+        @mtime = Time.now
+      end
+
       def to_s
         js = @target == :node ? '' : "if (typeof globalThis !== 'undefined' && typeof global === 'undefined') { globalThis.global = globalThis; }\n"
         unless @js_imports.empty?

data/lib/isomorfeus/asset_manager/config.rb

@@ -10,6 +10,7 @@ module Isomorfeus
       attr_accessor :root
       attr_accessor :app_root
       attr_accessor :assets_path
+      attr_accessor :asset_manager_tmpdir
       attr_accessor :node_paths
       attr_accessor :assets
 
@@ -66,4 +67,6 @@ module Isomorfeus
     'web.js' => Isomorfeus::AssetManager::Asset.new(:browser),
     'ssr.js' => Isomorfeus::AssetManager::Asset.new(:node)
   }
+  self.asset_manager_tmpdir = Dir.mktmpdir
+  Kernel.at_exit { FileUtils.rm_rf(Isomorfeus.asset_manager_tmpdir) if Dir.exist?(Isomorfeus.asset_manager_tmpdir) }
 end

data/lib/isomorfeus/asset_manager/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   class AssetManager
-    VERSION = '0.12.1'
+    VERSION = '0.12.2'
   end
 end

data/lib/isomorfeus/asset_manager.rb

@@ -7,7 +7,7 @@ module Isomorfeus
     def initialize
       Isomorfeus.set_node_paths
 
-      @tmpdir = Dir.mktmpdir
+      @tmpdir = Isomorfeus.asset_manager_tmpdir
       @imports_path = File.join(@tmpdir, 'imports')
       @output_path = File.join(@tmpdir, 'output')
       FileUtils.mkdir_p(@imports_path)
@@ -30,12 +30,14 @@ module Isomorfeus
   
     def transition(asset_key, asset)
       return if !Isomorfeus.development? && asset.bundled?
-      compile_ruby_and_save(asset_key, asset)
-      save_imports(asset_key, asset)
-      run_esbuild(asset_key, asset)
-      asset.bundle = bundled_asset(asset_key)
-      if !Isomorfeus.production? && asset.target != :node
-        asset.bundle_map = bundled_asset_map(asset_key) 
+      asset.mutex.synchronize do
+        return if !Isomorfeus.development? && asset.bundled?
+        asset.touch
+        compile_ruby_and_save(asset_key, asset)
+        save_imports(asset_key, asset)
+        run_esbuild(asset_key, asset)
+        asset.bundle = bundled_asset(asset_key)
+        asset.bundle_map = bundled_asset_map(asset_key) unless Isomorfeus.production?
       end
     end
 
@@ -55,15 +57,17 @@ module Isomorfeus
 
     def compile_ruby_and_save(asset_key, asset)
       asset.ruby_imports.each do |ruby_import|
+        out_file = File.join(@imports_path, ruby_import.module_name + '.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, { es6_wrap: 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
-        if !Isomorfeus.production? && asset.target != :node
-          js_map_path = File.join(@imports_path, ruby_import.module_name + '.js.map')
+        unless Isomorfeus.production?
           js << "\n//# sourceMappingURL=file://#{js_map_path}\n"
           File.write(js_map_path, result.source_map)
         end
-        File.write(File.join(@imports_path, ruby_import.module_name + '.js'), js)
+        File.write(out_file, js)
       end
     end
 
@@ -133,7 +137,7 @@ module Isomorfeus
         outdir: global.output_path,
         platform: '#{asset.target}',
         publicPath: '/assets',
-        sourcemap: #{(!Isomorfeus.production? && asset.target != :node) ? 'true' : 'false'},
+        sourcemap: #{!Isomorfeus.production? ? 'true' : 'false'},
         splitting: false,
         target: 'es6',
         write: true

data/lib/isomorfeus-asset-manager.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'thread'
 require 'tmpdir'
 require 'zlib'
 require 'opal'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-asset-manager
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-06 00:00:00.000000000 Z
+date: 2021-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isomorfeus-speednode