update webpacker

Judahmeek · justin808 · commit d2836d27188f · 2021-04-25T12:50:36.000-10:00
diff --git a/Gemfile b/Gemfile
@@ -47,8 +47,7 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-# gem "webpacker", "~> 6"
-gem "webpacker", github: "shakacode/webpacker", branch: "justin808/fix-debug-webpacker"
+gem "webpacker", "6.0.0.beta.6"
 
 gem "react_on_rails", "12.0.4"
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,14 +1,3 @@
-GIT
-  remote: https://github.com/shakacode/webpacker.git
-  revision: 6bd9a4735fe5f2039fa27dad4ee07660df866dc9
-  branch: justin808/fix-debug-webpacker
-  specs:
-    webpacker (6.0.0.beta.2)
-      activesupport (>= 5.2)
-      rack-proxy (>= 0.6.1)
-      railties (>= 5.2)
-      semantic_range (>= 2.3.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -168,7 +157,7 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    semantic_range (2.3.1)
+    semantic_range (3.0.0)
     spring (2.1.1)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
@@ -194,6 +183,11 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
+    webpacker (6.0.0.beta.6)
+      activesupport (>= 5.2)
+      rack-proxy (>= 0.6.1)
+      railties (>= 5.2)
+      semantic_range (>= 2.3.0)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -221,10 +215,10 @@ DEPENDENCIES
   tzinfo-data
   web-console (>= 3.3.0)
   webdrivers
-  webpacker!
+  webpacker (= 6.0.0.beta.6)
 
 RUBY VERSION
    ruby 2.7.2p137
 
 BUNDLED WITH
-   2.1.4
+   2.2.14
diff --git a/app/views/layouts/hello_world.html.erb b/app/views/layouts/hello_world.html.erb
@@ -3,7 +3,7 @@
   <head>
     <title>ReactOnRailsWithWebpacker</title>
     <%= csrf_meta_tags %>
-    <%= javascript_packs_with_chunks_tag 'hello-world-bundle' %>
+    <%= javascript_pack_tag 'hello-world-bundle' %>
   </head>
 
   <body>
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "@babel/preset-react": "^7.12.5",
     "@babel/preset-typescript": "^7.12.1",
-    "@rails/webpacker": "^6.0.0-beta.2",
+    "@rails/webpacker": "^6.0.0-beta.6",
     "@types/react": "^16.9.56",
     "@types/react-dom": "^16.9.9",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
diff --git a/yarn.lock b/yarn.lock
@@ -1086,10 +1086,10 @@
     schema-utils "^2.6.5"
     source-map "^0.7.3"
 
-"@rails/webpacker@^6.0.0-beta.2":
-  version "6.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-6.0.0-beta.2.tgz#8b090b1d2fc39b677630b97758a225c97c9bddae"
-  integrity sha512-4y4PtrvDHfwF9z8LatwU58TmsJSfBaxR+3Vs95yOldoWURIOIOI/rXKnlisbJ/mVVsNceBy4an0FHInPDEjpbA==
+"@rails/webpacker@^6.0.0-beta.6":
+  version "6.0.0-beta.6"
+  resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-6.0.0-beta.6.tgz#180d3297d466168b15a0bc089f5de8c4977a00c3"
+  integrity sha512-rM99yqoBwSZtH4KgWtG1mIZaNQFAPYR/eI+8/COXkbA0taEd0vmAZ70TkLT+gxFenrjLHW32v0/42HEKICzO/w==
   dependencies:
     "@babel/core" "^7.12.9"
     "@babel/plugin-proposal-class-properties" "^7.12.1"
