opal-webpack-loader 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b42dbe838247fa4884f7c83689dcdb82977deb68acee953ee74f66e9ea4d5bd2
-  data.tar.gz: 88ac81dc363188576833979952bed5e4ed2c8010297c20716d5d262d14331d30
+  metadata.gz: 47e3de8dc59fca8c77ec96cce2a2d981360ffc59a1d5b3081d5b38ac9e872abc
+  data.tar.gz: 74ee8b8d003d7d4f7da72f2b778a6f6eca2d74188231b56eefdc2de45b1f0bbf
 SHA512:
-  metadata.gz: e05bd637ddba7fc0199e2c1eb1baf0b9e63041c6da56ac546bda0e28055a547e045556195c164da3185be4d319ac4dd13579bd0d48d22d80c18c63670e22039d
-  data.tar.gz: 40002724fdd6ddebaf9081fa1d31ad0df40552e766e5d69d67b18aa69a2c525f7b68cf70fddd9a7dad4638624bff15d69cba559b7613bdf62aaac3b72497d91c
+  metadata.gz: 2fe218979c2f394a314e49a5c10beb6fcdd016928eba20fb0f7b5bf50ea6523ecccbbfe98aae2b44b506ab660749843a3c998e7ce70873784f959326e5bd3ef3
+  data.tar.gz: e49f7d2c1171b2e0b7c314424706fc020927126a91a69b9472ea13d887b838a308e360a2670ca3eda50605a8d0073709edd7abf3fdb9b7d4e206a363f0da3b0e

data/bin/opal-webpack-compile-server

@@ -1,8 +1,59 @@
 #!/usr/bin/env ruby
 require 'opal-webpack-loader/compile_server'
+require 'open3'
+
+puts "args: #{ARGV}"
 
 if ARGV[0] == 'stop' || ARGV[0] == 'kill'
   OpalWebpackCompileServer::Exe.stop
 else
-  OpalWebpackCompileServer::Exe.run
+  if ARGV[0] == 'start'
+    OpalWebpackCompileServer::Exe.stop
+    runargs = ARGV[1..-1]
+  else
+    runargs = ARGV
+  end
+
+  fork { OpalWebpackCompileServer::Exe.run }
+
+  have_socket = false
+  start_time = Time.now
+  begin
+    until have_socket
+      if File.exist?(OpalWebpackCompileServer::OWCS_SOCKET_PATH)
+        have_socket = true
+      else
+        if Time.now - start_time > 60
+          puts "opal-webpack-compile-server didnt start in time. Exiting"
+          OpalWebpackCompileServer::Exe.stop(false)
+          exit 1
+        end
+      end
+    end
+  rescue Exception => e
+    OpalWebpackCompileServer::Exe.stop(false)
+    puts "opal-webpack-compile-server couldn't start:"
+    puts e.backtrace.join("\n")
+    puts e.message
+    exit 1
+  end
+
+  begin
+    # see: http://stackoverflow.com/a/1162850/83386
+    Open3.popen3(*runargs) do |stdin, stdout, stderr, thread|
+      # read each stream from a new thread
+      { :out => stdout, :err => stderr }.each do |key, stream|
+        Thread.new do
+          until (raw_line = stream.gets).nil? do
+            puts raw_line
+          end
+        end
+      end
+
+      thread.join # don't exit until the external process is done
+    end
+  rescue Interrupt => e
+    puts "opal-webpack-compile-server got interrupted. Exiting with drama."
+    exit 0
+  end
 end

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

@@ -26,7 +26,9 @@ module OpalWebpackCompileServer
         exit(0)
       end
 
-      filename = data.chop # remove newline
+      request_hash = Oj.load(data)
+      filename = request_hash['filename']
+      compile_source_map = request_hash['source_map']
 
       operation = proc do
         begin
@@ -34,10 +36,12 @@ module OpalWebpackCompileServer
           c = Opal::Compiler.new(source, file: filename, es6_modules: true)
           c.compile
           result = { 'javascript' => c.result }
-          result['source_map'] = c.source_map.as_json
-          result['source_map']['sourcesContent'] = [source]
-          result['source_map']['file'] = filename
-          result['source_map']['names'] = result['source_map']['names'].map(&:to_s)
+          if compile_source_map
+            result['source_map'] = c.source_map.as_json
+            result['source_map']['sourcesContent'] = [source]
+            result['source_map']['file'] = filename
+            result['source_map']['names'] = result['source_map']['names'].map(&:to_s)
+          end
           result['required_trees'] = c.required_trees
           Oj.dump(result)
         rescue Exception => e
@@ -120,7 +124,7 @@ module OpalWebpackCompileServer
       @unlink = false
     end
 
-    def self.stop
+    def self.stop(do_exit = true)
       if File.exist?(OWCS_SOCKET_PATH)
         dont_unlink_on_exit
         begin
@@ -131,7 +135,7 @@ module OpalWebpackCompileServer
           # socket cant be reached so owcs is already dead, delete socket
           unlink_on_exit
         end
-        exit(0)
+        exit(0) if do_exit
       end
     end
 
@@ -145,7 +149,7 @@ module OpalWebpackCompileServer
         load_paths = OpalWebpackCompileServer::LoadPathManager.get_load_paths
         if load_paths
           Opal.append_paths(*load_paths)
-          Process.daemon(true)
+          # Process.daemon(true)
           EventMachine.run do
             EventMachine.start_unix_domain_server(OWCS_SOCKET_PATH, OpalWebpackCompileServer::Compiler)
           end

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

@@ -1,11 +1,11 @@
 module OpalWebpackLoader
   class Manifest
     def self.manifest
-      @manifest ||= JSON.parse(File.read(File.join(Rails.root, 'public', 'packs', 'manifest.json')))
+      @manifest ||= JSON.parse(File.read(OpalWebpackLoader.manifest_path))
     end
 
     def self.lookup_path_for(asset)
       manifest[asset]
     end
   end
-end
+end

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

@@ -2,18 +2,13 @@ module OpalWebpackLoader
   module RailsViewHelper
     def owl_include_tag(path)
       case Rails.env
-      when 'production'
-        public, packs, asset = path.split('/')
-        asset_path = OpalWebpackLoader::Manifest.lookup_path_for(asset)
-        javascript_include_tag(asset_path)
       when 'development'
-        javascript_include_tag('http://localhost:3035' + path[0..-4] + '_development' + path[-3..-1])
-      when 'test'
-        real_path = path[0..-4] + '_test' + path[-3..-1]
-        public, packs, asset = real_path.split('/')
+        javascript_include_tag("http://localhost:3035#{OpalWebpackLoader.client_asset_path}/#{path}")
+      else
+        asset = path.split('/').last
         asset_path = OpalWebpackLoader::Manifest.lookup_path_for(asset)
-        javascript_include_tag(asset_path)
+        javascript_include_tag("#{OpalWebpackLoader.client_asset_path}/#{asset_path}")
       end
     end
   end
-end
+end

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

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

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

@@ -1,19 +1,13 @@
 module OpalWebpackLoader
   module ViewHelper
-    def owl_include_tag(path)
-      case Rails.env
-      when 'production'
-        public, packs, asset = path.split('/')
-        asset_path = OpalWebpackLoader::Manifest.lookup_path_for(asset)
-        "<script type=\"application/javascript\" src=\"#{asset_path}\"></script>"
+    def owl_include_tag(path, env = 'development')
+      case env
       when 'development'
-        "<script type=\"application/javascript\" src=\"#{'http://localhost:3035' + path[0..-4] + '_development' + path[-3..-1]}\"></script>"
-      when 'test'
-        real_path = path[0..-4] + '_test' + path[-3..-1]
-        public, packs, asset = real_path.split('/')
-        asset_path = OpalWebpackLoader::Manifest.lookup_path_for(asset)
-        "<script type=\"application/javascript\" src=\"#{asset_path}\"></script>"
+        "<script type=\"application/javascript\" src=\"http://localhost:3035#{OpalWebpackLoader.client_asset_path}/#{path}\"></script>"
+      else
+        asset_path = OpalWebpackLoader::Manifest.lookup_path_for(path)
+        "<script type=\"application/javascript\" src=\"#{OpalWebpackLoader.client_asset_path}/#{asset_path}\"></script>"
       end
     end
   end
-end
+end

data/lib/opal-webpack-loader.rb

@@ -1,8 +1,50 @@
 # check version of opal-webpack-loader-npm
 require 'opal-webpack-loader/version'
 require 'opal-webpack-loader/manifest'
+
+module OpalWebpackLoader
+  def self.manifest_path
+    @manifest_path
+  end
+
+  def self.manifest_path=(path)
+    @manifest_path = path
+  end
+
+  def self.client_asset_path
+    @client_asset_path
+  end
+
+  def self.client_asset_path=(path)
+    @client_asset_path = path
+  end
+end
+
 if defined? Rails
   require 'opal-webpack-loader/rails_view_helper'
 else
   require 'opal-webpack-loader/view_helper'
 end
+
+OpalWebpackLoader.manifest_path = File.join(Dir.getwd, 'public', 'assets', 'manifest.json')
+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'
+  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

metadata

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