shakapacker 8.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c91750341bc2784dd7ac88b732dd6881393e47cc4d8b6581226ad4cd92a96923
-  data.tar.gz: 0bbb3a5721287691e508522e6d354a2c8d445756fc73823c68d6122bb4757b92
+  metadata.gz: 11198f6552ef8050f8946a58ebdf5ff5cffa7a79a9dd8aec3932afd1b7befdc3
+  data.tar.gz: 7b50eca8202c5f2bcadabd61d5f9dfb15c48a91d5b4c45125beb58c5e1943ce1
 SHA512:
-  metadata.gz: 29df517703f09ddc5e55de809e5bf8e0641903b98f0fab9c67c2710789d3f5003844cb8332f82a953a3f024481d74bdb5fce1d714c4aa99c178d9e9758bb49a4
-  data.tar.gz: 27d226aa730bca5b467ee6935b97f42064982ea69e4e66436adf9dc510b143de8cd420a9459f18bc4836efda9295cdd76220ed28162fbdc84c4c52350a801d84
+  metadata.gz: 82d676202bfbd8d99d0192e91f1215715094122f32e3776c9ab394cb9f35c7e0bbc67f31aacc88b07c4081b059c46011be883c7bf4f48988f82d3f18a9b99024
+  data.tar.gz: dac55e80ee92fa06ba53580b0555a677788dfb0d061148db7fef18bd34b9ad11cbe3350b4ee84609b3207d0f2dc45a9e6a454f21eb2dbf3688e17eaf7861bf44

data/.github/workflows/dummy.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: '16'
       - uses: ruby/setup-ruby@v1

data/.github/workflows/generator.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby: ['2.7', '3.0', '3.1', '3.2']
+        ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
         gemfile:
           - gemfiles/Gemfile-rails.6.0.x
           - gemfiles/Gemfile-rails.6.1.x
@@ -32,6 +32,10 @@ jobs:
             gemfile: gemfiles/Gemfile-rails.6.0.x
           - ruby: '3.2'
             gemfile: gemfiles/Gemfile-rails.6.0.x
+          - ruby: '3.3'
+            gemfile: gemfiles/Gemfile-rails.6.0.x
+          - ruby: '3.3'
+            gemfile: gemfiles/Gemfile-rails.6.1.x
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}

data/.github/workflows/node.yml

@@ -44,7 +44,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: yarn

data/.github/workflows/ruby.yml

@@ -19,9 +19,11 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
+      - name: Remove Gemfile.lock
+        run: rm -f Gemfile.lock
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2'
+          ruby-version: '3.3'
           bundler-cache: true
 
       - name: Ruby rubocop
@@ -33,7 +35,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby: ['2.7', '3.0', '3.1', '3.2']
+        ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
         gemfile:
           - gemfiles/Gemfile-rails.6.0.x
           - gemfiles/Gemfile-rails.6.1.x
@@ -47,6 +49,10 @@ jobs:
             gemfile: gemfiles/Gemfile-rails.6.0.x
           - ruby: '3.2'
             gemfile: gemfiles/Gemfile-rails.6.0.x
+          - ruby: '3.3'
+            gemfile: gemfiles/Gemfile-rails.6.0.x
+          - ruby: '3.3'
+            gemfile: gemfiles/Gemfile-rails.6.1.x
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}

data/.gitignore

@@ -1,5 +1,4 @@
 /.bundle
-Gemfile.lock
 /pkg
 /spec/mounted_app/test/dummy/log
 /spec/test_app/log

data/.node-version

@@ -1 +1 @@
-21.0.0
+22.2.0

data/CHANGELOG.md

@@ -10,24 +10,32 @@ _next_ branch is for v8 changes
 ## [Unreleased]
 Changes since the last non-beta release.
 
-### Breaking changes
-- Removes CDN url from the manifest.json paths. [PR 473](https://github.com/shakacode/shakapacker/pull/473) by [tomdracz](https://github.com/tomdracz).
-
-  This returns to the Webpacker behaviour prior to the aborted Webpacker v6.
+### Changed
+- Update outdated GitHub Actions to use Node.js 20.0 versions instead [PR 497](https://github.com/shakacode/shakapacker/pull/497) by [adriangohjw](https://github.com/adriangohjw).
+- Allow `webpack-merge` v6 to be used [PR 502](https://github.com/shakacode/shakapacker/pull/502) by [G-Rath](https://github.com/g-rath).
 
 ### Fixed
 
-- Fixes incorrect removal of files in the assets:clean task [PR 474](https://github.com/shakacode/shakapacker/pull/474) by [tomdracz](https://github.com/tomdracz).
+- Fixes failing tests for Ruby 2.7 due to `Rack::Handler::Puma.respond_to?(:config)` [PR 501](https://github.com/shakacode/shakapacker/pull/501) by [adriangohjw](https://github.com/adriangohjw)
+
+- Improve documentation for using Yarn PnP [PR 484](https://github.com/shakacode/shakapacker/pull/484) by [G-Rath](https://github.com/g-rath).
+
+- Remove old `yarn` bin script [PR 483](https://github.com/shakacode/shakapacker/pull/483) by [G-Rath](https://github.com/g-rath).
+
+## [v8.0.0] - May 17, 2024
 
-## [v8.0.0.rc.3] - May 9, 2024
+See the [v8 Upgrade Guide](https://github.com/shakacode/shakapacker/blob/main/docs/v8_upgrade.md).
 
 ### Fixed
 
-- Support v9 PNPM lockfiles [PR 472](https://github.com/shakacode/shakapacker/pull/472) by [G-Rath](https://github.com/g-rath).
+- Fixes incorrect removal of files in the assets:clean task [PR 474](https://github.com/shakacode/shakapacker/pull/474) by [tomdracz](https://github.com/tomdracz).
 
-## [v8.0.0.rc.2] - May 7, 2024
+- Support v9 PNPM lockfiles [PR 472](https://github.com/shakacode/shakapacker/pull/472) by [G-Rath](https://github.com/g-rath).
 
 ### Breaking changes
+
+- Removes CDN url from the manifest.json paths. [PR 473](https://github.com/shakacode/shakapacker/pull/473) by [tomdracz](https://github.com/tomdracz). This returns to the Webpacker behaviour prior to the aborted Webpacker v6.
+
 - Remove `relative_url_root` [PR 413](https://github.com/shakacode/shakapacker/pull/413) by [G-Rath](https://github.com/g-rath).
 
 - Removes deprecated support of `Webpacker` spelling, config variables and constants. [PR 429](https://github.com/shakacode/shakapacker/pull/429) by [tomdracz](https://github.com/tomdracz).
@@ -43,6 +51,8 @@ Changes since the last non-beta release.
   This enables support for package managers other than `yarn`, with `npm` being the default; to continue using Yarn,
   specify it in `package.json` using the [`packageManager`](https://nodejs.org/api/packages.html#packagemanager) property.
 
+  This also removed `@node_modules_bin_path`, `SHAKAPACKER_NODE_MODULES_BIN_PATH`, and support for installing `Shakapacker`'s javascript package in a separate directory from the Gemfile containing `Shakapacker`'s ruby gem.
+
 - Remove `yarn_install` rake task, and stop installing js packages automatically as part of `assets:precompile` [PR 412](https://github.com/shakacode/shakapacker/pull/412) by [G-Rath](https://github.com/g-rath).
 
 - Remove `check_yarn` rake task [PR 443](https://github.com/shakacode/shakapacker/pull/443) by [G-Rath](https://github.com/g-rath).
@@ -345,7 +355,7 @@ Note: [Rubygem is 6.3.0.pre.rc.1](https://rubygems.org/gems/shakapacker/versions
 ## [v6.0.0.rc.6 changes from v5.4] - Forked January 16, 2022
 
 
-- `node_modules` will no longer be babel transfomed compiled by default. This primarily fixes [rails issue #35501](https://github.com/rails/rails/issues/35501) as well as [numerous other webpacker issues](https://github.com/rails/webpacker/issues/2131#issuecomment-581618497). The disabled loader can still be required explicitly via:
+- `node_modules` will no longer be babel transformed compiled by default. This primarily fixes [rails issue #35501](https://github.com/rails/rails/issues/35501) as well as [numerous other webpacker issues](https://github.com/rails/webpacker/issues/2131#issuecomment-581618497). The disabled loader can still be required explicitly via:
 
   ```js
   const nodeModules = require('@rails/webpacker/rules/node_modules.js')
@@ -370,9 +380,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/v8.0.0-rc.3...main
-[v8.0.0.rc.3]: https://github.com/shakacode/shakapacker/compare/v8.0.0-rc.2...v8.0.0-rc.3
-[v8.0.0.rc.2]: https://github.com/shakacode/shakapacker/compare/v7.2.3...v8.0.0-rc.2
+[Unreleased]: https://github.com/shakacode/shakapacker/compare/v8.0.0...main
+[v8.0.0]: https://github.com/shakacode/shakapacker/compare/v7.2.3...v8.0.0
 [v7.2.3]: https://github.com/shakacode/shakapacker/compare/v7.2.2...v7.2.3
 [v7.2.2]: https://github.com/shakacode/shakapacker/compare/v7.2.1...v7.2.2
 [v7.2.1]: https://github.com/shakacode/shakapacker/compare/v7.2.0...v7.2.1

data/Gemfile.lock

@@ -0,0 +1,257 @@
+PATH
+  remote: .
+  specs:
+    shakapacker (8.0.1)
+      activesupport (>= 5.2)
+      package_json
+      rack-proxy (>= 0.6.1)
+      railties (>= 5.2)
+      semantic_range (>= 2.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.3.4)
+      activesupport (= 7.1.3.4)
+      globalid (>= 0.3.6)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      timeout (>= 0.4.0)
+    activestorage (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      marcel (~> 1.0)
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
+    byebug (11.1.3)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    date (3.3.4)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    erubi (1.13.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
+    io-console (0.7.2)
+    irb (1.14.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.7)
+    minitest (5.24.1)
+    mutex_m (0.2.0)
+    net-imap (0.4.14)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
+    nio4r (2.7.3)
+    nokogiri (1.16.6)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    package_json (0.1.0)
+    parallel (1.25.1)
+    parser (3.3.3.0)
+      ast (~> 2.4.1)
+      racc
+    psych (5.1.2)
+      stringio
+    racc (1.8.0)
+    rack (3.1.6)
+    rack-proxy (0.7.7)
+      rack
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails (7.1.3.4)
+      actioncable (= 7.1.3.4)
+      actionmailbox (= 7.1.3.4)
+      actionmailer (= 7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actiontext (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      bundler (>= 1.15.0)
+      railties (= 7.1.3.4)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rdoc (6.7.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    reline (0.5.9)
+      io-console (~> 0.5)
+    rexml (3.3.1)
+      strscan
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-rails (6.0.4)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
+    rspec-support (3.13.1)
+    rubocop (1.64.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.21.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    ruby-progressbar (1.13.0)
+    semantic_range (3.0.0)
+    stringio (3.1.1)
+    strscan (3.1.0)
+    thor (1.3.1)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.16)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.3.0)
+  byebug
+  nokogiri (>= 1.13.6)
+  rack-proxy (>= 0.7.2)
+  rails (>= 6.1.6)
+  rails-html-sanitizer (>= 1.4.3)
+  rake (>= 11.1)
+  rspec-rails (~> 6.0.2)
+  rubocop
+  rubocop-performance
+  shakapacker!
+
+BUNDLED WITH
+   2.5.9

data/README.md

@@ -156,7 +156,7 @@ Shakapacker uses the [`package_json`](https://github.com/shakacode/package_json)
 
 If `packageManager` is not set when running `shakapacker:install`, Shakapacker will set it based on the lockfile and the result of calling `--version` on the inferred manager; if no lockfile is present, then `npm` be used unless you choose to explicitly set the `PACKAGE_JSON_FALLBACK_MANAGER` to your preferred package manager.
 
-> **Note**
+> [!NOTE]
 >
 > The `packageManager` property is only used to determine the package manager to use, based primarily on its name.
 > The version (if present) is only used to determine if Yarn Classic or Yarn Berry should be used, but is otherwise
@@ -167,7 +167,9 @@ If `packageManager` is not set when running `shakapacker:install`, Shakapacker w
 
 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]
+If you wish to use [Yarn PnP](https://yarnpkg.com/features/pnp) you will need to configure Babel using a `babel.config.js` file rather than via `package.json` - see [customizing Babel Config](./docs/customizing_babel_config.md) for examples on how to do this.
+
+> [!NOTE]
 >
 > The rest of the documentation will only reference `npm` when providing commands such as to install optional packages except in cases where
 > a particular package manager requires a very different command; otherwise it should be safe to just replace `npm` with the name of your 
@@ -444,16 +446,13 @@ 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 88: Caching issues in Development since migrating to Shakapacker](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/).
 

data/docs/customizing_babel_config.md

@@ -14,16 +14,44 @@ The default configuration of babel is done by using `package.json` to use the fi
 ```
 
 ## Customizing the Babel Config
-This example shows how you can create an object and apply _additional_ presets and plugins on top of the default.
 
-### React Configuration
-To use this example file,
+### Basic Configuration
+
+This is a very basic skeleton that you can use that includes the Shakapacker preset, and makes it easy to add new plugins and presents:
+
+```js
+// babel.config.js
+module.exports = function (api) {
+  const defaultConfigFunc = require('shakapacker/package/babel/preset.js')
+  const resultConfig = defaultConfigFunc(api)
+
+  const changesOnDefault = {
+    presets: [
+      // put custom presets here
+    ].filter(Boolean),
+    plugins: [
+      // put custom plugins here
+    ].filter(Boolean),
+  }
 
+  resultConfig.presets = [...resultConfig.presets, ...changesOnDefault.presets]
+  resultConfig.plugins = [...resultConfig.plugins, ...changesOnDefault.plugins]
+
+  return resultConfig
+}
 ```
+
+### React Configuration
+
+This shows how you can add to the above skeleton to support React - to use this, install the following dependencies:
+
+```bash
 npm install react react-dom @babel/preset-react
 npm install --dev @pmmmwh/react-refresh-webpack-plugin react-refresh
 ```
 
+And then update the configuration:
+
 ```js
 // babel.config.js
 module.exports = function (api) {
@@ -54,7 +82,7 @@ module.exports = function (api) {
   }
 
   resultConfig.presets = [...resultConfig.presets, ...changesOnDefault.presets]
-  resultConfig.plugins = [...resultConfig.plugins, ...changesOnDefault.plugins ]
+  resultConfig.plugins = [...resultConfig.plugins, ...changesOnDefault.plugins]
 
   return resultConfig
 }

data/docs/react.md

@@ -3,11 +3,12 @@
 These steps describe creating a Rails/React app, using Shakapacker as the bundler.
 
 ## Easy Setup
+
 If you'd like easy integration of React with Ruby on Rails, see [React on Rails](https://github.com/shakacode/react_on_rails).
 
-The below information applies to a React on Rails app, except that you need to setup some environment variables as follows:
+The following information applies to a React on Rails app. Additionally, you need to set up some environment variables as follows:
 
-```
+```shell
 EXECJS_RUNTIME=Node
 ```
 

data/docs/troubleshooting.md

@@ -180,7 +180,7 @@ default: &default
 
 If you want to access any dependency without importing it everywhere or use it directly in your dev tools, please check: [https://webpack.js.org/plugins/provide-plugin/](https://webpack.js.org/plugins/provide-plugin/) and the [webpack docs on shimming globals](https://webpack.js.org/guides/shimming/#shimming-globals).
 
-Note, if you are exposing globals, like jQuery, to non-webpack dependencies (like an inline script) via the [expose-loader](https://webpack.js.org/loaders/expose-loader/), you will need to override the default of `defer: true` to be `defer:false` your call to the `javascript_pack_tag` so that the browser will load your bundle to setup the global variable before other code depends on it. However, you really should try to remove the dependendency on such globals.
+Note, if you are exposing globals, like jQuery, to non-webpack dependencies (like an inline script) via the [expose-loader](https://webpack.js.org/loaders/expose-loader/), you will need to override the default of `defer: true` to be `defer:false` your call to the `javascript_pack_tag` so that the browser will load your bundle to set up the global variable before other code depends on it. However, you really should try to remove the dependency on such globals.
 
 Thus ProvidePlugin manages build-time dependencies to global symbols whereas the expose-loader manages runtime dependencies to global symbols.
 

data/docs/v8_upgrade.md

@@ -33,7 +33,7 @@ Setting for example:
 __webpack_public_path__ = 'https://mycdn.url.com/packs';
 ```
 
-In your code and ensuring it is run first in the app, will allow the dynamic imports lookup path to be overriden at runtime.
+In your code and ensuring it is run first in the app, will allow the dynamic imports lookup path to be overridden at runtime.
 
 You can also try Webpack `output.publicPath` option of `'auto'` as per https://webpack.js.org/guides/public-path/#automatic-publicpath.
 
@@ -152,7 +152,7 @@ module.exports = merge(globalMutableWebpackConfig, customConfig);
 
 ```js
 // after
-const { generateWebpackConfig } = require('shakapacker');
+const { generateWebpackConfig, merge } = require('shakapacker');
 
 const customConfig = {
   module: {

data/lib/shakapacker/version.rb

@@ -1,4 +1,4 @@
 module Shakapacker
   # Change the version in package.json too, please!
-  VERSION = "8.0.0".freeze
+  VERSION = "8.0.1".freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shakapacker",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "homepage": "https://github.com/shakacode/shakapacker",
   "bugs": {
@@ -62,7 +62,7 @@
     "webpack-assets-manifest": "^5.0.6",
     "webpack-cli": "^4.9.2 || ^5.0.0",
     "webpack-dev-server": "^4.9.0 || ^5.0.0",
-    "webpack-merge": "^5.8.0"
+    "webpack-merge": "^5.8.0 || ^6.0.0"
   },
   "peerDependenciesMeta": {
     "@types/babel__core": {

data/shakapacker.gemspec

@@ -27,6 +27,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rubocop"
   s.add_development_dependency "rubocop-performance"
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- test/*`.split("\n")
+  s.files = `git ls-files -z`.split("\x0").reject { |f|
+    f.match(%r{^(test|spec|features|tmp|node_modules|packages|coverage|Gemfile.lock|rakelib)/})
+  }
+
+  s.test_files = `git ls-files -- test/*`.split("\n")
 end