shakapacker 6.4.0 → 6.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41d452e91baefc4e4235ab82c30a8a5fb6cfa98854016124f8214b8b2f475986
-  data.tar.gz: '08fb5cd0691f29a12862b827d1fc247565300256e21ba2dead9a2e1d128cc2a2'
+  metadata.gz: c2ce3fcf970a230e5d52a78be7e8acd7b7bd11338a33a24f1d1ad55b6636ff3c
+  data.tar.gz: 239818a24f0db0e7239a2d114f387b0e3990127350b3e900ee8c2e358fa800dc
 SHA512:
-  metadata.gz: c39f8cd91ea7a0a786341ddbc115d91c30dee7826914c0fcb85ab1f9e52b0719706b4d7343922184f8beefaa20de7fa7d7fa760a36bb06e2f73c38a6d965d792
-  data.tar.gz: c70a8973e7f69d60ceab67055b6c597b8ace1ba72137b2dc4a3902f9e3fae71f393aaa4dc82f5253f57c3e559b56b0d2a12f4f3234f0249c234b8f3106162b3c
+  metadata.gz: b587960642b7351b54a429dcff2230d0fc08aba1cd8c48d9460c19c981d29262d6e1010d07ebaddaf96f7b1f0154de7b9b99c5263b75f7207c1ee9c647b9941c
+  data.tar.gz: 2574d2356fc023d4a7747c3e4f594042c85553d7c8b429fda2a6fe76e0a87e67fdb8bb478ed5c4267541dfb38b599c0af6c760b417df44b7f4ae6a6337ec7c66

data/CHANGELOG.md

@@ -8,6 +8,14 @@ Changes since last non-beta release.
 
 _Please add entries here for your pull requests that are not yet released._
 
+## [v6.4.1] - June 5, 2022
+### Fixed
+- Restores automatic installation of yarn packages removed in [#131](https://github.com/shakacode/shakapacker/pull/131), with added deprecation notice. [PR 140](https://github.com/shakacode/shakapacker/pull/140) by [tomdracz](https://github.com/tomdracz).
+
+  This will be again removed in Shakapacker v7 so you need to ensure you are installing yarn packages explicitly before the asset compilation, rather than relying on this behaviour through `asset:precompile` task (e.g. Capistrano deployment).
+
+- Disable Spring being used by `rails-erb-loader`. [PR 141](https://github.com/shakacode/shakapacker/pull/141) by [tomdracz](https://github.com/tomdracz).
+
 ## [v6.4.0] - June 2, 2022
 ### Fixed
 - Fixed [Issue 123: Rails 7.0.3 - Webpacker configuration file not found when running rails webpacker:install (shakapacker v6.3)](https://github.com/shakacode/shakapacker/issues/123) in [PR 136: Don't enhance precompile if no config #136](https://github.com/shakacode/shakapacker/pull/136) by [justin808](https://github.com/justin808).
@@ -137,7 +145,8 @@ Note: [Rubygem is 6.3.0.pre.rc.1](https://rubygems.org/gems/shakapacker/versions
 ## v5.4.3 and prior changes from rails/webpacker
 See [CHANGELOG.md in rails/webpacker (up to v5.4.3)](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) 
 
-[Unreleased]: https://github.com/shakacode/shakapacker/compare/v6.4.0...master
+[Unreleased]: https://github.com/shakacode/shakapacker/compare/v6.4.1...master
+[v6.4.1]: https://github.com/shakacode/shakapacker/compare/v6.4.0...v6.4.1
 [v6.4.0]: https://github.com/shakacode/shakapacker/compare/v6.3.0...v6.4.0
 [v6.3.0]: https://github.com/shakacode/shakapacker/compare/v6.2.1...v6.3.0
 [v6.2.1]: https://github.com/shakacode/shakapacker/compare/v6.2.0...v6.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shakapacker (6.3.0)
+    shakapacker (6.4.0)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
@@ -99,8 +99,8 @@ GEM
       racc (~> 1.4)
     nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     racc (1.6.0)
     rack (2.2.3.1)
@@ -134,21 +134,21 @@ GEM
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
-    rubocop (1.21.0)
+    rubocop (1.30.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.11.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
     rubocop-performance (1.11.5)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)

data/lib/tasks/webpacker/compile.rake

@@ -1,8 +1,16 @@
 $stdout.sync = true
 
+def yarn_install_available?
+  rails_major = Rails::VERSION::MAJOR
+  rails_minor = Rails::VERSION::MINOR
+
+  rails_major > 5 || (rails_major == 5 && rails_minor >= 1)
+end
+
 def enhance_assets_precompile
   # yarn:install was added in Rails 5.1
-  Rake::Task["assets:precompile"].enhance do |task|
+  deps = yarn_install_available? ? [] : ["webpacker:yarn_install"]
+  Rake::Task["assets:precompile"].enhance(deps) do |task|
     prefix = task.name.split(/#|assets:precompile/).first
 
     Rake::Task["#{prefix}webpacker:compile"].invoke
@@ -29,6 +37,6 @@ if Webpacker.config.webpacker_precompile?
   if Rake::Task.task_defined?("assets:precompile")
     enhance_assets_precompile
   else
-    Rake::Task.define_task("assets:precompile" => ["webpacker:compile"])
+    Rake::Task.define_task("assets:precompile" => ["webpacker:yarn_install", "webpacker:compile"])
   end
 end

data/lib/tasks/webpacker/yarn_install.rake

@@ -0,0 +1,24 @@
+namespace :webpacker do
+  desc "Support for older Rails versions. Install all JavaScript dependencies as specified via Yarn"
+  task :yarn_install do
+    warn <<~MSG.strip
+      Shakapacker - Automatic installation of yarn packages is deprecated
+      Automatic installation of yarn packages when assets are precompiled is deprecated and will be removed in Shakapacker v7.
+      Please ensure you are installing yarn packages explicitly before the asset compilation.
+    MSG
+
+    valid_node_envs = %w[test development production]
+    node_env = ENV.fetch("NODE_ENV") do
+      valid_node_envs.include?(Rails.env) ? Rails.env : "production"
+    end
+    Dir.chdir(Rails.root) do
+      yarn_flags =
+        if `yarn --version`.start_with?("1")
+          "--no-progress --frozen-lockfile"
+        else
+          "--immutable"
+        end
+      system({ "NODE_ENV" => node_env }, "yarn install #{yarn_flags}")
+    end
+  end
+end

data/lib/tasks/yarn.rake

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# Duplicate of the yarn tasks still present in Rails until Webpacker <5 have been deprecated
+
+namespace :yarn do
+  desc "Install all JavaScript dependencies as specified via Yarn"
+  task :install do
+    warn <<~MSG.strip
+      Shakapacker - Automatic installation of yarn packages is deprecated
+      Automatic installation of yarn packages when assets are precompiled is deprecated and will be removed in Shakapacker v7.
+      Please ensure you are installing yarn packages explicitly before the asset compilation.
+    MSG
+
+    begin
+      # Install only production deps when for not usual envs.
+      valid_node_envs = %w[test development production]
+      node_env = ENV.fetch("NODE_ENV") do
+        valid_node_envs.include?(Rails.env) ? Rails.env : "production"
+      end
+
+      yarn_flags =
+        if `#{RbConfig.ruby} "#{Rails.root}/bin/yarn" --version`.start_with?("1")
+          "--no-progress --frozen-lockfile"
+        else
+          "--immutable"
+        end
+
+      system(
+        { "NODE_ENV" => node_env },
+        "#{RbConfig.ruby} \"#{Rails.root}/bin/yarn\" install #{yarn_flags}",
+        exception: true
+      )
+    rescue Errno::ENOENT
+      $stderr.puts "bin/yarn was not found."
+      $stderr.puts "Please run `bundle exec rails app:update:bin` to create it."
+      exit 1
+    end
+  end
+end
+
+# Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use.
+if Rake::Task.task_defined?("assets:precompile") && File.exist?(Rails.root.join("bin", "yarn"))
+  Rake::Task["assets:precompile"].enhance [ "yarn:install" ]
+end

data/lib/webpacker/version.rb

@@ -1,4 +1,4 @@
 module Webpacker
   # Change the version in package.json too, please!
-  VERSION = "6.4.0".freeze
+  VERSION = "6.4.1".freeze
 end

data/package/rules/erb.js

@@ -9,7 +9,13 @@ module.exports = canProcess('rails-erb-loader', (resolvedPath) => ({
   use: [
     {
       loader: resolvedPath,
-      options: { runner: `${runner}bin/rails runner` }
+      options: {
+        runner: `${runner}bin/rails runner`,
+        env: {
+          ...process.env,
+          DISABLE_SPRING: 1
+        }
+      }
     }
   ]
 }))

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shakapacker",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "main": "package/index.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakapacker
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.4.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -178,6 +178,8 @@ files:
 - lib/tasks/webpacker/install.rake
 - lib/tasks/webpacker/verify_config.rake
 - lib/tasks/webpacker/verify_install.rake
+- lib/tasks/webpacker/yarn_install.rake
+- lib/tasks/yarn.rake
 - lib/webpacker.rb
 - lib/webpacker/base_strategy.rb
 - lib/webpacker/commands.rb
@@ -301,7 +303,7 @@ homepage: https://github.com/shakacode/shakapacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/shakacode/shakapacker/tree/v6.4.0
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v6.4.1
 post_install_message:
 rdoc_options: []
 require_paths: