Commit 7d0ac32

author

Robert Mosolgo

authored

Merge pull request #703 from Najtmare/fix/webpacker_generator_not_camelizing_file_name

Camelize the file name when webpacker is defined

2 parents ac28d14 + abab872 commit 7d0ac32Copy full SHA for 7d0ac32

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -101,17 +101,19 @@ def create_component_file`
`101`	`101`
`102`	`102`	`# Prefer webpacker to sprockets:`
`103`	`103`	`if defined?(Webpacker)`
	`104`	`+ new_file_name = file_name.camelize`
`104`	`105`	`extension = options[:coffee] ? "coffee" : "js"`
`105`	`106`	`target_dir = Webpacker::Configuration.source_path`
`106`	`107`	`.join("components")`
`107`	`108`	`.relative_path_from(::Rails.root)`
`108`	`109`	`.to_s`
`109`	`110`	`else`
	`111`	`+ new_file_name = file_name`
`110`	`112`	`extension = template_extension`
`111`	`113`	`target_dir = 'app/assets/javascripts/components'`
`112`	`114`	`end`
`113`	`115`
`114`		`- file_path = File.join(target_dir, "#{file_name}.#{extension}")`
	`116`	`+ file_path = File.join(target_dir, "#{new_file_name}.#{extension}")`
`115`	`117`	`template("component.#{template_extension}", file_path)`
`116`	`118`	`end`
`117`	`119`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class CoffeeComponentGeneratorTest < Rails::Generators::TestCase`
`8`	`8`
`9`	`9`	`if WebpackerHelpers.available?`
`10`	`10`	`def filename`
`11`		`- "app/javascript/components/generated_component.coffee"`
	`11`	`+ "app/javascript/components/GeneratedComponent.coffee"`
`12`	`12`	`end`
`13`	`13`	`else`
`14`	`14`	`def filename`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class ComponentGeneratorTest < Rails::Generators::TestCase`
`8`	`8`
`9`	`9`	`if WebpackerHelpers.available?`
`10`	`10`	`def filename`
`11`		`- "app/javascript/components/generated_component.js"`
	`11`	`+ "app/javascript/components/GeneratedComponent.js"`
`12`	`12`	`end`
`13`	`13`	`else`
`14`	`14`	`def filename`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class Es6ComponentGeneratorTest < Rails::Generators::TestCase`
`8`	`8`
`9`	`9`	`if WebpackerHelpers.available?`
`10`	`10`	`def filename`
`11`		`- "app/javascript/components/generated_component.js"`
	`11`	`+ "app/javascript/components/GeneratedComponent.js"`
`12`	`12`	`end`
`13`	`13`	`else`
`14`	`14`	`def filename`

Comments

(0)