From 5545a95cc84aca5d1548d568128090621e66f6ec Mon Sep 17 00:00:00 2001 From: ytbryan Date: Mon, 7 Jan 2019 23:44:25 +0800 Subject: [PATCH 1/9] Use babel.config.js provided by webpacker 4. Get ready with vue on rails 1.0.0.beta1 --- lib/installs/setup.rb | 13 ------------- lib/vueonrails/version.rb | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/lib/installs/setup.rb b/lib/installs/setup.rb index 217c6d7..df86099 100644 --- a/lib/installs/setup.rb +++ b/lib/installs/setup.rb @@ -56,19 +56,6 @@ insert_into_file Rails.root.join("package.json").to_s, scripts, after: "\"private\": true,\n" -babelrc = <<-eos - "env": { - "test": { - "presets": [ - ["env", { "targets": { "node": "current" }}] - ] - } - }, -eos - -insert_into_file Rails.root.join(".babelrc").to_s, -babelrc, before: " \"presets\": [" - # Insert locale.js as a default i18n and add second locale cn.yml 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 diff --git a/lib/vueonrails/version.rb b/lib/vueonrails/version.rb index 7e8f009..71c7125 100644 --- a/lib/vueonrails/version.rb +++ b/lib/vueonrails/version.rb @@ -1,3 +1,3 @@ module Vueonrails - VERSION = "0.3.0" + VERSION = "1.0.0.beta1" end From 2bdee007210da02fcefb700374c1ba4cddb5e718 Mon Sep 17 00:00:00 2001 From: ytbryan Date: Thu, 10 Jan 2019 13:09:51 +0800 Subject: [PATCH 2/9] Support pug in Vue on Rails Install pug dependencies and insert its configuration Generate component with pug template --- CHANGELOG.md | 1 + lib/generators/options/pug.rb | 14 ++++++++++++++ lib/generators/vue/vue_generator.rb | 1 + lib/installs/loaders/pug.js | 15 +++++++++++++++ lib/installs/pug.rb | 12 ++++++++++++ lib/tasks/vue.rake | 3 ++- 6 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 lib/generators/options/pug.rb create mode 100644 lib/installs/loaders/pug.js create mode 100644 lib/installs/pug.rb diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ff1f0c..f4dff50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,3 +13,4 @@ - Vue on Rails application template using `rails new app -m https://vueonrails.com/vue -d postgresql` - Support Babel 7 - Support webpack 4 & Webpacker 4 +- Support pre-processor like pug diff --git a/lib/generators/options/pug.rb b/lib/generators/options/pug.rb new file mode 100644 index 0000000..910a57b --- /dev/null +++ b/lib/generators/options/pug.rb @@ -0,0 +1,14 @@ +pugtemplate = <<-eos + +eos + +if options[:seperate] == true + gsub_file Rails.root.join("#{PARTS_PATH}/#{name}/#{name}.vue").to_s, + /