react_on_rails 13.1.0 → 13.3.0

data/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb

@@ -29,17 +29,13 @@ module ReactOnRails
         stale_generated_files(client_files)
       end
 
-      def stale_generated_component_packs
-        stale_generated_files(component_pack_files)
-      end
-
       def stale_generated_files(files)
         manifest_needed = ReactOnRails::WebpackerUtils.using_webpacker? &&
                           !ReactOnRails::WebpackerUtils.manifest_exists?
 
         return ["manifest.json"] if manifest_needed
 
-        most_recent_mtime = find_most_recent_mtime(files)
+        most_recent_mtime = Utils.find_most_recent_mtime(files)
         all_compiled_assets.each_with_object([]) do |webpack_generated_file, stale_gen_list|
           if !File.exist?(webpack_generated_file) ||
              File.mtime(webpack_generated_file) < most_recent_mtime
@@ -51,13 +47,6 @@ module ReactOnRails
 
       private
 
-      def find_most_recent_mtime(files)
-        files.reduce(1.year.ago) do |newest_time, file|
-          mt = File.mtime(file)
-          mt > newest_time ? mt : newest_time
-        end
-      end
-
       def all_compiled_assets
         @all_compiled_assets ||= begin
           webpack_generated_files = @webpack_generated_files.map do |bundle_name|
@@ -89,14 +78,6 @@ module ReactOnRails
         @client_files ||= make_file_list(make_globs(source_path)).to_ary
       end
 
-      def component_pack_files
-        make_file_list(make_globs(components_search_path)).to_ary
-      end
-
-      def components_search_path
-        "#{source_path}/**/#{ReactOnRails.configuration.components_subdirectory}"
-      end
-
       def make_globs(dirs)
         Array(dirs).map { |dir| File.join(dir, "**", "*") }
       end

data/lib/react_on_rails/utils.rb

@@ -197,5 +197,31 @@ module ReactOnRails
       rstrip = to_remove - lstrip
       str[0..(midpoint - lstrip - 1)] + TRUNCATION_FILLER + str[(midpoint + rstrip)..-1]
     end
+
+    def self.find_most_recent_mtime(files)
+      files.reduce(1.year.ago) do |newest_time, file|
+        mt = File.mtime(file)
+        mt > newest_time ? mt : newest_time
+      end
+    end
+
+    def self.prepend_to_file_if_text_not_present(file:, text_to_prepend:, regex:)
+      if File.exist?(file)
+        file_content = File.read(file)
+
+        return if file_content.match(regex)
+
+        content_with_prepended_text = text_to_prepend + file_content
+        File.write(file, content_with_prepended_text, mode: "w")
+      else
+        File.write(file, text_to_prepend, mode: "w+")
+      end
+
+      puts "Prepended\n#{text_to_prepend}to #{file}."
+    end
+
+    def self.semver_to_string(ary)
+      "#{ary[0]}.#{ary[1]}.#{ary[2]}"
+    end
   end
 end

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "13.1.0"
+  VERSION = "13.3.0"
 end

data/lib/react_on_rails/webpacker_utils.rb

@@ -2,8 +2,6 @@
 
 module ReactOnRails
   module WebpackerUtils
-    # TODO: V13 code should be cleaned up so that the webpacker gem is required.
-    # This check should only be done at startup.
     def self.using_webpacker?
       return @using_webpacker if defined?(@using_webpacker)
 
@@ -20,7 +18,18 @@ module ReactOnRails
     def self.shakapacker_version
       return nil unless ReactOnRails::Utils.gem_available?("shakapacker")
 
-      Gem.loaded_specs["shakapacker"].version.to_s
+      @shakapacker_version ||= Gem.loaded_specs["shakapacker"].version.to_s
+    end
+
+    def self.shakapacker_version_as_array
+      match = shakapacker_version.match(ReactOnRails::VersionChecker::MAJOR_MINOR_PATCH_VERSION_REGEX)
+
+      @shakapacker_version_as_array = [match[1].to_i, match[2].to_i, match[3].to_i]
+    end
+
+    def self.shackapacker_version_requirement_met?(ary)
+      ary[0] >= shakapacker_version_as_array[0] && ary[1] >= shakapacker_version_as_array[1] &&
+        ary[2] >= shakapacker_version_as_array[2]
     end
 
     # This returns either a URL for the webpack-dev-server, non-server bundle or
@@ -85,5 +94,47 @@ module ReactOnRails
       puts wrap_message(msg)
       exit!
     end
+
+    def self.webpack_assets_status_checker
+      source_path = ReactOnRails::Utils.source_path
+      generated_assets_full_path = ReactOnRails::Utils.generated_assets_full_path
+      webpack_generated_files = ReactOnRails.configuration.webpack_generated_files
+
+      @webpack_assets_status_checker ||= ReactOnRails::TestHelper::WebpackAssetsStatusChecker.new(
+        source_path: source_path,
+        generated_assets_full_path: generated_assets_full_path,
+        webpack_generated_files: webpack_generated_files
+      )
+    end
+
+    def self.raise_nested_entries_disabled
+      msg = <<~MSG
+        **ERROR** ReactOnRails: `nested_entries` is configured to be disabled in shakapacker. Please update \
+        webpacker.yml to enable nested entries. for more information read
+        https://www.shakacode.com/react-on-rails/docs/guides/file-system-based-automated-bundle-generation.md#enable-nested_entries-for-shakapacker
+      MSG
+
+      raise ReactOnRails::Error, msg
+    end
+
+    def self.raise_shakapacker_version_incompatible_for_autobundling
+      msg = <<~MSG
+        **ERROR** ReactOnRails: Please upgrade Shakapacker to version #{ReactOnRails::WebpackerUtils.semver_to_string(ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION)} or \
+        above to use the automated bundle generation feature. The currently installed version is \
+        #{ReactOnRails::WebpackerUtils.semver_to_string(ReactOnRails::WebpackerUtils.shakapacker_version_as_array)}.
+      MSG
+
+      raise ReactOnRails::Error, msg
+    end
+
+    def self.raise_shakapacker_not_installed
+      msg = <<~MSG
+        **ERROR** ReactOnRails: Missing Shakapacker gem. Please upgrade to use Shakapacker \
+        #{ReactOnRails::WebpackerUtils.semver_to_string(minimum_required_shakapacker_version)} or above to use the \
+        automated bundle generation feature.
+      MSG
+
+      raise ReactOnRails::Error, msg
+    end
   end
 end

data/lib/tasks/generate_packs.rake

@@ -6,6 +6,6 @@ namespace :react_on_rails do
   DESC
 
   task generate_packs: :environment do
-    ReactOnRails::PacksGenerator.generate
+    ReactOnRails::PacksGenerator.instance.generate_packs_if_stale
   end
 end

data/package.json

@@ -1,48 +1,49 @@
 {
   "name": "react-on-rails",
-  "version": "13.1.0",
+  "version": "13.3.0",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {
     "doc": "docs"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.10",
-    "@babel/core": "^7.12.10",
-    "@babel/plugin-transform-runtime": "^7.12.10",
-    "@babel/plugin-transform-typescript": "^7.12.1",
-    "@babel/preset-env": "^7.12.10",
-    "@babel/preset-react": "^7.12.10",
-    "@babel/types": "^7.12.10",
-    "@types/jest": "^26.0.18",
-    "@types/react": "^16.9.23",
-    "@types/react-dom": "^16.9.5",
+    "@babel/cli": "^7.20.7",
+    "@babel/core": "^7.20.12",
+    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/plugin-transform-typescript": "^7.20.13",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-react": "^7.18.6",
+    "@babel/types": "^7.20.7",
+    "@types/jest": "^28.1.3",
+    "@types/react": "^16.14.35",
+    "@types/react-dom": "^16.9.17",
     "@types/turbolinks": "^5.2.0",
-    "@types/webpack-env": "^1.17.0",
-    "@typescript-eslint/eslint-plugin": "^4.10.0",
-    "@typescript-eslint/parser": "^4.10.0",
+    "@types/webpack-env": "^1.18.0",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
+    "@typescript-eslint/parser": "^4.33.0",
     "babelify": "^10.0.0",
     "blue-tape": "^1.0.0",
-    "create-react-class": "^15.6.0",
-    "eslint": "^7.15.0",
+    "create-react-class": "^15.7.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^7.0.0",
     "eslint-config-shakacode": "^16.0.1",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.3.0",
-    "eslint-plugin-react": "^7.21.5",
-    "jest": "^26.6.3",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-react": "^7.32.1",
+    "jest": "^28.1.3",
+    "jest-environment-jsdom": "^28.1.3",
     "jsdom": "^16.4.0",
     "nps": "^5.9.3",
-    "prettier": "^2.2.1",
+    "prettier": "^2.8.3",
     "prettier-eslint-cli": "^5.0.0",
-    "prop-types": "^15.5.10",
-    "react": "^16.5.2",
-    "react-dom": "^16.5.2",
+    "prop-types": "^15.8.1",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
     "react-transform-hmr": "^1.0.4",
-    "redux": "^4.0.1",
-    "ts-jest": "^26.4.4",
-    "typescript": "^4.1.2"
+    "redux": "^4.2.0",
+    "ts-jest": "^28.0.8",
+    "typescript": "^4.9.4"
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.12.5",