shakapacker 7.0.3 → 7.2.0.rc.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9451e388d4f6c2419456201c10b56e5f24ef5a1b6abaf82fb950187f16c4cbb
-  data.tar.gz: 9082cdaec1dffb060c1a903a3589373170741d0744b65c41d6d901669b77d614
+  metadata.gz: d7c6cb64c439d97ec52580010225f4b2204ea652e281926da18b21be6c7ef545
+  data.tar.gz: 33adeb8d524cd2c08206bc1b06c3183cd44f469c7c44b453466ea149baceb30d
 SHA512:
-  metadata.gz: bc8eb8a8b9b52b4a1a9c2a1bcb4ae6e24f59484ea97f660e030a5660b5c6b4d8b077f8e784fbf6f1bf032e5d89b0c26b7d5b421b8c2692747aafb9820e46971b
-  data.tar.gz: c3a7d20636ee49637516df81a72813f34f82dceb88ecd1dbc276071f6d44ce756326094d9b31feaf93d8d83325687af37eaead127b3f00e8cf25e9d65764be6f
+  metadata.gz: 22c9e5716abf6528ab34f652a6b145cb97897769b7c9f4da09f63b9090ce3a2faea507db94cc6fcd87cdf5be8bc60be0881ffd2f9f1f7a5d218d37d759021ffc
+  data.tar.gz: c3a299a84e15d15216d9e6e8c83513b6a9d0ca805587b80779e7e6b8bafd0e8f7090686a6fd82da1eecd829d25a68bf8df25ebf7bec1f82213918edb83953f92

data/.github/workflows/dummy.yml

@@ -7,7 +7,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.1.2'

data/.github/workflows/generator.yml

@@ -10,6 +10,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         ruby: ['2.6', '2.7', '3.0']
+        use_package_json_gem: ['true', 'false']
         gemfile:
           - gemfiles/Gemfile-rails.6.0.x
           - gemfiles/Gemfile-rails.6.1.x
@@ -28,10 +29,14 @@ jobs:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
       - name: Install dependencies
         run: bundle install
       - run: bundle exec rake run_spec:generator
+        env:
+          SHAKAPACKER_USE_PACKAGE_JSON_GEM: ${{ matrix.use_package_json_gem }}

data/.github/workflows/jest.yml

@@ -13,9 +13,11 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
           cache: yarn

data/.github/workflows/js-lint.yml

@@ -13,9 +13,11 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
           cache: yarn

data/.github/workflows/rubocop.yml

@@ -12,7 +12,9 @@ jobs:
         ruby: ['2.7', '3.0']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.github/workflows/ruby-backward-compatibility.yml

@@ -29,7 +29,9 @@ jobs:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
@@ -37,3 +39,9 @@ jobs:
 
       - name: Ruby specs - Backward compatibility
         run: bundle exec rake run_spec:gem_bc
+        env:
+          SHAKAPACKER_USE_PACKAGE_JSON_GEM: "false"
+      - name: Ruby specs - Backward compatibility
+        run: bundle exec rake run_spec:gem_bc
+        env:
+          SHAKAPACKER_USE_PACKAGE_JSON_GEM: "true"

data/.github/workflows/ruby.yml

@@ -29,11 +29,20 @@ jobs:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
       - name: Ruby specs
-        run: bundle exec rake run_spec:gem_bc
+        run: bundle exec rake run_spec:gem
+        env:
+          SHAKAPACKER_USE_PACKAGE_JSON_GEM: "false"
+
+      - name: Ruby specs
+        run: bundle exec rake run_spec:gem
+        env:
+          SHAKAPACKER_USE_PACKAGE_JSON_GEM: "true"

data/CHANGELOG.md

@@ -5,13 +5,25 @@
 
 ## Versions
 ## [Unreleased]
-Changes since last non-beta release.
+Changes since the last non-beta release.
 
 _Please add entries here for your pull requests that are not yet released._
 
+### Added
+- Experimental support for other JS package managers using `package_json` gem [PR 349](https://github.com/shakacode/shakapacker/pull/349) by [G-Rath](https://github.com/g-rath).
+
+## [v7.1.0] - September 30, 2023
+
+### Added
+- Support passing custom webpack config directly to `generateWebpackConfig` for merging [PR 343](https://github.com/shakacode/shakapacker/pull/343) by [G-Rath](https://github.com/g-rath).
+
+### Fixed
+- Use `NODE_OPTIONS` to enable Node-specific debugging flags [PR 350](https://github.com/shakacode/shakapacker/pull/350).
+- Add the boilerplate `application.js` into `packs/` [PR 363](https://github.com/shakacode/shakapacker/pull/363).
+
 ## [v7.0.3] - July 7, 2023
 ### Fixed
-- Fixed commands execution for projects with space in absolute path [PR 322](https://github.com/shakacode/shakapacker/pull/322) by [kukicola](https://github.com/kukicola).
+- Fixed commands execution for projects with space in the absolute path [PR 322](https://github.com/shakacode/shakapacker/pull/322) by [kukicola](https://github.com/kukicola).
 
 ## [v7.0.2] - July 3, 2023
 ### Fixed
@@ -267,7 +279,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/v7.0.3...master
+[Unreleased]: https://github.com/shakacode/shakapacker/compare/v7.1.0...master
+[v7.1.0]: https://github.com/shakacode/shakapacker/compare/v7.0.3...v7.1.0
 [v7.0.3]: https://github.com/shakacode/shakapacker/compare/v7.0.2...v7.0.3
 [v7.0.2]: https://github.com/shakacode/shakapacker/compare/v7.0.1...v7.0.2
 [v7.0.1]: https://github.com/shakacode/shakapacker/compare/v7.0.0...v7.0.1

data/README.md

@@ -51,6 +51,7 @@ Read the [full review here](https://clutch.co/profile/shakacode#reviews?sort_by=
     - [Optional support](#optional-support)
   - [Installation](#installation)
     - [Rails v6+](#rails-v6)
+    - [Using alternative package managers](#using-alternative-package-managers)
     - [Note for Yarn v2 usage](#note-for-yarn-v2-usage)
   - [Concepts](#concepts)
   - [Usage](#usage)
@@ -163,9 +164,21 @@ yarn add @babel/core @babel/plugin-transform-runtime @babel/preset-env @babel/ru
 Previously, these "webpack" and "babel" packages were direct dependencies for `shakapacker`. By
 making these peer dependencies, you have control over the versions used in your webpack and babel configs.
 
+### Using alternative package managers
+
+There is experimental support for using package managers besides Yarn classic for managing JavaScript dependencies using the [`package_json`](https://github.com/G-Rath/package_json) gem.
+
+This can be enabled by setting the environment variable `SHAKAPACKER_USE_PACKAGE_JSON_GEM` to `true`; Shakapacker will then use the `package_json` gem which in turn will look for the [`packageManager`](https://nodejs.org/api/packages.html#packagemanager) property in the `package.json` or otherwise the `PACKAGE_JSON_FALLBACK_MANAGER` environment variable to determine which manager to use, defaulting to `npm` if neither are found.
+
+See [here](https://github.com/G-Rath/package_json#specifying-a-package-manager) for a list of the supported package managers and more information; note that `package_json` does not handle ensuring the manager is installed.
+
+> **Note**
+> 
+> The rest of the documentation assumes that `package_json` is not being used, and so always references `yarn` - you should instead use the package manager of your choice for these commands.  
+
 ### Note for Yarn v2 usage
 
-If you are using Yarn v2 (berry), please note that PnP modules are not supported.
+If you are using Yarn v2 (berry), please note that PnP modules are not supported unless you're using `SHAKAPACKER_USE_PACKAGE_JSON_GEM`.
 
 To use Shakapacker with Yarn v2, make sure you set `nodeLinker: node-modules` in your `.yarnrc.yml` file as per the [Yarn docs](https://yarnpkg.com/getting-started/migration#step-by-step) to opt out of Plug'n'Play behavior.
 
@@ -272,7 +285,11 @@ Note, the default of "defer" for the `javascript_pack_tag`. You can override tha
 <%= javascript_pack_tag 'calendar' %>
 <%= javascript_pack_tag 'map' %>
 ```
-While this also generally applies to `stylesheet_pack_tag`, you may use multiple calls to stylesheet_pack_tag if, say, you require multiple <style> tags for different output media:
+
+While this also generally applies to `stylesheet_pack_tag`,
+you may use multiple calls to stylesheet_pack_tag if,
+say,
+you require multiple `<style>` tags for different output media:
 
 ``` erb
 <%= stylesheet_pack_tag 'application', media: 'screen' %>
@@ -417,7 +434,16 @@ In production or CI environments, the `digest` strategy is more suitable, unless
 
 You can control what strategy is used by the `compiler_strategy` option in `shakapacker.yml` config file. By default `mtime` strategy is used in development environment, `digest` is used elsewhere.
 
-**Note:** If you are not using the `shakapacker-dev-server`, your packs will be served by the Rails public file server. If you've enabled caching (Rails application `config.action_controller.perform_caching` setting), your changes will likely not be picked up due to `Cache-Control` header being set and assets being cached in the browser memory. For more details see [issue](https://github.com/shakacode/shakapacker/issues/88)[ #88](https://github.com/shakacode/shakapacker/issues/88)](https://github.com/shakacode/shakapacker/issues/88).
+**Note:**
+If you are not using the `shakapacker-dev-server`,
+your packs will be served by the Rails public file server.
+If you've enabled caching
+(Rails application `config.action_controller.perform_caching` setting),
+your changes will likely not be picked up due to `Cache-Control` header being set
+and
+assets being cached in the browser memory.
+For more details see
+[issue 88: Caching issues in Development since migrating to Shakapacker](https://github.com/shakacode/shakapacker/issues/88).
 
 If you want to use live code reloading, or you have enough JavaScript that on-demand compilation is too slow, you'll need to run `./bin/shakapacker-dev-server`. This process will watch for changes in the relevant files, defined by `shakapacker.yml` configuration settings for `source_path`, `source_entry_path`, and `additional_paths`, and it will then automatically reload the browser to match. This feature is also known as [Hot Module Replacement](https://webpack.js.org/concepts/hot-module-replacement/).
 
@@ -465,26 +491,40 @@ First, you don't _need_ to use Shakapacker's webpack configuration. However, the
 
 1. Your output files go to the right directory
 2. Your output includes a manifest, via package [`webpack-assets-manifest`](https://github.com/webdeveric/webpack-assets-manifest) that maps output names (your 'packs') to the fingerprinted versions, including bundle-splitting dependencies. That's the main secret sauce of Shakapacker!
+ 
+The webpack configuration used by Shakapacker lives in `config/webpack/webpack.config.js`; this makes it easy to customize the configuration beyond what's available in `config/shakapacker.yml` by giving you complete control of the final configuration. By default, this file exports the result of `generateWebpackConfig` which handles generating a webpack configuration based on `config/shakapacker.yml`.
 
-The most practical webpack configuration is to take the default from Shakapacker and then use [webpack-merge](https://github.com/survivejs/webpack-merge) to merge your customizations with the default. For example, suppose you want to add some `resolve.extensions`:
+The easiest way to modify this config is to pass your desired customizations to `generateWebpackConfig` which will use [webpack-merge](https://github.com/survivejs/webpack-merge) to merge them with the configuration generated from `config/shakapacker.yml`:
 
 ```js
-// use the new NPM package name, `shakapacker`.
-// merge is webpack-merge from https://github.com/survivejs/webpack-merge
+// config/webpack/webpack.config.js
+const { generateWebpackConfig } = require('shakapacker')
+
+const options = {
+  resolve: {
+      extensions: ['.css', '.ts', '.tsx']
+  }
+}
+
+// This results in a new object copied from the mutable global
+module.exports = generateWebpackConfig(options)
+```
+
+The `shakapacker` package also exports the `merge` function from [webpack-merge](https://github.com/survivejs/webpack-merge) to make it easier to do more advanced customizations:
+
+```js
+// config/webpack/webpack.config.js
 const { generateWebpackConfig, merge } = require('shakapacker')
 
-const baseWebpackConfig = generateWebpackConfig()
+const webpackConfig = generateWebpackConfig()
 
 const options = {
   resolve: {
-      extensions: ['.css', '.ts', '.tsx']
+    extensions: ['.css', '.ts', '.tsx']
   }
 }
 
-// Copy the object using merge b/c the baseClientWebpackConfig is a mutable global
-// If you want to use this object for client and server rendering configurations,
-// having a new object is essential.
-module.exports = merge({}, baseWebpackConfig, options)
+module.exports = merge(options, webpackConfig)
 ```
 
 This example is based on [an example project](https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/blob/master/config/webpack/webpack.config.js)
@@ -513,12 +553,11 @@ Then `require` this file in your `config/webpack/webpack.config.js`:
 ```js
 // config/webpack/webpack.config.js
 // use the new NPM package name, `shakapacker`.
-const { generateWebpackConfig, merge } = require('shakapacker')
+const { generateWebpackConfig } = require('shakapacker')
 
-const webpackConfig = generateWebpackConfig()
 const customConfig = require('./custom')
 
-module.exports = merge(webpackConfig, customConfig)
+module.exports = generateWebpackConfig(customConfig)
 ```
 
 If you need access to configs within Shakapacker's configuration, you can import them like so:
@@ -616,12 +655,10 @@ Then modify the webpack config to use it as a plugin:
 
 ```js
 // config/webpack/webpack.config.js
-const { generateWebpackConfig, merge } = require("shakapacker");
-
-const webpackConfig = generateWebpackConfig()
+const { generateWebpackConfig } = require("shakapacker");
 const ForkTSCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
 
-module.exports = merge(webpackConfig, {
+module.exports = generateWebpackConfig({
   plugins: [new ForkTSCheckerWebpackPlugin()],
 });
 ```
@@ -638,9 +675,7 @@ Optionally, add the `CSS` extension to webpack config for easy resolution.
 
 ```js
 // config/webpack/webpack.config.js
-const { generateWebpackConfig, merge } = require('shakapacker')
-
-const webpackConfig = generateWebpackConfig()
+const { generateWebpackConfig } = require('shakapacker')
 
 const customConfig = {
   resolve: {
@@ -648,7 +683,7 @@ const customConfig = {
   }
 }
 
-module.exports = merge(webpackConfig, customConfig)
+module.exports = generateWebpackConfig(customConfig)
 ```
 
 To enable `PostCSS`, `Sass` or `Less` support, add `CSS` support first and

data/docs/troubleshooting.md

@@ -150,11 +150,9 @@ To silent these warnings, please update `config/webpack/webpack.config.js`:
 ```js
 const webpack = require('webpack')
 const { resolve } = require('path')
-const { generateWebpackConfig, merge } = require('shakapacker')
+const { generateWebpackConfig } = require('shakapacker')
 
-const webpackConfig = generateWebpackConfig();
-
-module.exports = merge(webpackConfig, {
+module.exports = generateWebpackConfig({
   plugins: [
     new webpack.ContextReplacementPlugin(
       /angular(\\|\/)core(\\|\/)(@angular|esm5)/,
@@ -201,11 +199,9 @@ Instead do:
 // config/webpack/webpack.config.js
 
 const webpack = require('webpack')
-const { generateWebpackConfig, merge } = require('shakapacker')
-
-const webpackConfig = generateWebpackConfig();
+const { generateWebpackConfig } = require('shakapacker')
 
-module.exports = merge(webpackConfig, {
+module.exports = generateWebpackConfig({
   plugins: [
     new webpack.ProvidePlugin({
       $: 'jquery',

data/docs/using_esbuild_loader.md

@@ -59,11 +59,9 @@ o do so, you need to modify your webpack configuration and use `ESBuildMinifyPlu
 Example:
 
 ```js
-const { generateWebpackConfig, merge } = require('shakapacker')
+const { generateWebpackConfig } = require('shakapacker')
 const { ESBuildMinifyPlugin } = require('esbuild-loader')
 
-const baseWebpackConfig = generateWebpackConfig()
-
 const options = {
   optimization: {
     minimizer: [
@@ -74,7 +72,7 @@ const options = {
   }
 }
 
-module.exports = merge({}, baseWebpackConfig, options)
+module.exports = generateWebpackConfig(options)
 ```
 
 For more details, see instructions at https://github.com/shakacode/shakapacker#webpack-configuration and https://github.com/privatenumber/esbuild-loader#js-minification-eg-terser.

data/docs/v6_upgrade.md

@@ -101,7 +101,7 @@ _If you're on webpacker v5, follow [how to upgrade to webpacker v6.0.0.rc.6 from
 
 1. Update `webpack-dev-server` to the current version, greater than 4.2, updating `package.json`.
 
-1. Update API usage of the view helpers by changing `javascript_packs_with_chunks_tag` and `stylesheet_packs_with_chunks_tag` to `javascript_pack_tag` and `stylesheet_pack_tag`. Ensure that your layouts and views will only have **at most one call** to `javascript_pack_tag` and **at most one call** to `stylesheet_pack_tag`. You can now pass multiple bundles to these view helper methods. If you fail to changes this, you may experience performance issues, and other bugs related to multiple copies of React, like [issue 2932](https://github.com/rails/webpacker/issues/2932).  If you expose jquery globally with `expose-loader,` by using `import $ from "expose-loader?exposes=$,jQuery!jquery"` in your `app/javascript/application.js`, pass the option `defer: false` to your `javascript_pack_tag`.
+1. Update API usage of the view helpers by changing `javascript_packs_with_chunks_tag` and `stylesheet_packs_with_chunks_tag` to `javascript_pack_tag` and `stylesheet_pack_tag`. Ensure that your layouts and views will only have **at most one call** to `javascript_pack_tag` and **at most one call** to `stylesheet_pack_tag`. You can now pass multiple bundles to these view helper methods. If you fail to changes this, you may experience performance issues, and other bugs related to multiple copies of React, like [issue 2932](https://github.com/rails/webpacker/issues/2932).  If you expose jquery globally with `expose-loader` by using `import $ from "expose-loader?exposes=$,jQuery!jquery"` in your `app/javascript/application.js`, pass the option `defer: false` to your `javascript_pack_tag`.
 
 1. If you are using any integrations like `css`, `postcss`, `React` or `TypeScript`. Please see https://github.com/shakacode/shakapacker#integrations section on how they work in v6.
 

data/lib/install/template.rb

@@ -1,3 +1,4 @@
+require "shakapacker/utils/misc"
 require "shakapacker/utils/version_syntax_converter"
 
 # Install Shakapacker
@@ -14,8 +15,8 @@ if Dir.exist?(Shakapacker.config.source_path)
   say "The packs app source directory already exists"
 else
   say "Creating packs app source directory"
-  empty_directory "app/javascript"
-  copy_file "#{__dir__}/application.js", "app/javascript/application.js"
+  empty_directory "app/javascript/packs"
+  copy_file "#{__dir__}/application.js", "app/javascript/packs/application.js"
 end
 
 apply "#{__dir__}/binstubs.rb"
@@ -41,12 +42,28 @@ else
   say %(        Add <%= javascript_pack_tag "application" %> within the <head> tag in your custom layout.)
 end
 
+def package_json
+  if @package_json.nil?
+    Shakapacker::Utils::Misc.require_package_json_gem
+
+    @package_json = PackageJson.read
+  end
+
+  @package_json
+end
+
 # Ensure there is `system!("bin/yarn")` command in `./bin/setup` file
 if (setup_path = Rails.root.join("bin/setup")).exist?
-  say "Run bin/yarn during bin/setup"
+  def native_install_command
+    return "bin/yarn" unless Shakapacker::Utils::Misc.use_package_json_gem
+
+    package_json.manager.native_install_command.join(" ")
+  end
+
+  say "Run #{native_install_command} during bin/setup"
 
   if File.read(setup_path).match? Regexp.escape("  # system('bin/yarn')\n")
-    gsub_file(setup_path, "# system('bin/yarn')", "system!('bin/yarn')")
+    gsub_file(setup_path, "# system('bin/yarn')", "system!('#{native_install_command}')")
   else
     # Due to the inconsistency of quotation usage in Rails 7 compared to
     # earlier versions, we check both single and double quotations here.
@@ -55,30 +72,58 @@ if (setup_path = Rails.root.join("bin/setup")).exist?
     string_to_add = <<-RUBY
 
   # Install JavaScript dependencies
-  system!("bin/yarn")
-RUBY
+  system!("#{native_install_command}")
+    RUBY
 
     if File.read(setup_path).match? pattern
       insert_into_file(setup_path, string_to_add, after: pattern)
     else
       say <<~MSG, :red
         It seems your `bin/setup` file doesn't have the expected content.
-        Please review the file and manually add `system!("bin/yarn")` before any
+        Please review the file and manually add `system!("#{native_install_command}")` before any
         other command that requires JavaScript dependencies being already installed.
       MSG
     end
   end
 end
 
-results = []
+def add_dependencies(dependencies, type)
+  return package_json.manager.add!(dependencies, type: type) if Shakapacker::Utils::Misc.use_package_json_gem
+
+  # TODO: check that run actually errors
+  run("yarn add #{dependencies.join(" ")}") if type == :production
+  run("yarn add --dev #{dependencies.join(" ")}") if type == :dev
+rescue PackageJson::Error
+  say "Shakapacker installation failed 😭 See above for details.", :red
+  exit 1
+end
+
+def fetch_peer_dependencies
+  if Shakapacker::Utils::Misc.use_package_json_gem
+    return PackageJson.read("#{__dir__}/../../").fetch("peerDependencies")
+  end
+
+  package_json = File.read("#{__dir__}/../../package.json")
+  JSON.parse(package_json)["peerDependencies"]
+end
 
 Dir.chdir(Rails.root) do
   npm_version = Shakapacker::Utils::VersionSyntaxConverter.new.rubygem_to_npm(Shakapacker::VERSION)
   say "Installing shakapacker@#{npm_version}"
-  results << run("yarn add shakapacker@#{npm_version} --exact")
+  add_dependencies(["shakapacker@#{npm_version}"], :production)
+
+  if Shakapacker::Utils::Misc.use_package_json_gem
+    package_json.merge! do |pj|
+      {
+        "dependencies" => pj["dependencies"].merge({
+          # TODO: workaround for test suite - long-run need to actually account for diff pkg manager behaviour
+          "shakapacker" => pj["dependencies"]["shakapacker"].delete_prefix("^")
+        })
+      }
+    end
+  end
 
-  package_json = File.read("#{__dir__}/../../package.json")
-  peers = JSON.parse(package_json)["peerDependencies"]
+  peers = fetch_peer_dependencies
   dev_dependency_packages = ["webpack-dev-server"]
 
   dependencies_to_add = []
@@ -96,13 +141,8 @@ Dir.chdir(Rails.root) do
   end
 
   say "Adding shakapacker peerDependencies"
-  results << run("yarn add #{dependencies_to_add.join(' ')}")
+  add_dependencies(dependencies_to_add, :production)
 
   say "Installing webpack-dev-server for live reloading as a development dependency"
-  results << run("yarn add --dev #{dev_dependencies_to_add.join(' ')}")
-end
-
-unless results.all?
-  say "Shakapacker installation failed 😭 See above for details.", :red
-  exit 1
+  add_dependencies(dev_dependencies_to_add, :dev)
 end

data/lib/shakapacker/compiler.rb

@@ -106,9 +106,11 @@ class Shakapacker::Compiler
 
       Shakapacker.set_shakapacker_env_variables_for_backward_compatibility
 
-      env.merge("SHAKAPACKER_ASSET_HOST"        => ENV.fetch("SHAKAPACKER_ASSET_HOST", ActionController::Base.helpers.compute_asset_host),
-                "SHAKAPACKER_RELATIVE_URL_ROOT" => ENV.fetch("SHAKAPACKER_RELATIVE_URL_ROOT", ActionController::Base.relative_url_root),
-                "SHAKAPACKER_CONFIG" => instance.config_path.to_s)
+      env.merge(
+        "SHAKAPACKER_ASSET_HOST"        => instance.config.asset_host,
+        "SHAKAPACKER_RELATIVE_URL_ROOT" => instance.config.relative_url_root,
+        "SHAKAPACKER_CONFIG"            => instance.config_path.to_s
+      )
     end
 
     def bin_shakapacker_path

data/lib/shakapacker/configuration.rb

@@ -116,6 +116,14 @@ class Shakapacker::Configuration
     data.fetch(key, defaults[:shakapacker_precompile])
   end
 
+  def asset_host
+    ENV.fetch("SHAKAPACKER_ASSET_HOST", ActionController::Base.helpers.compute_asset_host)
+  end
+
+  def relative_url_root
+    ENV.fetch("SHAKAPACKER_RELATIVE_URL_ROOT", ActionController::Base.relative_url_root)
+  end
+
   private
     def data
       @data ||= load

data/lib/shakapacker/deprecation_helper.rb

@@ -1,7 +1,7 @@
 require "thor"
 
 module Shakapacker
-  DEPRECATION_GUIDE_URL = "https://github.com/shakacode/shakapacker/docs/v7_upgrade.md"
+  DEPRECATION_GUIDE_URL = "https://github.com/shakacode/shakapacker/blob/master/docs/v7_upgrade.md"
   DEPRECATION_MESSAGE = <<~MSG
     DEPRECATION NOTICE:
 

data/lib/shakapacker/dev_server_runner.rb

@@ -66,12 +66,9 @@ module Shakapacker
         env = Shakapacker::Compiler.env
         env["SHAKAPACKER_CONFIG"] = @shakapacker_config
         env["WEBPACK_SERVE"] = "true"
+        env["NODE_OPTIONS"] = ENV["NODE_OPTIONS"] || ""
 
-        cmd = if node_modules_bin_exist?
-          ["#{@node_modules_bin_path}/webpack", "serve"]
-        else
-          ["yarn", "webpack", "serve"]
-        end
+        cmd = build_cmd
 
         if @argv.include?("--debug-webpacker")
           Shakapacker.puts_deprecation_message(
@@ -83,7 +80,7 @@ module Shakapacker
         end
 
         if @argv.delete("--debug-shakapacker") || @argv.delete("--debug-webpacker")
-          cmd = [ "node", "--inspect-brk", "--trace-warnings" ] + cmd
+          env["NODE_OPTIONS"] = "#{env["NODE_OPTIONS"]} --inspect-brk --trace-warnings"
         end
 
         cmd += ["--config", @webpack_config]
@@ -97,6 +94,16 @@ module Shakapacker
         end
       end
 
+      def build_cmd
+        if Shakapacker::Utils::Misc.use_package_json_gem
+          return package_json.manager.native_exec_command("webpack", ["serve"])
+        end
+
+        return ["#{@node_modules_bin_path}/webpack", "serve"] if node_modules_bin_exist?
+
+        ["yarn", "webpack", "serve"]
+      end
+
       def node_modules_bin_exist?
         File.exist?("#{@node_modules_bin_path}/webpack-dev-server")
       end

data/lib/shakapacker/runner.rb

@@ -1,3 +1,5 @@
+require "shakapacker/utils/misc"
+
 module Shakapacker
   class Runner
     def self.run(argv)
@@ -14,7 +16,7 @@ module Shakapacker
 
       Shakapacker.set_shakapacker_env_variables_for_backward_compatibility
 
-      @node_modules_bin_path = ENV["SHAKAPACKER_NODE_MODULES_BIN_PATH"] || `yarn bin`.chomp
+      @node_modules_bin_path = fetch_node_modules_bin_path
       @shakapacker_config    = ENV["SHAKAPACKER_CONFIG"] || File.join(@app_path, "config/shakapacker.yml")
 
       @shakapacker_config = Shakapacker.get_config_file_path_with_backward_compatibility(@shakapacker_config)
@@ -24,5 +26,21 @@ module Shakapacker
         exit!
       end
     end
+
+    def fetch_node_modules_bin_path
+      return nil if Shakapacker::Utils::Misc.use_package_json_gem
+
+      ENV["SHAKAPACKER_NODE_MODULES_BIN_PATH"] || `yarn bin`.chomp
+    end
+
+    def package_json
+      if @package_json.nil?
+        Shakapacker::Utils::Misc.require_package_json_gem
+
+        @package_json = PackageJson.read(@app_path)
+      end
+
+      @package_json
+    end
   end
 end