webpacker 6.0.0.beta.7 → 6.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2425c109984a7a6029a78cecf6cbc2a9567cc91ea9fb9d85efc11bb4c7f5e591
-  data.tar.gz: c58f07ce11e2e4d8813016947f4365e681a3366225142cb5ba35a352063da428
+  metadata.gz: 96eeffae92e201748b583ac421869d0e76ec806df6dc750d2f0459b2aad05f62
+  data.tar.gz: 3ed4f39584aa504dd761c59d160014eacc2e8392f847f3c95d5380c32d449142
 SHA512:
-  metadata.gz: 405ea2a5d1be7ee478b7556e2306be7db07b48d48cbccf260a6bfcad71ccde747f114c1d71309571db3061dca03cd75bc719e2a400d09f7ab1eb6096e86662f9
-  data.tar.gz: 81458c1b088cf49dc03072a6fcd94dded64739b1820f2a83631c0eb36ecd2174d180a325353f2f950cefbc45db6d016e4151d0d81cb9b00f0615cb9667b1218f
+  metadata.gz: d70ec25c9ee0ca7cbbe42f1806a7e3e142f0b7b55a0a9cdcd43d1922cf23bd69346bbdab6e37cd31a1cbb4fc533b951b60ef3fed3d622f36208a3841eccc4ff7
+  data.tar.gz: 47b10bc8e36c8e0697a2341714f27ffc2d749d465b840d14cea71847f592b30f5e6512325198fcedbb2c406859acbc15384c32a71c3cbc62a0ecd2c26b4f9e62

data/.github/workflows/jest.yml

@@ -3,16 +3,19 @@ name: Jest specs
 on: [push, pull_request]
 
 jobs:
-  build:
+  jest:
     name: Jest specs
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [10.x, 12.x, 14.x, 15.x]
+        node: [12.x, 14.x, 15.x]
 
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Install yarn maybe
+        run: which yarn || sudo npm install -g yarn
+
       - uses: actions/checkout@v2
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path

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

@@ -3,7 +3,7 @@ name: JS lint
 on: [push, pull_request]
 
 jobs:
-  build:
+  js-lint:
     name: JS Lint
 
     strategy:
@@ -14,6 +14,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Install yarn maybe
+        run: which yarn || sudo npm install -g yarn
+
       - uses: actions/checkout@v2
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path

data/.github/workflows/rubocop.yml

@@ -3,7 +3,7 @@ name: Rubocop
 on: [push, pull_request]
 
 jobs:
-  build:
+  rubocop:
     name: Rubocop
     runs-on: ${{ matrix.os }}
     env:

data/.github/workflows/ruby.yml

@@ -3,7 +3,7 @@ name: Ruby specs
 on: [push, pull_request]
 
 jobs:
-  build:
+  test:
     name: Ruby specs
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' || matrix.experimental }}
@@ -23,23 +23,20 @@ jobs:
         ]
         gemfile: [
           "gemfiles/Gemfile-rails.5.2.x",
-          "gemfiles/Gemfile-rails.6.0.x"
+          "gemfiles/Gemfile-rails.6.0.x",
+          "gemfiles/Gemfile-rails.6.1.x"
         ]
         exclude:
-          - ruby: "2.4"
+          - ruby: 2.4
             gemfile: gemfiles/Gemfile-rails.6.0.x
-          - ruby: "3.0"
+          - ruby: 2.4
+            gemfile: gemfiles/Gemfile-rails.6.1.x
+          - ruby: 2.5
+            gemfile: gemfiles/Gemfile-rails.6.1.x
+          - ruby: 3.0
             gemfile: gemfiles/Gemfile-rails.5.2.x
         experimental: [false]
         include:
-          - ruby: 2.5
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails-edge
-            experimental: true
-          - ruby: 2.6
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails-edge
-            experimental: true
           - ruby: 2.7
             os: ubuntu-latest
             gemfile: gemfiles/Gemfile-rails-edge
@@ -58,6 +55,9 @@ jobs:
           restore-keys: |
             bundle-use-ruby-${{ matrix.ruby }}-${{ matrix.gemfile }}-gems-
 
+      - name: Install yarn maybe
+        run: which yarn || sudo npm install -g yarn
+
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.node-version

@@ -1 +1 @@
-10.22.1
+16.7.0

data/.rubocop.yml

@@ -8,6 +8,7 @@ AllCops:
     - "lib/install/templates/**"
     - "vendor/**/*"
     - "node_modules/**/*"
+    - "_actions/**/*"
 
 # Prefer &&/|| over and/or.
 Style/AndOr:

data/CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ## [[6.0.0]](https://github.com/rails/webpacker/compare/v5.1.1...master) - 2021-TBD
 
-Please see [UPGRADE GUIDE](./docs/v6_upgrade.md) for more informations.
+Please see [UPGRADE GUIDE](./docs/v6_upgrade.md) for more information.
 
 - `node_modules` will no longer be 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:
 
@@ -14,26 +14,37 @@ environment.loaders.append('nodeModules', nodeModules)
 ```
 
 - If you have added `environment.loaders.delete('nodeModules')` to your `environment.js`, this must be removed or you will receive an error (`Item nodeModules not found`).
-- The install task will now set the `extract_css` default to `true` in all environments and generate a separate `application.css` file for the default `application` pack, as supported by multiple files per entry introduced in 5.0.0. [#2608](https://github.com/rails/webpacker/pull/2608)
+- `extract_css` option was removed. Webpacker will generate a separate `application.css` file for the default `application` pack, as supported by multiple files per entry introduced in 5.0.0. [#2608](https://github.com/rails/webpacker/pull/2608). However, CSS will be inlined when the webpack-dev-server is used with `hmr: true`. JS package exports `inliningCss`. This is useful to enable HMR for React.
 - Webpacker's wrapper to the `splitChunks()` API will now default `runtimeChunk: 'single'` which will help prevent potential issues when using multiple entry points per page [#2708](https://github.com/rails/webpacker/pull/2708).
 - Changes `@babel/preset-env` modules option to `'auto'` per recommendation in the Babel docs [#2709](https://github.com/rails/webpacker/pull/2709)
 - Adds experimental Yarn 2 support. Note you must manually set `nodeLinker: node-modules` in your `.yarnrc.yml`.
-
 - Fixes dev server issues [#2898](https://github.com/rails/webpacker/pull/2898)
+- Update static files path to from `media/` to `static/`.
 
 ### Breaking changes
-
-- Simple webpack config
 - Removed integration installers
 - Splitchunks enabled by default
-- CSS extraction enabled by default
-- Optional CSS support
+- CSS extraction enabled by default, except when devServer is configured and running
+
+## [[5.4.0]](https://github.com/rails/webpacker/compare/v5.3.0...v5.4.0) - 2021-05-18
+
+- Fix compatibility with Psych 4
+
+## [[5.3.0]](https://github.com/rails/webpacker/compare/v5.2.1...v5.3.0) - 2021-04-27
+
+- Adds experimental Yarn 2 support. Note you must manually set `nodeLinker: node-modules` in your `.yarnrc.yml`.
+
+- Keep backups, even when they're old [#2912](https://github.com/rails/webpacker/pull/2912)
+
+## [[5.2.2]](https://github.com/rails/webpacker/compare/v5.2.1...v5.2.2) - 2021-04-27
+
+- Bump deps and remove node-sass [#2997](https://github.com/rails/webpacker/pull/2997).
 
-## [[5.2.1]](https://github.com/rails/webpacker/compare/v5.2.0...5.2.1) - 2020-08-17
+## [[5.2.1]](https://github.com/rails/webpacker/compare/v5.2.0...v5.2.1) - 2020-08-17
 
 - Revert [#1311](https://github.com/rails/webpacker/pull/1311).
 
-## [[5.2.0]](https://github.com/rails/webpacker/compare/v5.1.1...5.2.0) - 2020-08-16
+## [[5.2.0]](https://github.com/rails/webpacker/compare/v5.1.1...v5.2.0) - 2020-08-16
 
 - Bump dependencies and fixes. See [diff](https://github.com/rails/webpacker/compare/v5.1.1...5-x-stable) for changes.
 
@@ -412,7 +423,7 @@ See changes: https://github.com/rails/webpacker/compare/e8b197e36c77181ca2e4765c
 
 ### Added
 
-- On CI, sort files & check modified w/ digest intead of mtime[#1522](https://github.com/rails/webpacker/pull/1522)
+- On CI, sort files & check modified w/ digest instead of mtime[#1522](https://github.com/rails/webpacker/pull/1522)
 
 ## [3.5.3] - 2018-05-03
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    webpacker (6.0.0.beta.7)
+    webpacker (6.0.0.rc.2)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
@@ -180,4 +180,4 @@ DEPENDENCIES
   webpacker!
 
 BUNDLED WITH
-   2.2.3
+   2.2.25

data/README.md

@@ -5,17 +5,13 @@
 [![Rubocop](https://github.com/rails/webpacker/workflows/Rubocop/badge.svg)](https://github.com/rails/webpacker/actions)
 [![JS lint](https://github.com/rails/webpacker/workflows/JS%20lint/badge.svg)](https://github.com/rails/webpacker/actions)
 
-[![node.js](https://img.shields.io/badge/node-%3E%3D%2010.17.0-brightgreen.svg)](https://www.npmjs.com/package/@rails/webpacker)
+[![node.js](https://img.shields.io/badge/node-%3E%3D%2012.0.0-brightgreen.svg)](https://www.npmjs.com/package/@rails/webpacker)
 [![Gem](https://img.shields.io/gem/v/webpacker.svg)](https://rubygems.org/gems/webpacker)
 
 Webpacker makes it easy to use the JavaScript pre-processor and bundler
 [Webpack v5](https://webpack.js.org/)
-to manage application-like JavaScript in Rails. It coexists with the asset pipeline,
-as the primary purpose for webpack is app-like JavaScript, not images, CSS, or
-even JavaScript Sprinkles (that all continues to live in app/assets).
-
-However, it is possible to use Webpacker for CSS, images and fonts assets as well,
-in which case you may not even need the asset pipeline. This is mostly relevant when exclusively using component-based JavaScript frameworks.
+to manage application-like JavaScript in Rails. It can coexist with the asset pipeline,
+leaving Webpack responsible solely for app-like JavaScript, or it can be used exclusively, making it also responsible for images, fronts, and CSS as well.
 
 **NOTE:** The master branch now hosts the code for v6.x.x. Please refer to [5-x-stable](https://github.com/rails/webpacker/tree/5-x-stable) branch for 5.x documentation.
 
@@ -26,16 +22,29 @@ in which case you may not even need the asset pipeline. This is mostly relevant
 
 - [Prerequisites](#prerequisites)
 - [Features](#features)
+  - [Optional support](#optional-support)
 - [Installation](#installation)
   - [Usage](#usage)
+    - [Server-Side Rendering (SSR)](#server-side-rendering-ssr)
   - [Development](#development)
   - [Webpack Configuration](#webpack-configuration)
+  - [Babel Configuration](#babel-configuration)
+  - [Integrations](#integrations)
+    - [React](#react)
+    - [CoffeeScript](#coffeescript)
+    - [TypeScript](#typescript)
+    - [CSS](#css)
+    - [Postcss](#postcss)
+    - [Sass](#sass)
+    - [Less](#less)
+    - [Stylus](#stylus)
+    - [Other frameworks](#other-frameworks)
   - [Custom Rails environments](#custom-rails-environments)
   - [Upgrading](#upgrading)
 - [Paths](#paths)
-  - [Resolved](#resolved)
-  - [Watched](#watched)
+  - [Additional paths](#additional-paths)
 - [Deployment](#deployment)
+- [Troubleshooting](#troubleshooting)
 - [Contributing](#contributing)
 - [License](#license)
 
@@ -45,7 +54,7 @@ in which case you may not even need the asset pipeline. This is mostly relevant
 
 - Ruby 2.4+
 - Rails 5.2+
-- Node.js 10.22.1+ || 12+ || 14+
+- Node.js 12+ || 14+
 - Yarn 1.x+ || 2.x+
 
 ## Features
@@ -69,39 +78,28 @@ in which case you may not even need the asset pipeline. This is mostly relevant
 
 ## Installation
 
-You can either add Webpacker during setup of a new Rails 5.1+ application
-using new `--webpack` option:
+You can configure a new Rails application with Webpacker right from the start using the `--webpack` option:
 
 ```bash
-# Available Rails 5.1+
 rails new myapp --webpack
 ```
 
-Or add it to your `Gemfile`:
+Or you can add it later by changing your `Gemfile`:
 
 ```ruby
 # Gemfile
-gem 'webpacker', '~> 6.x'
+gem 'webpacker', '~> 6.0'
 
 # OR if you prefer to use master
 gem 'webpacker', git: 'https://github.com/rails/webpacker.git'
 yarn add https://github.com/rails/webpacker.git
 ```
 
-Finally, run the following to install Webpacker:
+Then running the following to install Webpacker:
 
 ```bash
-bundle
-bundle exec rails webpacker:install
-
-# OR (on rails version < 5.0)
-bundle exec rake webpacker:install
-```
-
-Optional: To fix ["unmet peer dependency" warnings](https://github.com/rails/webpacker/issues/1078),
-
-```bash
-yarn upgrade
+./bin/bundle install
+./bin/rails webpacker:install
 ```
 
 When `package.json` and/or `yarn.lock` changes, such as when pulling down changes to your local environment in a team settings, be sure to keep your NPM packages up-to-date:
@@ -135,6 +133,35 @@ You can then link the JavaScript pack in Rails views using the `javascript_pack_
 <%= stylesheet_pack_tag 'application' %>
 ```
 
+The `javascript_pack_tag` and `stylesheet_pack_tag` helpers will include all the transpiled
+packs with the chunks in your view, which creates html tags for all the chunks.
+
+The result looks like this:
+
+```erb
+<%= javascript_pack_tag 'calendar', 'map' %>
+
+<script src="/packs/vendor-16838bab065ae1e314.js" data-turbolinks-track="reload"></script>
+<script src="/packs/calendar~runtime-16838bab065ae1e314.js" data-turbolinks-track="reload"></script>
+<script src="/packs/calendar-1016838bab065ae1e314.js" data-turbolinks-track="reload"></script>
+<script src="/packs/map~runtime-16838bab065ae1e314.js" data-turbolinks-track="reload"></script>
+<script src="/packs/map-16838bab065ae1e314.js" data-turbolinks-track="reload"></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.
+
+```erb
+<%# DO %>
+<%= javascript_pack_tag 'calendar', 'map' %>
+<%= stylesheet_pack_tag 'calendar', 'map' %>
+
+<%# DON'T %>
+<%= javascript_pack_tag 'calendar' %>
+<%= javascript_pack_tag 'map' %>
+<%= stylesheet_pack_tag 'calendar' %>
+<%= stylesheet_pack_tag 'map' %>
+```
+
 If you want to link a static asset for `<img />` tag, you can use the `asset_pack_path` helper:
 ```erb
 <img src="<%= asset_pack_path 'images/logo.svg' %>" />
@@ -164,39 +191,20 @@ If you want to use images in your stylesheets:
 }
 ```
 
-Note, if you are using server-side rendering of JavaScript with dynamic code-spliting,
-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.
+#### Server-Side Rendering (SSR)
+
+Note, if you are using server-side rendering of JavaScript with dynamic code-spliting, 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.
+
+**Note:** In order for your styles or static assets files to be available in your view, you would need to link them in your "pack" or entry file. Otherwise, Webpack won't know to package up those files.
 
-**Note:** In order for your styles or static assets files to be available in your view,
-you would need to link them in your "pack" or entry file. Otherwise, Webpack won't know
-to package up those files.
 
 ### Development
 
-Webpacker ships with two binstubs: `./bin/webpack` and `./bin/webpack-dev-server`.
-Both are thin wrappers around the standard `webpack.js` and `webpack-dev-server.js`
-executables to ensure that the right configuration files and environmental variables
-are loaded based on your environment.
-
-In development, Webpacker compiles on demand rather than upfront by default. This
-happens when you refer to any of the pack assets using the Webpacker helper methods.
-This means that you don't have to run any separate processes. Compilation errors are logged
-to the standard Rails log. However, this auto-compilation happens when a web request
-is made that requires an updated webpack build, not when files change. Thus, that can
-be painfully slow for front-end development in this default way. Instead, you should either
-run the `bin/webpack --watch` or run `./bin/webpack-dev-server`
-
-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/webpack-dev-server` or `ruby ./bin/webpack-dev-server`.
-Windows users will need to run these commands in a terminal separate from `bundle exec rails s`.
-This process will watch for changes in the `app/packs/entrypoints/*.js` files and automatically
-reload the browser to match. This feature is also known as
-[Hot Module Replacement](https://webpack.js.org/concepts/hot-module-replacement/).
-
-HMR is only the first step to running "Fast Refresh" with React. For more information
-on how to configure rails/webpacker for Fast Refresh with React, see article
-[HMR and React Hot Reloading](https://github.com/shakacode/react_on_rails/blob/master/docs/rails-webpacker-react-integration-options.md#hmr-and-react-hot-reloading).
+Webpacker ships with two binstubs: `./bin/webpack` and `./bin/webpack-dev-server`. Both are thin wrappers around the standard `webpack.js` and `webpack-dev-server.js` executables to ensure that the right configuration files and environmental variables are loaded based on your environment.
+
+In development, Webpacker compiles on demand rather than upfront by default. This happens when you refer to any of the pack assets using the Webpacker helper methods. This means that you don't have to run any separate processes. Compilation errors are logged to the standard Rails log. However, this auto-compilation happens when a web request is made that requires an updated webpack build, not when files change. Thus, that can be painfully slow for front-end development in this default way. Instead, you should either run the `bin/webpack --watch` or run `./bin/webpack-dev-server`
+
+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/webpack-dev-server` or `ruby ./bin/webpack-dev-server`. Windows users will need to run these commands in a terminal separate from `bundle exec rails s`. This process will watch for changes in the `app/packs/entrypoints/*.js` files and automatically reload the browser to match. This feature is also known as [Hot Module Replacement](https://webpack.js.org/concepts/hot-module-replacement/).
 
 ```bash
 # webpack dev server
@@ -209,25 +217,15 @@ on how to configure rails/webpacker for Fast Refresh with React, see article
 ./bin/webpack
 ```
 
-Once you start this webpack development server, Webpacker will automatically start proxying all
-webpack asset requests to this server. When you stop this server, Rails will detect
-that it's not running and Rails will revert back to on-demand compilation _if_ you have
-the `compile` option set to true in your `config/webpacker.yml`
+Once you start this webpack development server, Webpacker will automatically start proxying all webpack asset requests to this server. When you stop this server, Rails will detect that it's not running and Rails will revert back to on-demand compilation _if_ you have the `compile` option set to true in your `config/webpacker.yml`
 
-You can use environment variables as options supported by
-[webpack-dev-server](https://webpack.js.org/configuration/dev-server/) in the
-form `WEBPACKER_DEV_SERVER_<OPTION>`. Please note that these environmental
-variables will always take precedence over the ones already set in the
-configuration file, and that the _same_ environmental variables must
-be available to the `rails server` process.
+You can use environment variables as options supported by [webpack-dev-server](https://webpack.js.org/configuration/dev-server/) in the form `WEBPACKER_DEV_SERVER_<OPTION>`. Please note that these environmental variables will always take precedence over the ones already set in the configuration file, and that the _same_ environmental variables must be available to the `rails server` process.
 
 ```bash
 WEBPACKER_DEV_SERVER_HOST=example.com WEBPACKER_DEV_SERVER_INLINE=true WEBPACKER_DEV_SERVER_HOT=false ./bin/webpack-dev-server
 ```
 
-By default, the webpack dev server listens on `localhost` in development for security purposes.
-However, if you want your app to be available over local LAN IP or a VM instance like vagrant,
-you can set the `host` when running `./bin/webpack-dev-server` binstub:
+By default, the webpack dev server listens on `localhost` in development for security purposes. However, if you want your app to be available over local LAN IP or a VM instance like vagrant, you can set the `host` when running `./bin/webpack-dev-server` binstub:
 
 ```bash
 WEBPACKER_DEV_SERVER_HOST=0.0.0.0 ./bin/webpack-dev-server
@@ -236,23 +234,20 @@ WEBPACKER_DEV_SERVER_HOST=0.0.0.0 ./bin/webpack-dev-server
 **Note:** You need to allow webpack-dev-server host as an allowed origin for `connect-src` if you are running your application in a restrict CSP environment (like Rails 5.2+). This can be done in Rails 5.2+ in the CSP initializer `config/initializers/content_security_policy.rb` with a snippet like this:
 
 ```ruby
-  Rails.application.config.content_security_policy do |policy|
-    policy.connect_src :self, :https, 'http://localhost:3035', 'ws://localhost:3035' if Rails.env.development?
-  end
+Rails.application.config.content_security_policy do |policy|
+  policy.connect_src :self, :https, 'http://localhost:3035', 'ws://localhost:3035' if Rails.env.development?
+end
 ```
 
 **Note:** Don't forget to prefix `ruby` when running these binstubs on Windows
 
+
 ### Webpack Configuration
 
-Webpacker gives you a default set of configuration files for test, development and
-production environments in `config/webpack/*.js`. You can configure each individual
-environment in their respective files or configure them all in the base
+Webpacker gives you a default set of configuration files for test, development and production environments in `config/webpack/*.js`. You can configure each individual environment in their respective files or configure them all in the base
 `config/webpack/base.js` file.
 
-By default, you don't need to make any changes to `config/webpack/*.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.
+By default, you don't need to make any changes to `config/webpack/*.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.
 
 Here is how you can modify webpack configuration:
 
@@ -283,8 +278,7 @@ const customConfig = require('./custom')
 module.exports = merge(webpackConfig, customConfig)
 ```
 
-If you need access to configs within Webpacker's configuration,
-you can import them like so:
+If you need access to configs within Webpacker's configuration, you can import them like so:
 
 ```js
 // config/webpack/base.js
@@ -297,11 +291,51 @@ console.log(webpackConfig.source_path)
 console.log(JSON.stringify(webpackConfig, undefined, 2))
 ```
 
+### Babel configuration
+
+By default, you will find the Webpacker preset in your `package.json`.
+
+```json
+"babel": {
+  "presets": [
+    "./node_modules/@rails/webpacker/package/babel/preset.js"
+  ]
+},
+```
+
+Optionally, you can change your Babel configuration by removing these lines in your `package.json` and add [a Babel configuration file](https://babeljs.io/docs/en/config-files) in your project.
+
+
 ### Integrations
 
-Webpacker out of the box supports JS and static assets (fonts, images etc.)
-compilation. To enable support for CoffeeScript or TypeScript install
-relevant packages:
+Webpacker out of the box supports JS and static assets (fonts, images etc.) compilation. To enable support for CoffeeScript or TypeScript install relevant packages:
+
+#### React
+
+```bash
+yarn add react react-dom @babel/preset-react
+```
+
+...if you are using typescript, update your `tsconfig.json`
+
+```json
+{
+  "compilerOptions": {
+    "declaration": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": ["es6", "dom"],
+    "module": "es6",
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "target": "es5",
+    "jsx": "react",
+    "noEmit": true
+  },
+  "exclude": ["**/*.spec.ts", "node_modules", "vendor", "public"],
+  "compileOnSave": false
+}
+```
 
 #### CoffeeScript
 
@@ -315,6 +349,12 @@ yarn add coffeescript coffee-loader
 yarn add typescript @babel/preset-typescript
 ```
 
+Babel won’t perform any type-checking on TypeScript code. To optionally use type-checking run:
+
+```bash
+yarn add fork-ts-checker-webpack-plugin
+```
+
 Add tsconfig.json
 
 ```json
@@ -339,12 +379,6 @@ Add tsconfig.json
 }
 ```
 
-Babel won’t perform any type-checking on TypeScript code. To optionally use type-checking run:
-
-```bash
-yarn add fork-ts-checker-webpack-plugin
-```
-
 Then modify the webpack config to use it as a plugin:
 
 ```js
@@ -362,10 +396,10 @@ module.exports = merge(webpackConfig, {
 To enable CSS support in your application, add following packages:
 
 ```bash
-yarn add css-loader mini-css-extract-plugin css-minimizer-webpack-plugin
+yarn add css-loader style-loader mini-css-extract-plugin css-minimizer-webpack-plugin
 ```
 
-optionally, add the css extension to webpack config for easy resolution.
+Optionally, add the `CSS` extension to webpack config for easy resolution.
 
 ```js
 // config/webpack/base.js
@@ -379,13 +413,18 @@ const customConfig = {
 module.exports = merge(webpackConfig, customConfig)
 ```
 
-To enable postcss, sass or less support, add css support first and
+To enable `PostCSS`, `Sass` or `Less` support, add `CSS` support first and
 then add the relevant pre-processors:
 
 #### Postcss
 
 ```bash
-yarn add postcss-loader
+yarn add postcss postcss-loader
+```
+
+Optionally add these two plugins if they are required in your `postcss.config.js`:
+```bash
+yarn add postcss-preset-env postcss-flexbugs-fixes
 ```
 
 #### Sass
@@ -406,39 +445,6 @@ yarn add less less-loader
 yarn add stylus stylus-loader
 ```
 
-#### React
-
-React is supported and you just need to add relevant packages,
-
-```bash
-yarn add react react-dom @babel/preset-react
-```
-
-if you are using typescript, update your `tsconfig.json`
-
-```json
-{
-  "compilerOptions": {
-    "declaration": false,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "lib": ["es6", "dom"],
-    "module": "es6",
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "target": "es5",
-    "jsx": "react",
-    "noEmit": true
-  },
-  "exclude": ["**/*.spec.ts", "node_modules", "vendor", "public"],
-  "compileOnSave": false
-}
-```
-
-For more information on React props hydration and Server-Side Rendering (SSR), see the article
-[Rails/Webpacker React Integration Options](https://github.com/shakacode/react_on_rails/blob/master/docs/rails-webpacker-react-integration-options.md)
-in the [ShakaCode/react_on_rails](https://github.com/shakacode/react_on_rails) repo.
-
 #### Other frameworks
 
 Please follow webpack integration guide for relevant framework or library,
@@ -450,7 +456,7 @@ Please follow webpack integration guide for relevant framework or library,
 For example to add Vue support:
 ```js
 // config/webpack/rules/vue.js
-const VueLoaderPlugin = require('vue-loader/lib/plugin')
+const { VueLoaderPlugin } = require('vue-loader')
 
 module.exports = {
   module: {
@@ -461,7 +467,10 @@ module.exports = {
       }
     ]
   },
-  plugins: [new VueLoaderPlugin()]
+  plugins: [new VueLoaderPlugin()],
+  resolve: {
+    extensions: ['.vue']
+  }
 }
 ```
 
@@ -470,9 +479,10 @@ module.exports = {
 const { webpackConfig, merge } = require('@rails/webpacker')
 const vueConfig = require('./rules/vue')
 
-module.exports = merge(webpackConfig, vueConfig)
+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.
@@ -493,8 +503,7 @@ staging:
   public_output_path: packs-staging
 ```
 
-or, Webpacker will use production environment as a fallback environment for loading configurations. Please note, `NODE_ENV` can either be set to `production`, `development` or `test`.
-This means you don't need to create additional environment files inside `config/webpacker/*` and instead use webpacker.yml to load different configurations using `RAILS_ENV`.
+Otherwise Webpacker will use production environment as a fallback environment for loading configurations. Please note, `NODE_ENV` can either be set to `production`, `development` or `test`. This means you don't need to create additional environment files inside `config/webpacker/*` and instead use webpacker.yml to load different configurations using `RAILS_ENV`.
 
 For example, the below command will compile assets in production mode but will use staging configurations from `config/webpacker.yml` if available or use fallback production environment configuration:
 
@@ -502,15 +511,13 @@ For example, the below command will compile assets in production mode but will u
 RAILS_ENV=staging bundle exec rails assets:precompile
 ```
 
-And, this will compile in development mode and load configuration for cucumber environment
-if defined in webpacker.yml or fallback to production configuration
+And, this will compile in development mode and load configuration for cucumber environment if defined in webpacker.yml or fallback to production configuration
 
 ```bash
 RAILS_ENV=cucumber NODE_ENV=development bundle exec rails assets:precompile
 ```
 
-Please note, binstubs compiles in development mode however rake tasks
-compiles in production mode.
+Please note, binstubs compiles in development mode however rake tasks compiles in production mode.
 
 ```bash
 # Compiles in development mode unless NODE_ENV is specified, per the binstub source
@@ -533,9 +540,14 @@ bundle update webpacker
 # overwrite your changes to the default install files and revert any unwanted changes from the install
 rails webpacker:install
 
+# yarn 1 instructions
 yarn upgrade @rails/webpacker --latest
 yarn upgrade webpack-dev-server --latest
 
+# yarn 2 instructions
+yarn up @rails/webpacker@latest
+yarn up webpack-dev-server@latest
+
 # Or to install the latest release (including pre-releases)
 yarn add @rails/webpacker@next
 ```
@@ -544,19 +556,11 @@ Also, consult the [CHANGELOG](./CHANGELOG.md) for additional upgrade links.
 
 ## 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.
+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.
 
-The configuration for what webpack is supposed to compile by default rests
-on the convention that every file in `app/packs/entrypoints/*`**(default)**
-or whatever path you set for `source_entry_path` in the `webpacker.yml` configuration
-is turned into their own output files (or entry points, as webpack calls it). Therefore you don't want to put anything inside `packs` directory that you do not want to be
-an entry file. As a rule of thumb, put all files you want to link in your views inside
-"packs" directory and keep everything else under `app/packs`.
+The configuration for what webpack is supposed to compile by default rests on the convention that every file in `app/packs/entrypoints/*`**(default)** or whatever path you set for `source_entry_path` in the `webpacker.yml` configuration is turned into their own output files (or entry points, as webpack calls it). Therefore you don't want to put anything inside `packs` directory that you do not want to be an entry file. As a rule of thumb, put all files you want to link in your views inside "packs" directory and keep everything else under `app/packs`.
 
-Suppose you want to change the source directory from `app/packs`
-to `frontend` and output to `assets/packs`. This is how you would do it:
+Suppose you want to change the source directory from `app/packs` to `frontend` and output to `assets/packs`. This is how you would do it:
 
 ```yml
 # config/webpacker.yml
@@ -574,16 +578,11 @@ development:
     port: 3035
 ```
 
-If you have `hmr` turned to true, then the `stylesheet_pack_tag` generates no output,
-as you will want to configure your styles to be inlined in your JavaScript for hot reloading.
-During production and testing, the `stylesheet_pack_tag` will create the appropriate HTML tags.
+If you have `hmr` turned to true, then the `stylesheet_pack_tag` generates no output, as you will want to configure your styles to be inlined in your JavaScript for hot reloading. During production and testing, the `stylesheet_pack_tag` will create the appropriate HTML tags.
 
 ### Additional paths
 
-If you are adding Webpacker to an existing app that has most of the assets inside
-`app/assets` or inside an engine, and you want to share that
-with webpack modules, you can use the `additional_paths`
-option available in `config/webpacker.yml`. This lets you
+If you are adding Webpacker to an existing app that has most of the assets inside `app/assets` or inside an engine, and you want to share that with webpack modules, you can use the `additional_paths` option available in `config/webpacker.yml`. This lets you
 add additional paths that webpack should look up when resolving modules:
 
 ```yml
@@ -598,9 +597,10 @@ import 'stylesheets/main'
 import 'images/rails.png'
 ```
 
-**Note:** Please be careful when adding paths here otherwise it
-will make the compilation slow, consider adding specific paths instead of
-whole parent directory if you just need to reference one or two modules
+**Note:** Please be careful when adding paths here otherwise it will make the compilation slow, consider adding specific paths instead of whole parent directory if you just need to reference one or two modules
+
+**Also note:** While importing assets living outside your `source_path` defined in webpacker.yml (like, for instance, assets under `app/assets`) from within your packs using _relative_ paths like `import '../../assets/javascripts/file.js'` will work in development, Webpacker won't recompile the bundle in production unless a file that lives in one of it's watched paths has changed (check out `Webpacker::Compiler#watched_files_digest`). That's why you'd need to add `app/assets` to the additional_paths as stated above and use `import 'javascripts/file.js'` instead.
+
 
 ## Deployment
 
@@ -610,16 +610,19 @@ 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.
 
+
 ## Troubleshooting
 
 See the doc page for [Troubleshooting](./docs/troubleshooting.md).
 
+
 ## Contributing
 
 [![Code Helpers](https://www.codetriage.com/rails/webpacker/badges/users.svg)](https://www.codetriage.com/rails/webpacker)
 
 We encourage you to contribute to Webpacker! See [CONTRIBUTING](CONTRIBUTING.md) for guidelines about how to proceed.
 
+
 ## License
 
 Webpacker is released under the [MIT License](https://opensource.org/licenses/MIT).