opal-webpack-loader 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 231761fce0db6f68b21ac4084c065663d567b79776333a36244330137f91720b
-  data.tar.gz: bd9a62382e957ee5753586f69e14482d662daf385ddf7975da05781a0f3add3f
+  metadata.gz: 6e7e5f3b220d06e291ef7a5805237d73c53b27313766b7891e0bc18a8b00ccc8
+  data.tar.gz: 5d1078190a7c4b286de96c8114e9692728b87f6063c558c7de5737e3513f4b0d
 SHA512:
-  metadata.gz: 7705b03915305c31710b6c19843a83473f92186f83ac135405b91b0fed22884fbc0b1218dc73cbafd0bd8fcc77295179bed878c5d55f553b808ada33927b6a6a
-  data.tar.gz: 685b9a599a552a3bb1a8b36667816d4ce31a63a51af7a06bf67096b39afb6af5019b999610c610a3a94957b5e13d56f732f47be00b451e1a6b892ee492b9b413
+  metadata.gz: e4bd10876231791a4a9368212950c81e1b8f007daa895db6ae95d0c01571a3ea3672650e35bda7765c74b06e02000a1164deb264dc22980e413d290bae9cc3e4
+  data.tar.gz: 70ba5421ca317f15126577d6990d30d9b354ee1c6864b28518756d07d99b9df13a25912331fe67a8e6034a1d4f9fc40da5e8941cc2aa7402d21b5f540bedfefd

data/bin/opal-webpack-compile-server

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'digest'
 require 'oj'
-require 'c_lexer'
 require 'optparse'
 require 'opal/paths'
 require 'opal/source_map'

data/bin/opal-webpack-windows-compile-server

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'digest'
 require 'oj'
-require 'c_lexer'
 require 'optparse'
 require 'opal/paths'
 require 'opal/source_map'
@@ -64,6 +63,10 @@ modules_to_require.each do |mod|
   require mod
 end
 
+def compiler_options_digest(compiler_options)
+  @compiler_options_digest ||= Digest::SHA1.hexdigest(Oj.dump(compiler_options, mode: :strict))
+end
+
 def compile(request, cache, compiler_options)
   begin
     request_json = Oj.load(request.chop!, mode: :strict)
@@ -73,7 +76,7 @@ def compile(request, cache, compiler_options)
     source = File.read(filename)
     if cache
       source_digest = Digest::SHA1.hexdigest(source)
-      key = "owl_#{compiler_options_digest}_#{source_digest}_#{compile_source_map}"
+      key = "owl_#{compiler_options_digest(compiler_options)}_#{source_digest}_#{compile_source_map}"
       result_json = cache.get(key)
       return result_json if result_json
     end
@@ -95,6 +98,7 @@ end
 if ARGV[0] == 'start'
   number_of_instances = ARGV[1].to_i
   number_of_instances == 4 if number_of_instances == 0
+  number_of_instances == 16 if number_of_instances > 16
 else
   raise 'arguments must be either "stop" or "start number_of_instances"'
   exit(1)
@@ -112,8 +116,7 @@ begin
         STDERR.puts "Exiting with drama."
         exit(0)
       else
-        result = compile(request, cache, compiler_options)
-        result
+        compile(request, cache, compiler_options)
       end
     end
   end.run

data/bin/owl-compiler

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'digest'
 require 'oj'
-require 'c_lexer'
 require 'optparse'
 require 'opal/paths'
 require 'opal/source_map'
@@ -73,19 +72,23 @@ compile_source_map = compile_server_options[:source_map]
 filename = compile_server_options[:source_file]
 source = File.read(filename)
 compiler_options.merge!(es6_modules: true)
-compiler_options.merge!(file: filename)
+
+def compiler_options_digest(compiler_options)
+  @compiler_options_digest ||= Digest::SHA1.hexdigest(Oj.dump(compiler_options, mode: :strict))
+end
 
 begin
   if compile_server_options[:cache]
     source_digest = Digest::SHA1.hexdigest(source)
-    key = "owl_#{compiler_options_digest}_#{source_digest}_#{compile_source_map}"
+    key = "owl_#{compiler_options_digest(compiler_options)}_#{source_digest}_#{compile_source_map}"
     result_json = compile_server_options[:cache].get(key)
     if result_json
       STDOUT.puts result_json
       exit 0
     end
   end
-  c = Opal::Compiler.new(source, compiler_options)
+  
+  c = Opal::Compiler.new(source, compiler_options.merge(file: filename))
   result = { 'javascript' => c.compile }
   if compile_source_map
     result['source_map'] = c.source_map.as_json

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

@@ -1,3 +1,3 @@
 module OpalWebpackLoader
-  VERSION="0.11.3"
+  VERSION="0.11.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-webpack-loader
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Jan Biedermann
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: c_lexer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement