webpacker 6.0.0.beta.6 → 6.0.0.pre.1

data/package/utils/helpers.js

@@ -16,36 +16,11 @@ const resetEnv = () => {
 
 const ensureTrailingSlash = (path) => (path.endsWith('/') ? path : `${path}/`)
 
-const resolvedPath = (packageName) => {
-  try {
-    return require.resolve(packageName)
-  } catch (e) {
-    if (e.code !== 'MODULE_NOT_FOUND') {
-      throw e
-    }
-    return null
-  }
-}
-
-const moduleExists = (packageName) => (!!resolvedPath(packageName))
-
-const canProcess = (rule, fn) => {
-  const modulePath = resolvedPath(rule)
-
-  if (modulePath) {
-    return fn(modulePath)
-  }
-
-  return null
-}
-
 module.exports = {
   chdirTestApp,
   chdirCwd,
   isArray,
   isBoolean,
   ensureTrailingSlash,
-  canProcess,
-  moduleExists,
   resetEnv
 }

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/packs").to_s
+    source_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/app/javascript").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/packs", "entrypoints").to_s
+    source_entry_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/app/javascript", "packs").to_s
     assert_equal @config.source_entry_path.to_s, source_entry_path
   end
 

data/test/dev_server_runner_test.rb

@@ -43,27 +43,19 @@ 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: [], env: Webpacker::Compiler.env)
+    def verify_command(cmd, use_node_modules: true, argv: [])
       cwd = Dir.pwd
       Dir.chdir(test_app_path)
 
       klass = Webpacker::DevServerRunner
       instance = klass.new(argv)
       mock = Minitest::Mock.new
-      mock.expect(:call, nil, [env, *cmd])
+      mock.expect(:call, nil, [Webpacker::Compiler.env, *cmd])
 
       klass.stub(:new, instance) do
         instance.stub(:node_modules_bin_exist?, use_node_modules) do

data/test/helper_test.rb

@@ -79,6 +79,33 @@ class HelperTest < ActionView::TestCase
       favicon_pack_tag("media/images/nested/mb-icon.png", rel: "apple-touch-icon", type: "image/png")
   end
 
+  def test_javascript_pack_tag
+    assert_equal \
+      %(<script src="/packs/bootstrap-300631c4f0e0f9c865bc.js"></script>),
+      javascript_pack_tag("bootstrap.js")
+  end
+
+  def test_javascript_pack_tag_symbol
+    assert_equal \
+      %(<script src="/packs/bootstrap-300631c4f0e0f9c865bc.js"></script>),
+      javascript_pack_tag(:bootstrap)
+  end
+
+  def test_javascript_pack_tag_splat
+    assert_equal \
+      %(<script src="/packs/bootstrap-300631c4f0e0f9c865bc.js" defer="defer"></script>\n) +
+        %(<script src="/packs/application-k344a6d59eef8632c9d1.js" defer="defer"></script>),
+      javascript_pack_tag("bootstrap.js", "application.js", defer: true)
+  end
+
+  def test_javascript_pack_tag_split_chunks
+    assert_equal \
+      %(<script src="/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js"></script>\n) +
+        %(<script src="/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js"></script>\n) +
+        %(<script src="/packs/application-k344a6d59eef8632c9d1.js"></script>),
+      javascript_packs_with_chunks_tag("application")
+  end
+
   def test_preload_pack_asset
     if self.class.method_defined?(:preload_link_tag)
       assert_equal \
@@ -95,51 +122,30 @@ class HelperTest < ActionView::TestCase
     end
   end
 
-  def test_javascript_pack_tag
+  def test_stylesheet_pack_tag_split_chunks
     assert_equal \
-      %(<script src="/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js"></script>\n) +
-        %(<script src="/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js"></script>\n) +
-        %(<script src="/packs/application-k344a6d59eef8632c9d1.js"></script>\n) +
-        %(<script src="/packs/bootstrap-300631c4f0e0f9c865bc.js"></script>),
-      javascript_pack_tag("application", "bootstrap")
-  end
-
-  def test_javascript_pack_tag_splat
-    assert_equal \
-      %(<script src="/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js" defer="defer"></script>\n) +
-        %(<script src="/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js" defer="defer"></script>\n) +
-        %(<script src="/packs/application-k344a6d59eef8632c9d1.js" defer="defer"></script>),
-      javascript_pack_tag("application", defer: true)
-  end
-
-  def test_javascript_pack_tag_symbol
-    assert_equal \
-      %(<script src="/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js"></script>\n) +
-        %(<script src="/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js"></script>\n) +
-        %(<script src="/packs/application-k344a6d59eef8632c9d1.js"></script>),
-      javascript_pack_tag(:application)
+      %(<link rel="stylesheet" media="screen" href="/packs/1-c20632e7baf2c81200d3.chunk.css" />\n) +
+        %(<link rel="stylesheet" media="screen" href="/packs/application-k344a6d59eef8632c9d1.chunk.css" />\n) +
+        %(<link rel="stylesheet" media="screen" href="/packs/hello_stimulus-k344a6d59eef8632c9d1.chunk.css" />),
+      stylesheet_packs_with_chunks_tag("application", "hello_stimulus")
   end
 
   def test_stylesheet_pack_tag
     assert_equal \
-      %(<link rel="stylesheet" media="screen" href="/packs/1-c20632e7baf2c81200d3.chunk.css" />\n) +
-        %(<link rel="stylesheet" media="screen" href="/packs/application-k344a6d59eef8632c9d1.chunk.css" />\n) +
-        %(<link rel="stylesheet" media="screen" href="/packs/hello_stimulus-k344a6d59eef8632c9d1.chunk.css" />),
-      stylesheet_pack_tag("application", "hello_stimulus")
+      %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
+      stylesheet_pack_tag("bootstrap.css")
   end
 
   def test_stylesheet_pack_tag_symbol
     assert_equal \
-      %(<link rel="stylesheet" media="screen" href="/packs/1-c20632e7baf2c81200d3.chunk.css" />\n) +
-        %(<link rel="stylesheet" media="screen" href="/packs/application-k344a6d59eef8632c9d1.chunk.css" />\n) +
-        %(<link rel="stylesheet" media="screen" href="/packs/hello_stimulus-k344a6d59eef8632c9d1.chunk.css" />),
-      stylesheet_pack_tag(:application, :hello_stimulus)
+      %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
+      stylesheet_pack_tag(:bootstrap)
   end
 
   def test_stylesheet_pack_tag_splat
     assert_equal \
-      %(<link rel="stylesheet" media="all" href="/packs/1-c20632e7baf2c81200d3.chunk.css" />\n) +
-        %(<link rel="stylesheet" media="all" href="/packs/application-k344a6d59eef8632c9d1.chunk.css" />),
-      stylesheet_pack_tag("application", media: "all")
+      %(<link rel="stylesheet" media="all" href="/packs/bootstrap-c38deda30895059837cf.css" />\n) +
+        %(<link rel="stylesheet" media="all" href="/packs/application-dd6b1cd38bfa093df600.css" />),
+      stylesheet_pack_tag("bootstrap.css", "application.css", media: "all")
   end
 end

data/test/manifest_test.rb

@@ -25,14 +25,6 @@ class ManifestTest < Minitest::Test
     assert_equal Webpacker.manifest.lookup!("bootstrap.js"), "/packs/bootstrap-300631c4f0e0f9c865bc.js"
   end
 
-  def test_lookup_with_chunks_without_extension_success!
-    assert_equal Webpacker.manifest.lookup_pack_with_chunks!("bootstrap", type: :javascript), ["/packs/bootstrap-300631c4f0e0f9c865bc.js"]
-  end
-
-  def test_lookup_with_chunks_with_extension_success!
-    assert_equal Webpacker.manifest.lookup_pack_with_chunks!("bootstrap.js", type: :javascript), ["/packs/bootstrap-300631c4f0e0f9c865bc.js"]
-  end
-
   def test_lookup_nil
     assert_nil Webpacker.manifest.lookup("foo.js")
   end

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/packs
-  source_entry_path: entrypoints
+  source_path: app/javascript
+  source_entry_path: packs
   public_output_path: packs
   cache_path: tmp/cache/webpacker
 

data/test/test_app/app/{packs/entrypoints → 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/packs and only use these pack files to reference
+// a relevant structure within app/javascript 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/packs
-  source_entry_path: entrypoints
+  source_path: app/javascript
+  source_entry_path: packs
   public_root_path: public
   public_output_path: packs
   cache_path: tmp/cache/webpacker

data/test/test_app/public/packs/manifest.json

@@ -24,13 +24,6 @@
         ]
       }
     },
-    "bootstrap": {
-      "assets": {
-        "js": [
-          "/packs/bootstrap-300631c4f0e0f9c865bc.js"
-        ]
-      }
-    },
     "hello_stimulus": {
       "assets": {
         "css": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webpacker
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta.6
+  version: 6.0.0.pre.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-27 00:00:00.000000000 Z
+date: 2020-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,7 +126,6 @@ files:
 - ".gitignore"
 - ".node-version"
 - ".rubocop.yml"
-- 6_0_upgrade.md
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -134,9 +133,27 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- config/README.md
-- config/webpacker.yml
+- docs/assets.md
+- docs/cloud9.md
+- docs/css.md
+- docs/deployment.md
+- docs/docker.md
+- docs/engines.md
+- docs/env.md
+- docs/es6.md
+- docs/folder-structure.md
+- docs/integrations.md
+- docs/misc.md
+- docs/props.md
+- docs/react.md
+- docs/target.md
+- docs/testing.md
 - docs/troubleshooting.md
+- docs/typescript.md
+- docs/v4-upgrade.md
+- docs/webpack-dev-server.md
+- docs/webpack.md
+- docs/yarn.md
 - gemfiles/Gemfile-rails-edge
 - gemfiles/Gemfile-rails.5.2.x
 - gemfiles/Gemfile-rails.6.0.x
@@ -148,7 +165,10 @@ files:
 - lib/install/config/webpack/production.js
 - lib/install/config/webpack/test.js
 - lib/install/config/webpacker.yml
-- lib/install/packs/entrypoints/application.js
+- lib/install/examples/vue3/app.vue
+- lib/install/examples/vue3/hello_vue.js
+- lib/install/javascript/packs/application.css
+- lib/install/javascript/packs/application.js
 - lib/install/template.rb
 - lib/tasks/webpacker.rake
 - lib/tasks/webpacker/binstubs.rake
@@ -182,10 +202,10 @@ 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
+- package/babel/preset-react.js
 - package/babel/preset.js
 - package/config.js
 - package/configPath.js
@@ -204,9 +224,8 @@ files:
 - package/rules/file.js
 - package/rules/index.js
 - package/rules/less.js
-- package/rules/raw.js
 - package/rules/sass.js
-- package/rules/stylus.js
+- package/rules/svg.js
 - package/utils/get_style_rule.js
 - package/utils/helpers.js
 - test/command_test.rb
@@ -229,9 +248,9 @@ files:
 - test/mounted_app/test/dummy/package.json
 - test/rake_tasks_test.rb
 - test/test_app/Rakefile
-- 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/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/bin/webpack
 - test/test_app/bin/webpack-dev-server
 - test/test_app/config.ru
@@ -253,8 +272,8 @@ homepage: https://github.com/rails/webpacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/webpacker/tree/v6.0.0.beta.6
-  changelog_uri: https://github.com/rails/webpacker/blob/v6.0.0.beta.6/CHANGELOG.md
+  source_code_uri: https://github.com/rails/webpacker/tree/v6.0.0.pre.1
+  changelog_uri: https://github.com/rails/webpacker/blob/v6.0.0.pre.1/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -295,9 +314,9 @@ test_files:
 - test/mounted_app/test/dummy/package.json
 - test/rake_tasks_test.rb
 - test/test_app/Rakefile
-- 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/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/bin/webpack
 - test/test_app/bin/webpack-dev-server
 - test/test_app/config.ru

data/6_0_upgrade.md

@@ -1,62 +0,0 @@
-# To webpacker v6 from v5
-
-This guide aims to help you migrating to webpacker 6. If you are using
-vanilla webpacker install then hopefully, the upgrade should be really
-straightforward.
-
-## Preparation
-
-1. If your `source_path` is `app/javascript`, rename it to `app/packs`
-2. If your `source_entry_path` is `packs`, rename it to `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.0.0.pre.2'
-  ```
-
-  ```bash
-  bundle install
-  ```
-
-  ```bash
-  yarn add @rails/webpacker@next
-  ```
-
-  ```bash
-  bundle exec rails webpacker:install
-  ```
-
-- Change `javascript_packs_with_chunks_tag` and `stylesheet_packs_with_chunks_tag` to `javascript_pack_tag` and
-  `stylesheet_pack_tag`.
-
-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.
-
-8. Copy over any custom webpack config from `config/webpack_old`
-
-- Common code previously called 'environment' changed to 'base' 
-- import `environment` changed name to `webpackConfig`.
-
-  ```js
-  // config/webpack/base.js
-  const { webpackConfig, merge } = require('@rails/webpacker')
-  const customConfig = require('./custom')
-
-  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`.
-
-10. `extensions` was removed from the webpacker.yml file. Move custom extensions to
-  your configuration by by merging an object like this. For more details, see docs for 
-  [Webpack Configuration](https://github.com/rails/webpacker/blob/master/README.md#webpack-configuration)
-```js
-{
-  resolve: {
-      extensions: ['.ts', '.tsx']
-  }
-}
-```

data/config/README.md

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

data/config/webpacker.yml

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