shakapacker 6.0.0.rc.12 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ba657aae9dfeb59090b6199029f76386c42623c57f3a97a95f91ef34e6aafc6
-  data.tar.gz: 26ee13bf4652772256fd0ef3e2e1e2013a08bde979172660ec4c17778fe8f582
+  metadata.gz: 3ecb405340a0fa5b44d13390860eaccbaf8ec55524e1e7ce56189274abbd400c
+  data.tar.gz: '0288c90b0b9675d165aad967b0c9ae7d9b4af2a59d788f1dde34434db0e37c36'
 SHA512:
-  metadata.gz: 95e60f443c8cff3af9c486e5654b6c57ee6a8a47458659ba6df09c4ed59eef16822c8de9d39b4e877b93e7a235230c9a176763ae1c2e6bb762fd721a99a5edf9
-  data.tar.gz: ae7fcfed84f078ad216b48dcd4d5f227819132e30f642ffaa2fbe5b566aa6c29e4ae46d49da7e769947228be877829bac60ae13e93cb359e9400a0a6fa2786f1
+  metadata.gz: ccd9911ec6c1a53ddc173bb86d5d87e714c174c41a28c4d6211544c25b2e39a7b72c85ed19cd7306ec7bcdeece73435071a86c1ae905fb2a8f995a0da8650b78
+  data.tar.gz: db5eff828636edf6a341c1aa2e0f89a6e58e7a476da0b908d38fbabe5b967b7dd1cee5a7fca6771fc5bc0dfc544ddcd64dc5e0fc72765b1f9f0116614c159bbf

data/CHANGELOG.md

@@ -1,13 +1,22 @@
-For versions prior to v6, see the [5.x stable branch of rails/webpacker](https://github.com/rails/webpacker/tree/5-x-stable).
-
+* For versions prior to v6, see the [5.x stable branch of rails/webpacker](https://github.com/rails/webpacker/tree/5-x-stable). 
+* Please see [UPGRADE GUIDE](./docs/v6_upgrade.md).
 
 ## Versions
 ### [Unreleased]
 Changes since last non-beta release.
 
 *Please add entries here for your pull requests that are not yet released.*
+## [v6.0.1] - January 24, 2022
+### Improved
+- PR #21 removed pnp-webpack-plugin as a dev dependency but did not remove it from the peer dependency list. [PR 30](https://github.com/shakacode/shakapacker/pull/19) by [t27duck](https://github.com/t27duck].
+
+## [v6.0.0 changes from v6.0.0.rc.6] - January 22, 2022
+
+### Improved
+- Raise on multiple invocations of javascript_pack_tag and stylesheet_pack_tag helpers. [PR 19](https://github.com/shakacode/shakapacker/pull/19) by [tomdracz](https://github.com/tomdracz].
+- Remove automatic addition of node_modules into rails asset load path. [PR 20](https://github.com/shakacode/shakapacker/pull/20) by [tomdracz](https://github.com/tomdracz].
+- Remove pnp-webpack-plugin. [PR 21](https://github.com/shakacode/shakapacker/pull/21) by [tomdracz](https://github.com/tomdracz].
 
-## [6.0.0.rc.12]
 
 ### Merged from rails/webpacker
 
@@ -20,11 +29,9 @@ Changes since last non-beta release.
   to `config/webpack/#{NODE_ENV}.js`.
 - Changed all package.json dependencies to peerDependencies, so upgrading requires adding the dependencies, per the [UPGRADE GUIDE](./docs/v6_upgrade.md).
 
-## [6.0.0.rc.6] - Forked January 16, 2022
+## [v6.0.0.rc.6 changes from v5.4] - Forked January 16, 2022
 
-Latest is rc.9.
 
-Please see [UPGRADE GUIDE](./docs/v6_upgrade.md) for more information.
 - `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:
 
   ```js
@@ -48,6 +55,7 @@ Please see [UPGRADE GUIDE](./docs/v6_upgrade.md) for more information.
 - CSS extraction enabled by default, except when devServer is configured and running
 
 
-[Unreleased]: https://github.com/shakacode/shakapacker/compare/6.0.0-rc.11...master
-[6.0.0.rc.12]: https://github.com/shakacode/shakapacker/compare/aba79635e6ff6562ec04d3c446d57ef19a5fef7d...6.0.0-rc.12
-[6.0.0.rc.6]: https://github.com/rails/webpacker/compare/v5.4.3...aba79635e6ff6562ec04d3c446d57ef19a5fef7d
+[Unreleased]: https://github.com/shakacode/shakapacker/compare/6.0.1...master
+[v6.0.1]: https://github.com/shakacode/shakapacker/compare/v6.0.0...v6.0.1
+[v6.0.0 changes from v6.0.0.rc.6]: https://github.com/shakacode/shakapacker/compare/aba79635e6ff6562ec04d3c446d57ef19a5fef7d...v6.0.0
+[v6.0.0.rc.6 changes from v5.4]: https://github.com/rails/webpacker/compare/v5.4.3...aba79635e6ff6562ec04d3c446d57ef19a5fef7d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shakapacker (6.0.0.rc.6)
+    shakapacker (6.0.0.rc.13)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)

data/README.md

@@ -1,16 +1,16 @@
 # Shakapacker
 
-_Actively maintained fork of [rails/webpacker](https://github.com/rails/webpacker). For pre v6, see [rails/webpacker 5-x-stable](https://github.com/rails/webpacker/tree/5-x-stable). Be sure to see the [CHANGELOG](./CHANGELOG.md)._
-
-Note, internal naming will continue to use `webpacker` where possible.
+_Official, actively maintained fork of [rails/webpacker](https://github.com/rails/webpacker). Internal naming for `shakapacker` will continue to use `webpacker` where possible. Notably, the NPM package name is `shakapacker`._
+* See [V6 Upgrade](./docs/v6_upgrade.md) for upgrading from v5 or prior v6 releases. 
 
 [![Ruby specs](https://github.com/shakacode/shakapacker/workflows/Ruby%20specs/badge.svg)](https://github.com/shakacode/shakapacker/actions)
 [![Jest specs](https://github.com/shakacode/shakapacker/workflows/Jest%20specs/badge.svg)](https://github.com/shakacode/shakapacker/actions)
 [![Rubocop](https://github.com/shakacode/shakapacker/workflows/Rubocop/badge.svg)](https://github.com/shakacode/shakapacker/actions)
 [![JS lint](https://github.com/shakacode/shakapacker/workflows/JS%20lint/badge.svg)](https://github.com/shakacode/shakapacker/actions)
 
-[![node.js](https://img.shields.io/badge/node-%3E%3D%2012.0.0-brightgreen.svg)](https://www.npmjs.com/package/@shakacode/shakapacker)
+[![node.js](https://img.shields.io/badge/node-%3E%3D%2012.0.0-brightgreen.svg)](https://www.npmjs.com/package/shakapacker)
 [![Gem](https://img.shields.io/gem/v/shakapacker.svg)](https://rubygems.org/gems/shakapacker)
+[![npm version](https://badge.fury.io/js/shakapacker.svg)](https://badge.fury.io/js/shakapacker)
 
 Webpacker makes it easy to use the JavaScript pre-processor and bundler
 [Webpack v5](https://webpack.js.org/)
@@ -19,8 +19,6 @@ leaving Webpack responsible solely for app-like JavaScript, or it can be used ex
 
 See a comparison of [webpacker with jsbundling-rails](https://github.com/rails/jsbundling-rails/blob/main/docs/comparison_with_webpacker.md).
 
-Visit [Shipping Webpacker v6 – Status](https://discuss.rubyonrails.org/t/shipping-webpacker-v6-status/79683) for the latest news on a v6 release.
-
 Discussion forums to discuss debugging and troubleshooting tips. Please open issues for bugs and feature requests:
 1. [rails/webpacker discussion forum](https://discuss.rubyonrails.org/c/webpacker/10)
 2. [Discussions tab](https://github.com/shakacode/shakapacker/discussions)
@@ -37,9 +35,11 @@ Discussion forums to discuss debugging and troubleshooting tips. Please open iss
   - [Rails v6](#rails-v6)
   - [Rails v7](#rails-v7)
   - [Manual Installation Steps](#manual-installation-steps)
+  - [Note for Sprockets usage](#note-for-sprockets-usage)
 - [Usage](#usage)
-      - [Defer for `javascript_pack_tag`](#defer-for-javascript_pack_tag)
-    - [Server-Side Rendering (SSR)](#server-side-rendering-ssr)
+  - [View Helpers](#view-helpers)
+  - [Defer for `javascript_pack_tag`](#defer-for-javascript_pack_tag)
+  - [Server-Side Rendering (SSR)](#server-side-rendering-ssr)
   - [Development](#development)
   - [Webpack Configuration](#webpack-configuration)
   - [Babel configuration](#babel-configuration)
@@ -56,9 +56,10 @@ Discussion forums to discuss debugging and troubleshooting tips. Please open iss
     - [Other frameworks](#other-frameworks)
   - [Custom Rails environments](#custom-rails-environments)
   - [Upgrading](#upgrading)
-- [Paths](#paths)
+  - [Paths](#paths)
   - [Additional paths](#additional-paths)
 - [Deployment](#deployment)
+- [Example Apps](#example-apps)
 - [Troubleshooting](#troubleshooting)
 - [Contributing](#contributing)
 - [License](#license)
@@ -73,49 +74,40 @@ Discussion forums to discuss debugging and troubleshooting tips. Please open iss
 - Yarn
 
 ## Features
-
+- Rails view helpers that fully support webpack output
+- Convenient but not required webpack configuration. The only requirement is that your webpack configuration create a manifest.
+- HMR with the webpack-dev-server, such as for hot-reloading for React!
+- Automatic code splitting using multiple entry points to optimize JavaScript downloads
 - [Webpack v5](https://webpack.js.org/)
 - ES6 with [babel](https://babeljs.io/)
-- Automatic code splitting using multiple entry points
 - Asset compression, source-maps, and minification
 - CDN support
-- Rails view helpers
-- Extensible and configurable
+- Extensible and configurable. For example, all major dependencies are specified as peers, so you can upgrade easily.
 
 ### Optional support
-
-  _requires extra packages to be installed_
-
-  - Stylesheets - Sass, Less, Stylus and Css, PostCSS
-  - CoffeeScript
-  - TypeScript
-  - React
+ _Requires extra packages to be installed._
+ - React
+ - TypeScript
+ - Stylesheets - Sass, Less, Stylus and Css, PostCSS
+ - CoffeeScript
 
 ## Installation
 
-### Rails v6
-With Rails v6, webpacker is installed by default:
-```bash
-rails new myapp
-```
 
-### Rails v7
+### Rails v6+
 
-With Rails v7, skip JavaScript for a new app and follow below Manual Installation Steps to manually add the `webpacker` gem to your Gemfile. 
+With Rails v6+, skip JavaScript for a new app and follow below Manual Installation Steps to manually add the `shakapacker` gem to your Gemfile.
 ```bash
 rails new myapp --skip-javascript
 ```
 
-### Manual Installation Steps
+_Note, Rails 6 installs the older v5 version of webpacker unless you specify `--skip-javascript`._
+
 Update your `Gemfile`:
 
 ```ruby
 # Gemfile
-gem 'webpacker', '~> 6.0'
-
-# OR if you prefer to use master
-gem 'webpacker', git: 'https://github.com/shakacode/shakapacker.git'
-yarn add https://github.com/shakacode/shakapacker.git
+gem 'shakapacker', '~> 6.0'
 ```
 
 Then running the following to install Webpacker:
@@ -135,15 +127,26 @@ Note, in v6, most JS packages are peer dependencies. Thus, the installer will ad
 
 ```bash
 yarn add @babel/core @babel/plugin-transform-runtime @babel/preset-env @babel/runtime babel-loader \
-  compression-webpack-plugin pnp-webpack-plugin terser-webpack-plugin \
+  compression-webpack-plugin terser-webpack-plugin \
   webpack webpack-assets-manifest webpack-cli webpack-merge webpack-sources webpack-dev-server
 ```
 
-Previously, these "webpack" and "babel" packages were direct dependencies for `@shakacode/shakapacker`. By
+Previously, these "webpack" and "babel" packages were direct dependencies for `webpacker`. By
 making these peer dependencies, you have control over the versions used in your webpack and babel configs.
 
+### Note for Sprockets usage
+
+If you are still using Sprockets for some of your assets, you might want to include files from `node_modules` directory in your asset pipeline. This is useful, for example, if you want to reference a stylesheet from a node package in your `.scss` stylesheet.
+
+In order to enable this, make sure you add `node_modules` to the asset load path by adding the following in an initializer (for example `config/initializers/assets.rb`)
+```ruby
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
+```
+
 ## Usage
 
+### View Helpers
+
 Once installed, you can start writing modern ES6-flavored JavaScript apps right away:
 
 ```yml
@@ -181,7 +184,7 @@ The result looks like this:
 <script src="/packs/map-16838bab065ae1e314.js" data-turbolinks-track="reload" defer></script>
 ```
 
-**Important:** Pass all your pack names as multiple arguments, not multiple calls, when using `javascript_pack_tag` and the **`stylesheet_pack_tag`. Otherwise, you will get duplicated chunks on the page. Be especially careful if you might be calling these view helpers from your view, partials, and the layout for a page. You will need some logic to ensure you call the helpers only once with multiple arguments.
+**Important:** Pass all your pack names as multiple arguments, not multiple calls, when using `javascript_pack_tag` and the `stylesheet_pack_tag`. Otherwise, you will get duplicated chunks on the page. Be especially careful if you might be calling these view helpers from your view, partials, and the layout for a page. You will need some logic to ensure you call the helpers only once with multiple arguments.
 
 ```erb
 <%# DO %>
@@ -223,10 +226,10 @@ If you want to use images in your stylesheets:
   background-image: url('../images/logo.svg')
 }
 ```
-##### Defer for `javascript_pack_tag`
+### Defer for `javascript_pack_tag`
 Note, the default of "defer" for the `javascript_pack_tag`. You can override that to `false`. If you expose jquery globally with `expose-loader,` by using `import $ from "expose-loader?exposes=$,jQuery!jquery"` in your `app/packs/entrypoints/application.js`, pass the option `defer: false` to your `javascript_pack_tag`.
 
-#### Server-Side Rendering (SSR)
+### Server-Side Rendering (SSR)
 
 Note, if you are using server-side rendering of JavaScript with dynamic code-splitting, as is often done with extensions to Webpacker, like [React on Rails](https://github.com/shakacode/react_on_rails), your JavaScript should create the link prefetch HTML tags that you will use, so you won't need to use to `asset_pack_path` in those circumstances.
 
@@ -287,11 +290,33 @@ end
 
 ### Webpack Configuration
 
-Webpacker gives you a default configuration file for your test, development, and production environments in `config/webpack/*.js`. 
+First, you don't _need_ to use Shakapacker's webpack configuration. However, the `shakapacker` NPM package provides convenient access to configuration code that reads the `config/webpacker.yml` file which the view helpers also use. If you have your own customized webpack configuration, at the mininmum, you must ensure:
 
-By default, you don't need to make any changes to `config/webpack/webpack.config.js` files since it's all standard production-ready configuration. However, if you do need to customize or add a new loader, this is where you would go.
+1. Your output files go the right directory
+2. You provide 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 webpacker!
 
-Here is how you can modify webpack configuration:
+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`:
+
+```js
+// use the new NPM package name, `shakapacker`.
+// merge is webpack-merge from https://github.com/survivejs/webpack-merge
+const { webpackConfig: baseWebpackConfig, merge } = require('shakapacker')
+
+const options = {
+  resolve: {
+      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,
+// havaing a new object is essential.
+module.exports = merge({}, baseWebpackConfig, options)
+```
+
+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)
+
+Webpacker gives you a default configuration file `config/webpack/webpack.config.js`, which, by default, you don't need to make any changes to `config/webpack/webpack.config.js` since it's a standard production-ready configuration. However, you will probably want to customize or add a new loader by modifying the webpack configuration, as shown above.
 
 You might add separate files to keep your code more organized.
 
@@ -314,7 +339,8 @@ Then `require` this file in your `config/webpack/webpack.config.js`:
 
 ```js
 // config/webpack/webpack.config.js
-const { webpackConfig, merge } = require('@shakacode/shakapacker')
+// use the new NPM package name, `shakapacker`.
+const { webpackConfig, merge } = require('shakapacker')
 const customConfig = require('./custom')
 
 module.exports = merge(webpackConfig, customConfig)
@@ -324,7 +350,7 @@ If you need access to configs within Webpacker's configuration, you can import t
 
 ```js
 // config/webpack/webpack.config.js
-const { webpackConfig } = require('@shakacode/shakapacker')
+const { webpackConfig } = require('shakapacker')
 
 console.log(webpackConfig.output_path)
 console.log(webpackConfig.source_path)
@@ -335,12 +361,12 @@ console.log(JSON.stringify(webpackConfig, undefined, 2))
 
 ### Babel configuration
 
-By default, you will find the Webpacker preset in your `package.json`.
+By default, you will find the Webpacker preset in your `package.json`. Note, you need to use the new NPM package name, `shakapacker`.
 
 ```json
 "babel": {
   "presets": [
-    "./node_modules/@shakacode/shakapacker/package/babel/preset.js"
+    "./node_modules/shakapacker/package/babel/preset.js"
   ]
 },
 ```
@@ -423,7 +449,7 @@ Then modify the webpack config to use it as a plugin:
 
 ```js
 // config/webpack/webpack.config.js
-const { webpackConfig, merge } = require("@shakacode/shakapacker");
+const { webpackConfig, merge } = require("shakapacker");
 const ForkTSCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
 
 module.exports = merge(webpackConfig, {
@@ -443,7 +469,7 @@ Optionally, add the `CSS` extension to webpack config for easy resolution.
 
 ```js
 // config/webpack/webpack.config.js
-const { webpackConfig, merge } = require('@shakacode/shakapacker')
+const { webpackConfig, merge } = require('shakapacker')
 const customConfig = {
   resolve: {
     extensions: ['.css']
@@ -516,13 +542,12 @@ module.exports = {
 
 ```js
 // config/webpack/webpack.config.js
-const { webpackConfig, merge } = require('@shakacode/shakapacker')
+const { webpackConfig, merge } = require('shakapacker')
 const vueConfig = require('./rules/vue')
 
 module.exports = merge(vueConfig, webpackConfig)
 ```
 
-
 ### Custom Rails environments
 
 Out of the box Webpacker ships with - development, test and production environments in `config/webpacker.yml` however, in most production apps extra environments are needed as part of deployment workflow. Webpacker supports this out of the box from version 3.4.0+ onwards.
@@ -575,26 +600,26 @@ You can run following commands to upgrade Webpacker to the latest stable version
 
 ```bash
 # check your Gemfile for version restrictions
-bundle update webpacker
+bundle update shakapacker
 
 # overwrite your changes to the default install files and revert any unwanted changes from the install
 rails webpacker:install
 
 # yarn 1 instructions
-yarn upgrade @shakacode/shakapacker --latest
+yarn upgrade shakapacker --latest
 yarn upgrade webpack-dev-server --latest
 
 # yarn 2 instructions
-yarn up @shakacode/shakapacker@latest
+yarn up shakapacker@latest
 yarn up webpack-dev-server@latest
 
 # Or to install the latest release (including pre-releases)
-yarn add @shakacode/shakapacker@next
+yarn add shakapacker@next
 ```
 
 Also, consult the [CHANGELOG](./CHANGELOG.md) for additional upgrade links.
 
-## Paths
+### Paths
 
 By default, Webpacker ships with simple conventions for where the JavaScript app files and compiled webpack bundles will go in your Rails app. All these options are configurable from `config/webpacker.yml` file.
 
@@ -650,18 +675,17 @@ When compiling assets for production on a remote server, such as a continuous in
 
 If you are using a CDN setup, webpacker 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 `WEBPACKER_ASSET_HOST` environment variable.
 
+## 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)
+
 
 ## Troubleshooting
 
 See the doc page for [Troubleshooting](./docs/troubleshooting.md).
 
-
 ## Contributing
 
-[![Code Helpers](https://www.codetriage.com/shakacode/shakapacker/badges/users.svg)](https://www.codetriage.com/shakacode/shakapacker)
-
-We encourage you to contribute to Webpacker! See [CONTRIBUTING](CONTRIBUTING.md) for guidelines about how to proceed.
-
+We encourage you to contribute to Shakapacker/Webpacker! See [CONTRIBUTING](CONTRIBUTING.md) for guidelines about how to proceed. We have a [Slack discussion channel](https://reactrails.slack.com/join/shared_invite/enQtNjY3NTczMjczNzYxLTlmYjdiZmY3MTVlMzU2YWE0OWM0MzNiZDI0MzdkZGFiZTFkYTFkOGVjODBmOWEyYWQ3MzA2NGE1YWJjNmVlMGE).
 
 ## License
 

data/docs/customizing_babel_config.md

@@ -1,13 +1,13 @@
 # Customizing Babel Config
 
 ## Default Configuration
-The default configuration of babel is done by using `package.json` to use the file within the `@shakacode/shakapacker` package.
+The default configuration of babel is done by using `package.json` to use the file within the `shakapacker` package.
 
 ```json
 {
   "babel": {
     "presets": [
-      "./node_modules/@shakacode/shakapacker/package/babel/preset.js"
+      "./node_modules/shakapacker/package/babel/preset.js"
     ]
   }
 }
@@ -27,7 +27,7 @@ yarn add --dev @pmmmwh/react-refresh-webpack-plugin react-refresh
 ```js
 // babel.config.js
 module.exports = function (api) {
-  const defaultConfigFunc = require('@shakacode/shakapacker/package/babel/preset.js')
+  const defaultConfigFunc = require('shakapacker/package/babel/preset.js')
   const resultConfig = defaultConfigFunc(api)
   const isProductionEnv = api.env('production')
 

data/docs/developing_webpacker.md

@@ -13,7 +13,7 @@ Let's call the shakacode/shakapacker directory `WEBPACKER_DIR` which has shakaco
 ### Setup with Yalc
 Use [`yalc`](https://github.com/wclr/yalc) unless you like yak shaving weird errors.
 1. In `WEBPACKER_DIR`, run `yalc publish`
-2. In `TEST_APP_DIR`, run `yalc link @shakacode/shakapacker`
+2. In `TEST_APP_DIR`, run `yalc link shakapacker`
 
 ## Update the Package Code
 1. Make some JS change in WEBPACKER_DIR

data/docs/troubleshooting.md

@@ -132,7 +132,7 @@ To silent these warnings, please update `config/webpack/webpack.config.js`:
 ```js
 const webpack = require('webpack')
 const { resolve } = require('path')
-const { webpackConfig, merge } = require('@shakacode/shakapacker')
+const { webpackConfig, merge } = require('shakapacker')
 
 module.exports = merge(webpackConfig, {
   plugins: [
@@ -181,7 +181,7 @@ Instead do:
 // config/webpack/webpack.config.js
 
 const webpack = require('webpack')
-const { webpackConfig, merge } = require('@shakacode/shakapacker')
+const { webpackConfig, merge } = require('shakapacker')
 
 module.exports = merge(webpackConfig, {
   plugins: [

data/docs/v6_upgrade.md

@@ -10,6 +10,15 @@ Webpacker used to configure Webpack indirectly, which lead to a [complicated sec
 
 This means you have to configure integration with frameworks yourself, but webpack-merge helps with this. See this example for [Vue](https://github.com/shakacode/shakapacker#other-frameworks) and scroll to the bottom for [more examples](#examples-of-v5-to-v6).
 
+## webpacker v6.0.0.rc.6 to shakapacker
+See an example migration here: [PR 27](https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/pull/27).
+          
+### Update
+1. Peer dependencies. Run `yarn add @babel/core @babel/plugin-transform-runtime @babel/preset-env @babel/runtime babel-loader compression-webpack-plugin terser-webpack-plugin webpack webpack-assets-manifest webpack-cli webpack-merge webpack-sources webpack-dev-server`
+1. Update any scripts that called `bin/webpack` or `bin/webpack-dev-server` to `bin/webpacker` or `bin/webpacker-dev-server`
+1. Update your webpack config for a single config file, `config/webpack/webpack.config.js`. 
+1. Update `babel.config.js` if you need JSX support. 
+
 ## How to upgrade to Webpacker v6 from v5
 1. Ensure you have a clean working git branch. You will be overwriting all your files and reverting the changes that you don't want.
 
@@ -33,13 +42,13 @@ This means you have to configure integration with frameworks yourself, but webpa
 
 1. Upgrade the Webpacker Ruby gem and the NPM package
 
-   Note: [Check the releases page to verify the latest version](https://github.com/rails/webpacker/releases), and make sure to install identical version numbers of webpacker gem and `@shakacode/shakapacker` npm package. (Gems use a period and packages use a dot between the main version number and the beta version.)
+   Note: [Check the gem page to verify the latest version](https://rubygems.org/gems/shakapacker), and make sure to install identical version numbers of `shakapacker` gem and package. (Gems use a period and packages use a dot between the main version number and the beta version.)
 
    Example going to a specific version:
 
    ```ruby
    # Gemfile
-   gem 'webpacker', '6.0.0.rc.7'
+   gem 'shakapacker', '6.0.0.rc.13'
    ```
 
    ```bash
@@ -47,7 +56,7 @@ This means you have to configure integration with frameworks yourself, but webpa
    ```
 
    ```bash
-   yarn add @shakacode/shakapacker@6.0.0-rc.7 --exact
+   yarn add shakapacker@6.0.0-rc.13 --exact
    ```
 
   ```bash
@@ -58,13 +67,13 @@ This means you have to configure integration with frameworks yourself, but webpa
 
   Note, the webpacker:install will install the peer dependencies:
   ```bash
-  yarn add @babel/core @babel/plugin-transform-runtime @babel/preset-env @babel/runtime babel-loader compression-webpack-plugin pnp-webpack-plugin terser-webpack-plugin webpack webpack-assets-manifest webpack-cli webpack-merge webpack-sources webpack-dev-server
+  yarn add @babel/core @babel/plugin-transform-runtime @babel/preset-env @babel/runtime babel-loader compression-webpack-plugin terser-webpack-plugin webpack webpack-assets-manifest webpack-cli webpack-merge webpack-sources webpack-dev-server
   ```
 
 1. There is now a single default configuration file of `config/webpack/webpack.config.js`. Previously, the config file was set
   to `config/webpack/#{NODE_ENV}.js`. In the `config/webpack/` directory, you can either refactor your code in `test.js`, `development.js`, and `production.js` to a single file, `webpack.config.js` or you can replace the contents of `config/webpack/config.webpack.js` to conditionally load the old file based on the NODE_ENV with this snippet:
    ```js
-   const { env, webpackConfig } = require('@shakacode/shakapacker')
+   const { env, webpackConfig } = require('shakapacker')
    const { existsSync } = require('fs')
    const { resolve } = require('path')
 
@@ -109,7 +118,7 @@ This means you have to configure integration with frameworks yourself, but webpa
 1. Import `environment` changed to `webpackConfig`. For example, the new code looks like:
    ```js
    // config/webpack/webpack.config.js
-   const { webpackConfig, merge } = require('@shakacode/shakapacker')
+   const { webpackConfig, merge } = require('shakapacker')
    const customConfig = require('./custom')
 
    module.exports = merge(webpackConfig, customConfig)

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

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

data/lib/install/package.json

@@ -6,7 +6,7 @@
   "version": "0.1.0",
   "babel": {
     "presets": [
-      "./node_modules/@shakacode/shakapacker/package/babel/preset.js"
+      "./node_modules/shakapacker/package/babel/preset.js"
     ]
   },
   "browserslist": [

data/lib/install/template.rb

@@ -45,15 +45,6 @@ if (setup_path = Rails.root.join("bin/setup")).exist?
 RUBY
 end
 
-if (asset_config_path = Rails.root.join("config/initializers/assets.rb")).exist?
-  say "Add node_modules to the asset load path"
-  append_to_file asset_config_path, <<-RUBY
-
-# Add node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join("node_modules")
-RUBY
-end
-
 if (csp_config_path = Rails.root.join("config/initializers/content_security_policy.rb")).exist?
   say "Make note of webpack-dev-server exemption needed to csp"
   insert_into_file csp_config_path, <<-RUBY, after: %(# Rails.application.config.content_security_policy do |policy|)
@@ -66,11 +57,11 @@ results = []
 
 Dir.chdir(Rails.root) do
   if Webpacker::VERSION.match?(/^[0-9]+\.[0-9]+\.[0-9]+$/)
-    say "Installing @shakacode/shakapacker@#{Webpacker::VERSION}"
-    results << run("yarn add @shakacode/shakapacker@#{Webpacker::VERSION}")
+    say "Installing shakapacker@#{Webpacker::VERSION}"
+    results << run("yarn add shakapacker@#{Webpacker::VERSION}")
   else
-    say "Installing @shakacode/shakapacker@next"
-    results << run("yarn add @shakacode/shakapacker@next")
+    say "Installing shakapacker@next"
+    results << run("yarn add shakapacker@next")
   end
 
   package_json = File.read("#{__dir__}/../../package.json")
@@ -80,7 +71,7 @@ Dir.chdir(Rails.root) do
     result << "#{package}@#{major_version}"
   end.join(" ")
 
-  say "Adding @shakacode/shakapacker peerDependencies"
+  say "Adding shakapacker peerDependencies"
   results << run("yarn add #{peers_to_add}")
 
   say "Installing webpack-dev-server for live reloading as a development dependency"

data/lib/shakapacker.rb

@@ -0,0 +1 @@
+require "webpacker"

data/lib/tasks/webpacker/info.rake

@@ -11,7 +11,7 @@ namespace :webpacker do
       $stdout.puts "Yarn: #{`yarn --version`}"
 
       $stdout.puts "\n"
-      $stdout.puts "@shakacode/shakapacker: \n#{`npm list @shakacode/shakapacker version`}"
+      $stdout.puts "shakapacker: \n#{`npm list shakapacker version`}"
 
       $stdout.puts "Is bin/webpacker present?: #{File.exist? 'bin/webpacker'}"
       $stdout.puts "Is bin/webpacker-dev-server present?: #{File.exist? 'bin/webpacker-dev-server'}"

data/lib/webpacker/helper.rb

@@ -96,6 +96,13 @@ module Webpacker::Helper
   #   <%= javascript_pack_tag 'calendar' %>
   #   <%= javascript_pack_tag 'map' %>
   def javascript_pack_tag(*names, defer: true, **options)
+    if @javascript_pack_tag_loaded
+      raise "To prevent duplicated chunks on the page, you should call javascript_pack_tag only once on the page. " \
+      "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#usage for the usage guide"
+    end
+
+    @javascript_pack_tag_loaded = true
+
     javascript_include_tag(*sources_from_manifest_entrypoints(names, type: :javascript), **options.tap { |o| o[:defer] = defer })
   end
 
@@ -141,6 +148,13 @@ module Webpacker::Helper
   #   <%= stylesheet_pack_tag 'calendar' %>
   #   <%= stylesheet_pack_tag 'map' %>
   def stylesheet_pack_tag(*names, **options)
+    if @stylesheet_pack_tag_loaded
+      raise "To prevent duplicated chunks on the page, you should call stylesheet_pack_tag only once on the page. " \
+      "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#usage for the usage guide"
+    end
+
+    @stylesheet_pack_tag_loaded = true
+
     return "" if Webpacker.inlining_css?
 
     stylesheet_link_tag(*sources_from_manifest_entrypoints(names, type: :stylesheet), **options)

data/lib/webpacker/version.rb

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

data/package/babel/preset.js

@@ -1,4 +1,4 @@
-const { moduleExists } = require('@shakacode/shakapacker')
+const { moduleExists } = require('shakapacker')
 
 module.exports = function config(api) {
   const validEnv = ['development', 'test', 'production']

data/package/environments/base.js

@@ -3,7 +3,6 @@
 
 const { basename, dirname, join, relative, resolve } = require('path')
 const extname = require('path-complete-extname')
-const PnpWebpackPlugin = require('pnp-webpack-plugin')
 const { sync: globSync } = require('glob')
 const WebpackAssetsManifest = require('webpack-assets-manifest')
 const webpack = require('webpack')
@@ -92,15 +91,13 @@ module.exports = {
   entry: getEntryObject(),
   resolve: {
     extensions: ['.js', '.jsx', '.mjs', '.ts', '.tsx', '.coffee'],
-    modules: getModulePaths(),
-    plugins: [PnpWebpackPlugin]
+    modules: getModulePaths()
   },
 
   plugins: getPlugins(),
 
   resolveLoader: {
-    modules: ['node_modules'],
-    plugins: [PnpWebpackPlugin.moduleLoader(module)]
+    modules: ['node_modules']
   },
 
   optimization: {

data/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@shakacode/shakapacker",
-  "version": "6.0.0-rc.12",
+  "name": "shakapacker",
+  "version": "6.0.1",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "main": "package/index.js",
   "files": [
@@ -18,7 +18,6 @@
     "@babel/runtime": "^7.15.4",
     "babel-loader": "^8.2.2",
     "compression-webpack-plugin": "^9.0.0",
-    "pnp-webpack-plugin": "^1.7.0",
     "terser-webpack-plugin": "^5.2.4",
     "webpack": "^5.53.0",
     "webpack-assets-manifest": "^5.0.6",
@@ -40,7 +39,6 @@
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.26.0",
     "jest": "^27.2.1",
-    "pnp-webpack-plugin": "^1.7.0",
     "webpack": "^5.53.0",
     "webpack-assets-manifest": "^5.0.6",
     "webpack-merge": "^5.8.0"

data/test/helper_test.rb

@@ -12,6 +12,9 @@ class HelperTest < ActionView::TestCase
         "https://example.com"
       end
     end.new
+
+    @javascript_pack_tag_loaded = nil
+    @stylesheet_pack_tag_loaded = nil
   end
 
   def test_asset_pack_path
@@ -129,6 +132,18 @@ class HelperTest < ActionView::TestCase
       javascript_pack_tag(:application)
   end
 
+  def test_javascript_pack_tag_multiple_invocations
+    error = assert_raises do
+      javascript_pack_tag(:application)
+      javascript_pack_tag(:bootstrap)
+    end
+
+    assert_equal \
+      "To prevent duplicated chunks on the page, you should call javascript_pack_tag only once on the page. " +
+        "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#usage for the usage guide",
+      error.message
+  end
+
   def application_stylesheet_chunks
     %w[/packs/1-c20632e7baf2c81200d3.chunk.css /packs/application-k344a6d59eef8632c9d1.chunk.css]
   end
@@ -156,4 +171,16 @@ class HelperTest < ActionView::TestCase
       (application_stylesheet_chunks).map { |chunk| stylesheet_link_tag(chunk, media: "all") }.join("\n"),
       stylesheet_pack_tag("application", media: "all")
   end
+
+  def test_stylesheet_pack_tag_multiple_invocations
+    error = assert_raises do
+      stylesheet_pack_tag(:application)
+      stylesheet_pack_tag(:hello_stimulus)
+    end
+
+    assert_equal \
+      "To prevent duplicated chunks on the page, you should call stylesheet_pack_tag only once on the page. " +
+        "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#usage for the usage guide",
+      error.message
+  end
 end

data/test/mounted_app/test/dummy/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "dependencies": {
-    "@shakacode/shakapacker": "file:../../../../"
+    "shakapacker": "file:../../../../"
   },
   "license": "MIT"
 }

data/yarn.lock

@@ -3215,13 +3215,6 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-pnp-webpack-plugin@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz#65741384f6d8056f36e2255a8d67ffc20866f5c9"
-  integrity sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==
-  dependencies:
-    ts-pnp "^1.1.6"
-
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -3730,11 +3723,6 @@ tr46@^2.1.0:
   dependencies:
     punycode "^2.1.1"
 
-ts-pnp@^1.1.6:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
-  integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
-
 tsconfig-paths@^3.12.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakapacker
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc.12
+  version: 6.0.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -157,6 +157,7 @@ files:
 - lib/install/config/webpacker.yml
 - lib/install/package.json
 - lib/install/template.rb
+- lib/shakapacker.rb
 - lib/shakapacker/utils/misc.rb
 - lib/shakapacker/utils/version_syntax_converter.rb
 - lib/tasks/webpacker.rake
@@ -268,7 +269,7 @@ homepage: https://github.com/shakacode/shakapacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/shakacode/shakapacker/tree/v6.0.0-rc.12
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v6.0.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -280,9 +281,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.32
 signing_key: