-
Notifications
You must be signed in to change notification settings - Fork 94
Support controllers_path generator option for controller and manifest tasks. #152
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jhirn
wants to merge
11
commits into
hotwired:main
Choose a base branch
from
jhirn:stimulus-generator-path-option
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
def4f67
Support js_root generator option for controller and manifest tasks.
jhirn 8e7afca
Use StimulusGenerator .class_options for js_root in rake task.
jhirn 2b4381d
Use .js_root instead place of hash accessor
jhirn 821174b
Inline generator_options as they aren't used elsewhere
jhirn 280e31a
add puts back to stimulus:manifest:display
jhirn 99cd4b0
Style changes
dhh 98e8a2c
Use a fully formed controllers_path
dhh f2dbb1e
Use controllers_path
dhh e90a3d5
Style
dhh f057e18
Fix rebase: controller_path => controller_root
jhirn 496209e
Add tests. Validate controller_path is set and not absolute directory.
jhirn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| require "stimulus/manifest" | ||
| require "generators/stimulus/stimulus_generator" | ||
|
|
||
| module Stimulus | ||
| module Tasks | ||
|
|
@@ -7,6 +8,11 @@ module Stimulus | |
| system RbConfig.ruby, "./bin/rails", "app:template", "LOCATION=#{File.expand_path("../install/#{path}.rb", __dir__)}" | ||
| end | ||
|
|
||
| def controllers_root | ||
| Rails.root.join \ | ||
| StimulusGenerator.new(["stimulus"], Rails.application.config.generators.options.dig(:stimulus), {}).options.controllers_path | ||
| end | ||
|
|
||
| def using_bun? | ||
| Rails.root.join("bun.config.js").exist? | ||
| end | ||
|
|
@@ -47,12 +53,12 @@ namespace :stimulus do | |
| namespace :manifest do | ||
| desc "Show the current Stimulus manifest (all installed controllers)" | ||
| task :display do | ||
| puts Stimulus::Manifest.generate_from(Rails.root.join("app/javascript/controllers")) | ||
| puts Stimulus::Manifest.generate_from(Stimulus::Tasks.controllers_root) | ||
| end | ||
|
|
||
| desc "Update the Stimulus manifest (will overwrite controllers/index.js)" | ||
| task :update do | ||
| Stimulus::Manifest.write_index_from(Rails.root.join("app/javascript/controllers")) | ||
| task update: :environment do | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do we need to add the environment task as a dependency? It doesn't seem necessary. |
||
| Stimulus::Manifest.write_index_from(Stimulus::Tasks.controllers_root) | ||
| end | ||
| end | ||
| end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a little hard to read and still too long in my opinion, I believe the suggestion from @dhh should be good