react_on_rails 6.0.0.beta.1 → 6.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eccbfc7edbe4d39c8b80673c50d25c2c3e21ab9c
-  data.tar.gz: 2eb9f721f5b67a58e7d3c392614042c6a4a3b8c4
+  metadata.gz: bcc4a03b77263a8492274ed04f2aea8fedfdd151
+  data.tar.gz: 54179a432dfc85cc1f69387b9e69fc27a96e4058
 SHA512:
-  metadata.gz: 55115761bd37dc567a886ed5092b4d7101f166d5ec2741c816f26e59248a979fb378373a0189c6cb0fb31c1be98d553b188ea2145bb6b30afc0c844a2ba178da
-  data.tar.gz: b63c6519d7f9b75a8fa71ff7e73ff354ecc13afa6aa206952ff96719cd9736ea8e511137d48f96f98e558031ed89a0c0754fd5843a10459d08b889b85bd09a1d
+  metadata.gz: 2e74c3ee062e6766b5b9a0db851978dd38fc936ae99387deeb1ad2d93a8f43bdc95c7997e8d85ea277f0f17cd848bb6b611a4d58d50f0e6b6692529ed5b3cc43
+  data.tar.gz: 50fa6532ad2f6df651dfb8fed5d1f5b21dcea3fcb7619c3fe8f6ab24be2de31075165f76748f6a9ea1da8c005974542fa17d392d3e1cbb3abbc050f9b1a03511

data/.travis.yml

@@ -3,7 +3,7 @@ sudo: required
 language: ruby
 
 rvm:
-  - 2.2.4
+  - 2.3.0
 
 services:
   - docker

data/lib/react_on_rails/test_helper.rb

@@ -64,8 +64,7 @@ module ReactOnRails
         webpack_assets_status_checker ||=
           WebpackAssetsStatusChecker.new(client_dir: client_dir,
                                          generated_assets_dir: generated_assets_dir,
-                                         webpack_generated_files: webpack_generated_files
-                                        )
+                                         webpack_generated_files: webpack_generated_files)
 
         unless @printed_once
           puts

data/lib/react_on_rails/test_helper/ensure_assets_compiled.rb

@@ -35,7 +35,7 @@ module ReactOnRails
         # Inform the developer that we're ensuring gen assets are ready.
         puts_start_compile_check_message(stale_gen_files)
 
-        webpack_assets_compiler.compile_assets
+        webpack_assets_compiler.compile_asseta
       end
 
       def puts_start_compile_check_message(stale_files)

data/lib/react_on_rails/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ReactOnRails
-  VERSION = "6.0.0.beta.1".freeze
+  VERSION = "6.0.0.beta.2".freeze
 end

data/lib/tasks/assets.rake

@@ -21,10 +21,9 @@ end
 
 namespace :react_on_rails do
   namespace :assets do
-
-    if ReactOnRails.configuration.symlink_non_digested_assets_regex
-      desc "Creates non-digested symlinks for the assets in the public asset dir"
-      task symlink_non_digested_assets: :"assets:environment" do
+    desc "Creates non-digested symlinks for the assets in the public asset dir"
+    task symlink_non_digested_assets: :"assets:environment" do
+      if ReactOnRails.configuration.symlink_non_digested_assets_regex
         manifest_path = Dir.glob(ReactOnRails::assets_path.join(".sprockets-manifest-*.json"))
                           .first
         manifest_data = JSON.load(File.new(manifest_path))
@@ -42,74 +41,66 @@ namespace :react_on_rails do
           end
         end
       end
+    end
 
-      desc "Cleans all broken symlinks for the assets in the public asset dir"
-      task delete_broken_symlinks: :"assets:environment" do
-        Dir.glob(ReactOnRails::assets_path.join("*")).each do |filename|
-          if File.lstat(filename).symlink?
-            begin
-              target = File.readlink(filename)
-            rescue
-              puts "React on Rails: Warning: your platform doesn't support File::readlink method."/
-                     "Skipping broken link check."
-              return
-            end
-            path = Pathname.new(File.dirname(filename))
-            target_path = path.join(target)
-            unless File.exist?(target_path)
-              puts "React on Rails: Deleting broken link: #{filename}"
-              File.delete(filename)
-            end
+    desc "Cleans all broken symlinks for the assets in the public asset dir"
+    task delete_broken_symlinks: :"assets:environment" do
+      Dir.glob(ReactOnRails::assets_path.join("*")).each do |filename|
+        if File.lstat(filename).symlink?
+          begin
+            target = File.readlink(filename)
+          rescue
+            puts "React on Rails: Warning: your platform doesn't support File::readlink method."/
+                   "Skipping broken link check."
+            return
+          end
+          path = Pathname.new(File.dirname(filename))
+          target_path = path.join(target)
+          unless File.exist?(target_path)
+            puts "React on Rails: Deleting broken link: #{filename}"
+            File.delete(filename)
           end
         end
       end
     end
 
-
-    # We might need the clear_prerequisites (delete after testing without)
-    # Rake::Task["assets:precompile"]
-    #   .clear_prerequisites
-    #   .enhance(["assets:compile_environment"])
-
-    if ReactOnRails.configuration.npm_build_production_command.present?
-      # In this task, set prerequisites for the assets:precompile task
-      desc <<-DESC
+    # In this task, set prerequisites for the assets:precompile task
+    desc <<-DESC
 Create webpack assets before calling assets:environment
 The webpack task must run before assets:environment task.
 Otherwise Sprockets cannot find the files that webpack produces.
 This is the secret sauce for how a Heroku deployment knows to create the webpack generated JavaScript files.
-      DESC
-      task compile_environment: :webpack do
-        Rake::Task["assets:environment"].invoke
-      end
+    DESC
+    task compile_environment: :webpack do
+      Rake::Task["assets:environment"].invoke
+    end
 
-      desc <<-DESC
+    desc <<-DESC
 Compile assets with webpack
 Uses command defined with ReactOnRails.configuration.npm_build_production_command
-sh "cd client && #{ReactOnRails.configuration.npm_build_production_command}"
-      DESC
-      task :webpack do
+sh "cd client && `ReactOnRails.configuration.npm_build_production_command`"
+    DESC
+    task webpack: :environment do
+      if ReactOnRails.configuration.npm_build_production_command.present?
         sh "cd client && #{ReactOnRails.configuration.npm_build_production_command}"
       end
+    end
 
-      desc "Delete assets created with webpack, in #{ReactOnRails.configuration.generated_assets_dir}"
-      task :clobber do
+    desc "Delete assets created with webpack, in the generated assetst directory (/app/assets/webpack)"
+    task clobber: :environment do
+      dir = Rails.root.join(ReactOnRails.configuration.generated_assets_dir)
+      if dir.present? && File.directory?(dir)
+        puts "Deleting files in directory #{dir}"
         rm_r Dir.glob(Rails.root.join("#{ReactOnRails.configuration.generated_assets_dir}/*"))
+      else
+        puts "Could not find dir #{dir}"
       end
     end
   end
 end
 
-if ReactOnRails.configuration.symlink_non_digested_assets_regex
-  Rake::Task["assets:precompile"].enhance do
-    Rake::Task["react_on_rails:assets:symlink_non_digested_assets"].invoke
-    Rake::Task["react_on_rails:assets:delete_broken_symlinks"].invoke
-  end
-end
-
-if ReactOnRails.configuration.npm_build_production_command.present?
-  Rake::Task["assets:precompile"].enhance do
-    Rake::Task["react_on_rails:assets:compile_environment"].invoke
-  end
-end
-
+# These tasks run as pre-requisites of assets:precompile.
+# Note, it's not possible to refer to ReactOnRails configuration values at this point.
+Rake::Task["assets:precompile"].enhance(["react_on_rails:assets:compile_environment",
+                                         "react_on_rails:assets:symlink_non_digested_assets",
+                                         "react_on_rails:assets:delete_broken_symlinks"])

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "6.0.0-beta.1",
+  "version": "6.0.0-beta.2",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta.1
+  version: 6.0.0.beta.2
 platform: ruby
 authors:
 - Justin Gordon