opal-webpack-loader 0.8.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bea86452f39ecdabf13c4b301b2593a5f7c95d8fb1869d5da0aeff75d60cd195
-  data.tar.gz: 2b6d29a971da82914d2a92520bc5fade0d3436ffc0fc3cc0d59f8a7445d27d11
+  metadata.gz: 6b9be7c0874e8efdf2c1c15c2a38bf1cc107136626239924aaf0d2407983c4f6
+  data.tar.gz: e3c584bc62ca84f981d1800664c510d332c92a7d4f018c91d1e0a7ccf853e98f
 SHA512:
-  metadata.gz: 37103b5030a63091eed19db90605c9f5307c2f00bcc8af5e0fc9a596201c3b9ee8f209b8afdc6104fbd179fc17fb522c262fbb4a3addd02526efd29302d0c072
-  data.tar.gz: 4ed3753886bc1646d18caf4e0b2f082d7ce14c787ac9c2318b1a5236173095220a6d8a7ec7b75394123a7a54b8ba7f53ad8e50121d4a165cda6cf1289316b51b
+  metadata.gz: 4ef420caee7d006a798b70b5bbfc51d46c1d3520d15be5afe7b8f3af4cf627c7c7450490c7531c63b25818e358456afef1572983cbe3b9d3c4fb781f22ba977f
+  data.tar.gz: 4907ac5ebacb26340fcdcc0016801b762030398d36b4c3884d89df95ab5d38a174257b1e957eaa3c467122692d3b75ac9892bc210d912c5de3f3535eea5e96a0

data/bin/opal-webpack-compile-server

@@ -10,16 +10,9 @@ require 'opal-webpack-loader/load_path_manager'
 require 'opal-webpack-loader/compile_worker'
 require 'opal-webpack-loader/compile_server'
 
-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
-
 modules_to_require = []
 compiler_options = {}
+compile_server_options = {}
 
 OptionParser.new do |opts|
   opts.on('-r', '--require MODULE', 'Require the module before starting the compile server.') do |m|
@@ -43,17 +36,33 @@ OptionParser.new do |opts|
   opts.on('-f', '--false FLAG', 'Set compiler flag to false.' ) do |f|
     compiler_options[f.to_sym] = false
   end
+
+  opts.on('-l', '--load-paths-cache PATH', 'Path to load path cache json') do |l|
+    compile_server_options[:load_paths_cache] = l
+  end
+
+  opts.on('-s', '--socket-path PATH', 'Path of the socket the compile server should create.') do |s|
+    compile_server_options[:socket_path] = s
+  end
 end.parse!
 
 modules_to_require.each do |mod|
   require mod
 end
 
+at_exit do
+  if OpalWebpackLoader::CompileServer.unlink_socket?
+    if File.exist?(compile_server_options[:socket_path])
+      File.unlink(compile_server_options[:socket_path])
+    end
+  end
+end
+
 if ARGV[0] == 'stop' || ARGV[0] == 'kill'
-  OpalWebpackLoader::CompileServer.stop
+  OpalWebpackLoader::CompileServer.stop(compile_server_options[:socket_path])
 else
   if ARGV[0] == 'start'
-    OpalWebpackLoader::CompileServer.stop(false)
+    OpalWebpackLoader::CompileServer.stop(compile_server_options[:socket_path],false)
     number_of_workers = ARGV[1].to_i
     number_of_workers == 4 if number_of_workers == 0
     number_of_workers == 16 if number_of_workers > 16
@@ -69,18 +78,18 @@ else
     exit(1)
   end
 
-  load_paths = OpalWebpackLoader::LoadPathManager.read_load_paths_cache
+  load_paths = OpalWebpackLoader::LoadPathManager.read_load_paths_cache(compile_server_options[:load_paths_cache])
   if load_paths
     Opal.append_paths(*load_paths)
   end
 
-  pid = fork { OpalWebpackLoader::CompileServer.new.start(number_of_workers, compiler_options) }
+  pid = fork { OpalWebpackLoader::CompileServer.new.start(number_of_workers, compiler_options, compile_server_options[:socket_path]) }
 
   have_socket = false
   start_time = Time.now
   begin
     until have_socket
-      if File.exist?(OpalWebpackLoader::CompileServer::OWCS_SOCKET_PATH)
+      if File.exist?(compile_server_options[:socket_path])
         have_socket = true
       else
         if Time.now - start_time > 60

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

@@ -3,9 +3,6 @@ require 'tempfile'
 
 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]
     TIMEOUT = 15
 
@@ -21,11 +18,11 @@ module OpalWebpackLoader
       @unlink = false
     end
 
-    def self.stop(do_exit = true)
-      if File.exist?(OWCS_SOCKET_PATH)
+    def self.stop(socket_path, do_exit = true)
+      if File.exist?(socket_path)
         dont_unlink_socket_on_exit
         begin
-          s = UNIXSocket.new(OWCS_SOCKET_PATH)
+          s = UNIXSocket.new(socket_path)
           s.send("command:stop\x04", 0)
           s.close
         rescue
@@ -42,12 +39,12 @@ module OpalWebpackLoader
       @signal_queue = []
     end
 
-    def start(number_of_workers = 4, compiler_options)
+    def start(number_of_workers = 4, compiler_options, socket_path)
       $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)
+      @socket = UNIXServer.new(socket_path)
       spawn_workers(compiler_options)
       SIGNALS.each { |sig| trap_deferred(sig) }
       trap('CHLD') { @write_pipe.write_nonblock('.') }

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

@@ -298,7 +298,7 @@ module OpalWebpackLoader
       end
 
       def production_script
-        "webpack --config=#{File.join(@webpack_config_directory, 'production.js')}"
+        "parallel-webpack --config=#{File.join(@webpack_config_directory, 'production.js')}"
       end
 
       def install_webpack_config

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

@@ -25,12 +25,14 @@ module OpalWebpackLoader
       path_entries
     end
 
-    def self.read_load_paths_cache
-      load_paths_cache = Oj.load(File.read(OpalWebpackLoader::CompileServer::OWL_LP_CACHE), mode: :strict)
+    def self.read_load_paths_cache(json_path)
+      load_paths_cache = Oj.load(File.read(json_path), mode: :strict)
       load_paths_cache['opal_load_paths']
     end
 
-    def self.create_load_paths_cache(filter)
+    def self.create_load_paths_cache(args)
+      cache_path = args[0]
+      filter = args[1..-1]
       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)"
@@ -54,8 +56,7 @@ module OpalWebpackLoader
           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, mode: :strict, indent: 2))
+        File.write(cache_path, Oj.dump(cache_obj, mode: :strict, indent: 2))
         load_path_lines
       else
         raise 'Error getting load paths!'

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

@@ -9,6 +9,9 @@ const common_config = {
     context: path.resolve(__dirname, '<%= opal_directory %>'),
     mode: "development",
     optimization: {
+        removeAvailableModules: false,
+        removeEmptyChunks: false,
+        splitChunks: false,
         minimize: false // dont minimize for debugging
     },
     performance: {

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

@@ -9,6 +9,9 @@ const common_config = {
     context: path.resolve(__dirname, '<%= opal_directory %>'),
     mode: "development",
     optimization: {
+        removeAvailableModules: false,
+        removeEmptyChunks: false,
+        splitChunks: false,
         minimize: false // dont minimize in development, to speed up hot reloads
     },
     performance: {

data/lib/opal-webpack-loader/templates/package.json.erb

@@ -16,6 +16,7 @@
     "extra-watch-webpack-plugin": "^1.0.3",
     "file-loader": "^1.1.11",
     "node-sass": "^4.12.0",
+    "parallel-webpack": "^2.4.0",
     "sass-loader": "^7.1.0",
     "style-loader": "^0.23.1",
     "terser-webpack-plugin": "^1.2.3",

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

@@ -1,3 +1,3 @@
 module OpalWebpackLoader
-  VERSION="0.8.8"
+  VERSION="0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-webpack-loader
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal