rename generator_templates to templates

use `ActionController::Base` instead `ApplicationController` prep for next PR and release
vueonrails · Jan 4, 2019 · e5df256 · e5df256
1 parent 761055f
commit e5df256
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,3 +11,5 @@
 - Vue UI ready
 - State management with simple store https://vuejs.org/v2/guide/state-management.html
 - Vue on Rails application template using `rails new app -m https://vueonrails.com/vue -d postgresql`
+- Support Babel 7
+- Support webpack 4 & Webpacker 4
diff --git a/app/controllers/vue_controller.rb b/app/controllers/vue_controller.rb
@@ -1,2 +1,2 @@
-class VueController < ApplicationController
+class VueController < ActionController::Base
 end
diff --git a/...enerators/generator_templates/I18n/cn.yml → lib/generators/templates/I18n/cn.yml b/...enerators/generator_templates/I18n/cn.yml → lib/generators/templates/I18n/cn.yml
diff --git a/...erators/generator_templates/I18n/index.js → lib/generators/templates/I18n/index.js b/...erators/generator_templates/I18n/index.js → lib/generators/templates/I18n/index.js
diff --git a/...s/generator_templates/forms/index.vue.erb → lib/generators/templates/forms/index.vue.erb b/...s/generator_templates/forms/index.vue.erb → lib/generators/templates/forms/index.vue.erb
diff --git a/...ators/generator_templates/packs/index.css → lib/generators/templates/packs/index.css b/...ators/generator_templates/packs/index.css → lib/generators/templates/packs/index.css
diff --git a/...rators/generator_templates/packs/index.js → lib/generators/templates/packs/index.js b/...rators/generator_templates/packs/index.js → lib/generators/templates/packs/index.js
diff --git a/...ators/generator_templates/packs/index.vue → lib/generators/templates/packs/index.vue b/...ators/generator_templates/packs/index.vue → lib/generators/templates/packs/index.vue
diff --git a/...ors/generator_templates/packs/pack.js.erb → lib/generators/templates/packs/pack.js.erb b/...ors/generator_templates/packs/pack.js.erb → lib/generators/templates/packs/pack.js.erb
diff --git a/...emplates/single_file_components/index.vue → ...emplates/single_file_components/index.vue b/...emplates/single_file_components/index.vue → ...emplates/single_file_components/index.vue
diff --git a/...ators/generator_templates/stores/index.js → lib/generators/templates/stores/index.js b/...ators/generator_templates/stores/index.js → lib/generators/templates/stores/index.js
diff --git a/...rs/generator_templates/tests/index.js.erb → lib/generators/templates/tests/index.js.erb b/...rs/generator_templates/tests/index.js.erb → lib/generators/templates/tests/index.js.erb
diff --git a/...nerator_templates/turbolinks/index.js.erb → ...erators/templates/turbolinks/index.js.erb b/...nerator_templates/turbolinks/index.js.erb → ...erators/templates/turbolinks/index.js.erb
diff --git a/lib/generators/vue/vue_generator.rb b/lib/generators/vue/vue_generator.rb
@@ -5,7 +5,7 @@ class VueGenerator < Rails::Generators::NamedBase
   PARTS_PATH = "app/javascript/parts"
   TESTS_PATH = "app/javascript/tests"
 
-  source_root File.expand_path('../../generator_templates', __FILE__)
+  source_root File.expand_path('../../templates', __FILE__)
 
   argument :name, type: :string, default: nil
 

diff --git a/lib/installs/setup.rb b/lib/installs/setup.rb
@@ -70,11 +70,11 @@
 babelrc, before: "  \"presets\": ["
 
 # Insert locale.js as a default i18n and add second locale cn.yml
-copy_file "#{__dir__}/../generators/generator_templates/i18n/index.js", Rails.root.join("app/javascript/locales/locale.js").to_s
-copy_file "#{__dir__}/../generators/generator_templates/i18n/cn.yml", Rails.root.join("config/locales/cn.yml").to_s
+copy_file "#{__dir__}/../generators/templates/i18n/index.js", Rails.root.join("app/javascript/locales/locale.js").to_s
+copy_file "#{__dir__}/../generators/templates/i18n/cn.yml", Rails.root.join("config/locales/cn.yml").to_s
 
 # Insert store.js as a simple store for components' state 
-copy_file "#{__dir__}/../generators/generator_templates/stores/index.js", Rails.root.join("app/javascript/parts/store.js").to_s
+copy_file "#{__dir__}/../generators/templates/stores/index.js", Rails.root.join("app/javascript/parts/store.js").to_s
 
 # Add Procfile for foreman
 template "#{__dir__}/Procfile",  Rails.root.join("Procfile").to_s
@@ -83,4 +83,4 @@
 gsub_file Rails.root.join("app/views/layouts/application.html.erb").to_s, 
 /<body>/, '<%= content_tag :body, class: specific_page_vue do %>'
 gsub_file Rails.root.join("app/views/layouts/application.html.erb").to_s, 
-/<\/body>/, '<% end %>'
+/<\/body>/, '<% end %>'
diff --git a/vueonrails.gemspec b/vueonrails.gemspec
@@ -21,5 +21,4 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'rspec', '~> 3.8', '>= 3.8.0'
 end