opal-webpack-loader 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9b54a6d72b3aafc8740ff6fed7e5d45f4c74de4e7dd3ace44cf837049c6c06b
-  data.tar.gz: a8bdc45777a51e6d3b8f3f973402b2565afe697f587337842ad8189fb576b13f
+  metadata.gz: 1b55e893894b05e91eab4ef13fa4a1c9a796e3258505725bdf2a80855639aa5f
+  data.tar.gz: cf6b3c096fe6e7cc28364416d3513e02257aa9c6c045bcedaf203f3e12e098d0
 SHA512:
-  metadata.gz: 967e207065beb55ff6b556f5654740fc1a5765daaaf30f98d29d9bf7372ecfe0114e5c7e8dcad8d56d045232322bb670b2d2410e744bbac6cc2f787e8d645c58
-  data.tar.gz: 7c1a492488d09e5846133b0c886c6de73f07da36e8a22702dcc1fe4a54ca48ca45135e361eecffa9c8c1b72cc18aecd7fc8e8035fb25a7a46df6b390e32f942f
+  metadata.gz: ad3d491649b5e555cef8260e0ddb3243c6db21a5f1525bdeadbfd6f98147b7108740f13555cd151d949d63a5f2511824d81051aa80462413dcad766c84234758
+  data.tar.gz: bfd86eaa367c5f329c8b73f0dbfffc5e9ba5a35d3450c2ad1fe05b0c5167cc461a368cfee9e9e16053be1d38acd156697990999714bc4c9207b85f667fe5c18b

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

@@ -20,19 +20,31 @@ module OpalWebpackCompileServer
   OWCS_SOCKET_PATH = OWL_CACHE_DIR + 'owcs_socket'
 
   class Compiler < EventMachine::Connection
+    def initialize(*args)
+      @received_data = ''
+      super(*args)
+    end
+
     def receive_data(data)
-      if data.start_with?('command:stop')
+      @received_data << data
+
+      return unless @received_data.end_with?("}\x04")
+
+      if @received_data.start_with?('command:stop')
         EventMachine.stop
         exit(0)
       end
 
-      request_hash = Oj.load(data)
-      filename = request_hash['filename']
-      compile_source_map = request_hash['source_map']
+      request_json = Oj.load(@received_data.chop!, {})
+
+      @received_data = ''
+
+      compile_source_map = request_json["source_map"]
+      filename = request_json["filename"]
+      source = request_json["source"]
 
       operation = proc do
         begin
-          source = File.read(filename)
           c = Opal::Compiler.new(source, file: filename, es6_modules: true)
           c.compile
           result = { 'javascript' => c.result }
@@ -45,12 +57,12 @@ module OpalWebpackCompileServer
           result['required_trees'] = c.required_trees
           Oj.dump(result, {})
         rescue Exception => e
-          Oj.dump({ 'error' => { 'name' => e.class, 'message' => e.message, 'backtrace' => e.backtrace } }, {})
+          Oj.dump({ 'error' => { 'name' => e.class, 'message' => e.message, 'backtrace' => e.backtrace.join("\n") } }, {})
         end
       end
 
       callback = proc do |json|
-        self.send_data(json + "\n")
+        self.send_data(json)
         close_connection_after_writing
       end
 

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

@@ -33,6 +33,7 @@ module OpalWebpackLoader
       #     +- spec
       #     +- tmp
       def iso
+        @application_css = '../styles/application.css'
         @asset_output_directory = File.join('public', 'assets')
         @js_entrypoints_directory = File.join('isomorfeus', 'imports')
         @conf_rel_prefix = '..'
@@ -43,6 +44,7 @@ module OpalWebpackLoader
         create_common_directories
         create_isomorfeus_directories
         install_webpack_config
+        create_file_from_template('application.css.erb', File.join('isomorfeus', 'styles', 'application.css'), {})
         create_file_from_template('initializer.rb.erb', File.join('config', 'owl_init.rb'), {})
         add_gem
         print_message
@@ -70,6 +72,7 @@ module OpalWebpackLoader
       TEXT
 
       def flat
+        @application_css = '../styles/application.css'
         @asset_output_directory = File.join('public', 'assets')
         @js_entrypoints_directory = File.join('javascripts')
         @conf_rel_prefix = '..'
@@ -80,11 +83,11 @@ module OpalWebpackLoader
         create_directory(@styles_directory)
         create_common_directories
         install_common_things
+        create_file_from_template('application.css.erb', File.join('styles', 'application.css'), {})
         create_file_from_template('initializer.rb.erb', 'owl_init.rb', { opal_directory: @opal_directory })
         create_file_from_template('app_loader.rb.erb', 'app_loader.rb', {})
         add_gem
         print_message
-        puts "Make sure to require the owl initializer, e.g. `require './owl_init'`, in your projects startup file."
       end
 
       desc "rails", "Install owl configuration into a existing rails project, execute from the projects root directory."
@@ -113,6 +116,7 @@ module OpalWebpackLoader
       TEXT
 
       def rails
+        @application_css = '../stylesheets/application.css'
         @asset_output_directory = File.join('public', 'assets')
         @js_entrypoints_directory = File.join('app', 'assets', 'javascripts')
         @conf_rel_prefix = File.join('..', '..')
@@ -163,7 +167,7 @@ module OpalWebpackLoader
       end
 
       def install_js_entries
-        erb_hash = { opal_dir: File.join(@js_rel_prefix, @opal_directory), opal_name: options[:opal_name] }
+        erb_hash = { opal_dir: File.join(@js_rel_prefix, @opal_directory), opal_name: options[:opal_name], application_css: @application_css }
         create_file_from_template('application.js.erb', File.join(@js_entrypoints_directory, 'application.js'), erb_hash)
         create_file_from_template('application_common.js.erb', File.join(@js_entrypoints_directory, 'application_common.js'),erb_hash)
         create_file_from_template('application_debug.js.erb', File.join(@js_entrypoints_directory, 'application_debug.js'), erb_hash)
@@ -185,13 +189,8 @@ module OpalWebpackLoader
           package_json["scripts"]["development"] = development_script
           package_json["scripts"]["production_build"] = production_script
           package_json["devDependencies"] = {} unless package_json.has_key?("devDependencies")
-          package_json["devDependencies"]["chokidar"] = gem_package_json["devDependencies"]["chokidar"]
-          package_json["devDependencies"]["compression-webpack-plugin"] = gem_package_json["devDependencies"]["compression-webpack-plugin"]
-          package_json["devDependencies"]["opal-webpack-loader"] = OpalWebpackLoader::VERSION
-          package_json["devDependencies"]["webpack"] = gem_package_json["devDependencies"]["webpack"]
-          package_json["devDependencies"]["webpack-cli"] = gem_package_json["devDependencies"]["webpack-cli"]
-          package_json["devDependencies"]["webpack-dev-server"] = gem_package_json["devDependencies"]["webpack-dev-server"]
-          package_json["devDependencies"]["webpack-manifest-plugin"] = gem_package_json["devDependencies"]["webpack-manifest-plugin"]
+          package_json["devDependencies"].merge!(gem_package_json["devDependencies"])
+          package_json["devDependencies"]["opal-webpack-loader"] = "^#{OpalWebpackLoader::VERSION}"
           File.write('package.json', Oj.dump(package_json, mode: :strict))
           puts "Updated package.json, updated scripts and owl dependencies"
         else

data/lib/opal-webpack-loader/templates/application.css.erb

@@ -0,0 +1,4 @@
+/* application stylesheets */
+body {
+  color: black;
+}

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

@@ -1,4 +1,7 @@
 // entry file for the browser environment
+// import stylesheets here
+import '<%= application_css %>';
+
 // import npm modules that are valid to use only in the browser
 // for example modules which depend on the window or document objects of the browser
 //

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

@@ -3,6 +3,7 @@ const path = require('path');
 const webpack = require('webpack');
 const chokidar = require('chokidar');
 const OwlResolver = require('opal-webpack-loader/resolver'); // to resolve ruby files
+const ExtraWatchWebpackPlugin = require('extra-watch-webpack-plugin'); // to watch for added ruby files
 
 module.exports = {
     context: path.resolve(__dirname, '<%= opal_directory %>'),
@@ -42,7 +43,11 @@ module.exports = {
     plugins: [
         // both for hot reloading
         new webpack.NamedModulesPlugin(),
-        new webpack.HotModuleReplacementPlugin()
+        new webpack.HotModuleReplacementPlugin(),
+        // watch for added files in opal dir
+        new ExtraWatchWebpackPlugin({
+            dirs: [ path.resolve(__dirname, '<%= opal_directory %>') ]
+        })
     ],
     module: {
         rules: [
@@ -60,8 +65,7 @@ module.exports = {
                     {
                         loader: "css-loader",
                         options: {
-                            sourceMap: true, // set to false to speed up hot reloads
-                            minimize: false // set to false to speed up hot reloads
+                            sourceMap: true // set to false to speed up hot reloads
                         }
                     },
                     {
@@ -86,8 +90,7 @@ module.exports = {
                     {
                         loader: "css-loader",
                         options: {
-                            sourceMap: true, // set to false to speed up hot reloads
-                            minimize: false // set to false to speed up hot reloads
+                            sourceMap: true // set to false to speed up hot reloads
                         }
                     }
                 ]

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

@@ -3,6 +3,7 @@ const path = require('path');
 const webpack = require('webpack');
 const chokidar = require('chokidar');
 const OwlResolver = require('opal-webpack-loader/resolver'); // to resolve ruby files
+const ExtraWatchWebpackPlugin = require('extra-watch-webpack-plugin'); // to watch for added ruby files
 
 module.exports = {
     context: path.resolve(__dirname, '<%= opal_directory %>'),
@@ -33,7 +34,11 @@ module.exports = {
     plugins: [
         // both for hot reloading
         new webpack.NamedModulesPlugin(),
-        new webpack.HotModuleReplacementPlugin()
+        new webpack.HotModuleReplacementPlugin(),
+        // watch for added files in opal dir
+        new ExtraWatchWebpackPlugin({
+            dirs: [ path.resolve(__dirname, '<%= opal_directory %>') ]
+        })
     ],
     module: {
         rules: [
@@ -49,10 +54,7 @@ module.exports = {
                         }
                     },
                     {
-                        loader: "css-loader",
-                        options: {
-                            minimize: false // set to false to speed up hot reloads
-                        }
+                        loader: "css-loader"
                     },
                     {
                         loader: "sass-loader",
@@ -73,10 +75,7 @@ module.exports = {
                         }
                     },
                     {
-                        loader: "css-loader",
-                        options: {
-                            minimize: false // set to false to speed up hot reloads
-                        }
+                        loader: "css-loader"
                     }
                 ]
             },

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

@@ -1,4 +1,5 @@
 {
+  "private": true,
   "dependencies": {
   },
   "scripts": {
@@ -9,7 +10,13 @@
   "devDependencies": {
     "chokidar": "^2.1.5",
     "compression-webpack-plugin": "^2.0.0",
+    "css-loader": "^2.1.1",
+    "extra-watch-webpack-plugin": "^1.0.3",
+    "file-loader": "^1.1.11",
     "opal-webpack-loader": "^<%= owl_version %>",
+    "node-sass": "^4.12.0",
+    "sass-loader": "^7.1.0",
+    "style-loader": "^0.23.1",
     "webpack": "^4.30.0",
     "webpack-cli": "^3.3.0",
     "webpack-dev-server": "^3.3.1",

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

@@ -61,21 +61,7 @@ module.exports = {
             {
                 // loader for .css files
                 test: /.css$/,
-                use: [
-                    {
-                        loader: "style-loader",
-                        options: {
-                            hmr: false
-                        }
-                    },
-                    {
-                        loader: "css-loader",
-                        options: {
-                            sourceMap: false, // set to false to speed up hot reloads
-                            minimize: true // set to false to speed up hot reloads
-                        }
-                    }
-                ]
+                use: [ "style-loader", "css-loader" ]
             },
             {
                 test: /.(png|svg|jpg|gif)$/,

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

@@ -1,3 +1,3 @@
 module OpalWebpackLoader
-  VERSION="0.6.4"
+  VERSION="0.6.5"
 end

data/spec/installer_spec.rb

@@ -22,7 +22,6 @@ RSpec.describe 'owl installer' do
       arg_val = %w[rails]
       expect(Dir.exist?(File.join('railing', 'config', 'webpack'))).to be false
       OpalWebpackLoader::Installer::CLI.start(arg_val)
-
       expect(File.exist?(File.join('app', 'assets', 'javascripts', 'application.js'))).to be true
       expect(File.exist?(File.join('app', 'assets', 'javascripts', 'application.js_owl_new'))).to be true
       expect(File.exist?(File.join('app', 'assets', 'javascripts', 'application_common.js'))).to be true
@@ -44,7 +43,6 @@ RSpec.describe 'owl installer' do
       arg_val = %w[rails -o hyperhyper]
       expect(Dir.exist?(File.join('railing', 'config', 'webpack'))).to be false
       OpalWebpackLoader::Installer::CLI.start(arg_val)
-
       expect(File.exist?(File.join('app', 'assets', 'javascripts', 'application.js'))).to be true
       expect(File.exist?(File.join('app', 'assets', 'javascripts', 'application.js_owl_new'))).to be true
       expect(File.exist?(File.join('app', 'assets', 'javascripts', 'application_common.js'))).to be true
@@ -80,12 +78,14 @@ RSpec.describe 'owl installer' do
       Dir.chdir('flattering')
       arg_val = %w[flat]
       OpalWebpackLoader::Installer::CLI.start(arg_val)
+      expect(File.exist?(File.join('styles', 'application.css'))).to be true
       expect(File.exist?(File.join('javascripts', 'application.js'))).to be true
       expect(File.exist?(File.join('javascripts', 'application_common.js'))).to be true
       expect(File.exist?(File.join('javascripts', 'application_debug.js'))).to be true
       expect(File.exist?(File.join('javascripts', 'application_ssr.js'))).to be true
       expect(File.exist?(File.join('opal', 'opal_loader.rb'))).to be true
       expect(File.exist?(File.join('owl_init.rb'))).to be true
+      expect(File.exist?(File.join('app_loader.rb'))).to be true
       expect(File.exist?(File.join('webpack', 'debug.js'))).to be true
       expect(File.exist?(File.join('webpack', 'development.js'))).to be true
       expect(File.exist?(File.join('webpack', 'production.js'))).to be true

data/spec/owl_spec.rb

@@ -2,15 +2,20 @@ require 'spec_helper'
 
 RSpec.describe 'owl' do
   context 'in a rails app' do
+    before :all do
+      `npm pack`
+    end
+
     before do
       Dir.chdir('spec')
       Dir.chdir('test_apps')
       FileUtils.rm_rf('railing') if Dir.exist?('railing')
+      `yarn cache clean`
     end
 
     after do
       Dir.chdir('..') if Dir.pwd.end_with?('railing')
-      FileUtils.rm_rf('railing') if Dir.exist?('railing')
+      # FileUtils.rm_rf('railing') if Dir.exist?('railing')
       Dir.chdir('..')
       Dir.chdir('..')
     end
@@ -31,6 +36,11 @@ RSpec.describe 'owl' do
 
       GEMS
       File.write('Gemfile', gemfile)
+      # add local owl npm package
+      package_json = Oj.load(File.read('package.json'), mode: :strict)
+      package_json["devDependencies"].delete("opal-webpack-loader")
+      File.write('package.json', Oj.dump(package_json, mode: :strict))
+      `yarn add file:../../../opal-webpack-loader-#{OpalWebpackLoader::VERSION}.tgz --dev`
       `yarn install`
       # bundler set some environment things, but we need a clean environment, so things don't get mixed up, use env
       `env -i PATH="#{ENV['PATH']}" bundle install`
@@ -44,15 +54,20 @@ RSpec.describe 'owl' do
   end
 
   context 'in a roda app' do
+    before :all do
+      `npm pack`
+    end
+
     before do
       Dir.chdir('spec')
       Dir.chdir('test_apps')
       FileUtils.rm_rf('flattering') if Dir.exist?('flattering')
+      `yarn cache clean`
     end
 
     after do
       Dir.chdir('..') if Dir.pwd.end_with?('flattering')
-      FileUtils.rm_rf('flattering') if Dir.exist?('flattering')
+      #FileUtils.rm_rf('flattering') if Dir.exist?('flattering')
       Dir.chdir('..')
       Dir.chdir('..')
     end
@@ -72,6 +87,11 @@ RSpec.describe 'owl' do
 
       GEMS
       File.write('Gemfile', gemfile)
+      # add local owl npm package
+      package_json = Oj.load(File.read('package.json'), mode: :strict)
+      package_json["devDependencies"].delete("opal-webpack-loader")
+      File.write('package.json', Oj.dump(package_json, mode: :strict))
+      `yarn add file:../../../opal-webpack-loader-#{OpalWebpackLoader::VERSION}.tgz --dev`
       `yarn install`
       # bundler set some environment things, but we need a clean environment, so things don't get mixed up, use env
       `env -i PATH="#{ENV['PATH']}" bundle install`

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'oj'
 require 'thor'
+require_relative '../lib/opal-webpack-loader/version'
 require_relative '../lib/opal-webpack-loader/installer_cli'
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-webpack-loader
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -155,6 +155,7 @@ files:
 - lib/opal-webpack-loader/rails_view_helper.rb
 - lib/opal-webpack-loader/templates/Procfile.erb
 - lib/opal-webpack-loader/templates/app_loader.rb.erb
+- lib/opal-webpack-loader/templates/application.css.erb
 - lib/opal-webpack-loader/templates/application.js.erb
 - lib/opal-webpack-loader/templates/application_common.js.erb
 - lib/opal-webpack-loader/templates/application_debug.js.erb