js-routes 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0fd81f6f8575bb26353c7e485f0551cc62420a266e22d5503739332b5762037
-  data.tar.gz: b84d4ad0f70f8e1f454bdd2c6fb8b77a316376b3407a3fd0b6c681d87b87ada9
+  metadata.gz: 55d34a6a511e250d1fc59aa2e868a3148734bc6fafc6f156ff86eea1f0d6f81e
+  data.tar.gz: 94143965ae4a2a14db535dd484521c3348c18eee2ca6f61ee72186e908cdc786
 SHA512:
-  metadata.gz: 23db2ecfc872d470727b60d7c63148aa15d9d5b76d6eaedbf7bbe5ee964ae5ca5abfb09f69199dd813fcd0b09b12d0920fcb0abf9b09a1bb2a6dbfbaf7884e75
-  data.tar.gz: faf0d713243b705277604493bdf2f5d9f61c5cd953ef9bcfbcd1f2d88fdfd850d27ed48e0740f0fa4c0f4492a310bec13d6a76fc070113703ab7e7750e812b0c
+  metadata.gz: d727f254cec5e5269e92ef1180309aacb3362fc4aa8065c2fb604237d9096918c1e0ab534b7b443df656fb5218962e949522ce3338b4be9d99e17d0268f6efbb
+  data.tar.gz: 9ce12dc8aefab9a646aadc2318e541f6b422fc9340856e69488889374727c7de7f7e70fa8fbe510263b9d7f5edf2097657ae62fac0a90d0206b9b2be5481b48a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master
 
+## v2.2.6
+
+* Prefer to extend `javascript:build` instead of `assets:precompile`. [#305](https://github.com/railsware/js-routes/issues/305)
+* Add stimulus framework application.js location to generators
 
 ## v2.2.5
 

data/Readme.md

@@ -60,12 +60,13 @@ import {post_path} from '../routes';
 alert(post_path(1))
 ```
 
-Upgrade `rake assets:precompile` to update js-routes files in `Rakefile`: 
+Upgrade js building process to update js-routes files in `Rakefile`: 
 
 ``` ruby
-namespace :assets do
-  task :precompile => "js:routes:typescript"
-end
+task "javascript:build" => "js:routes:typescript"
+# For setups without jsbundling-rails
+task "assets:precompile" => "js:routes:typescript"
+
 ```
 
 Add js-routes files to `.gitignore`:

data/lib/js_routes/generators/base.rb

@@ -0,0 +1,16 @@
+
+require "rails/generators"
+
+class JsRoutes::Generators::Base < Rails::Generators::Base
+
+  protected
+
+  def application_js_path
+    [
+      "app/javascript/packs/application.js",
+      "app/javascript/controllers/application.js",
+    ].find do |path|
+      File.exists?(Rails.root.join(path))
+    end
+  end
+end

data/lib/js_routes/generators/middleware.rb

@@ -1,15 +1,17 @@
-require "rails/generators"
+require "js_routes/generators/base"
 
-class JsRoutes::Generators::Middleware < Rails::Generators::Base
+class JsRoutes::Generators::Middleware < JsRoutes::Generators::Base
 
   source_root File.expand_path(__FILE__ + "/../../../templates")
 
   def create_middleware
     copy_file "initializer.rb", "config/initializers/js_routes.rb"
-    inject_into_file "app/javascript/packs/application.js", pack_content
     inject_into_file "config/environments/development.rb", middleware_content, before: /^end\n\z/
     inject_into_file "Rakefile", rakefile_content
     inject_into_file ".gitignore", gitignore_content
+    if path = application_js_path
+      inject_into_file path, pack_content
+    end
     JsRoutes.generate!
     JsRoutes.definitions!
   end
@@ -33,12 +35,11 @@ window.Routes = Routes;
   end
 
   def rakefile_content
+    enhanced_task = Bundler.load.gems.find {|g| g.name = 'jsbundling-rails'} ?
+      "javascript:build" : "assets:precompile"
     <<-RB
-
-# Update js-routes file before assets precompile
-namespace :assets do
-  task :precompile => "js:routes:typescript"
-end
+# Update js-routes file before javascript build
+task "#{enhanced_task}" => "js:routes:typescript"
     RB
   end
 

data/lib/js_routes/generators/webpacker.rb

@@ -9,7 +9,9 @@ class JsRoutes::Generators::Webpacker < Rails::Generators::Base
     copy_file "erb.js", "config/webpack/loaders/erb.js"
     copy_file "routes.js.erb", "app/javascript/routes.js.erb"
     inject_into_file "config/webpack/environment.js", loader_content
-    inject_into_file "app/javascript/packs/application.js", pack_content
+    if path = application_js_path
+      inject_into_file path, pack_content
+    end
     command = Rails.root.join("./bin/yarn add rails-erb-loader")
     run command
   end

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 module JsRoutes
-  VERSION = "2.2.5"
+  VERSION = "2.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -167,6 +167,7 @@ files:
 - lib/js_routes.rb
 - lib/js_routes/configuration.rb
 - lib/js_routes/engine.rb
+- lib/js_routes/generators/base.rb
 - lib/js_routes/generators/middleware.rb
 - lib/js_routes/generators/webpacker.rb
 - lib/js_routes/instance.rb