opal-webpack-loader 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aa55937b3915292ac13d9c66b4bf9f6f737ad5836afc702272ea97614045730
-  data.tar.gz: 00f9d0764d203b8303b7b1691481cdebad1a47b158e31f99d64b65405ab46de4
+  metadata.gz: b195faad06e86f99145977d3551f71b22ff4717f9c3750572061a18e88b57c0e
+  data.tar.gz: 943969a8513c3acf8d28da2039a88d418f443c136fab28e3ddf689883b6e9c95
 SHA512:
-  metadata.gz: bf301a2b0c3810e3f3a42fa2eb4338f9a5274de6e1fd786fe29de4906700be1c5669fa6259dbdfdce55d8752b178329ee0f0814f9ff93152b15c6985ffa63164
-  data.tar.gz: 46f32a4d6ca22642aff5bdf70a16ea069b03826c7e11c1653eab1a7c6220bb658dcbffbb5a52ab6e207638bcf8f1784c6100472e40a3265efa8ca6225aa30f86
+  metadata.gz: 565979248f76810bcb6783a18dac93276ea69bc6ca45bdeadf2b5c055a21e56f1829d83f3df4ec9ca29e5cea1355a4996efcf9c572fbd6d26429665499a5020f
+  data.tar.gz: 68a3c55de9b28a6ca91a6e98a68e5920cd5ac314aab15e38db09954ea8d9cf311970c768640d9251b4d10fd2c44f63d76a89d09f9ac07ee98f5ee2fdb599770e

data/lib/opal-webpack-loader.rb

@@ -18,6 +18,14 @@ module OpalWebpackLoader
   def self.client_asset_path=(path)
     @client_asset_path = path
   end
+
+  def self.use_manifest
+    @use_manifest
+  end
+
+  def self.use_manifest=(bool)
+    @use_manifest = bool
+  end
 end
 
 if defined? Rails
@@ -27,13 +35,18 @@ else
 end
 
 OpalWebpackLoader.manifest_path = File.join(Dir.getwd, 'public', 'assets', 'manifest.json')
-OpalWebpackLoader.client_asset_path = '/assets'
+OpalWebpackLoader.client_asset_path = 'http://localhost:3035/assets/'
+OpalWebpackLoader.use_manifest = false
 
 npm = `which npm`.chop
 
 if npm != ''
   bin_dir = `npm bin`.chop
-  owl_npm_version = `#{bin_dir}/opal-webpack-loader-npm-version`.chop
+  begin
+    owl_npm_version = `#{bin_dir}/opal-webpack-loader-npm-version`.chop
+  rescue
+    owl_npm_version = nil
+  end
 
   if owl_npm_version != OpalWebpackLoader::VERSION
     raise "opal-webpack-loader: Incorrect version of npm package found or npm package not installed.\n" +
@@ -42,5 +55,5 @@ if npm != ''
       "\tor with 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."
+  STDERR.puts "opal-webpack-loader: Unable to check npm package version. Please check your npm installation."
 end

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

@@ -1,13 +1,12 @@
 module OpalWebpackLoader
   module RailsViewHelper
-    def owl_include_tag(path)
-      case Rails.env
-      when 'development'
-        javascript_include_tag("http://localhost:3035#{OpalWebpackLoader.client_asset_path}/#{path}")
-      else
+    def owl_script_tag(path)
+      if OpalWebpackLoader.use_manifest
         asset = path.split('/').last
         asset_path = OpalWebpackLoader::Manifest.lookup_path_for(asset)
-        javascript_include_tag("#{OpalWebpackLoader.client_asset_path}/#{asset_path}")
+        javascript_include_tag("#{OpalWebpackLoader.client_asset_path}#{asset_path}")
+      else
+        javascript_include_tag("#{OpalWebpackLoader.client_asset_path}#{path}")
       end
     end
   end

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

@@ -1,3 +1,3 @@
 module OpalWebpackLoader
-  VERSION="0.4.4"
+  VERSION="0.5.0"
 end

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

@@ -1,12 +1,11 @@
 module OpalWebpackLoader
   module ViewHelper
-    def owl_include_tag(path, env = 'development')
-      case env
-      when 'development'
-        "<script type=\"application/javascript\" src=\"http://localhost:3035#{OpalWebpackLoader.client_asset_path}/#{path}\"></script>"
-      else
+    def owl_script_tag(path)
+      if OpalWebpackLoader.use_manifest
         asset_path = OpalWebpackLoader::Manifest.lookup_path_for(path)
-        "<script type=\"application/javascript\" src=\"#{OpalWebpackLoader.client_asset_path}/#{asset_path}\"></script>"
+        "<script type=\"application/javascript\" src=\"#{OpalWebpackLoader.client_asset_path}#{asset_path}\"></script>"
+      else
+        "<script type=\"application/javascript\" src=\"#{OpalWebpackLoader.client_asset_path}#{path}\"></script>"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-webpack-loader
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Jan Biedermann