shakapacker 7.0.3 → 7.2.0.rc.0

data/spec/shakapacker/webpack_runner_spec.rb

@@ -12,44 +12,74 @@ describe "WebpackRunner" do
     ENV["RAILS_ENV"] = @original_rails_env
   end
 
-  it "runs cmd via node_modules" do
-    cmd = ["#{test_app_path}/node_modules/.bin/webpack", "--config", "#{test_app_path}/config/webpack/webpack.config.js"]
+  let(:test_app_path) { File.expand_path("./test_app", __dir__) }
 
-    verify_command(cmd, use_node_modules: true)
-  end
+  NODE_PACKAGE_MANAGERS.each do |fallback_manager|
+    context "when using package_json with #{fallback_manager} as the manager" do
+      with_use_package_json_gem(enabled: true, fallback_manager: fallback_manager)
+
+      let(:package_json) { PackageJson.read(test_app_path) }
+
+      require "package_json"
+
+      it "uses the expected package manager", unless: fallback_manager == "yarn_classic" do
+        cmd = package_json.manager.native_exec_command("webpack", ["--config", "#{test_app_path}/config/webpack/webpack.config.js"])
+
+        manager_name = fallback_manager.split("_")[0]
 
-  it "runs cmd via yarn" do
-    cmd = ["yarn", "webpack", "--config", "#{test_app_path}/config/webpack/webpack.config.js"]
+        expect(cmd).to start_with(manager_name)
+      end
 
-    verify_command(cmd, use_node_modules: false)
+      it "runs the command using the manager" do
+        cmd = package_json.manager.native_exec_command("webpack", ["--config", "#{test_app_path}/config/webpack/webpack.config.js"])
+
+        verify_command(cmd)
+      end
+
+      it "passes on arguments" do
+        cmd = package_json.manager.native_exec_command("webpack", ["--config", "#{test_app_path}/config/webpack/webpack.config.js", "--watch"])
+
+        verify_command(cmd, argv: (["--watch"]))
+      end
+    end
   end
 
-  it "runs cmd argv" do
-    cmd = ["#{test_app_path}/node_modules/.bin/webpack", "--config", "#{test_app_path}/config/webpack/webpack.config.js", "--watch"]
+  context "when not using package_json" do
+    with_use_package_json_gem(enabled: false)
+
+    it "supports running via node_modules" do
+      cmd = ["#{test_app_path}/node_modules/.bin/webpack", "--config", "#{test_app_path}/config/webpack/webpack.config.js"]
 
-    verify_command(cmd, argv: ["--watch"])
+      verify_command(cmd, use_node_modules: true)
+    end
+
+    it "supports running via yarn" do
+      cmd = ["yarn", "webpack", "--config", "#{test_app_path}/config/webpack/webpack.config.js"]
+
+      verify_command(cmd, use_node_modules: false)
+    end
+
+    it "passes on arguments" do
+      cmd = ["#{test_app_path}/node_modules/.bin/webpack", "--config", "#{test_app_path}/config/webpack/webpack.config.js", "--watch"]
+
+      verify_command(cmd, argv: ["--watch"])
+    end
   end
 
   private
-    def test_app_path
-      File.expand_path("./test_app", __dir__)
-    end
 
     def verify_command(cmd, use_node_modules: true, argv: [])
-      cwd = Dir.pwd
-      Dir.chdir(test_app_path)
-
-      klass = Shakapacker::WebpackRunner
-      instance = klass.new(argv)
+      Dir.chdir(test_app_path) do
+        klass = Shakapacker::WebpackRunner
+        instance = klass.new(argv)
 
-      allow(klass).to receive(:new).and_return(instance)
-      allow(instance).to receive(:node_modules_bin_exist?).and_return(use_node_modules)
-      allow(Kernel).to receive(:exec)
+        allow(klass).to receive(:new).and_return(instance)
+        allow(instance).to receive(:node_modules_bin_exist?).and_return(use_node_modules)
+        allow(Kernel).to receive(:exec)
 
-      klass.run(argv)
+        klass.run(argv)
 
-      expect(Kernel).to have_received(:exec).with(Shakapacker::Compiler.env, *cmd)
-    ensure
-      Dir.chdir(cwd)
+        expect(Kernel).to have_received(:exec).with(Shakapacker::Compiler.env, *cmd)
+      end
     end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require_relative "./support/package_json_helpers"
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause

data/spec/support/package_json_helpers.rb

@@ -0,0 +1,16 @@
+NODE_PACKAGE_MANAGERS = ["npm", "yarn_classic", "yarn_berry", "pnpm", "bun"]
+
+def with_use_package_json_gem(enabled:, fallback_manager: nil)
+  around do |example|
+    old_use_package_json_gem_value = ENV["SHAKAPACKER_USE_PACKAGE_JSON_GEM"]
+    old_package_json_fallback_manager_value = ENV["PACKAGE_JSON_FALLBACK_MANAGER"]
+
+    ENV["SHAKAPACKER_USE_PACKAGE_JSON_GEM"] = enabled.to_s
+    ENV["PACKAGE_JSON_FALLBACK_MANAGER"] = fallback_manager.to_s
+
+    example.run
+
+    ENV["SHAKAPACKER_USE_PACKAGE_JSON_GEM"] = old_use_package_json_gem_value
+    ENV["PACKAGE_JSON_FALLBACK_MANAGER"] = old_package_json_fallback_manager_value
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakapacker
 version: !ruby/object:Gem::Version
-  version: 7.0.3
+  version: 7.2.0.rc.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-13 00:00:00.000000000 Z
+date: 2023-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -26,6 +26,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: package_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +209,7 @@ files:
 - lib/tasks/shakapacker.rake
 - lib/tasks/shakapacker/binstubs.rake
 - lib/tasks/shakapacker/check_binstubs.rake
+- lib/tasks/shakapacker/check_manager.rake
 - lib/tasks/shakapacker/check_node.rake
 - lib/tasks/shakapacker/check_yarn.rake
 - lib/tasks/shakapacker/clean.rake
@@ -425,41 +440,57 @@ files:
 - spec/fixtures/beta_package-lock.v1.json
 - spec/fixtures/beta_package-lock.v2.json
 - spec/fixtures/beta_package.json
+- spec/fixtures/beta_pnpm-lock.v7.yaml
+- spec/fixtures/beta_pnpm-lock.v8.yaml
 - spec/fixtures/beta_yarn.v1.lock
 - spec/fixtures/beta_yarn.v2.lock
 - spec/fixtures/git_url_package-lock.v1.json
 - spec/fixtures/git_url_package-lock.v2.json
 - spec/fixtures/git_url_package.json
+- spec/fixtures/git_url_pnpm-lock.v7.yaml
+- spec/fixtures/git_url_pnpm-lock.v8.yaml
 - spec/fixtures/git_url_yarn.v1.lock
 - spec/fixtures/git_url_yarn.v2.lock
 - spec/fixtures/github_url_package-lock.v1.json
 - spec/fixtures/github_url_package-lock.v2.json
 - spec/fixtures/github_url_package.json
+- spec/fixtures/github_url_pnpm-lock.v7.yaml
+- spec/fixtures/github_url_pnpm-lock.v8.yaml
 - spec/fixtures/github_url_yarn.v1.lock
 - spec/fixtures/github_url_yarn.v2.lock
 - spec/fixtures/relative_path_package-lock.v1.json
 - spec/fixtures/relative_path_package-lock.v2.json
 - spec/fixtures/relative_path_package.json
+- spec/fixtures/relative_path_pnpm-lock.v7.yaml
+- spec/fixtures/relative_path_pnpm-lock.v8.yaml
 - spec/fixtures/relative_path_yarn.v1.lock
 - spec/fixtures/relative_path_yarn.v2.lock
 - spec/fixtures/semver_caret_package-lock.v1.json
 - spec/fixtures/semver_caret_package-lock.v2.json
 - spec/fixtures/semver_caret_package.json
+- spec/fixtures/semver_caret_pnpm-lock.v7.yaml
+- spec/fixtures/semver_caret_pnpm-lock.v8.yaml
 - spec/fixtures/semver_caret_yarn.v1.lock
 - spec/fixtures/semver_caret_yarn.v2.lock
 - spec/fixtures/semver_exact_package-lock.v1.json
 - spec/fixtures/semver_exact_package-lock.v2.json
 - spec/fixtures/semver_exact_package.json
+- spec/fixtures/semver_exact_pnpm-lock.v7.yaml
+- spec/fixtures/semver_exact_pnpm-lock.v8.yaml
 - spec/fixtures/semver_exact_yarn.v1.lock
 - spec/fixtures/semver_exact_yarn.v2.lock
 - spec/fixtures/semver_tilde_package-lock.v1.json
 - spec/fixtures/semver_tilde_package-lock.v2.json
 - spec/fixtures/semver_tilde_package.json
+- spec/fixtures/semver_tilde_pnpm-lock.v7.yaml
+- spec/fixtures/semver_tilde_pnpm-lock.v8.yaml
 - spec/fixtures/semver_tilde_yarn.v1.lock
 - spec/fixtures/semver_tilde_yarn.v2.lock
 - spec/fixtures/without_package-lock.v1.json
 - spec/fixtures/without_package-lock.v2.json
 - spec/fixtures/without_package.json
+- spec/fixtures/without_pnpm-lock.v7.yaml
+- spec/fixtures/without_pnpm-lock.v8.yaml
 - spec/fixtures/without_yarn.v1.lock
 - spec/fixtures/without_yarn.v2.lock
 - spec/generator_specs/e2e_template/files/app/controllers/home_controller.rb
@@ -470,8 +501,13 @@ files:
 - spec/generator_specs/e2e_template/files/config/routes.rb
 - spec/generator_specs/e2e_template/files/spec/system/test_react_component_renders_spec.rb
 - spec/generator_specs/e2e_template/template.rb
+- spec/generator_specs/fake-bin/bun
+- spec/generator_specs/fake-bin/npm
+- spec/generator_specs/fake-bin/pnpm
+- spec/generator_specs/fake-bin/yarn
 - spec/generator_specs/generator_spec.rb
 - spec/mounted_app/Rakefile
+- spec/mounted_app/package.json
 - spec/mounted_app/test/dummy/Rakefile
 - spec/mounted_app/test/dummy/bin/rails
 - spec/mounted_app/test/dummy/bin/rake
@@ -524,12 +560,13 @@ files:
 - spec/shakapacker/version_checker_spec.rb
 - spec/shakapacker/webpack_runner_spec.rb
 - spec/spec_helper.rb
+- spec/support/package_json_helpers.rb
 - yarn.lock
 homepage: https://github.com/shakacode/shakapacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/shakacode/shakapacker/tree/v7.0.3
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v7.2.0-rc.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -541,9 +578,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.12
 signing_key: