opal-webpack-loader 0.11.0 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75cfc2e9527b252335ad359e1eb5c7aa476cec879ed76c4501b686a50f39b1f2
-  data.tar.gz: b6d13eac5c5eaa0e3c46dfd15b8f59d01d59124f92608c741e93952c87bb04f6
+  metadata.gz: 6e7e5f3b220d06e291ef7a5805237d73c53b27313766b7891e0bc18a8b00ccc8
+  data.tar.gz: 5d1078190a7c4b286de96c8114e9692728b87f6063c558c7de5737e3513f4b0d
 SHA512:
-  metadata.gz: c9edddd5f0a21625c5376dbf609e594a35bfe36ab84ca2fb804fa7f011093e8a45aa516530bb0dceceec4dcc069619dc0e7c31ceecfd3f68a5ad0c6caf39699f
-  data.tar.gz: f21627293c524a6db7f7c53f89e83f13f77519597133c05dd992173b7d2cff05f0ab915cfe7eb8e52f036ce448f3905e572d75a2d345cefe93990ece36ad342b
+  metadata.gz: e4bd10876231791a4a9368212950c81e1b8f007daa895db6ae95d0c01571a3ea3672650e35bda7765c74b06e02000a1164deb264dc22980e413d290bae9cc3e4
+  data.tar.gz: 70ba5421ca317f15126577d6990d30d9b354ee1c6864b28518756d07d99b9df13a25912331fe67a8e6034a1d4f9fc40da5e8941cc2aa7402d21b5f540bedfefd

data/README.md

@@ -23,7 +23,7 @@ At the [Isomorfeus Framework Project](http://isomorfeus.com)
 opal-webpack-loader-0.7.1 compiles all of opal, a bunch of gems and over 19000SLC on a
 Intel® Core™ i7-7700HQ CPU @ 2.80GHz × 8, with 8 workers in around 1850ms
 - support for memcached or redis as compiler cache
-- fast builds on windows too, parallel when building multiple assets with parallel webpack
+- fast builds on windows too, parallel when building multiple assets with parallel-webpack
 - opal modules are packaged as es6 modules
 - support for rails with webpacker
 - other webpack features become available, like:
@@ -36,6 +36,7 @@ Intel® Core™ i7-7700HQ CPU @ 2.80GHz × 8, with 8 workers in around 1850ms
   - everything else webpack can do, like loading stylesheets, etc.
 
 ### Requirements
+- npm or yarn
 - opal-webpack-loader consists of 2 parts, the npm package and the gem, both are required and must be the same version.
 - webpack ^4.46
 - webpack-dev-server ^3.11.0

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.rb

@@ -38,27 +38,31 @@ OpalWebpackLoader.manifest_path = File.join(Dir.getwd, 'public', 'assets', 'mani
 OpalWebpackLoader.client_asset_path = 'http://localhost:3035/assets/'
 OpalWebpackLoader.use_manifest = false
 
-# TODO require yarn instead of npm
-npm = if Gem.win_platform?
-        `where npm`.chop.lines.last
-      else
-        `which npm`.chop
-      end
+owl_npm_version = nil
+begin
+  yarn = if Gem.win_platform?
+          `where yarn`.chop.lines.last.include?('yarn')
+        else
+          `which yarn`.chop.include?('yarn')
+        end
+  owl_npm_version = `yarn run -s opal-webpack-loader-npm-version`.chop if yarn
 
-if !npm.nil? && !npm.empty?
-  bin_dir = `npm bin`.chop
-  begin
-    owl_npm_version = `#{File.join(bin_dir, 'opal-webpack-loader-npm-version')}`.chop
-  rescue
-    owl_npm_version = nil
+  unless owl_npm_version
+    npm = if Gem.win_platform?
+            `where npm`.chop.lines.last.include?('npm')
+          else
+            `which npm`.chop.include?('npm')
+          end
+    owl_npm_version = `npm exec opal-webpack-loader-npm-version`.chop if npm
   end
+rescue
+  owl_npm_version = nil
+end
 
-  if owl_npm_version != OpalWebpackLoader::VERSION
-    STDERR.puts "opal-webpack-loader: Incorrect version of npm package found or npm package not installed.\n" +
-      "Please install the npm package for opal-webpack-loader:\n" +
-      "\twith npm:\tnpm install opal-webpack-loader@#{OpalWebpackLoader::VERSION}\n" +
-      "\tor with yarn:\tyarn add opal-webpack-loader@#{OpalWebpackLoader::VERSION}\n"
-  end
-else
-  STDERR.puts "opal-webpack-loader: Unable to check npm package version. Please check your npm installation."
+if owl_npm_version != OpalWebpackLoader::VERSION
+  STDERR.puts "opal-webpack-loader: Incorrect version of npm package found or npm package not installed.\n" +
+    "Please install the npm package for opal-webpack-loader:\n" +
+    "\twith npm:\tnpm install opal-webpack-loader@#{OpalWebpackLoader::VERSION}\n" +
+    "\tor with yarn:\tyarn add opal-webpack-loader@#{OpalWebpackLoader::VERSION}\n"
 end
+

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

@@ -99,26 +99,25 @@ const common_config = {
     devServer: {
         <%= dev_server_before %>
         open: false,
-        lazy: false,
         port: 3035,
         hot: true,
-        // hotOnly: true,
-        inline: true,
         https: false,
-        disableHostCheck: true,
+        allowedHosts: 'all',
         headers: {
             "Access-Control-Allow-Origin": "*",
             "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
             "Access-Control-Allow-Headers": "X-Requested-With, content-type, Authorization"
         },
-        watchOptions: {
-            // in case of problems with hot reloading uncomment the following two lines:
-            // aggregateTimeout: 250,
-            // poll: 50,
+        static: {
+            directory: path.resolve(__dirname, 'public'),
+            watch: {
+                // in case of problems with hot reloading uncomment the following two lines:
+                // aggregateTimeout: 250,
+                // poll: 50,
             ignored: /\bnode_modules\b/
+            }
         },
-        contentBase: path.resolve(__dirname, 'public'),
-        useLocalIp: false
+        host: 'local-ip'
     }
 };
 

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

@@ -84,26 +84,25 @@ const common_config = {
     devServer: {
         <%= dev_server_before %>
         open: false,
-        lazy: false,
         port: 3035,
-        hot: true,
-        // hotOnly: true,
-        inline: true,
+        hot: false,
         https: false,
-        disableHostCheck: true,
+        allowedHosts: 'all',
         headers: {
             "Access-Control-Allow-Origin": "*",
             "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
             "Access-Control-Allow-Headers": "X-Requested-With, content-type, Authorization"
         },
-        watchOptions: {
-            // in case of problems with hot reloading uncomment the following two lines:
-            // aggregateTimeout: 250,
-            // poll: 50,
+        static: {
+            directory: path.resolve(__dirname, 'public'),
+            watch: {
+                // in case of problems with hot reloading uncomment the following two lines:
+                // aggregateTimeout: 250,
+                // poll: 50,
             ignored: /\bnode_modules\b/
+            }
         },
-        contentBase: path.resolve(__dirname, 'public'),
-        useLocalIp: false
+        host: 'local-ip'
     }
 };
 

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

@@ -21,6 +21,6 @@
     "webpack": "^4.46.0",
     "webpack-assets-manifest": "^4.0.6",
     "webpack-cli": "^4.7.0",
-    "webpack-dev-server": "^3.11.2"
+    "webpack-dev-server": "^4.0.0-rc.0"
   }
 }

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-webpack-loader
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -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