shakapacker 7.0.0.rc.0 → 7.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c2600d05c024a802ccccf3e373a2e90f9042a6fe6a7fc73034f66bca4ac01bd
-  data.tar.gz: 683d520cb198b10c0bd10b3ee22d3c0bcf238bab85abb668d716ffa27481d283
+  metadata.gz: 58893ea0632011344e72e3fc4c887459f8e24872c5c5ab28792d1339d6d425e8
+  data.tar.gz: 2afede128c27cf45a4fcef08462fb9a64f5b89931075fdf89bd787af710939bd
 SHA512:
-  metadata.gz: 923fc595797f7e0b15d49d8cfc040b1fd155c4b7da4f3587b43f2a3a5f7989468e3b4f404e94f84ada36f13faeb1bf42dcac7f140b11927534ea9799bc89e325
-  data.tar.gz: e9b47474977e567da8256e677b5883bc86ebc498aaca5db6b3a1a6b172582cd152b61d48c2537b32cdec182db714b4989355c12033969d550135f4603820ee1c
+  metadata.gz: 7f49df282d8a4e42b28b2172a5f48b88d757c609323b57ffad3ab50091b3cea96110fcd5e6c9f865ab9552a7d49d51c864769ed0667c691f44f56d065b7d70ed
+  data.tar.gz: 1930a5cedaa8831fae4bbcab4e8baa05571414508ade9403e7b8a0ebd86f366d727ef6d3996e02a0a40e8b2faf21fdc5b4153a1fd7debd16e8467a8035071ee5

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,18 +1,14 @@
 ### Summary
 
-_Remove this paragraph and provide a general description of the code changes in your pull
-request... were there any bugs you had fixed? If so, mention them. If
-these bugs have open GitHub issues, be sure to tag them here as well,
-to keep the conversation linked together._
+_Remove this paragraph and describe the code changes in your pull request... were there any bugs you had fixed? If so, mention them. If these bugs have open GitHub issues, tag them here as well to keep the conversation linked._
 
 ### Pull Request checklist
-_Remove this line after checking all the items here. If the item is not applicable to the PR, both check it out and wrap it by `~`._
+_Remove this line after checking all the items here. If the item does not apply to the PR, both check it out and wrap it by `~`._
 
 - [ ] Add/update test to cover these changes
 - [ ] Update documentation
-- [ ] Update CHANGELOG file  
-  _Add the CHANGELOG entry at the top of the file._
+- [ ] Update CHANGELOG file
 
 ### Other Information
 
-_Remove this parapraph and mention any other important and relevant information such as benchmarks._
+_Remove this paragraph and mention other important and relevant information, such as benchmarks._

data/.github/workflows/dummy.yml

@@ -0,0 +1,21 @@
+name: Dummy specs
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.1.2'
+      - name: Install dependencies
+        run: |
+          bundle install
+          yarn install
+          sudo yarn global add yalc
+
+      - name: Run tests
+        run: bundle exec rake run_spec:dummy

data/.github/workflows/generator.yml

@@ -0,0 +1,37 @@
+name: Generator specs
+
+on: [push]
+
+jobs:
+  test:
+    name: Generator specs
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        ruby: ['2.6', '2.7', '3.0']
+        gemfile:
+          - gemfiles/Gemfile-rails.6.0.x
+          - gemfiles/Gemfile-rails.6.1.x
+          - gemfiles/Gemfile-rails.7.0.x
+          # Uncomment the following line only to ensure compatibility with the
+          # upcomming Rails versions, maybe before a release.
+          #- gemfiles/Gemfile-rails-edge
+        exclude:
+          - ruby: 2.6
+            os: ubuntu-latest
+            gemfile: gemfiles/Gemfile-rails.7.0.x
+          - ruby: 2.6
+            os: ubuntu-latest
+            gemfile: gemfiles/Gemfile-rails-edge
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install
+      - run: bundle exec rake run_spec:generator

data/.github/workflows/jest.yml

@@ -1,6 +1,6 @@
 name: Jest specs
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   jest:
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [12.x, 14.x, 16.x]
+        node: [14.x, 16.x, 18.x]
 
     runs-on: ${{ matrix.os }}
 

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

@@ -1,6 +1,6 @@
 name: JS lint
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   lint:
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [12.x, 14.x, 16.x]
+        node: [14.x, 16.x, 18.x]
 
     runs-on: ${{ matrix.os }}
 

data/.github/workflows/rubocop.yml

@@ -1,6 +1,6 @@
 name: Rubocop
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   rubocop:

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

@@ -1,6 +1,6 @@
 name: Ruby specs - Backward compatibility
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   test:
@@ -11,7 +11,6 @@ jobs:
         os: [ubuntu-latest]
         ruby: ['2.6', '2.7', '3.0']
         gemfile:
-          - gemfiles/Gemfile-rails.5.2.x
           - gemfiles/Gemfile-rails.6.0.x
           - gemfiles/Gemfile-rails.6.1.x
           - gemfiles/Gemfile-rails.7.0.x
@@ -25,9 +24,6 @@ jobs:
           - ruby: 2.6
             os: ubuntu-latest
             gemfile: gemfiles/Gemfile-rails-edge
-          - ruby: 3.0
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails.5.2.x
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
@@ -40,4 +36,4 @@ jobs:
           bundler-cache: true
 
       - name: Ruby specs - Backward compatibility
-        run: bundle exec rake test_bc
+        run: bundle exec rake run_spec:gem_bc

data/.github/workflows/ruby.yml

@@ -1,6 +1,6 @@
 name: Ruby specs
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   test:
@@ -11,7 +11,6 @@ jobs:
         os: [ubuntu-latest]
         ruby: ['2.6', '2.7', '3.0']
         gemfile:
-          - gemfiles/Gemfile-rails.5.2.x
           - gemfiles/Gemfile-rails.6.0.x
           - gemfiles/Gemfile-rails.6.1.x
           - gemfiles/Gemfile-rails.7.0.x
@@ -25,9 +24,6 @@ jobs:
           - ruby: 2.6
             os: ubuntu-latest
             gemfile: gemfiles/Gemfile-rails-edge
-          - ruby: 3.0
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails.5.2.x
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
@@ -40,4 +36,4 @@ jobs:
           bundler-cache: true
 
       - name: Ruby specs
-        run: bundle exec rake test
+        run: bundle exec rake run_spec:gem_bc

data/.gitignore

@@ -12,3 +12,6 @@ yarn-error.log*
 /log
 gemfiles/*.lock
 .DS_Store
+
+.yalc
+yalc.lock

data/CHANGELOG.md

@@ -8,8 +8,6 @@
 Changes since last non-beta release.
 
 _Please add entries here for your pull requests that are not yet released._
-### Improved
-- Set CSS modules mode depending on file type. [PR 261](https://github.com/shakacode/shakapacker/pull/261) by [talyuk](https://github.com/talyuk).
 
 ### Breaking changes
 - Removes defaults passed to `@babel/preset-typescript`. [PR 273](https://github.com/shakacode/shakapacker/pull/273) by [tomdracz](https://github.com/tomdracz).
@@ -18,42 +16,43 @@ _Please add entries here for your pull requests that are not yet released._
 
 - Export immutable webpackConfig function. [PR 293](https://github.com/shakacode/shakapacker/pull/293) by [tomdracz](https://github.com/tomdracz).
 
-  The `webpackConfig` property in the `shakapacker` module has been updated to be a function instead of a global mutable webpack configuration. This function now returns an immutable webpack configuration object, which ensures that any modifications made to it will not affect any other usage of the webpack configuration. If a project still requires the old mutable object, it can be accessed by replacing `webpackConfig` with `globalMutableWebpackConfig`.
+  The `webpackConfig` property in the `shakapacker` module has been updated to be a function instead of a global mutable webpack configuration. This function now returns an immutable webpack configuration object, which ensures that any modifications made to it will not affect any other usage of the webpack configuration. If a project still requires the old mutable object, it can be accessed by replacing `webpackConfig` with `globalMutableWebpackConfig`. Check [v7-upgrade](https://github.com/shakacode/shakapacker/blob/master/docs/v7_upgrade.md) documentation for more detail.
 
-### Improved
-- Move compilation lock file into the working directory. [PR 272](https://github.com/shakacode/shakapacker/pull/272) by [tomdracz](https://github.com/tomdracz).
+### Added
+- Set CSS modules mode depending on file type. [PR 261](https://github.com/shakacode/shakapacker/pull/261) by [talyuk](https://github.com/talyuk).
+- All standard webpack entries with the camelCase format are now supported in `shakapacker.yml` in snake_case format. [PR276](https://github.com/shakacode/shakapacker/pull/276) by [ahangarha](https://github.com/ahangarha).
+- The `shakapacker:install` rake task now has an option to force overriding files using `FORCE=true` environment variable [PR311](https://github.com/shakacode/shakapacker/pull/311) by [ahangarha](https://github.com/ahangarha).
+- Allow configuration of use of contentHash for specific environment [PR 234](https://github.com/shakacode/shakapacker/pull/234) by [justin808](https://github/justin808).
 
 ### Changed
 - Rename Webpacker to Shakapacker in the entire project including config files, binstubs, environment variables, etc. with a high degree of backward compatibility.
 
   This change might be breaking for certain setups and edge cases. More information: [v7 Upgrade Guide](./docs/v7_upgrade.md) [PR157](https://github.com/shakacode/shakapacker/pull/157) by [ahangarha](https://github.com/ahangarha)
-- Set `source_entry_path` to `packs` and `nested_entries` to `true` in`shakapacker.yml` [PR 284](https://github.com/shakacode/shakapacker/pull/284) by [ahangarha](https://github.com/ahangarha).
-
-### Fixed
-- Process `source_entry_path` with values starting with `/` as a relative path to `source_path` [PR 284](https://github.com/shakacode/shakapacker/pull/284) by [ahangarha](https://github.com/ahangarha).
 
+- Set `source_entry_path` to `packs` and `nested_entries` to `true` in`shakapacker.yml` [PR 284](https://github.com/shakacode/shakapacker/pull/284) by [ahangarha](https://github.com/ahangarha).
 - Dev server configuration is modified to follow [webpack recommended configurations](https://webpack.js.org/configuration/dev-server/) for dev server. [PR276](https://github.com/shakacode/shakapacker/pull/276) by [ahangarha](https://github.com/ahangarha):
-  - Deprecated `https` entry is removed from the default configuration file, allowing to set `server` or `https` as per the project requirements. For more detail, check Webpack documentation. The `https` entry can be effective only if there is no `server` entry in the config file.
+  - Deprecated `https` entry is removed from the default configuration file, allowing to set `server` or `https` as per the project requirements. For more detail, check webpack documentation. The `https` entry can be effective only if there is no `server` entry in the config file.
   - `allowed_hosts` is now set to `auto` instead of `all` by default.
 
-- Removes defaults passed to `@babel/preset-typescript`. [PR 273](https://github.com/shakacode/shakapacker/pull/273) by [tomdracz](https://github.com/tomdracz).
-
-  `@babel/preset-typescript` has been initialised in default configuration with `{ allExtensions: true, isTSX: true }` - meaning every file in the codebase was treated as TSX leading to potential issues. This has been removed and returns to sensible default of the preset which is to figure out the file type from the extensions. This change might affect generated output however so it is marked as breaking.
-
 - Remove the arbitrary stripping of the top-level directory when generating static file paths. [PR 283](https://github.com/shakacode/shakapacker/pull/283) by [tomdracz](https://github.com/tomdracz).
 
   Prior to this change, top level directory of static assets like images and fonts was stripped. This meant that file in `app/javascript/images/image.png` would be output to `static/image.png` directory and could be referenced through helpers as `image_pack_tag("image.jpg")` or `image_pack_tag("static/image.jpg")`.
 
   Going forward, the top level directory of static files will be retained so this will necessitate the update of file name references in asset helpers. In the example above, the file sourced from `app/javascript/images/image.png` will be now output to `static/images/image.png` and needs to be referenced as `image_pack_tag("images/image.jpg")` or `image_pack_tag("static/images/image.jpg")`.
 
+### Fixed
+- Move compilation lock file into the working directory. [PR 272](https://github.com/shakacode/shakapacker/pull/272) by [tomdracz](https://github.com/tomdracz).
+- Process `source_entry_path` with values starting with `/` as a relative path to `source_path` [PR 284](https://github.com/shakacode/shakapacker/pull/284) by [ahangarha](https://github.com/ahangarha).
+- Removes defaults passed to `@babel/preset-typescript` to make it possible to have projects with mix of JS and TS code [PR 273](https://github.com/shakacode/shakapacker/pull/273) by [tomdracz](https://github.com/tomdracz).
+
+  `@babel/preset-typescript` has been initialised in default configuration with `{ allExtensions: true, isTSX: true }` - meaning every file in the codebase was treated as TSX leading to potential issues. This has been removed and returns to sensible default of the preset which is to figure out the file type from the extensions. This change might affect generated output however so it is marked as breaking.
+
+- Fixed RC version detection during installation. [PR312](https://github.com/shakacode/shakapacker/pull/312) by [ahangarha](https://github.com/ahangarha)
+- Fix addition of webpack-dev-server to devDependencies during installation. [PR310](https://github.com/shakacode/shakapacker/pull/310) by [ahangarha](https://github.com/ahangarha)
 ### Removed
 - Remove redundant enhancement for precompile task to run `yarn install` [PR 270](https://github.com/shakacode/shakapacker/pull/270) by [ahangarha](https://github.com/ahangarha).
 - Remove deprecated `check_yarn_integrity` from `Shakapacker::Configuration` [PR SP288](https://github.com/shakacode/shakapacker/pull/288) by [ahangarha](https://github.com/ahangarha).
 
-### Added
-- All standard Webpack entries with the camelCase format are now supported in `shakapacker.yml` in snake_case format. [PR276](https://github.com/shakacode/shakapacker/pull/276) by [ahangarha](https://github.com/ahangarha).    
-
-
 ## [v6.6.0] - March 7, 2023
 ### Improved
 - Allow configuration of webpacker.yml through env variable. [PR 254](https://github.com/shakacode/shakapacker/pull/254) by [alecslupu](https://github.com/alecslupu).

data/CONTRIBUTING.md

@@ -1,26 +1,60 @@
+# Contributing Guidelines
+
+Thank you for your interest in contributing to Shakapacker! We welcome all contributions that align with our project goals and values. To ensure a smooth and productive collaboration, please follow these guidelines.
+
 ## Contents
+- [Reporting Issues](#reporting-issues)
+- [Submitting Pull Requests](#submitting-pull-requests)
 - [Setting Up a Development Environment](#setting-up-a-development-environment)
 - [Making sure your changes pass all tests](#making-sure-your-changes-pass-all-tests)
 - [Testing the generator](#testing-the-generator)
-- [Find existing issues](#find-existing-issues)
 
----
-## Setting Up a Development Environment
+## Reporting Issues
+If you encounter any issues with the project, please first check the exisiting issues (including closed ones). If the issues is not reported before, please opening an issue on our GitHub repository. Please provide a clear and detailed description of the issue, including steps to reproduce it. Creating a demo repository to demonstrate the issue would be ideal (and in some cases necessary).
 
-1. Install [Yarn](https://yarnpkg.com/)
+If looking to contribute to the project by fixing existing issues, we recommend looking at issues, particularly with the "[help wanted](https://github.com/shakacode/shakapacker/issues?q=is%3Aissue+label%3A%22help+wanted%22)" label.
 
-2. Run the following commands to set up the development environment.
+## Submitting Pull Requests
+We welcome pull requests that fix bugs, add new features, or improve existing ones. Before submitting a pull request, please make sure to:
 
-```
-bundle install
-yarn
-```
+  - Open an issue about what you want to propose before start working on.
+  - Fork the repository and create a new branch for your changes.
+  - Write clear and concise commit messages.
+  - Follow our code style guidelines.
+  - Write tests for your changes and [make sure all tests pass](#making-sure-your-changes-pass-all-tests).
+  - Update the documentation as needed.
+  - Update CHANGELOG.md if the changes affect public behavior of the project.
+
+---
+## Setting Up a Development Environment
+
+1. Install [Yarn](https://classic.yarnpkg.com/)
+2. To test your changes on a Rails test project do the following steps:
+   - For Ruby gem, update `Gemfile` and point the `shakapacker` to the locally developing Shakapacker project:
+      ```ruby
+      gem 'shakapacker', path: "relative_or_absolute_path_to_local_shakapacker"
+      ```
+   - For npm package, use `yalc` with following steps:
+      ```bash
+      # In Shakapacker root directory
+      yalc publish
+      # In Rails app for testing
+      yalc link shakapacker
+
+      # After every chagnes in shakapacker, run the folloing in Shakapacker directory
+      yalc push # or yalc publish --push
+      ```
+3. Run the following commands to set up the development environment.
+   ```
+   bundle install
+   yarn install
+   ```
 
 ## Making sure your changes pass all tests
 
-There are a number of automated checks which run on GitHub Actions when a pull request is created.
+There are several specs, covering different aspects of Shakapacker gem. You may run them locally or rely on GitHub CI actions configured to test the gem functionality if different Ruby, Rails, and Node environment.
 
-You can run those checks on your own locally to make sure that your changes would not break the CI build.
+We request running tests locally to ensure the new changes would not break the CI build.
 
 ### 1. Check the code for JavaScript style violations
 
@@ -40,12 +74,14 @@ bundle exec rubocop
 yarn test
 ```
 
-### 4. Run the Ruby test suite
+### 4. Run all the Ruby test suite
 
 ```
 bundle exec rake test
 ```
 
+Note: For this, you need `yalc` to be installed on your local machine
+
 #### 4.1 Run a single ruby test file
 
 ```
@@ -58,15 +94,35 @@ bundle exec rspec spec/configuration_spec.rb
 bundle exec rspec -e "#source_entry_path returns correct path"
 ```
 
-## Testing the generator
-If you change the generator, check that install instructions work.
+#### 4.3 Run only Shakapacker gem specs
 
-1. Update the gemfile so that gem "shakapacker" has a line like this, pointing to your install of shakapacker
+```
+bundle exec rake run_spec:gem
+```
+
+#### 4.4 Run only Shakapacker gem specs for backward compatibility
+These specs are to check Shakapcker v7 backward compatibility with v6.x
+
+```
+bundle exec rake run_spec:gem_bc
+```
+
+#### 4.5 Run dummy app test
+For this, you need `yalc` to be installed on your local machine
+
+```
+bundle exec rake run_spec:dummy
+```
+
+#### 4.6 Testing the installer
+To ensure that your installer works as expected, either you can run `bundle exec rake run_spec:install`, or take the following manual testing steps:
+
+1. Update the `Gemfile` so that gem `shakapacker` has a line like this, pointing to your developing Shakapacker:
    ```ruby
-   gem 'shakapacker', path: "~/shakacode/forks/shakapacker"
+   gem 'shakapacker', path: "relative_or_absolute_path_to_the_gem"
    ```
-2. `bundle`
-3. Run the generator confirm that you got the right changes. 
+2. Run `bundle install` to install the updated gem.
+3. Run `bundle exec rails shakapacker:install` to confirm that you got the right changes.
+
+ **Note:** Ensure that you use bundle exec otherwise the installed shakapacker gem will run and not the one you are working on.
 
-## Find existing issues
-You may look at the issues list to find existing known issues to be addressed. In this, we recommend to look at closed issues, particularly with "[help wanted](https://github.com/shakacode/shakapacker/issues?q=is%3Aissue+label%3A%22help+wanted%22+is%3Aclosed+)" label.

data/README.md

@@ -144,6 +144,8 @@ Then run the following to install Shakapacker:
 ./bin/rails shakapacker:install
 ```
 
+Before initiating the installation process, ensure you have committed all the changes. While installing Shakapacker, there might be some conflict between the existing file content and what Shakapacker tries to copy. You can either approve all the prompts for overriding these files or use the `FORCE=true` environment variable before the installation command to force the override without any prompt.
+
 When `package.json` and/or `yarn.lock` changes, such as when pulling down changes to your local environment in team settings, be sure to keep your NPM packages up-to-date:
 
 ```bash
@@ -214,6 +216,8 @@ Webpack intelligently includes only necessary files. In this example, the file `
 
 `nested_entries` allows you to have webpack entry points nested in subdirectories. This defaults to false so you don't accidentally create entry points for an entire tree of files. In other words, with `nested_entries: false`, you can have your entire `source_path` used for your source (using the `source_entry_path: /`) and you place files at the top level that you want as entry points. `nested_entries: true` allows you to have entries that are in subdirectories. This is useful if you have entries that are generated, so you can have a `generated` subdirectory and easily separate generated files from the rest of your codebase.
 
+To enable/disable the usage of contentHash in any node environment (specified using the `NODE_ENV` environment variable), add/modify `useContentHash` with a boolean value in `config/shakapacker.yml`. This feature is disabled for all environments except production by default. You may not disable the content hash for a `NODE_ENV` of production as that would break the browser caching of assets. Notice that despite the possibility of enabling this option for the development environment, [it is not recommended](https://webpack.js.org/guides/build-performance/#avoid-production-specific-tooling).
+
 #### Setting custom config path
 
 You can use the environment variable `SHAKAPACKER_CONFIG` to enforce a particular path to the config file rather than the default `config/shakapacker.yml`.
@@ -854,7 +858,7 @@ This behavior is optional & can be disabled by either setting a `SHAKAPACKER_PRE
 
 When compiling assets for production on a remote server, such as a continuous integration environment, it's recommended to use `yarn install --frozen-lockfile` to install NPM packages on the remote host to ensure that the installed packages match the `yarn.lock` file.
 
-If you are using a CDN setup, Shakapacker will use the configured [asset host](https://guides.rubyonrails.org/configuring.html#rails-general-configuration) value to prefix URLs for images or font icons which are included inside JS code or CSS. It is possible to override this value during asset compilation by setting the `SHAKAPACKER_ASSET_HOST` environment variable.
+If you are using a CDN setup, Shakapacker does NOT use the `ASSET_HOST` environment variable to prefix URLs for assets during bundle compilation. You must use the `SHAKAPACKER_ASSET_HOST` environment variable instead (`WEBPACKER_ASSET_HOST` if you're using any version of Webpacker or Shakapacker before Shakapacker v7).
 
 ## Example Apps
 * [React on Rails Tutorial With SSR, HMR fast refresh, and TypeScript](https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh)

data/Rakefile

@@ -1,15 +1,51 @@
 # frozen_string_literal: true
 require "bundler/gem_tasks"
+require "pathname"
 
-begin
-  require "rspec/core/rake_task"
-  RSpec::Core::RakeTask.new(:test)
-rescue LoadError
-end
+desc "Run all specs"
+task test: ["run_spec:all_specs"]
 
 task default: :test
 
-desc "Run backward compatibility specs"
-task :test_bc do
-  system("bundle exec rspec spec/backward_compatibility_specs/*_spec_bc.rb")
+namespace :run_spec do
+  desc "Run shakapacker specs"
+  task :gem do
+    puts "Running Shakapacker gem specs"
+    sh("bundle exec rspec spec/shakapacker/*_spec.rb")
+  end
+
+  desc "Run backward compatibility specs"
+  task :gem_bc do
+    puts "Running Shakapacker gem specs for backward compatibility"
+    sh("bundle exec rspec spec/backward_compatibility_specs/*_spec.rb")
+  end
+
+  desc "Run specs in the dummy app"
+  task :dummy do
+    puts "Running dummy app specs"
+    spec_dummy_dir = Pathname.new(File.join("spec", "dummy")).realpath
+    Bundler.with_unbundled_env do
+      sh_in_dir(".", "yalc publish")
+      sh_in_dir(spec_dummy_dir, [
+        "bundle install",
+        "yalc link shakapacker",
+        "yarn install",
+        "bundle exec rspec"
+      ])
+    end
+  end
+
+  desc "Run generator specs"
+  task :generator do
+    sh("bundle exec rspec spec/generator_specs/*_spec.rb")
+  end
+
+  desc "Run all specs"
+  task all_specs: %i[gem gem_bc dummy generator] do
+    puts "Completed all RSpec tests"
+  end
+end
+
+def sh_in_dir(dir, *shell_commands)
+  Shakapacker::Utils::Misc.sh_in_dir(dir, *shell_commands)
 end

data/docs/deployment.md

@@ -88,8 +88,7 @@ Now, you can set `brotli_static on;` in your nginx site config, as per the confi
 
 ## CDN
 
-Shakapacker out-of-the-box provides CDN support using your Rails app `config.action_controller.asset_host` setting. If you already have [CDN](http://guides.rubyonrails.org/asset_pipeline.html#cdns) added in your Rails app
-you don't need to do anything extra for Shakapacker, it just works.
+If you are using a CDN setup, Shakapacker does NOT use the `ASSET_HOST` environment variable to prefix URLs for assets during bundle compilation. You must use the `SHAKAPACKER_ASSET_HOST` environment variable instead (`WEBPACKER_ASSET_HOST` if you're using any version of Webpacker or Shakapacker before Shakapacker v7).
 
 ## Capistrano
 

data/lib/install/binstubs.rb

@@ -1,4 +1,6 @@
+force_option = ENV["FORCE"] ? { force: true } : {}
+
 say "Copying binstubs"
-directory "#{__dir__}/bin", "bin"
+directory "#{__dir__}/bin", "bin", force_option
 
 chmod "bin", 0755 & ~File.umask, verbose: false

data/lib/install/config/shakapacker.yml

@@ -1,4 +1,5 @@
 # Note: You must restart bin/shakapacker-dev-server for changes to take effect
+# This file contains the defaults used by shakapacker.
 
 default: &default
   source_path: app/javascript
@@ -44,6 +45,11 @@ default: &default
   # Select whether the compiler will use SHA digest ('digest' option) or most most recent modified timestamp ('mtime') to determine freshness
   compiler_strategy: digest
 
+  # Select whether the compiler will always use a content hash and not just in production
+  # Don't use contentHash except for production for performance
+  # https://webpack.js.org/guides/build-performance/#avoid-production-specific-tooling
+  useContentHash: false
+
 development:
   <<: *default
   compile: true
@@ -105,5 +111,8 @@ production:
   # Production depends on precompilation of packs prior to booting for performance.
   compile: false
 
+  # Use content hash for naming assets. Cannot be overridden by for production.
+  useContentHash: true
+
   # Cache manifest.json for performance
   cache_manifest: true

data/lib/install/config/webpack/webpack.config.js

@@ -1,5 +1,6 @@
-const { webpackConfig } = require('shakapacker')
-
 // See the shakacode/shakapacker README and docs directory for advice on customizing your webpackConfig.
+const { generateWebpackConfig } = require('shakapacker')
+
+const webpackConfig = generateWebpackConfig()
 
 module.exports = webpackConfig

data/lib/install/template.rb

@@ -1,9 +1,14 @@
+require "shakapacker/utils/version_syntax_converter"
+
 # Install Shakapacker
-copy_file "#{__dir__}/config/shakapacker.yml", "config/shakapacker.yml"
-copy_file "#{__dir__}/package.json", "package.json"
+
+force_option = ENV["FORCE"] ? { force: true } : {}
+
+copy_file "#{__dir__}/config/shakapacker.yml", "config/shakapacker.yml", force_option
+copy_file "#{__dir__}/package.json", "package.json", force_option
 
 say "Copying webpack core config"
-directory "#{__dir__}/config/webpack", "config/webpack"
+directory "#{__dir__}/config/webpack", "config/webpack", force_option
 
 if Dir.exist?(Shakapacker.config.source_path)
   say "The packs app source directory already exists"
@@ -68,26 +73,33 @@ end
 results = []
 
 Dir.chdir(Rails.root) do
-  if Shakapacker::VERSION.match?(/^[0-9]+\.[0-9]+\.[0-9]+$/)
-    say "Installing shakapacker@#{Shakapacker::VERSION}"
-    results << run("yarn add shakapacker@#{Shakapacker::VERSION} --exact")
-  else
-    say "Installing shakapacker@next"
-    results << run("yarn add shakapacker@next --exact")
-  end
+  npm_version = Shakapacker::Utils::VersionSyntaxConverter.new.rubygem_to_npm(Shakapacker::VERSION)
+  say "Installing shakapacker@#{npm_version}"
+  results << run("yarn add shakapacker@#{npm_version} --exact")
 
   package_json = File.read("#{__dir__}/../../package.json")
   peers = JSON.parse(package_json)["peerDependencies"]
-  peers_to_add = peers.reduce([]) do |result, (package, version)|
+  dev_dependency_packages = ["webpack-dev-server"]
+
+  dependencies_to_add = []
+  dev_dependencies_to_add = []
+
+  peers.each do |(package, version)|
     major_version = version.match(/(\d+)/)[1]
-    result << "#{package}@#{major_version}"
-  end.join(" ")
+    entry = "#{package}@#{major_version}"
+
+    if dev_dependency_packages.include? package
+      dev_dependencies_to_add << entry
+    else
+      dependencies_to_add << entry
+    end
+  end
 
   say "Adding shakapacker peerDependencies"
-  results << run("yarn add #{peers_to_add}")
+  results << run("yarn add #{dependencies_to_add.join(' ')}")
 
   say "Installing webpack-dev-server for live reloading as a development dependency"
-  results << run("yarn add --dev webpack-dev-server")
+  results << run("yarn add --dev #{dev_dependencies_to_add.join(' ')}")
 end
 
 unless results.all?