Merge branch 'main' into main

Author: bogdan

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 jobs:
@@ -18,7 +18,7 @@ jobs:
             gemfile: gemfiles/rails51_sprockets_3.gemfile
           - ruby: "2.7"
             gemfile: gemfiles/rails52_sprockets_3.gemfile
-          - ruby: "2.7"
+          - ruby: "3.2"
             gemfile: gemfiles/rails70_sprockets_4.gemfile
           - ruby: "3.3"
             gemfile: gemfiles/rails80_sprockets_4.gemfile

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
-## master
+## main
+
+* Fix support of shakapacker [#321](https://github.com/railsware/js-routes/issue/321).
 
 ## v2.3.0
 

Gemfile

@@ -6,4 +6,6 @@ gemspec
 group :development do
   gem 'sorbet', '>= 0.5.11518'
   gem 'tapioca'
+  gem 'debug'
+  gem 'bump'
 end

VERSION_2_UPGRADE.md

@@ -3,7 +3,7 @@
 ### Using ESM module by default
 
 New version of JsRoutes doesn't try to guess your javascript environment module system because JS has generated a ton of legacy module systems in the past. 
-[ESM+Webpacker](/Readme.md#webpacker) upgrade is recommended. 
+[ESM](/Readme.md#webpacker) upgrade is recommended. 
 
 However, if you don't want to follow that pass, specify `module_type` configuration option instead based on module system available in your JS environment.
 Here are supported values:

gemfiles/rails80_sprockets_4.gemfile

@@ -3,6 +3,6 @@
 source "http://rubygems.org"
 
 gem "railties", "~> 8.0"
-gem "sprockets", "~> 4.0"
+gem "sprockets", "~> 4.2"
 
 gemspec path: "../"

js-routes.gemspec

@@ -42,12 +42,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<rspec>, [">= 3.10.0"])
   s.add_development_dependency(%q<bundler>, [">= 2.2.25"])
   s.add_development_dependency(%q<appraisal>, [">= 0.5.2"])
-  s.add_development_dependency(%q<bump>, [">= 0.10.0"])
   if defined?(JRUBY_VERSION)
     s.add_development_dependency(%q<therubyrhino>, [">= 2.0.4"])
   else
-    s.add_development_dependency(%q<byebug>)
-    s.add_development_dependency(%q<pry-byebug>)
     s.add_development_dependency(%q<mini_racer>, [">= 0.4.0"])
   end
 end

lib/js_routes/configuration.rb

@@ -1,6 +1,8 @@
 # typed: strict
+
 require "pathname"
 require "js_routes/types"
+require 'js_routes/utils'
 
 module JsRoutes
   class Configuration
@@ -114,14 +116,14 @@ def source_file
 
     sig { returns(Pathname) }
     def output_file
-      webpacker_dir = defined?(::Webpacker) ?
-        T.unsafe(::Webpacker).config.source_path :
-        pathname('app', 'javascript')
+      shakapacker = JsRoutes::Utils.shakapacker
+      shakapacker_dir = shakapacker ?
+        shakapacker.config.source_path : pathname('app', 'javascript')
       sprockets_dir = pathname('app','assets','javascripts')
       file_name = file || default_file_name
       sprockets_file = sprockets_dir.join(file_name)
-      webpacker_file = webpacker_dir.join(file_name)
-      !Dir.exist?(webpacker_dir) && defined?(::Sprockets) ? sprockets_file : webpacker_file
+      webpacker_file = shakapacker_dir.join(file_name)
+      !Dir.exist?(shakapacker_dir) && defined?(::Sprockets) ? sprockets_file : webpacker_file
     end
 
     protected

lib/js_routes/generators/webpacker.rb

@@ -1,11 +1,12 @@
 require "rails/generators"
+require 'js_routes/utils'
 
 class JsRoutes::Generators::Webpacker < Rails::Generators::Base
 
   def create_webpack
     copy_file "initializer.rb", "config/initializers/js_routes.rb"
     copy_file "erb.js", "config/webpack/loaders/erb.js"
-    copy_file "routes.js.erb", "#{Webpacker.config.source_path}/routes.js.erb"
+    copy_file "routes.js.erb", "#{JsRoutes::Utils.shakapacker.config.source_path}/routes.js.erb"
     inject_into_file "config/webpack/environment.js", loader_content
     if path = application_js_path
       inject_into_file path, pack_content

lib/js_routes/utils.rb

@@ -0,0 +1,18 @@
+# typed: strict
+
+module JsRoutes
+  module Utils
+    extend T::Sig
+    sig {returns(T.untyped)}
+    def self.shakapacker
+      if defined?(::Shakapacker)
+        ::Shakapacker
+      elsif defined?(::Webpacker)
+        ::Webpacker
+      else
+        nil
+      end
+    end
+  end
+
+end

spec/js_routes/options_spec.rb

@@ -465,13 +465,6 @@
     end
 
     context "with url_links option" do
-      around(:each) do |example|
-        Rails.version >= "7.1.0" ? Rails.deprecator : ActiveSupport::Deprecation
-        deprecator_object.silence do
-          example.run
-        end
-      end
-
       let(:_options) { { :compact => true, :url_links => true, default_url_options: {host: 'localhost'} } }
       it "should not strip urls" do
         expectjs("Routes.inbox(1)").to eq(test_routes.inbox_path(1))