webpacker 6.0.0.beta.2 → 6.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70198a585cf22360094497e860a23dcd172c7926820eaa905b00eaf15c997010
-  data.tar.gz: a1ff9f0cc031d1fffc69813b071b10947aa1648fbedaee826be547bd03adcdc2
+  metadata.gz: ab62c5d5a1d4736592168baa8920743203529b76be71a5f551058ab20ee04204
+  data.tar.gz: e992911dd9c65cde8af17479b98b4efde3e12a98196ab586a09320fff9f1c00c
 SHA512:
-  metadata.gz: 2e16cfe7311345f9e2af7e4b821ada9acdaff357ff64cbbbebf038a43199dcafa3b82c403bec1f9ab182ff456efd9ff14eb9756b4edbd76c68beba3cf8543cdc
-  data.tar.gz: de893725da86a372346c6c552a49a4efb078e24343e16a173b6d51230dc2ccb8bc26d5fbf8726d6d8f8d1a7277eea81d3ed29a06c76998db98cb5970c040bcb0
+  metadata.gz: df861ac4efabed724387cd80542f4a1203b47ba93da1e15b232fd323345d9ed7ac7230ca51ffb20f30a046ad57a61dc1be4d45ae613fbfcb6ca3622de5775d7a
+  data.tar.gz: 7a728cb196c75ca876cf407a20e6d2ae1dbf149cbe1755bdf4a698300b0d2ecc7b8f5b827a2a35d07d8cd1ffcd5e8727573319bcb8982239bb04550e8b079776

data/.github/workflows/jest.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [10.x, 12.x, 14.x]
+        node: [10.x, 12.x, 14.x, 15.x]
 
     runs-on: ${{ matrix.os }}
 

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

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [12.x]
+        node: [14.x]
 
     runs-on: ${{ matrix.os }}
 

data/.github/workflows/ruby.yml

@@ -18,7 +18,8 @@ jobs:
           2.4,
           2.5,
           2.6,
-          2.7
+          2.7,
+          3.0
         ]
         gemfile: [
           "gemfiles/Gemfile-rails.5.2.x",
@@ -27,13 +28,11 @@ jobs:
         exclude:
           - ruby: "2.4"
             gemfile: gemfiles/Gemfile-rails.6.0.x
+          - ruby: "3.0"
+            gemfile: gemfiles/Gemfile-rails.5.2.x
         experimental: [false]
         include:
-          - ruby: head
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails.6.0.x
-            experimental: true
-          - ruby: head
+          - ruby: 2.5
             os: ubuntu-latest
             gemfile: gemfiles/Gemfile-rails-edge
             experimental: true
@@ -45,6 +44,10 @@ jobs:
             os: ubuntu-latest
             gemfile: gemfiles/Gemfile-rails-edge
             experimental: true
+          - ruby: 3.0
+            os: ubuntu-latest
+            gemfile: gemfiles/Gemfile-rails-edge
+            experimental: true
 
     steps:
       - uses: actions/checkout@v2

data/6_0_upgrade.md

@@ -6,17 +6,20 @@ straightforward.
 
 ## Preparation
 
-- Rename `config/webpack` to `config/webpack_old`
-- Rename `config/webpacker.yml` to `config/webpacker_old.yml`
-- Upgrade webpacker
+1. If your `source_path` is `app/javascript`, rename it to `app/packs`
+2. If your `source_entry_path` is `app/javascript/packs`, rename it to `app/packs/entrypoints`
+3. Rename `config/webpack` to `config/webpack_old`
+4. Rename `config/webpacker.yml` to `config/webpacker_old.yml`
+5. Uninstall the current version of `webpack-dev-server`: `yarn remove webpack-dev-server`
+6. Upgrade webpacker
 
   ```ruby
   # Gemfile
-  gem 'webpacker', '~> 6.x'
+  gem 'webpacker', '~> 6.0.0.pre.2'
   ```
 
-  ```
-  bundle
+  ```bash
+  bundle install
   ```
 
   ```bash
@@ -30,9 +33,9 @@ straightforward.
 - Change `javascript_pack_tag` and `stylesheet_pack_tag` to `javascript_packs_with_chunks_tag` and
   `stylesheet_packs_with_chunks_tag`
 
-- If you are using any integrations like css, react or typescript. Please see https://github.com/rails/webpacker#integrations section on how they work in v6.0
+7. If you are using any integrations like `css`, `React` or `TypeScript`. Please see https://github.com/rails/webpacker#integrations section on how they work in v6.0.
 
-- Copy over any custom webpack config from `config/webpack_old`
+8. Copy over any custom webpack config from `config/webpack_old`
 
   ```js
   // config/webpack/base.js
@@ -41,3 +44,5 @@ straightforward.
 
   module.exports = merge(webpackConfig, customConfig)
   ```
+
+9. Copy over custom browserlist config from `.browserlistrc` if it exists into the `"browserlist"` key in `package.json` and remove `.browserslistrc`.

data/CHANGELOG.md

@@ -17,6 +17,8 @@ environment.loaders.append('nodeModules', nodeModules)
 - 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)
+
 ### Breaking changes
 
 - Simple webpack config

data/CONTRIBUTING.md

@@ -9,7 +9,7 @@ yarn
 ```
 
 ## 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 a number of automated checks which run on GitHub Actions when a pull request is created.
 You can run those checks on your own locally to make sure that your changes would not break the CI build.
 
 ### 1. Check the code for JavaScript style violations

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    webpacker (6.0.0.beta.2)
+    webpacker (6.0.0.beta.3)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
@@ -85,14 +85,16 @@ GEM
     method_source (1.0.0)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    mini_portile2 (2.5.0)
+    minitest (5.14.3)
     nio4r (2.5.2)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     parallel (1.19.2)
     parser (2.7.2.0)
       ast (~> 2.4.1)
+    racc (1.5.2)
     rack (2.2.3)
     rack-proxy (0.6.5)
       rack

data/README.md

@@ -63,9 +63,9 @@ in which case you may not even need the asset pipeline. This is mostly relevant
 
   _requires extra packages to be installed_
 
-  - Stylesheets - SASS, LESS and CSS, PostCSS
-  - Coffeescript
-  - Typescript
+  - Stylesheets - Sass, Less, Stylus and Css, PostCSS
+  - CoffeeScript
+  - TypeScript
   - React
 
 ## Installation
@@ -116,9 +116,9 @@ yarn install
 Once installed, you can start writing modern ES6-flavored JavaScript apps right away:
 
 ```yml
-app/javascript:
-  ├── packs:
-  │   # only webpack entry files here
+app/packs:
+  ├── entrypoints:
+  │   # Only webpack entry files here
   │   └── application.js
   │   └── application.css
   └── src:
@@ -136,16 +136,37 @@ You can then link the JavaScript pack in Rails views using the `javascript_packs
 <%= stylesheet_packs_with_chunks_tag 'application' %>
 ```
 
-If you want to link a static asset for `<link rel="prefetch">` or `<img />` tag, you
-can use the `asset_pack_path` helper:
-
+If you want to link a static asset for `<img />` tag, you can use the `asset_pack_path` helper:
 ```erb
-<link rel="prefetch" href="<%= asset_pack_path 'application.css' %>" />
 <img src="<%= asset_pack_path 'images/logo.svg' %>" />
 ```
 
+Or use the dedicated helper:
+```erb
+<%= image_pack_tag 'application.png', size: '16x10', alt: 'Edit Entry' %>
+<%= image_pack_tag 'picture.png', srcset: { 'picture-2x.png' => '2x' } %>
+```
+
+If you want to create a favicon:
+```erb
+<%= favicon_pack_tag 'mb-icon.png', rel: 'apple-touch-icon', type: 'image/png' %>
+```
+
+If you want to preload a static asset in your `<head>`, you can use the `preload_pack_asset` helper:
+```erb
+<%= preload_pack_asset 'fonts/fa-regular-400.woff2' %>
+```
+
+If you want to use images in your stylesheets:
+
+```css
+.foo {
+  background-image: url('../images/logo.svg')
+}
+```
+
 **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.
+you would need to link them in your `pack` or entry file.
 
 ### Development
 
@@ -161,7 +182,7 @@ to the standard Rails log.
 
 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/javascript/packs/*.js` files and automatically reload the browser to match.
+in the `app/packs/entrypoints/*.js` files and automatically reload the browser to match.
 
 ```bash
 # webpack dev server
@@ -212,7 +233,7 @@ WEBPACKER_DEV_SERVER_HOST=0.0.0.0 ./bin/webpack-dev-server
 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/environment.js` file.
+`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,
@@ -261,18 +282,18 @@ console.log(webpackConfig.source_path)
 ### Integrations
 
 Webpacker out of the box supports JS and static assets (fonts, images etc.)
-compilation. To enable support for Coffeescript or Typescript install
+compilation. To enable support for CoffeeScript or TypeScript install
 relevant packages,
 
-**Coffeescript**
+#### CoffeeScript
 
-```
+```bash
 yarn add coffeescript coffee-loader
 ```
 
-**Typescript**
+#### TypeScript
 
-```
+```bash
 yarn add typescript @babel/preset-typescript
 ```
 
@@ -289,7 +310,7 @@ Add tsconfig.json
     "moduleResolution": "node",
     "baseUrl": ".",
     "paths": {
-      "*": ["node_modules/*", "app/javascript/*"]
+      "*": ["node_modules/*", "app/packs/*"]
     },
     "sourceMap": true,
     "target": "es5",
@@ -304,7 +325,7 @@ Add tsconfig.json
 
 To enable CSS support in your application, add following packages,
 
-```
+```bash
 yarn add css-loader mini-css-extract-plugin css-minimizer-webpack-plugin
 ```
 
@@ -327,25 +348,25 @@ then add the relevant pre-processors:
 
 #### Postcss
 
-```
+```bash
 yarn add postcss-loader
 ```
 
 #### Sass
 
-```
+```bash
 yarn add sass sass-loader
 ```
 
 #### Less
 
-```
+```bash
 yarn add less less-loader
 ```
 
-#### Less
+#### Stylus
 
-```
+```bash
 yarn add stylus stylus-loader
 ```
 
@@ -353,7 +374,7 @@ yarn add stylus stylus-loader
 
 React is supported and you just need to add relevant packages,
 
-```
+```bash
 yarn add react react-dom @babel/preset-react
 ```
 
@@ -382,12 +403,11 @@ if you are using typescript, update your `tsconfig.json`
 
 Please follow webpack integration guide for relevant framework or library,
 
-1. Svelte - https://github.com/sveltejs/svelte-loader#install
-2. Angular - https://v2.angular.io/docs/ts/latest/guide/webpack.html#!#configure-webpack
-3. Vue - https://vue-loader.vuejs.org/guide/
-
-For example to add Vue support,
+1. [Svelte](https://github.com/sveltejs/svelte-loader#install)
+2. [Angular](https://v2.angular.io/docs/ts/latest/guide/webpack.html#!#configure-webpack)
+3. [Vue](https://vue-loader.vuejs.org/guide/)
 
+For example to add Vue support:
 ```js
 // config/webpack/rules/vue.js
 const VueLoaderPlugin = require('vue-loader/lib/plugin')
@@ -403,7 +423,9 @@ module.exports = {
   },
   plugins: [new VueLoaderPlugin()]
 }
+```
 
+```js
 // config/webpack/base.js
 const { webpackConfig, merge } = require('@rails/webpacker')
 const vueConfig = require('./rules/vue')
@@ -481,13 +503,13 @@ 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/javascript/packs/*`**(default)**
+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/javascript`.
+"packs" directory and keep everything else under `app/packs`.
 
-Suppose you want to change the source directory from `app/javascript`
+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

data/config/README.md

@@ -0,0 +1,3 @@
+# Note
+
+This directory exists for Jest specs that execute code expecting the Rails config directory at this path.

data/config/webpacker.yml

@@ -0,0 +1 @@
+config/lib/install/config/webpacker.yml

data/lib/install/config/webpacker.yml

@@ -1,8 +1,8 @@
 # Note: You must restart bin/webpack-dev-server for changes to take effect
 
 default: &default
-  source_path: app/javascript
-  source_entry_path: packs
+  source_path: app/packs
+  source_entry_path: entrypoints
   public_root_path: public
   public_output_path: packs
   cache_path: tmp/cache/webpacker
@@ -25,6 +25,8 @@ development:
     host: localhost
     port: 3035
     public: localhost:3035
+    # Inject browserside javascript that required by both HMR and Live(full) reload
+    inject_client: true
     # Hot Module Replacement updates modules while the application is running without a full reload
     hmr: false
     # Inline should be set to true if using HMR; it inserts a script to take care of live reloading

data/lib/install/javascript/packs/application.js

@@ -1,7 +1,7 @@
 /* eslint no-console:0 */
 // This file is automatically compiled by Webpack, along with any other files
 // present in this directory. You're encouraged to place your actual application logic in
-// a relevant structure within app/javascript and only use these pack files to reference
+// a relevant structure within app/packs and only use these pack files to reference
 // that code so it'll be compiled.
 //
 // To reference this file, add <%= javascript_pack_tag 'application' %> to the appropriate

data/lib/webpacker/commands.rb

@@ -64,7 +64,8 @@ class Webpacker::Commands
 
     def current_version
       packs = manifest.refresh.values.map do |value|
-        next if value.is_a?(Hash)
+        value = value["src"] if value.is_a?(Hash)
+        next unless value.is_a?(String)
 
         File.join(config.root_path, "public", "#{value}*")
       end.compact

data/lib/webpacker/compiler.rb

@@ -35,7 +35,7 @@ class Webpacker::Compiler
 
   # Returns true if all the compiled packs are up to date with the underlying asset files.
   def fresh?
-    watched_files_digest == last_compilation_digest
+    last_compilation_digest&.== watched_files_digest
   end
 
   # Returns true if the compiled packs are out of date with the underlying asset files.
@@ -69,7 +69,7 @@ class Webpacker::Compiler
       bin_webpack_path = config.root_path.join("bin/webpack")
       first_line = File.readlines(bin_webpack_path).first.chomp
       /ruby/.match?(first_line) ? RbConfig.ruby : ""
-     end
+    end
 
     def run_webpack
       logger.info "Compiling..."

data/lib/webpacker/dev_server_runner.rb

@@ -64,6 +64,7 @@ module Webpacker
       def execute_cmd
         env = Webpacker::Compiler.env
         env["WEBPACKER_CONFIG"] = @webpacker_config
+        env["WEBPACK_DEV_SERVER"] = "true"
 
         cmd = if node_modules_bin_exist?
           ["#{@node_modules_bin_path}/webpack", "serve"]
@@ -73,6 +74,7 @@ module Webpacker
 
         if @argv.include?("--debug-webpacker")
           cmd = [ "node", "--inspect-brk"] + cmd
+          @argv.delete "--debug-webpacker"
         end
 
         cmd += ["--config", @webpack_config]

data/lib/webpacker/helper.rb

@@ -74,7 +74,7 @@ module Webpacker::Helper
 
   # Creates a script tag that references the named pack file, as compiled by webpack per the entries list
   # in package/environments/base.js. By default, this list is auto-generated to match everything in
-  # app/javascript/packs/*.js. In production mode, the digested reference is automatically looked up.
+  # app/packs/entrypoints/*.js. In production mode, the digested reference is automatically looked up.
   #
   # Example:
   #
@@ -87,7 +87,7 @@ module Webpacker::Helper
   # Creates script tags that reference the js chunks from entrypoints when using split chunks API,
   # as compiled by webpack per the entries list in package/environments/base.js.
   # By default, this list is auto-generated to match everything in
-  # app/javascript/packs/*.js and all the dependent chunks. In production mode, the digested reference is automatically looked up.
+  # app/packs/entrypoints/*.js and all the dependent chunks. In production mode, the digested reference is automatically looked up.
   # See: https://webpack.js.org/plugins/split-chunks-plugin/
   #
   # Example:
@@ -129,7 +129,7 @@ module Webpacker::Helper
 
   # Creates a link tag that references the named pack file, as compiled by webpack per the entries list
   # in package/environments/base.js. By default, this list is auto-generated to match everything in
-  # app/javascript/packs/*.js. In production mode, the digested reference is automatically looked up.
+  # app/packs/entrypoints/*.js. In production mode, the digested reference is automatically looked up.
   #
   # Note: If the development server is running and hot module replacement is active, this will return nothing.
   # In that setup you need to configure your styles to be inlined in your JavaScript for hot reloading.
@@ -145,7 +145,7 @@ module Webpacker::Helper
   # Creates link tags that reference the css chunks from entrypoints when using split chunks API,
   # as compiled by webpack per the entries list in package/environments/base.js.
   # By default, this list is auto-generated to match everything in
-  # app/javascript/packs/*.js and all the dependent chunks. In production mode, the digested reference is automatically looked up.
+  # app/packs/entrypoints/*.js and all the dependent chunks. In production mode, the digested reference is automatically looked up.
   # See: https://webpack.js.org/plugins/split-chunks-plugin/
   #
   # Examples:

data/lib/webpacker/version.rb

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

data/lib/webpacker/webpack_runner.rb

@@ -15,6 +15,7 @@ module Webpacker
 
       if @argv.include?("--debug-webpacker")
         cmd = [ "node", "--inspect-brk"] + cmd
+        @argv.delete "--debug-webpacker"
       end
 
       if @argv.include?("--trace-deprecation")

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/webpacker",
-  "version": "6.0.0-beta.2",
+  "version": "6.0.0-beta.3",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "main": "package/index.js",
   "files": [

data/package/__tests__/development.js

@@ -22,7 +22,8 @@ describe('Development environment', () => {
       expect(webpackConfig).toMatchObject({
         devServer: {
           host: 'localhost',
-          port: 3035
+          port: 3035,
+          injectClient: true
         }
       })
     })

data/package/__tests__/index.js

@@ -0,0 +1,9 @@
+const index = require('../index')
+
+describe('index', () => {
+  test('exports webpack-merge v5 functions', () => {
+    expect(index.merge).toBeInstanceOf(Function)
+    expect(index.mergeWithRules).toBeInstanceOf(Function)
+    expect(index.mergeWithCustomize).toBeInstanceOf(Function)
+  })
+})

data/package/environments/__tests__/base.js

@@ -17,14 +17,14 @@ describe('Base config', () => {
   describe('config', () => {
     test('should return entry', () => {
       expect(baseConfig.entry.application).toEqual(
-        resolve('app', 'javascript', 'packs', 'application.js')
+        resolve('app', 'packs', 'entrypoints', 'application.js')
       )
     })
 
     test('should return multi file entry points', () => {
       expect(baseConfig.entry.multi_entry.sort()).toEqual([
-        resolve('app', 'javascript', 'packs', 'multi_entry.css'),
-        resolve('app', 'javascript', 'packs', 'multi_entry.js')
+        resolve('app', 'packs', 'entrypoints', 'multi_entry.css'),
+        resolve('app', 'packs', 'entrypoints', 'multi_entry.js')
       ])
     })
 
@@ -53,7 +53,7 @@ describe('Base config', () => {
 
     test('should return default resolve.modules with additions', () => {
       expect(baseConfig.resolve.modules).toEqual([
-        resolve('app', 'javascript'),
+        resolve('app', 'packs'),
         resolve('app/assets'),
         resolve('/etc/yarn'),
         resolve('some.config.js'),

data/package/environments/base.js

@@ -91,7 +91,7 @@ module.exports = {
   },
   entry: getEntryObject(),
   resolve: {
-    extensions: ['.js', '.mjs', '.ts', '.coffee'],
+    extensions: ['.js', '.jsx', '.mjs', '.ts', '.tsx', '.coffee'],
     modules: getModulePaths(),
     plugins: [PnpWebpackPlugin]
   },

data/package/environments/development.js

@@ -34,6 +34,7 @@ if (
       hot: devServer.hmr,
       contentBase,
       inline: devServer.inline,
+      injectClient: devServer.inject_client,
       useLocalIp: devServer.use_local_ip,
       public: devServer.public,
       publicPath,

data/package/index.js

@@ -1,7 +1,7 @@
 /* eslint global-require: 0 */
 /* eslint import/no-dynamic-require: 0 */
 
-const { merge } = require('webpack-merge')
+const webpackMerge = require('webpack-merge')
 const { resolve } = require('path')
 const { existsSync } = require('fs')
 const baseConfig = require('./environments/base')
@@ -23,7 +23,7 @@ module.exports = {
   webpackConfig: webpackConfig(),
   baseConfig,
   rules,
-  merge,
   moduleExists,
-  canProcess
+  canProcess,
+  ...webpackMerge
 }

data/test/configuration_test.rb

@@ -10,12 +10,12 @@ class ConfigurationTest < Webpacker::Test
   end
 
   def test_source_path
-    source_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/app/javascript").to_s
+    source_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/app/packs").to_s
     assert_equal source_path, @config.source_path.to_s
   end
 
   def test_source_entry_path
-    source_entry_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/app/javascript", "packs").to_s
+    source_entry_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/app/packs", "entrypoints").to_s
     assert_equal @config.source_entry_path.to_s, source_entry_path
   end
 

data/test/dev_server_runner_test.rb

@@ -43,19 +43,27 @@ class DevServerRunnerTest < Webpacker::Test
     end
   end
 
+  def test_environment_variables
+    cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/development.js"]
+    env = Webpacker::Compiler.env.dup
+    env["WEBPACKER_CONFIG"] = "#{test_app_path}/config/webpacker.yml"
+    env["WEBPACK_DEV_SERVER"] = "true"
+    verify_command(cmd, env: env)
+  end
+
   private
     def test_app_path
       File.expand_path("test_app", __dir__)
     end
 
-    def verify_command(cmd, use_node_modules: true, argv: [])
+    def verify_command(cmd, use_node_modules: true, argv: [], env: Webpacker::Compiler.env)
       cwd = Dir.pwd
       Dir.chdir(test_app_path)
 
       klass = Webpacker::DevServerRunner
       instance = klass.new(argv)
       mock = Minitest::Mock.new
-      mock.expect(:call, nil, [Webpacker::Compiler.env, *cmd])
+      mock.expect(:call, nil, [env, *cmd])
 
       klass.stub(:new, instance) do
         instance.stub(:node_modules_bin_exist?, use_node_modules) do

data/test/mounted_app/test/dummy/config/webpacker.yml

@@ -1,8 +1,8 @@
 # Note: You must restart bin/webpack-dev-server for changes to take effect
 
 default: &default
-  source_path: app/javascript
-  source_entry_path: packs
+  source_path: app/packs
+  source_entry_path: entrypoints
   public_output_path: packs
   cache_path: tmp/cache/webpacker
 

data/test/test_app/app/{javascript/packs → packs/entrypoints}/application.js

@@ -1,7 +1,7 @@
 /* eslint no-console:0 */
 // This file is automatically compiled by Webpack, along with any other files
 // present in this directory. You're encouraged to place your actual application logic in
-// a relevant structure within app/javascript and only use these pack files to reference
+// a relevant structure within app/packs and only use these pack files to reference
 // that code so it'll be compiled.
 //
 // To reference this file, add <%= javascript_pack_tag 'application' %> to the appropriate

data/test/test_app/config/webpacker.yml

@@ -1,8 +1,8 @@
 # Note: You must restart bin/webpack-dev-server for changes to take effect
 
 default: &default
-  source_path: app/javascript
-  source_entry_path: packs
+  source_path: app/packs
+  source_entry_path: entrypoints
   public_root_path: public
   public_output_path: packs
   cache_path: tmp/cache/webpacker

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webpacker
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta.2
+  version: 6.0.0.beta.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -134,6 +134,8 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- config/README.md
+- config/webpacker.yml
 - gemfiles/Gemfile-rails-edge
 - gemfiles/Gemfile-rails.5.2.x
 - gemfiles/Gemfile-rails.6.0.x
@@ -145,7 +147,6 @@ files:
 - lib/install/config/webpack/production.js
 - lib/install/config/webpack/test.js
 - lib/install/config/webpacker.yml
-- lib/install/javascript/packs/application.css
 - lib/install/javascript/packs/application.js
 - lib/install/template.rb
 - lib/tasks/webpacker.rake
@@ -180,6 +181,7 @@ files:
 - package/__tests__/dev_server.js
 - package/__tests__/development.js
 - package/__tests__/env.js
+- package/__tests__/index.js
 - package/__tests__/production.js
 - package/__tests__/staging.js
 - package/__tests__/test.js
@@ -226,9 +228,9 @@ files:
 - test/mounted_app/test/dummy/package.json
 - test/rake_tasks_test.rb
 - test/test_app/Rakefile
-- test/test_app/app/javascript/packs/application.js
-- test/test_app/app/javascript/packs/multi_entry.css
-- test/test_app/app/javascript/packs/multi_entry.js
+- test/test_app/app/packs/entrypoints/application.js
+- test/test_app/app/packs/entrypoints/multi_entry.css
+- test/test_app/app/packs/entrypoints/multi_entry.js
 - test/test_app/bin/webpack
 - test/test_app/bin/webpack-dev-server
 - test/test_app/config.ru
@@ -250,8 +252,8 @@ homepage: https://github.com/rails/webpacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/webpacker/tree/v6.0.0.beta.2
-  changelog_uri: https://github.com/rails/webpacker/blob/v6.0.0.beta.2/CHANGELOG.md
+  source_code_uri: https://github.com/rails/webpacker/tree/v6.0.0.beta.3
+  changelog_uri: https://github.com/rails/webpacker/blob/v6.0.0.beta.3/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -292,9 +294,9 @@ test_files:
 - test/mounted_app/test/dummy/package.json
 - test/rake_tasks_test.rb
 - test/test_app/Rakefile
-- test/test_app/app/javascript/packs/application.js
-- test/test_app/app/javascript/packs/multi_entry.css
-- test/test_app/app/javascript/packs/multi_entry.js
+- test/test_app/app/packs/entrypoints/application.js
+- test/test_app/app/packs/entrypoints/multi_entry.css
+- test/test_app/app/packs/entrypoints/multi_entry.js
 - test/test_app/bin/webpack
 - test/test_app/bin/webpack-dev-server
 - test/test_app/config.ru

data/lib/install/javascript/packs/application.css

@@ -1,9 +0,0 @@
-/* 
-Any CSS added to this file or imported from this file, e.g. `@import '../stylesheets/my-css.css'`,
-will be included in the "application" pack. Any CSS imported from application.js or as part of the 
-application.js dependency graph, e.g. `import '../stylesheets/my-css.css'` will also be included 
-in the "application" pack. 
-
-To reference this file, add <%= stylesheet_pack_tag 'application' %> to the appropriate
-layout file, like app/views/layouts/application.html.erb
-*/