diff --git a/README.md b/README.md index 7c131df..62c9619 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,24 @@ ![vue on rails](https://vueonrails.com/assets/img/vueonrails.png) -> Vue for your favorite Rails projects +> Vue for your favorite Rails products -The Vue on Rails gem makes it easy to build Vue components on your Rails application. +The Vue on Rails gem makes it easy to build Vue components on your Rails products. It uses Rails 5.x, Vue 2.x, Webpacker 4.x, Ruby 2.x, Node 11.x, Yarn 1.12.x. -- ❄️ Server Side Rendering using Hypernova -- 💎 Compatible with Rails 6/5/4 and Webpacker -- 🌎 Internationalization for component parts - 🖖 Vue UI ready -- 🔨 Component generators and scaffolds -- 📦 Out of the box configuration -- ✂️ Specific-page Vue +- 🐶 Support pug - 🤡 Jest test ready +- ✂️ Specific-page Vue +- 👷🏻️ Asset pipeline helpers - 🎯 Simple state management +- 📦 Out of the box configuration +- 🔨 Component generators and scaffolds +- ❄️ Server Side Rendering using Hypernova - 🗃 Easily migrate to Vuex state management -- 🐶 Support pug -- 👷🏻️ Asset pipeline helpers -- 🏎 Kickstart with our Vue on Rails application template at https://vueonrails.com/vue +- 🌎 Internationalization for component parts +- 💎 Compatible with Rails 6/5/4 and Webpacker +- 🏎 Kickstart with our application template at https://vueonrails.com/vue It ships out-of-the-box configuration, component generators and other solutions to make life easy for both Vue and Rails. diff --git a/lib/installs/setup.rb b/lib/installs/setup.rb index c7bcefb..15129ad 100644 --- a/lib/installs/setup.rb +++ b/lib/installs/setup.rb @@ -1,8 +1,8 @@ # Check for the lack of .babelrc or webpacker 4 def check_version_and_babel #should i check for evidence of webpacker:install? - File.exists?(Rails.root.join(".babelrc")) == false \ - || (Gem.loaded_specs["webpacker"].version < Gem::Version.new('4.x')) == false + (File.exists?(Rails.root.join(".babelrc")) == true) \ + || ((Gem.loaded_specs["webpacker"].version >= Gem::Version.new('4.x')) == false) end begin @@ -33,10 +33,16 @@ def check_version_and_babel "const alias = require('./alias/alias')\n", after: "require('@rails/webpacker')\n" # Add *_pack_tag into application.html.erb This is essential for specific-page vue setup. -pack_tag = <<-eos - <%= javascript_pack_tag 'application' %> - <%= stylesheet_pack_tag 'application' %> -eos +if (Gem.loaded_specs["rails"].version >= Gem::Version.new('6.x')) # rails 6 has default javascript_pack_tag + pack_tag = <<-eos + <%= stylesheet_pack_tag 'application', 'data-turbolinks-track': 'reload' %> + eos +else # non-rails 6 + pack_tag = <<-eos + <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_pack_tag 'application', 'data-turbolinks-track': 'reload' %> + eos +end insert_into_file Rails.root.join("app/views/layouts/application.html.erb").to_s, pack_tag, before: " \n" diff --git a/lib/installs/spv.rb b/lib/installs/spv.rb index 9639959..9721903 100644 --- a/lib/installs/spv.rb +++ b/lib/installs/spv.rb @@ -3,10 +3,17 @@ gsub_file Rails.root.join("app/views/layouts/application.html.erb").to_s, /<\/body>/, '<% end %>' -pack_tag = <<-eos - <%= javascript_pack_tag 'application' %> - <%= stylesheet_pack_tag 'application' %> -eos +if (Gem.loaded_specs["rails"].version >= Gem::Version.new('6.x')) # rails 6 has default javascript_pack_tag + pack_tag = <<-eos + <%= stylesheet_pack_tag 'application', 'data-turbolinks-track': 'reload' %> + eos +else # non-rails 6 + pack_tag = <<-eos + <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_pack_tag 'application', 'data-turbolinks-track': 'reload' %> + eos +end + insert_into_file Rails.root.join("app/views/layouts/application.html.erb").to_s, pack_tag, @@ -18,4 +25,4 @@ insert_into_file Rails.root.join("app/assets/javascripts/application.js").to_s, vue_on_rails, -before: "//= require_tree ." \ No newline at end of file +before: "//= require_tree ." diff --git a/lib/vueonrails/version.rb b/lib/vueonrails/version.rb index 71c7125..b36a3c5 100644 --- a/lib/vueonrails/version.rb +++ b/lib/vueonrails/version.rb @@ -1,3 +1,3 @@ module Vueonrails - VERSION = "1.0.0.beta1" + VERSION = "1.0.0.beta4" end diff --git a/logo.png b/logo.png new file mode 100644 index 0000000..4062358 Binary files /dev/null and b/logo.png differ