mirror of https://github.com/mastodon/mastodon
Update dependencies for Ruby (2017-10-30) (#5566)
* Update better_errors to version 2.4.0 * Update binding_of_caller to version 0.7.3 * Update bootsnap to version 1.1.5 * Update browser to version 2.5.2 * Update capistrano to version 3.10.0 * Update capistrano-bundler to version 1.3.0 * Update capistrano-rbenv to version 2.1.2 * Update capybara to version 2.15.4 * Update cld3 to version 3.2.1 * Update fabrication to version 2.18.0 * Update fog-openstack to version 0.1.22 * Update kaminari to version 1.1.1 * Update lograge to version 0.7.1 * Update nokogiri to version 1.8.1 * Update oj to version 3.3.9 * Update ox to version 2.8.1 * Update parallel_tests to version 2.17.0 * Update pkg-config to version 1.2.8 * Update rspec-rails to version 3.7.1 * Update rubocop to version 0.51.0 * Update scss_lint to version 0.55.0 * Update sidekiq to version 5.0.5 * Update sidekiq-scheduler to version 2.1.10 * Update tzinfo-data to version 1.2017.3 * Update webpacker to version 3.0.2 * bundle updatepull/5561/merge
Yamagishi Kazutoshi
7 years ago
committed by
Eugen Rochko
parent
b254e6ca5f
commit
a2a4bf4e78
@ -1,27 +1,17 @@
|
||||
#!/usr/bin/env ruby
|
||||
$stdout.sync = true
|
||||
# frozen_string_literal: true
|
||||
#
|
||||
# This file was generated by Bundler.
|
||||
#
|
||||
# The application 'webpack' is installed as part of a gem, and
|
||||
# this file is here to facilitate running it.
|
||||
#
|
||||
|
||||
require "shellwords"
|
||||
require "pathname"
|
||||
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
|
||||
Pathname.new(__FILE__).realpath)
|
||||
|
||||
ENV["RAILS_ENV"] ||= "development"
|
||||
RAILS_ENV = ENV["RAILS_ENV"]
|
||||
require "rubygems"
|
||||
require "bundler/setup"
|
||||
|
||||
ENV["NODE_ENV"] ||= RAILS_ENV
|
||||
NODE_ENV = ENV["NODE_ENV"]
|
||||
|
||||
APP_PATH = File.expand_path("../", __dir__)
|
||||
NODE_MODULES_PATH = File.join(APP_PATH, "node_modules")
|
||||
WEBPACK_CONFIG = File.join(APP_PATH, "config/webpack/#{NODE_ENV}.js")
|
||||
|
||||
unless File.exist?(WEBPACK_CONFIG)
|
||||
puts "Webpack configuration not found."
|
||||
puts "Please run bundle exec rails webpacker:install to install webpacker"
|
||||
exit!
|
||||
end
|
||||
|
||||
env = { "NODE_PATH" => NODE_MODULES_PATH.shellescape }
|
||||
cmd = [ "#{NODE_MODULES_PATH}/.bin/webpack", "--config", WEBPACK_CONFIG ] + ARGV
|
||||
|
||||
Dir.chdir(APP_PATH) do
|
||||
exec env, *cmd
|
||||
end
|
||||
load Gem.bin_path("webpacker", "webpack")
|
||||
|
||||
@ -1,68 +1,17 @@
|
||||
#!/usr/bin/env ruby
|
||||
$stdout.sync = true
|
||||
|
||||
require "shellwords"
|
||||
require "yaml"
|
||||
require "socket"
|
||||
|
||||
ENV["RAILS_ENV"] ||= "development"
|
||||
RAILS_ENV = ENV["RAILS_ENV"]
|
||||
|
||||
ENV["NODE_ENV"] ||= RAILS_ENV
|
||||
NODE_ENV = ENV["NODE_ENV"]
|
||||
|
||||
APP_PATH = File.expand_path("../", __dir__)
|
||||
CONFIG_FILE = File.join(APP_PATH, "config/webpacker.yml")
|
||||
NODE_MODULES_PATH = File.join(APP_PATH, "node_modules")
|
||||
WEBPACK_CONFIG = File.join(APP_PATH, "config/webpack/#{NODE_ENV}.js")
|
||||
|
||||
DEFAULT_LISTEN_HOST_ADDR = NODE_ENV == 'development' ? 'localhost' : '0.0.0.0'
|
||||
|
||||
def args(key)
|
||||
index = ARGV.index(key)
|
||||
index ? ARGV[index + 1] : nil
|
||||
end
|
||||
|
||||
begin
|
||||
dev_server = YAML.load_file(CONFIG_FILE)[RAILS_ENV]["dev_server"]
|
||||
|
||||
HOSTNAME = args('--host') || dev_server["host"]
|
||||
PORT = args('--port') || dev_server["port"]
|
||||
HTTPS = ARGV.include?('--https') || dev_server["https"]
|
||||
DEV_SERVER_ADDR = "http#{"s" if HTTPS}://#{HOSTNAME}:#{PORT}"
|
||||
LISTEN_HOST_ADDR = args('--listen-host') || DEFAULT_LISTEN_HOST_ADDR
|
||||
|
||||
rescue Errno::ENOENT, NoMethodError
|
||||
$stdout.puts "Webpack dev_server configuration not found in #{CONFIG_FILE}."
|
||||
$stdout.puts "Please run bundle exec rails webpacker:install to install webpacker"
|
||||
exit!
|
||||
end
|
||||
|
||||
begin
|
||||
server = TCPServer.new(LISTEN_HOST_ADDR, PORT)
|
||||
server.close
|
||||
|
||||
rescue Errno::EADDRINUSE
|
||||
$stdout.puts "Another program is running on port #{PORT}. Set a new port in #{CONFIG_FILE} for dev_server"
|
||||
exit!
|
||||
end
|
||||
|
||||
# Delete supplied host, port and listen-host CLI arguments
|
||||
["--host", "--port", "--listen-host"].each do |arg|
|
||||
ARGV.delete(args(arg))
|
||||
ARGV.delete(arg)
|
||||
end
|
||||
|
||||
env = { "NODE_PATH" => NODE_MODULES_PATH.shellescape }
|
||||
|
||||
cmd = [
|
||||
"#{NODE_MODULES_PATH}/.bin/webpack-dev-server", "--progress", "--color",
|
||||
"--config", WEBPACK_CONFIG,
|
||||
"--host", LISTEN_HOST_ADDR,
|
||||
"--public", "#{HOSTNAME}:#{PORT}",
|
||||
"--port", PORT.to_s
|
||||
] + ARGV
|
||||
|
||||
Dir.chdir(APP_PATH) do
|
||||
exec env, *cmd
|
||||
end
|
||||
# frozen_string_literal: true
|
||||
#
|
||||
# This file was generated by Bundler.
|
||||
#
|
||||
# The application 'webpack-dev-server' is installed as part of a gem, and
|
||||
# this file is here to facilitate running it.
|
||||
#
|
||||
|
||||
require "pathname"
|
||||
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
|
||||
Pathname.new(__FILE__).realpath)
|
||||
|
||||
require "rubygems"
|
||||
require "bundler/setup"
|
||||
|
||||
load Gem.bin_path("webpacker", "webpack-dev-server")
|
||||
|
||||
Loading…
Reference in New Issue