vue_cli-rails 0.1.4 → 0.1.6

data/lib/tasks/vue.rake

@@ -1,134 +1,37 @@
 namespace :vue do
   desc 'Run vue-cli create and regenerate configuration'
   task :create do
-    pm = VueCli::Rails::NodeEnv.new
-    abort('Cannot find node.js') unless pm.node?
+    require_relative '../helpers/scripts/vue_create'
+    VueCreate.run!
+  end
 
-    get_input = ->(message, list = 'Yn') {
-      list = list.chars
-      default = list.find { |c| c.upcase == c }
-      list = list.map { |c| c == default ? c : c.downcase }.uniq
-      valid = "[#{list.join('')}]"
-      list = list.map(&:downcase)
-      print "#{message} #{valid}"
-      loop do
-        r = STDIN.gets.chop.downcase
-        break default if r == ''
-        break r if list.include?(r)
-        print "  [INVALID!] Please retry: #{valid}:"
-      end
-    }
+  desc 'Add template/style support: formats=pug,sass,less,stylus'
+  task :support, [:formats] do |_t, args|
+    require_relative '../helpers/scripts/vue_command'
+    VueCommand.new.install_format_support(args.formats&.split(/\W/))
+  end
 
-    # 1. package manager
-    yarn = pm.yarn_version
-    npm = pm.npm_version
-    if yarn
-      if npm
-        input = get_input.call('Which package manager to use (Y=Yarn, N=npm)?')
-        pm.use!(input == 'n' ? :npm : :yarn)
-      else
-        pm.use!(:yarn)
-      end
-    elsif npm
-      pm.use!(:npm)
+  desc 'Dump config/vue.yml to JSON: set [js] to get result from vue.rails.js'
+  task :json_config, [:from] => :environment do |_t, args|
+    if args.from == 'js'
+      require_relative '../helpers/lib/cmd'
+      Cmd.run VueCli::Rails::Configuration::JS_CONFIG_CMD
     else
-      abort('Cannot find npm or yarn')
-    end
-    puts "Using package manager: #{pm.package_manager}"
-
-    # install vue-cli
-    unless pm.vue?
-      puts "@vue/cli haven't been installed"
-      pm.global_add('@vue/cli')
-    end
-
-    src_dir = Pathname.new(__FILE__).dirname.join('..', 'source')
-    root = ::Rails.root
-    FileUtils.chdir root
-
-    # 2. vue create .
-    input = 'y'
-    pack = root.join('package.json')
-    if pack.exist?
-      puts 'Detected `package.json`!'
-      input = get_input.call('  Do you want to rerun `vue create?`', 'yN')
-    end
-    pm.exec('vue create', '', "-n -m #{pm.package_manager} .") if input == 'y'
-
-    # 3. dev-dependencies
-    package = JSON.parse(pack.read)
-    dev_deps = package['devDependencies']
-    dd = %w[webpack-assets-manifest js-yaml].find_all do |dep|
-      !dev_deps.key?(dep)
-    end
-    pm.add "-D #{dd.join(' ')}" if dd.any?
-
-    # 4. remove `src` folder
-    src = root.join('src')
-    if src.exist? && src.directory?
-      puts 'Detected `src` folder (should be generated by vue-cli)'
-      input = get_input.call('  Do you want to delete src folder?')
-      FileUtils.rm_rf src if input == 'y'
-    end
-
-    # 5. copy sample codes
-    input = get_input.call('Do you want to copy demo code?', 'yN')
-    FileUtils.cp_r(src_dir.join('app'), root) if input == 'y'
-
-    # 6. config files
-    FileUtils.cp(src_dir.join('vue.rails.js'), "#{root}/")
-    input = 'y'
-    if root.join('vue.config.js').exist?
-      puts 'Detected `vue.config.js`!'
-      input = get_input.call('  Do you want to overwrite vue.config.js?', 'yN')
-    end
-    FileUtils.cp(src_dir.join('vue.config.js'), "#{root}/") if input == 'y'
-
-    # 7. generate config/vue.yml
-    yml_dest = root.join('config', 'vue.yml')
-    if yml_dest.exist?
-      puts 'Detected `config/vue.yml`!'
-      input = get_input.call('  Do you want to overwrite config/vue.yml?')
-    end
-    if input == 'y'
-      yml = src_dir.join('vue.yml').read
-      yml = yml.sub('#PACKAGE_MANAGER', pm.package_manager.to_s)
-      yml_dest.write(yml)
+      config = VueCli::Rails::Configuration.new
+      puts config.to_json
     end
   end
 
-  desc 'Add pug template support: formats=pug,sass,less,stylus'
-  task :support, [:formats] do |_t, args|
-    pkgs = []
-    args.formats.split(/\W/).each do |fmt|
-      pkgs += case fmt
-              when 'pug'
-                %w[pug-plain-loader pug]
-              when 'sass', 'scss'
-                %w[sass-loader node-sass]
-              when 'less'
-                %w[less-loader less]
-              when 'stylus'
-                %w[stylus-loader stylus]
-              else
-                []
-              end
-    end
-    throw(StandardError, '') if pkgs.empty?
-
+  desc 'Build assets: set [with_rails_assets] to invoke assets:precompile as well'
+  task :compile, [:with_rails_assets] => :environment do |_t, args|
     pm = VueCli::Rails::Configuration.instance.node_env
-    pm.add "-D #{pkgs.join(' ')}"
+    pm.exec('vue-cli-service build', env: { 'RAILS_ENV' => ::Rails.env })
+    ::Rake::Task['assets:precompile'].invoke if args.with_rails_assets
   end
 
-  desc 'Dump config/vue.yml to_json'
-  task :json_config => :environment do
-    config = VueCli::Rails::Configuration.new
-    puts config.to_json
-  end
-
-  desc 'Bundle assets for production'
-  task :compile => :environment do
-    pm = VueCli::Rails::Configuration.instance.node_env
-    pm.exec('vue-cli-service build', env: { 'RAILS_ENV' => 'production' })
+  desc 'Install Node way to run Rails dev server alongside webpack-dev-server'
+  task node_dev: :environment do
+    require_relative '../helpers/scripts/vue_command'
+    VueCommand.new.install_node_dev
   end
 end

data/lib/vue_cli/rails/configuration.rb

@@ -7,30 +7,67 @@ module VueCli
       end
 
       def node_env
+        raise(Error, 'Incorrect package_manager in config/vue.yml') if @package_manager.blank?
+
         @node_env ||= NodeEnv.new do |ne|
-          ne.use! @config['package_manager']
+          ne.use! @package_manager
         end
       end
 
+      JS_CONFIG_CMD = %{
+        node -e "console.log(JSON.stringify(require('./vue.rails.js').getSettings(), null, 2))"
+      }.strip.freeze
+
       def load_config(config)
-        r_env = ::Rails.env
-        config = config[r_env]
-        config['env'] = r_env
-        config['root'] = @root.to_s
-        config['entry'] = entry
-
-        public_output_path = config['public_output_path'] || 'vue_assets'
-        config['outputDir'] = File.join(resolve('public'), public_output_path)
-        config['publicPath'] = File.join('/', public_output_path, '/')
-        resolve_config(config, 'manifestOutput')
-
-        cfg_alias = config['alias']
-        cfg_alias.keys.each { |k| resolve_config(cfg_alias, k) }
-        dev_server = config['devServer'] || {}
+        config = config[::Rails.env]
+        c = {
+          'configureWebpack' => {
+            'entry' => entry,
+            'resolve' => {},
+          },
+        }
+        @package_manager = config['package_manager']
+        cw = c['configureWebpack']
+
+        c['env'] = ::Rails.env
+        c['root'] = @root.to_s
+        cw['output'] = config['js_output'] if config['js_output'].present?
+        c['manifestOutput'] = config['manifest_output']
+        unless c['manifestOutput'].presence
+          raise(Error, 'Incorrect manifest_output in config/vue.yml')
+        end
+
+        public_output_path = c['public_output_path'] || 'vue_assets'
+        c['outputDir'] = File.join(resolve('public'), public_output_path)
+        c['publicPath'] = File.join('/', public_output_path, '/')
+
+        %w[
+          launch_node
+          modern
+
+          filenameHashing
+          lintOnSave
+          runtimeCompiler
+          transpileDependencies
+          productionSourceMap
+          crossorigin
+          css
+          devServer
+          parallel
+          pwa
+          pluginOptions
+        ].each { |k| c[k] = config[k] if config.key?(k) }
+
+        resolve_config(c, 'manifestOutput')
+        config['alias']&.tap do |aliases|
+          aliases.each_key { |k| resolve_config(aliases, k) }
+          cw['resolve']['alias'] = aliases
+        end
+        dev_server = c['devServer'] || {}
         resolve_config(dev_server, 'contentBase')
 
-        self.class.manifest_file = config['manifestOutput']
-        @config = config
+        self.class.manifest_file = c['manifestOutput']
+        @config = c
       end
 
       def [](path)
@@ -47,7 +84,7 @@ module VueCli
       end
 
       def to_json
-        @config.to_json
+        JSON.pretty_generate(@config)
       end
 
       def manifest_data
@@ -60,12 +97,12 @@ module VueCli
         end
 
         def manifest_file=(val)
-          @manifest_file = Pathname.new(val)
+          @manifest_file = val ? Pathname.new(val) : nil
         end
 
         def manifest
           @manifest ||= OpenStruct.new(mtime: nil, data: {})
-          if @manifest_file.exist? && @manifest.mtime != @manifest_file.mtime
+          if @manifest_file&.exist? && @manifest.mtime != @manifest_file.mtime
             @manifest.mtime = @manifest_file.mtime
             @manifest.data = JSON.parse(@manifest_file.read)
           end
@@ -89,7 +126,7 @@ module VueCli
 
       def resolve_config(config, key, default = nil)
         path = config[key] || default
-        config[key] = resolve(path) if path.present?
+        config[key] = resolve(path) if path.present? && path.is_a?(String)
       end
     end
   end

data/lib/vue_cli/rails/dev_server_proxy.rb

@@ -12,9 +12,9 @@ module VueCli
 
       def perform_request(env)
         if env['PATH_INFO'].start_with?(@assets_path)
-          env["HTTP_HOST"] = env["HTTP_X_FORWARDED_HOST"] = env["HTTP_X_FORWARDED_SERVER"] = @host
-          env["HTTP_X_FORWARDED_PROTO"] = env["HTTP_X_FORWARDED_SCHEME"] = 'http'
-          env["SCRIPT_NAME"] = ''
+          env['HTTP_HOST'] = env['HTTP_X_FORWARDED_HOST'] = env['HTTP_X_FORWARDED_SERVER'] = @host
+          env['HTTP_X_FORWARDED_PROTO'] = env['HTTP_X_FORWARDED_SCHEME'] = 'http'
+          env['SCRIPT_NAME'] = ''
           super(env)
         else
           @app.call(env)

data/lib/vue_cli/rails/engine.rb

@@ -1,17 +1,13 @@
 module VueCli
   module Rails
     require 'vue_cli/rails/helper'
-    USE_PROXY_MIDDLEWARE = ::Rails.env.development? && defined?(::Rails::Server)
-    require 'vue_cli/rails/dev_server_proxy' if USE_PROXY_MIDDLEWARE
 
     class Engine < ::Rails::Engine
       initializer 'vue_cli' do |app|
-        if USE_PROXY_MIDDLEWARE
+        if ::Rails.env.development? && defined?(::Rails::Server)
+          require 'vue_cli/rails/dev_server_proxy'
           app.middleware.insert_before 0, DevServerProxy
-          fork do
-            config = Configuration.instance
-            config.node_env.exec(config['launch_node'] || 'vue-cli-service serve')
-          end
+          Engine.start_wds! if ENV['NO_WEBPACK_DEV_SERVER'].blank?
         end
 
         ::ActiveSupport.on_load :action_controller do
@@ -22,6 +18,19 @@ module VueCli
           include Helper
         end
       end
+
+      def self.start_wds!
+        fork do
+          config = Configuration.instance
+          port = config['devServer']&.dig('port')
+          if port
+            running = `lsof -i:#{port} -sTCP:LISTEN -Pn`&.chop.presence&.split("\n")
+            pid = running&.dig(1)&.split(/\s+/, 3)&.dig(1)
+            Process.kill('INT', pid.to_i) if pid.present?
+          end
+          config.node_env.exec(config['launch_dev_service'] || 'vue-cli-service serve')
+        end
+      end
     end
   end
 end

data/lib/vue_cli/rails/node_env.rb

@@ -8,6 +8,16 @@ module VueCli
         yield(self) if block_given?
       end
 
+      def use!(manager)
+        @pm = manager.to_sym
+        raise(ArgumentError, "Unsupported manager: #{@pm}") unless %i[npm yarn].include?(@pm)
+        raise(VueCli::Rails::Error, "Not installed: #{@pm}") unless try(:"#{@pm}?")
+      end
+
+      def reset
+        @versions = {}
+      end
+
       NODE_BIN_LIST.each do |bin|
         define_method :"#{bin}_version" do
           get_version_of(bin)
@@ -18,27 +28,21 @@ module VueCli
         end
       end
 
-      def use!(pm)
-        @pm = pm.to_sym
-        raise(ArgumentError, "Unsupported manager: #{@pm}") unless %i[npm yarn].include?(@pm)
-        raise(VueCli::Rails::Error, "Not installed: #{@pm}") unless self.try(:"#{@pm}?")
-      end
-
       def package_manager
         @pm
       end
 
       def exec(command, args = nil, extra = nil, env: {})
         cmd = COMMAND_LINE[command.to_sym] || {}
-        if @pm == :yarn && cmd[:yarn]
-          cmd = cmd[:yarn]
-        elsif @pm == :npm && cmd[:npm]
-          cmd = cmd[:npm]
-        elsif cmd[:npx]
-          cmd = @pm == :yarn ? "yarn exec #{cmd[:npx]}" : "npx #{cmd[:npx]}"
-        else
-          cmd = @pm == :yarn ? "yarn exec #{command}" : "npx #{command}"
-        end
+        cmd = if @pm == :yarn && cmd[:yarn]
+                cmd[:yarn]
+              elsif @pm == :npm && cmd[:npm]
+                cmd[:npm]
+              elsif cmd[:npx]
+                @pm == :yarn ? "yarn exec #{cmd[:npx]}" : "npx #{cmd[:npx]}"
+              else
+                @pm == :yarn ? "yarn exec #{command}" : "npx #{command}"
+              end
 
         cmd = "#{cmd} #{args}" if args.present?
         cmd = "#{cmd} #{@pm == :yarn ? '-- ' : ''}#{extra}" if extra.present?
@@ -49,11 +53,15 @@ module VueCli
       COMMAND_LINE = {
         add: {
           yarn: 'yarn add',
-          npm: 'npm i -S',
+          npm: 'npm i',
         },
         global_add: {
           yarn: 'yarn global add',
-          npm: 'npm i -g'
+          npm: 'npm i -g',
+        },
+        install: {
+          yarn: '',
+          npm: 'npm i',
         },
       }.freeze
 
@@ -66,14 +74,14 @@ module VueCli
       def get_version_of(bin)
         return @versions[bin] if @versions.key?(bin)
 
-        r = `#{bin} --version`.strip.presence rescue nil
-        @versions[bin] = r && r.start_with?('v') ? r[1..-1] : r
+        r = begin
+              `#{bin} --version`.strip.presence
+            rescue StandardError
+              nil
+            end
+        @versions[bin] = r&.start_with?('v') ? r[1..-1] : r
         @versions[bin]
       end
-
-      def version_ge?(v1, v2)
-        Gem::Version.new(v1) >= Gem::Version.new(v2)
-      end
     end
   end
 end

data/lib/vue_cli/rails/version.rb

@@ -1,5 +1,5 @@
 module VueCli
   module Rails
-    VERSION = "0.1.4"
+    VERSION = '0.1.6'.freeze
   end
 end

data/lib/vue_cli/rails.rb

@@ -1,4 +1,4 @@
-require "vue_cli/rails/version"
+require 'vue_cli/rails/version'
 require 'vue_cli/rails/configuration'
 require 'vue_cli/rails/node_env'
 

data/vue_cli-rails.gemspec

@@ -1,30 +1,30 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "vue_cli/rails/version"
+require 'vue_cli/rails/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "vue_cli-rails"
+  spec.name          = 'vue_cli-rails'
   spec.version       = VueCli::Rails::VERSION
-  spec.authors       = ["James Chen"]
-  spec.email         = ["egustc@gmail.com"]
+  spec.authors       = ['James Chen']
+  spec.email         = ['egustc@gmail.com']
 
-  spec.summary       = %q{Get vue-cli working with Rails}
-  spec.homepage      = "https://github.com/eGust/vue_cli-rails"
-  spec.license       = "MIT"
+  spec.summary       = 'Get vue-cli working with Rails'
+  spec.homepage      = 'https://github.com/eGust/vue_cli-rails'
+  spec.license       = 'MIT'
 
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.required_ruby_version = ">= 2.2"
+  spec.required_ruby_version = '>= 2.3'
 
-  spec.add_dependency "activesupport", ">= 4.2"
-  spec.add_dependency "railties",      ">= 4.2"
-  spec.add_dependency "rack-proxy",    ">= 0.6"
+  spec.add_dependency 'activesupport', '>= 4.2'
+  spec.add_dependency 'rack-proxy',    '>= 0.6'
+  spec.add_dependency 'railties',      '>= 4.2'
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vue_cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - James Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: rack-proxy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: rack-proxy
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +117,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -111,6 +126,13 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/helpers/lib.rb
+- lib/helpers/lib/cmd.rb
+- lib/helpers/lib/common.rb
+- lib/helpers/lib/input_loop.rb
+- lib/helpers/scripts/install_rails.rb
+- lib/helpers/scripts/vue_command.rb
+- lib/helpers/scripts/vue_create.rb
 - lib/source/app/assets/vue/components/layouts/App.vue
 - lib/source/app/assets/vue/components/layouts/index.js
 - lib/source/app/assets/vue/components/views/Bar.vue
@@ -133,6 +155,7 @@ files:
 - lib/vue_cli/rails/helper.rb
 - lib/vue_cli/rails/node_env.rb
 - lib/vue_cli/rails/version.rb
+- tmp/.keep
 - vue_cli-rails.gemspec
 homepage: https://github.com/eGust/vue_cli-rails
 licenses:
@@ -146,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="