opal-webpack-loader 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47e3de8dc59fca8c77ec96cce2a2d981360ffc59a1d5b3081d5b38ac9e872abc
-  data.tar.gz: 74ee8b8d003d7d4f7da72f2b778a6f6eca2d74188231b56eefdc2de45b1f0bbf
+  metadata.gz: 70df1e4c0186c1e9fb33fbff1cfbbb25d0cfc1f91a9c2b4a2c979433b423f6b7
+  data.tar.gz: b432080fa9e5ce27f9f57978626a4e750561c984a72aeb4a746b611b8b24ae7c
 SHA512:
-  metadata.gz: 2fe218979c2f394a314e49a5c10beb6fcdd016928eba20fb0f7b5bf50ea6523ecccbbfe98aae2b44b506ab660749843a3c998e7ce70873784f959326e5bd3ef3
-  data.tar.gz: e49f7d2c1171b2e0b7c314424706fc020927126a91a69b9472ea13d887b838a308e360a2670ca3eda50605a8d0073709edd7abf3fdb9b7d4e206a363f0da3b0e
+  metadata.gz: 521275d8cf04af784988f329ebfcbad9538181b5a44ecbfe6b6d16f6635d32dd7cfca9616821630c20263f170cb71d2fd39373a1069bc7067d78654bb05c5249
+  data.tar.gz: a902e118fc909dba6484729e54d00adbb86dbcf8220d517ebac592046fb80c8330f2ad8ad1f76c3154d256148b1db1ab6871f8a4de981d518cde7223e56e5ed4

data/lib/opal-webpack-loader.rb

@@ -32,19 +32,15 @@ OpalWebpackLoader.client_asset_path = '/assets'
 npm = `which npm`.chop
 
 if npm != ''
-  owl_version = `#{npm} view opal-webpack-loader version`
-else
-  yarn = `which yarn`.chop
-  if yarn != ''
-    owl_version = `#{yarn} -s info opal-webpack-loader version`
-  else
-    raise 'opal-webpack-loader: Could not find npm or yarn! Please install npm or yarn'
+  bind_dir = `npm bin`
+  owl_npm_version = `#{bin_dir}/opal-webpack-loader-npm-version`
+
+  if owl_npm_version.chop != OpalWebpackLoader::VERSION
+    raise "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} --save-dev\n" +
+      "\tor with yarn:\tyarn add opal-webpack-loader@#{OpalWebpackLoader::VERSION} --dev\n"
   end
-end
-
-if owl_version.chop != OpalWebpackLoader::VERSION
-  raise "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} --save-dev\n" +
-    "\twith yarn:\tyarn add opal-webpack-loader@#{OpalWebpackLoader::VERSION} --dev\n"
-end
+else
+  puts "opal-webpack-loader: Unable to check npm package version. Please check your npm installation."
+end

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

@@ -84,7 +84,7 @@ module OpalWebpackCompileServer
                      }
                    else
                      %x{
-                       bundle exec ruby -e 'require "bundler/setup"; Bundler.require; puts Opal.paths'
+                       bundle exec ruby -e 'require "bundler/setup"; Bundler.require; set :run, false if defined? Sinatra; puts Opal.paths'
                      }
                    end
       if $? == 0

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

@@ -1,3 +1,3 @@
 module OpalWebpackLoader
-  VERSION="0.4.0"
+  VERSION="0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-webpack-loader
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal