opal-webpack-loader 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6fddd8a389b2b937b326028f4526acde3fa4684a07494c35171d48129f75a53
-  data.tar.gz: 96b0a819a4715984f48d9813f1a70107e6f945a00e24feca6834a4a82e97251a
+  metadata.gz: 0d16462b0c87b2e4b5bfd45379a397ed582943e2d392080e58c44b81cbd500db
+  data.tar.gz: 6c0274bbc3dacbb1c735bf4078526a1669512ba1074d318b28018067ce70563d
 SHA512:
-  metadata.gz: 886a5692649c816ea1c84de476ab36b763e2dcb2e95ca15a83ccaaf153e6354a4e9a5903a59ad644b9efb63e28d4fe01a28e8d04ceb723ce7888c83043456553
-  data.tar.gz: 30e45fe1b42b7007f53726529afc979d9c0a71b60a062e535ce97030344bcf419996eda241f5371b14e3426b987a7c359b4de48c4294298c0ee64ecf8476f538
+  metadata.gz: 1b41086c5835da79c0199c0a259aafab20bd96f68e07097321c6426e7b0e464f11e1e7e724064f009bdf0a50643450f77e341665ad5d9ace677c0f18701113f3
+  data.tar.gz: ccf1621264e8a7109f804dcf9a8f61d328dcd2ebca83087a7c6d84f22928558695dcb1d1d3c652bfac5cc8fe1ab7aa2360d4f506cfbfd3ec5fd6335896744580

data/bin/opal-webpack-compile-server

@@ -1,38 +1,57 @@
 #!/usr/bin/env ruby
 require 'opal-webpack-loader/compile_server'
+require 'opal-webpack-loader/compile_worker'
+require 'opal-webpack-loader/load_path_manager'
 require 'open3'
 
+at_exit do
+  if OpalWebpackLoader::CompileServer.unlink_socket?
+    if File.exist?(OpalWebpackLoader::CompileServer::OWCS_SOCKET_PATH)
+      File.unlink(OpalWebpackLoader::CompileServer::OWCS_SOCKET_PATH)
+    end
+  end
+end
+
 puts "args: #{ARGV}"
 
 if ARGV[0] == 'stop' || ARGV[0] == 'kill'
-  OpalWebpackCompileServer::Exe.stop
+  OpalWebpackLoader::CompileServer.stop
 else
   if ARGV[0] == 'start'
-    OpalWebpackCompileServer::Exe.stop
-    runargs = ARGV[1..-1]
+    OpalWebpackLoader::CompileServer.stop(false)
+    number_of_workers = ARGV[1].to_i
+    if number_of_workers == 0
+      number_of_workers == 4
+      runargs = ARGV[1..-1]
+    else
+      runargs = ARGV[2..-1]
+    end
   else
-    runargs = ARGV
+    raise 'arguments must be either "stop" or "start number_of_workers process_to_run --with args"'
+    exit(1)
   end
 
-  pid = fork { OpalWebpackCompileServer::Exe.run }
+  OpalWebpackLoader::LoadPathManager.create_load_paths_cache
+
+  pid = fork { OpalWebpackLoader::CompileServer.new.start(number_of_workers) }
 
   have_socket = false
   start_time = Time.now
   begin
     until have_socket
-      if File.exist?(OpalWebpackCompileServer::OWCS_SOCKET_PATH)
+      if File.exist?(OpalWebpackLoader::CompileServer::OWCS_SOCKET_PATH)
         have_socket = true
       else
         if Time.now - start_time > 60
           puts "opal-webpack-compile-server didnt start in time. Exiting"
-          OpalWebpackCompileServer::Exe.stop(false)
+          OpalWebpackLoader::CompileServer.stop(false)
           Process.kill("TERM", pid)
           exit 1
         end
       end
     end
   rescue Exception => e
-    OpalWebpackCompileServer::Exe.stop(false)
+    OpalWebpackLoader::CompileServer.stop(false)
     puts "opal-webpack-compile-server couldn't start:"
     puts e.backtrace.join("\n")
     puts e.message
@@ -54,7 +73,7 @@ else
 
       thread.join # don't exit until the external process is done
     end
-  rescue Interrupt => e
+  rescue Interrupt
     puts "opal-webpack-compile-server got interrupted. Exiting with drama."
     Process.kill("TERM", pid)
     exit 0

data/lib/opal-webpack-loader/compile_server.rb

@@ -1,173 +1,142 @@
-require 'oj'
-require 'eventmachine'
-require 'opal/paths'
-require 'opal/source_map'
-require 'source_map'
-require 'opal/compiler'
 require 'socket'
 
-at_exit do
-  if OpalWebpackCompileServer::Exe.unlink_socket?
-    if File.exist?(OpalWebpackCompileServer::OWCS_SOCKET_PATH)
-      File.unlink(OpalWebpackCompileServer::OWCS_SOCKET_PATH)
-    end
-  end
-end
-
-module OpalWebpackCompileServer
-  OWL_CACHE_DIR = './.owl_cache/'
-  OWL_LP_CACHE = OWL_CACHE_DIR + 'load_paths.json'
-  OWCS_SOCKET_PATH = OWL_CACHE_DIR + 'owcs_socket'
+module OpalWebpackLoader
+  class CompileServer
+    OWL_CACHE_DIR = File.join('.','.owl_cache/')
+    OWL_LP_CACHE = File.join(OWL_CACHE_DIR, 'load_paths.json')
+    OWCS_SOCKET_PATH = File.join(OWL_CACHE_DIR, 'owcs_socket')
+    SIGNALS = %w[QUIT INT TERM TTIN TTOU]
+    TIMEOUT = 15
 
-  class Compiler < EventMachine::Connection
-    def initialize(*args)
-      @received_data = ''
-      super(*args)
+    def self.unlink_socket?
+      @unlink
     end
 
-    def receive_data(data)
-      @received_data << data
+    def self.unlink_socket_on_exit
+      @unlink = true
+    end
 
-      return unless @received_data.end_with?("}\x04")
+    def self.dont_unlink_socket_on_exit
+      @unlink = false
+    end
 
-      if @received_data.start_with?('command:stop')
-        EventMachine.stop
-        exit(0)
+    def self.stop(do_exit = true)
+      if File.exist?(OWCS_SOCKET_PATH)
+        dont_unlink_socket_on_exit
+        begin
+          s = UNIXSocket.new(OWCS_SOCKET_PATH)
+          s.send("command:stop\x04", 0)
+          s.close
+        rescue
+          # socket cant be reached so owlcs is already dead, delete socket
+          unlink_socket_on_exit
+        end
+        exit(0) if do_exit
       end
+    end
 
-      request_json = Oj.load(@received_data.chop!, {})
-
-      @received_data = ''
-
-      compile_source_map = request_json["source_map"]
-      filename = request_json["filename"]
-      source = File.read(filename)
+    def initialize
+      @read_pipe, @write_pipe = IO.pipe
+      @workers = {}
+      @signal_queue = []
+    end
 
-      operation = proc do
-        begin
-          c = Opal::Compiler.new(source, file: filename, es6_modules: true)
-          c.compile
-          result = { 'javascript' => c.result }
-          if compile_source_map
-            result['source_map'] = c.source_map.as_json
-            result['source_map']['sourcesContent'] = [source]
-            result['source_map']['file'] = filename
-            result['source_map']['names'] = result['source_map']['names'].map(&:to_s)
+    def start(number_of_workers = 4)
+      $PROGRAM_NAME = 'owl compile server'
+      @number_of_workers = number_of_workers
+      @server_pid = Process.pid
+      $stderr.sync = $stdout.sync = true
+      @socket = UNIXServer.new(OWCS_SOCKET_PATH)
+      spawn_workers
+      SIGNALS.each { |sig| trap_deferred(sig) }
+      trap('CHLD') { @write_pipe.write_nonblock('.') }
+
+      loop do
+        reap_workers
+        case (mode = @signal_queue.shift)
+        when nil
+          kill_runaway_workers
+          spawn_workers
+        when 'QUIT', 'TERM', 'INT'
+          @workers.each_pair do |pid, _worker|
+            Process.kill('TERM', pid)
+          end
+          break
+        when 'TTIN'
+          @number_of_workers += 1
+        when 'TTOU'
+          unless @number_of_workers <= 0
+            Config.workers -= 1
+            kill_worker('QUIT', @workers.keys.max)
           end
-          result['required_trees'] = c.required_trees
-          Oj.dump(result, {})
-        rescue Exception => e
-          Oj.dump({ 'error' => { 'name' => e.class, 'message' => e.message, 'backtrace' => e.backtrace.join("\n") } }, {})
         end
+        reap_workers
+        ready = IO.select([@read_pipe], nil, nil, 1) || next
+        ready.first && ready.first.first || next
+        @read_pipe.read_nonblock(1)
+        OpalWebpackLoader::CompileServer.unlink_socket_on_exit
       end
-
-      callback = proc do |json|
-        self.send_data(json)
-        close_connection_after_writing
-      end
-
-      EM.defer(operation, callback)
     end
-  end
 
-  class LoadPathManager
-    def self.get_load_path_entries(path)
-      path_entries = []
-      return [] unless Dir.exist?(path)
-      dir_entries = Dir.entries(path)
-      dir_entries.each do |entry|
-        next if entry == '.'
-        next if entry == '..'
-        next unless entry
-        absolute_path = File.join(path, entry)
-        if File.directory?(absolute_path)
-          more_path_entries = get_load_path_entries(absolute_path)
-          path_entries.push(*more_path_entries) if more_path_entries.size > 0
-        elsif (absolute_path.end_with?('.rb') || absolute_path.end_with?('.js')) && File.file?(absolute_path)
-          path_entries.push(absolute_path)
-        end
+    private
+
+    def reap_workers
+      loop do
+        pid, status = Process.waitpid2(-1, Process::WNOHANG) || break
+        reap_worker(pid, status)
       end
-      path_entries
+    rescue Errno::ECHILD
     end
 
-    def self.get_load_paths
-      load_paths = if File.exist?(File.join('bin', 'rails'))
-                     %x{
-                       bundle exec rails runner "puts (Rails.configuration.respond_to?(:assets) ? (Rails.configuration.assets.paths + Opal.paths).uniq : Opal.paths)"
-                     }
-                   else
-                     %x{
-                       bundle exec ruby -e 'if File.exist?("app_loader.rb"); require "./app_loader.rb"; else; require "bundler/setup"; Bundler.require; set :run, false if defined? Sinatra; end; puts Opal.paths'
-                     }
-                   end
-      if $? == 0
-        load_path_lines = load_paths.split("\n")
-        load_path_lines.pop if load_path_lines.last == ''
-
-        load_path_entries = []
-
-        cwd = Dir.pwd
-
-        load_path_lines.each do |path|
-          next if path.start_with?(cwd)
-          more_path_entries = get_load_path_entries(path)
-          load_path_entries.push(*more_path_entries) if more_path_entries.size > 0
-        end
-        cache_obj = { 'opal_load_paths' => load_path_lines, 'opal_load_path_entries' => load_path_entries }
-        Dir.mkdir(OpalWebpackCompileServer::OWL_CACHE_DIR) unless Dir.exist?(OpalWebpackCompileServer::OWL_CACHE_DIR)
-        File.write(OpalWebpackCompileServer::OWL_LP_CACHE, Oj.dump(cache_obj, {}))
-        load_path_lines
-      else
-        raise 'Error getting load paths!'
-        exit(2)
+    def reap_worker(pid, status)
+      worker = @workers.delete(pid)
+      begin
+        worker.tempfile.close
+      rescue
+        nil
       end
+      puts "OpalWebpackLoader::CompileServer: Reaped worker #{worker.number} (PID:#{pid}) status: #{status.exitstatus}"
     end
-  end
 
-  class Exe
-    def self.unlink_socket?
-      @unlink
+    def kill_worker(signal, pid)
+      Process.kill(signal, pid)
+    rescue Errno::ESRCH
     end
 
-    def self.unlink_on_exit
-      @unlink = true
+    def kill_runaway_workers
+      now = Time.now
+      @workers.each_pair do |pid, worker|
+        (now - worker.tempfile.ctime) <= TIMEOUT && next
+        $stderr.puts "worker #{worker.number} (PID:#{pid}) has timed out"
+        kill_worker('KILL', pid)
+      end
     end
 
-    def self.dont_unlink_on_exit
-      @unlink = false
+    def init_worker(worker)
+      @write_pipe.close
+      @read_pipe.close
+      @workers.each_pair { |_, w| w.tempfile.close }
+      worker.start
     end
 
-    def self.stop(do_exit = true)
-      if File.exist?(OWCS_SOCKET_PATH)
-        dont_unlink_on_exit
-        begin
-          s = UNIXSocket.new(OWCS_SOCKET_PATH)
-          s.send("command:stop\n", 0)
-          s.close
-        rescue
-          # socket cant be reached so owcs is already dead, delete socket
-          unlink_on_exit
-        end
-        exit(0) if do_exit
+    def spawn_workers
+      worker_number = -1
+      until (worker_number += 1) == @number_of_workers
+        @workers.value?(worker_number) && next
+        tempfile = Tempfile.new('')
+        tempfile.unlink
+        tempfile.sync = true
+        worker = OpalWebpackLoader::CompileWorker.new(@server_pid, @socket, tempfile, worker_number)
+        pid = fork { init_worker(worker) }
+        @workers[pid] = worker
       end
     end
 
-    def self.run
-      if File.exist?(OWCS_SOCKET_PATH) # OWCS already running
-        puts 'Another Opal Webpack Compile Server already running, exiting'
-        dont_unlink_on_exit
-        exit(1)
-      else
-        unlink_on_exit
-        load_paths = OpalWebpackCompileServer::LoadPathManager.get_load_paths
-        if load_paths
-          Opal.append_paths(*load_paths)
-          # Process.daemon(true)
-          EventMachine.run do
-            EventMachine.start_unix_domain_server(OWCS_SOCKET_PATH, OpalWebpackCompileServer::Compiler)
-          end
-        end
+    def trap_deferred(signal)
+      trap(signal) do |_|
+        @signal_queue << signal
+        @write_pipe.write_nonblock('.')
       end
     end
   end
-end
+end

data/lib/opal-webpack-loader/compile_worker.rb

@@ -0,0 +1,96 @@
+require 'oj'
+require 'opal/paths'
+require 'opal/source_map'
+require 'source_map'
+require 'opal/compiler'
+require 'socket'
+
+module OpalWebpackLoader
+  class CompileWorker
+    SIGNALS = %w[QUIT TTIN TTOU]
+
+    attr_reader :number, :tempfile
+
+    def initialize(master_pid, socket, tempfile, number)
+      @master_pid = master_pid
+      @socket     = socket
+      @tempfile   = tempfile
+      @number     = number
+    end
+
+    def ==(other_number)
+      number == other_number
+    end
+
+    def start
+      $PROGRAM_NAME = "owl compile worker #{number}"
+      SIGNALS.each { |sig| trap(sig, 'IGNORE') }
+      trap('CHLD', 'DEFAULT')
+      alive = true
+      %w[TERM INT].each { |sig| trap(sig) { exit(0) } }
+      trap('QUIT') do
+        alive = false
+        begin
+          @socket.close
+        rescue
+          nil
+        end
+      end
+      ret = nil
+      i = 0
+      while alive && @master_pid == Process.ppid
+        tempfile.chmod(i += 1)
+
+        if ret
+          begin
+            client = @socket.accept_nonblock
+            request = client.gets("\x04")
+
+            if request.start_with?('command:stop')
+              OpalWebpackLoader::CompileServer.unlink_socket_on_exit
+              Process.kill('TERM', @master_pid)
+              exit(0)
+            else
+              result = compile(request)
+              client.write result
+              client.flush
+              client.close
+            end
+          rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+          end
+        end
+        tempfile.chmod(i += 1)
+        ret = begin
+          IO.select([@socket], nil, nil, OpalWebpackLoader::CompileServer::TIMEOUT / 2) || next
+        rescue Errno::EBADF
+        end
+      end
+    end
+
+    private
+
+    def compile(request)
+      request_json = Oj.load(request.chop!, {})
+
+      compile_source_map = request_json["source_map"]
+      filename = request_json["filename"]
+      source = File.read(filename)
+
+      begin
+        c = Opal::Compiler.new(source, file: filename, es6_modules: true)
+        c.compile
+        result = { 'javascript' => c.result }
+        if compile_source_map
+          result['source_map'] = c.source_map.as_json
+          result['source_map']['sourcesContent'] = [source]
+          result['source_map']['file'] = filename
+          result['source_map']['names'] = result['source_map']['names'].map(&:to_s)
+        end
+        result['required_trees'] = c.required_trees
+        Oj.dump(result, {})
+      rescue Exception => e
+        Oj.dump({ 'error' => { 'name' => e.class, 'message' => e.message, 'backtrace' => e.backtrace.join("\n") } }, {})
+      end
+    end
+  end
+end

data/lib/opal-webpack-loader/installer_cli.rb

@@ -162,7 +162,7 @@ module OpalWebpackLoader
         install_webpack_config
         install_package_json
         install_js_entries
-        install_opal_entry
+        install_opal_entries
         install_procfile
       end
 
@@ -172,10 +172,12 @@ module OpalWebpackLoader
         create_file_from_template('application_common.js.erb', File.join(@js_entrypoints_directory, 'application_common.js'),erb_hash)
         create_file_from_template('application_debug.js.erb', File.join(@js_entrypoints_directory, 'application_debug.js'), erb_hash)
         create_file_from_template('application_ssr.js.erb', File.join(@js_entrypoints_directory, 'application_ssr.js'), erb_hash)
+        create_file_from_template('application_web_worker.js.erb', File.join(@js_entrypoints_directory, 'application_web_worker.js'), erb_hash)
       end
 
-      def install_opal_entry
+      def install_opal_entries
         create_file_from_template('opal_loader.rb.erb', File.join(@opal_directory, "#{options[:opal_name]}_loader.rb"), {})
+        create_file_from_template('opal_web_worker_loader.rb.erb', File.join(@opal_directory, "#{options[:opal_name]}_web_worker_loader.rb"), {})
       end
 
       def install_package_json
@@ -226,24 +228,26 @@ module OpalWebpackLoader
       end
 
       def debug_script
-        "bundle exec opal-webpack-compile-server start webpack-dev-server --config #{File.join(@webpack_config_directory, 'debug.js')}"
+        "bundle exec opal-webpack-compile-server start 4 webpack-dev-server --config #{File.join(@webpack_config_directory, 'debug.js')}"
       end
 
       def development_script
-        "bundle exec opal-webpack-compile-server start webpack-dev-server --config #{File.join(@webpack_config_directory, 'development.js')}"
+        "bundle exec opal-webpack-compile-server start 4 webpack-dev-server --config #{File.join(@webpack_config_directory, 'development.js')}"
       end
 
       def production_script
-        "bundle exec opal-webpack-compile-server start webpack --config=#{File.join(@webpack_config_directory, 'production.js')}"
+        "bundle exec opal-webpack-compile-server start 4 webpack --config=#{File.join(@webpack_config_directory, 'production.js')}"
       end
 
       def install_webpack_config
         erb_hash = {
           asset_output_directory: File.join(@conf_rel_prefix, @asset_output_directory),
+          default_targets: 'browser',
           js_entry: File.join(@conf_rel_prefix, @js_entrypoints_directory, 'application.js'),
           js_common_entry: File.join(@conf_rel_prefix, @js_entrypoints_directory, 'application_common.js'),
           js_debug_entry: File.join(@conf_rel_prefix, @js_entrypoints_directory, 'application_debug.js'),
           js_ssr_entry: File.join(@conf_rel_prefix, @js_entrypoints_directory, 'application_ssr.js'),
+          js_web_worker_entry: File.join(@conf_rel_prefix, @js_entrypoints_directory, 'application_web_worker.js'),
           opal_directory: File.join(@conf_rel_prefix, @opal_directory),
           stylesheets_directory: File.join(@conf_rel_prefix, @styles_directory),
           hmr_hook: ''

data/lib/opal-webpack-loader/load_path_manager.rb

@@ -0,0 +1,55 @@
+module OpalWebpackLoader
+  class LoadPathManager
+    def self.get_load_path_entries(path)
+      path_entries = []
+      return [] unless Dir.exist?(path)
+      dir_entries = Dir.entries(path)
+      dir_entries.each do |entry|
+        next if entry == '.'
+        next if entry == '..'
+        next unless entry
+        absolute_path = File.join(path, entry)
+        if File.directory?(absolute_path)
+          more_path_entries = get_load_path_entries(absolute_path)
+          path_entries.push(*more_path_entries) if more_path_entries.size > 0
+        elsif (absolute_path.end_with?('.rb') || absolute_path.end_with?('.js')) && File.file?(absolute_path)
+          path_entries.push(absolute_path)
+        end
+      end
+      path_entries
+    end
+
+    def self.create_load_paths_cache
+      load_paths = if File.exist?(File.join('bin', 'rails'))
+                     %x{
+                         bundle exec rails runner "puts (Rails.configuration.respond_to?(:assets) ? (Rails.configuration.assets.paths + Opal.paths).uniq : Opal.paths)"
+                       }
+                   else
+                     %x{
+                         bundle exec ruby -e 'if File.exist?("app_loader.rb"); require "./app_loader.rb"; else; require "bundler/setup"; Bundler.require; set :run, false if defined? Sinatra; end; puts Opal.paths'
+                       }
+                   end
+      if $? == 0
+        load_path_lines = load_paths.split("\n")
+        load_path_lines.pop if load_path_lines.last == ''
+
+        load_path_entries = []
+
+        cwd = Dir.pwd
+
+        load_path_lines.each do |path|
+          next if path.start_with?(cwd)
+          more_path_entries = get_load_path_entries(path)
+          load_path_entries.push(*more_path_entries) if more_path_entries.size > 0
+        end
+        cache_obj = { 'opal_load_paths' => load_path_lines, 'opal_load_path_entries' => load_path_entries }
+        Dir.mkdir(OpalWebpackLoader::CompileServer::OWL_CACHE_DIR) unless Dir.exist?(OpalWebpackLoader::CompileServer::OWL_CACHE_DIR)
+        File.write(OpalWebpackLoader::CompileServer::OWL_LP_CACHE, Oj.dump(cache_obj, {}))
+        load_path_lines
+      else
+        raise 'Error getting load paths!'
+        exit(2)
+      end
+    end
+  end
+end

data/lib/opal-webpack-loader/templates/application_web_worker.js.erb

@@ -0,0 +1,11 @@
+// entry file for browser webworkers
+// import npm modules that are only valid to use within browser webworkers
+// import ...;
+
+// import and load opal ruby files
+import init_webworker from '<%= opal_name %>_webworker_loader.rb';
+init_webworker();
+Opal.load('<%= opal_name %>_webworker_loader');
+
+// allow for hot reloading
+if (module.hot) { module.hot.accept(); }

data/lib/opal-webpack-loader/templates/debug.js.erb

@@ -5,7 +5,7 @@ const chokidar = require('chokidar');
 const OwlResolver = require('opal-webpack-loader/resolver'); // to resolve ruby files
 const ExtraWatchWebpackPlugin = require('extra-watch-webpack-plugin'); // to watch for added ruby files
 
-module.exports = {
+const common_config = {
     context: path.resolve(__dirname, '<%= opal_directory %>'),
     mode: "development",
     optimization: {
@@ -20,10 +20,6 @@ module.exports = {
     // devtool: 'cheap-eval-source-map', // less accurate
     // devtool: 'inline-source-map', // slowest
     // devtool: 'inline-cheap-source-map',
-    entry: {
-        application: [path.resolve(__dirname, '<%= js_debug_entry %>')],
-        application_ssr: [path.resolve(__dirname, '<%= js_ssr_entry %>')]
-    },
     output: {
         // webpack-dev-server keeps the output in memory
         filename: '[name].js',
@@ -145,8 +141,36 @@ module.exports = {
             // poll: 50,
             ignored: /\bnode_modules\b/
         },
-        contentBase: path.resolve(__dirname, 'public')
-        // watchContentBase: true
+        contentBase: path.resolve(__dirname, 'public'),
+        // watchContentBase: true,
+        // writeToDisk: true, // TODO this may need to be activated for ssr to work in development
+        useLocalIp: true
     }
 };
 
+const browser_config = {
+    target: 'web',
+    entry: {
+        application: [path.resolve(__dirname, '<%= js_entry %>')]
+    }
+};
+
+const ssr_config = {
+    target: 'node',
+    entry: {
+        application_ssr: [path.resolve(__dirname, '<%= js_ssr_entry %>')]
+    }
+};
+
+const web_worker_config = {
+    target: 'webworker',
+    entry: {
+        web_worker: [path.resolve(__dirname, '<%= js_web_worker_entry %>')]
+    }
+};
+
+const browser = Object.assign({}, common_config, browser_config);
+const ssr = Object.assign({}, common_config, ssr_config);
+const web_worker = Object.assign({}, common_config, web_worker_config);
+
+module.exports = [ <%= default_targets %> ];

data/lib/opal-webpack-loader/templates/development.js.erb

@@ -5,7 +5,7 @@ const chokidar = require('chokidar');
 const OwlResolver = require('opal-webpack-loader/resolver'); // to resolve ruby files
 const ExtraWatchWebpackPlugin = require('extra-watch-webpack-plugin'); // to watch for added ruby files
 
-module.exports = {
+const common_config = {
     context: path.resolve(__dirname, '<%= opal_directory %>'),
     mode: "development",
     optimization: {
@@ -15,10 +15,6 @@ module.exports = {
         maxAssetSize: 20000000,
         maxEntrypointSize: 20000000
     },
-    entry: {
-        application: [path.resolve(__dirname, '<%= js_entry %>')],
-        application_ssr: [path.resolve(__dirname, '<%= js_ssr_entry %>')]
-    },
     output: {
         // webpack-dev-server keeps the output in memory
         filename: '[name].js',
@@ -129,8 +125,36 @@ module.exports = {
             // poll: 50,
             ignored: /\bnode_modules\b/
         },
-        contentBase: path.resolve(__dirname, 'public')
-        // watchContentBase: true
+        contentBase: path.resolve(__dirname, 'public'),
+        // watchContentBase: true,
+        // writeToDisk: true,
+        useLocalIp: true
     }
 };
 
+const browser_config = {
+    target: 'web',
+    entry: {
+        application: [path.resolve(__dirname, '<%= js_entry %>')]
+    }
+};
+
+const ssr_config = {
+    target: 'node',
+    entry: {
+        application_ssr: [path.resolve(__dirname, '<%= js_ssr_entry %>')]
+    }
+};
+
+const web_worker_config = {
+    target: 'webworker',
+    entry: {
+        webworker: [path.resolve(__dirname, '<%= js_web_worker_entry %>')]
+    }
+};
+
+const browser = Object.assign({}, common_config, browser_config);
+const ssr = Object.assign({}, common_config, ssr_config);
+const web_worker = Object.assign({}, common_config, web_worker_config);
+
+module.exports = [ <%= default_targets %> ];

data/lib/opal-webpack-loader/templates/opal_web_worker_loader.rb.erb

@@ -0,0 +1,9 @@
+require 'opal'
+
+# the gem opal-autoloader may be used, so its not necessary to use 'require' all the time,
+# just using 'require_tree' to bundle everything is enough:
+#
+# require 'opal-autoloader'
+# require_tree 'my_app' # for a sub directory 'my_app'
+
+

data/lib/opal-webpack-loader/templates/production.js.erb

@@ -3,7 +3,7 @@ const OwlResolver = require('opal-webpack-loader/resolver');
 const CompressionPlugin = require("compression-webpack-plugin"); // for gzipping the packs
 const ManifestPlugin = require('webpack-manifest-plugin');  // for generating the manifest
 
-module.exports = {
+const common_config = {
     context: path.resolve(__dirname, '<%= opal_directory %>'),
     mode: "production",
     optimization: {
@@ -13,10 +13,6 @@ module.exports = {
         maxAssetSize: 20000000,
         maxEntrypointSize: 20000000
     },
-    entry: {
-        application: [path.resolve(__dirname, '<%= js_entry %>')],
-        application_ssr: [path.resolve(__dirname, '<%= js_ssr_entry %>')]
-    },
     output: {
         filename: '[name]-[chunkhash].js', // include fingerprint in file name, so browsers get the latest
         path: path.resolve(__dirname, '<%= asset_output_directory %>'),
@@ -92,3 +88,29 @@ module.exports = {
     }
 };
 
+const browser_config = {
+    target: 'web',
+    entry: {
+        application: [path.resolve(__dirname, '<%= js_entry %>')]
+    }
+};
+
+const ssr_config = {
+    target: 'node',
+    entry: {
+        application_ssr: [path.resolve(__dirname, '<%= js_ssr_entry %>')]
+    }
+};
+
+const web_worker_config = {
+    target: 'webworker',
+    entry: {
+        web_worker: [path.resolve(__dirname, '<%= js_web_worker_entry %>')]
+    }
+};
+
+const browser = Object.assign({}, common_config, browser_config);
+const ssr = Object.assign({}, common_config, ssr_config);
+const web_worker = Object.assign({}, common_config, web_worker_config);
+
+module.exports = [ <%= default_targets %> ];

data/lib/opal-webpack-loader/version.rb

@@ -1,3 +1,3 @@
 module OpalWebpackLoader
-  VERSION="0.6.6"
+  VERSION="0.7.0"
 end

data/spec/installer_spec.rb

@@ -27,7 +27,9 @@ RSpec.describe 'owl installer' do
       expect(File.exist?(File.join('app', 'assets', 'javascripts', 'application_common.js'))).to be true
       expect(File.exist?(File.join('app', 'assets', 'javascripts', 'application_debug.js'))).to be true
       expect(File.exist?(File.join('app', 'assets', 'javascripts', 'application_ssr.js'))).to be true
+      expect(File.exist?(File.join('app', 'assets', 'javascripts', 'application_web_worker.js'))).to be true
       expect(File.exist?(File.join('app', 'opal', 'opal_loader.rb'))).to be true
+      expect(File.exist?(File.join('app', 'opal', 'opal_web_worker_loader.rb'))).to be true
       expect(File.exist?(File.join('config', 'initializers', 'opal_webpack_loader.rb'))).to be true
       expect(File.exist?(File.join('config', 'webpack', 'debug.js'))).to be true
       expect(File.exist?(File.join('config', 'webpack', 'development.js'))).to be true
@@ -48,7 +50,9 @@ RSpec.describe 'owl installer' do
       expect(File.exist?(File.join('app', 'assets', 'javascripts', 'application_common.js'))).to be true
       expect(File.exist?(File.join('app', 'assets', 'javascripts', 'application_debug.js'))).to be true
       expect(File.exist?(File.join('app', 'assets', 'javascripts', 'application_ssr.js'))).to be true
+      expect(File.exist?(File.join('app', 'assets', 'javascripts', 'application_web_worker.js'))).to be true
       expect(File.exist?(File.join('app', 'hyperhyper', 'hyperhyper_loader.rb'))).to be true
+      expect(File.exist?(File.join('app', 'hyperhyper', 'hyperhyper_web_worker_loader.rb'))).to be true
       expect(File.exist?(File.join('config', 'initializers', 'opal_webpack_loader.rb'))).to be true
       expect(File.exist?(File.join('config', 'webpack', 'debug.js'))).to be true
       expect(File.exist?(File.join('config', 'webpack', 'development.js'))).to be true

data/spec/owl_spec.rb

@@ -15,19 +15,18 @@ RSpec.describe 'owl' do
 
     after do
       Dir.chdir('..') if Dir.pwd.end_with?('railing')
-      # FileUtils.rm_rf('railing') if Dir.exist?('railing')
+      FileUtils.rm_rf('railing') if Dir.exist?('railing')
       Dir.chdir('..')
       Dir.chdir('..')
     end
 
     it 'can run the production build script' do
-      `bundle exec rails new railing --skip-git --skip-bundle --skip-sprockets --skip-spring --skip-bootsnap`
+      `bundle exec rails new railing --skip-git --skip-bundle --skip-sprockets --skip-javascript --skip-spring --skip-bootsnap`
       expect(Dir.exist?('railing')).to be true
       Dir.chdir('railing')
       arg_val = %w[rails]
       expect(Dir.exist?(File.join('railing', 'config', 'webpack'))).to be false
       OpalWebpackLoader::Installer::CLI.start(arg_val)
-      FileUtils.mv(File.join('app', 'assets', 'javascripts', 'application.js_owl_new'), File.join('app', 'assets', 'javascripts', 'application.js´'))
       gemfile = File.read('Gemfile')
       gemfile << <<~GEMS
 
@@ -67,7 +66,7 @@ RSpec.describe 'owl' do
 
     after do
       Dir.chdir('..') if Dir.pwd.end_with?('flattering')
-      #FileUtils.rm_rf('flattering') if Dir.exist?('flattering')
+      FileUtils.rm_rf('flattering') if Dir.exist?('flattering')
       Dir.chdir('..')
       Dir.chdir('..')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-webpack-loader
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-28 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +136,9 @@ files:
 - bin/owl-install
 - lib/opal-webpack-loader.rb
 - lib/opal-webpack-loader/compile_server.rb
+- lib/opal-webpack-loader/compile_worker.rb
 - lib/opal-webpack-loader/installer_cli.rb
+- lib/opal-webpack-loader/load_path_manager.rb
 - lib/opal-webpack-loader/manifest.rb
 - lib/opal-webpack-loader/rails_view_helper.rb
 - lib/opal-webpack-loader/templates/Procfile.erb
@@ -160,10 +148,12 @@ files:
 - lib/opal-webpack-loader/templates/application_common.js.erb
 - lib/opal-webpack-loader/templates/application_debug.js.erb
 - lib/opal-webpack-loader/templates/application_ssr.js.erb
+- lib/opal-webpack-loader/templates/application_web_worker.js.erb
 - lib/opal-webpack-loader/templates/debug.js.erb
 - lib/opal-webpack-loader/templates/development.js.erb
 - lib/opal-webpack-loader/templates/initializer.rb.erb
 - lib/opal-webpack-loader/templates/opal_loader.rb.erb
+- lib/opal-webpack-loader/templates/opal_web_worker_loader.rb.erb
 - lib/opal-webpack-loader/templates/package.json.erb
 - lib/opal-webpack-loader/templates/production.js.erb
 - lib/opal-webpack-loader/templates/webpacker_development.js_example