diff --git a/Gemfile b/Gemfile index 28b94a9..6e66c50 100644 --- a/Gemfile +++ b/Gemfile @@ -3,12 +3,4 @@ gemspec gem "twenty-cli", path: "./twenty-cli" gem "twenty-server", path: "./twenty-server" gem "twenty-client", path: "./twenty-client" - -require 'rbconfig' gem "listen" -case RbConfig::CONFIG['target_os'] -when /(?i-mx:bsd|dragonfly)/ - gem 'rb-kqueue', '>= 0.2' -else - # Poll -end diff --git a/twenty-client/Gemfile.lock b/twenty-client/Gemfile.lock index 27968bf..11efedc 100644 --- a/twenty-client/Gemfile.lock +++ b/twenty-client/Gemfile.lock @@ -60,8 +60,8 @@ GEM nanoc-checking (~> 1.0) nanoc-cli (~> 4.11, >= 4.11.15) nanoc-core (~> 4.11, >= 4.11.15) - nanoc-webpack.rb (0.5.6) - ryo.rb (~> 0.4) + nanoc-webpack.rb (0.8.0) + ryo.rb (~> 0.5) parallel (1.24.0) parser (3.3.0.5) ast (~> 2.4.1) @@ -97,7 +97,7 @@ GEM rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (1.13.0) - ryo.rb (0.4.7) + ryo.rb (0.5.1) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -137,7 +137,7 @@ PLATFORMS DEPENDENCIES listen (~> 3.8) nanoc (~> 4.12) - nanoc-webpack.rb (~> 0.5) + nanoc-webpack.rb (~> 0.8) rainpress (~> 1.0) sass (~> 3.7) standard (~> 1.35) diff --git a/twenty-client/Rules b/twenty-client/Rules index 3053309..bbe9dbf 100644 --- a/twenty-client/Rules +++ b/twenty-client/Rules @@ -4,9 +4,8 @@ require "nanoc-webpack" buildenv = ENV["buildenv"] || "development" -Nanoc::Webpack.default_options.merge!( - "--config" => "webpack.#{buildenv}.js" -) +Nanoc::Webpack.default_argv.concat ["--config", "webpack.#{buildenv}.js"] + def require_rules(rules, locals = {}, target = binding) locals.each { target.local_variable_set(_1, _2) } diff --git a/twenty-client/twenty-client.gemspec b/twenty-client/twenty-client.gemspec index f8d1ecd..7941860 100644 --- a/twenty-client/twenty-client.gemspec +++ b/twenty-client/twenty-client.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |gem| gem.add_development_dependency "nanoc", "~> 4.12" gem.add_development_dependency "sass", "~> 3.7" gem.add_development_dependency "rainpress", "~> 1.0" - gem.add_development_dependency "nanoc-webpack.rb", "~> 0.5" + gem.add_development_dependency "nanoc-webpack.rb", "~> 0.8" gem.add_development_dependency "listen", "~> 3.8" gem.add_development_dependency "standard", "~> 1.35" end diff --git a/twenty-client/twenty-client.gemspec.erb b/twenty-client/twenty-client.gemspec.erb index d3a3d15..0d38545 100644 --- a/twenty-client/twenty-client.gemspec.erb +++ b/twenty-client/twenty-client.gemspec.erb @@ -17,7 +17,7 @@ Gem::Specification.new do |gem| gem.add_development_dependency "nanoc", "~> 4.12" gem.add_development_dependency "sass", "~> 3.7" gem.add_development_dependency "rainpress", "~> 1.0" - gem.add_development_dependency "nanoc-webpack.rb", "~> 0.5" + gem.add_development_dependency "nanoc-webpack.rb", "~> 0.8" gem.add_development_dependency "listen", "~> 3.8" gem.add_development_dependency "standard", "~> 1.35" end