react_on_rails 12.6.0 → 13.0.0.beta.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5490e90d68dc9b21393bc6640239432d50872526c092fb88d47aa2c70625bf53
-  data.tar.gz: aa540a9735ca1f6e4ffc1609591ffd2882c73102775f335ee4465cecda4c113b
+  metadata.gz: cdfa729f75cfd337b3436fe6e310d7e6a7789455fcba1baa729a2288d98c646f
+  data.tar.gz: 54495ad6beed806991e973866a4ccd62fd7b41d3141cbaec2e71a07e13999563
 SHA512:
-  metadata.gz: 9b1bb61ac6ce06aebb68769082403c20665ec89f27672e21a3a40d3f92fa11db7305b24470861f9028985e79c88fb43f4be76684f14eb02928e723030bf7ae23
-  data.tar.gz: 45e79902586891bab920ab9e0588bc970bd4f72fd502bad16db63d3194b3650e66119bd0b4dd8892fb3884a8dec9d9d055229954eae9081e6f4d9b20b0d5519d
+  metadata.gz: d0610cfa82d1d1b60f09f1586fb966dcfa12daf8549762f09e74a1fc00df6e0c8374138950e5195db0bed8501f7d8f3a1f62d90a9a779e6b652a0ada08d19d4e
+  data.tar.gz: 9e87301d7790829e6fe2391a68cf8de6e5724777e11b955b112783c7cfec13820d5a0c28691c5f2851ec49c92ab20e886b8c2a7b4c3fe2cfcec727d662cc4490

data/.circleci/config.yml

@@ -317,6 +317,7 @@ workflows:
       - build-dummy-app-webpack-test-bundles:
           requires:
             - install-dummy-app-node-packages
+            - install-dummy-app-ruby-gems
       - package-js-tests:
           requires:
             - install-package-node-packages

data/Gemfile.development_dependencies

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-gem "webpacker", "6.0.0.rc.6"
+gem "shakapacker", ">= 6.1.1"
 gem "bootsnap", require: false
 gem "rails", "~> 7.0"
 gem "sqlite3"
@@ -21,7 +21,7 @@ gem "sprockets", "~> 4.0"
 
 gem "amazing_print"
 
-gem "mini_racer", "~> 0.5"
+gem "mini_racer", ">= 0.6.2"
 
 group :development, :test do
   gem "listen"

data/README.md

@@ -14,13 +14,10 @@
 # News
 * ShakaCode now maintains the official successor to `rails/webpacker`, [`shakapacker`](https://github.com/shakacode/shakapacker).
 * Project is updated to support Rails 7!
-* **React and Webpack with Ruby on Rails**: The current version of https://github.com/rails/webpacker will soon ship. While it won't be the default for Rails 7, it is not "deprecated." The core webpack configuration has become slimmer, allowing easier extension. If you want to get started today, use the master branch of  [shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh](https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh) with `gem "webpacker", "6.0.0.rc.6"` Any updates to get to v6 from this point forward should be simple.
-
-If you have time, please comment on Justin's final proposals for Webpacker v6: [webpacker/pulls/justin808](https://github.com/rails/webpacker/pulls/justin808).
 
 -----
 
-*These are the docs for React on Rails 12. To see the version 11 docs, [click here](https://github.com/shakacode/react_on_rails/tree/11.3.0).*
+*These are the docs for React on Rails 13. To see the older docs: [v12](https://github.com/shakacode/react_on_rails/tree/12.6.0) and [v11](https://github.com/shakacode/react_on_rails/tree/11.3.0).*
 
 #### About
 React on Rails integrates Rails with (server rendering of) Facebook's [React](https://github.com/facebook/react) front-end framework.

data/docs/deployment/heroku-deployment.md

@@ -22,7 +22,7 @@ Alternatively, you can specify `config.build_production_command` to have
 react_on_rails invoke a command for you during assets:precompile.
 
 ```
-config.build_production_command = "RAILS_ENV=production bin/webpack"
+config.build_production_command = "RAILS_ENV=production NODE_ENV=production bin/webpacker"
 ```
 
 ### Consider Removing Webpacker's clean task

data/docs/guides/configuration.md

@@ -72,7 +72,7 @@ ReactOnRails.configure do |config|
   # to have react_on_rails invoke a command for you during assets:precompile.
   # The command is either a script or a module containing a class method `call`
   # In this example, the module BuildProductionCommand would have a class method `call`.
-  config.build_production_command = "RAILS_ENV=production bin/webpack"
+  config.build_production_command = "RAILS_ENV=production bin/webpacker"
 
   # See bottom for an example of the BuildProductionCommand module.
   # config.build_production_command = BuildProductionCommand
@@ -203,7 +203,7 @@ ReactOnRails.configure do |config|
   # with rspec then this controls what yarn command is run
   # to automatically refresh your webpack assets on every test run.
   #
-  config.build_test_command = "RAILS_ENV=test bin/webpack"
+  config.build_test_command = "RAILS_ENV=test bin/webpacker"
 
   # CONFIGURE YOUR SOURCE FILES
   # The test helper needs to know where your JavaScript files exist. The value is configured
@@ -238,7 +238,7 @@ module BuildProductionCommand
   include FileUtils
   # The call method will be called during assets:precompile
   def self.call
-    sh "bin/webpack"
+    sh "bin/webpacker"
   end
 end
 ```

data/docs/guides/hmr-and-hot-reloading-with-the-webpack-dev-server.md

@@ -11,10 +11,10 @@ The webpack-dev-server provides:
    For use with webpack, see **Client Side rendering and HMR using react-refresh-webpack-plugin** section bellow or visit [react-refresh-webpack-plugin](https://github.com/pmmmwh/react-refresh-webpack-plugin) for additional details.
 
 If you are ***not*** using server-side rendering (***not*** using `prerender: true`),
-then you can follow all the regular docs for using the `bin/webpack-dev-server` 
+then you can follow all the regular docs for using the `bin/webpacker-dev-server` 
 during development.
 
-# Server Side Rendering with the Default rails/webpacker bin/webpack-dev-server
+# Server Side Rendering with the Default rails/webpacker bin/webpacker-dev-server
 
 If you are using server-side rendering, then you have a couple options. The
 recommended technique is to have a different webpack configuration for server
@@ -41,7 +41,7 @@ If you don't configure these two to false, you'll see errors like:
 
 # Client Side rendering with HMR using react-refresh-webpack-plugin
 ## Basic installation
-To enable HMR functionality you have to use `./bin/webpack-dev-server`
+To enable HMR functionality you have to use `./bin/webpacker-dev-server`
 1. In `config/webpacker.yml` set **hmr** and **inline** `dev_server` properties to true. 
     ```
     dev_server:
@@ -59,7 +59,7 @@ To enable HMR functionality you have to use `./bin/webpack-dev-server`
 
 3. HMR is for use with the webpack-dev-server, so we only add this for the webpack-dev-server.
    ```
-   const { devServer } = require('@rails/webpacker')
+   const { devServer } = require('shakapacker')
 
    const isWebpackDevServer = process.env.WEBPACK_DEV_SERVER
 

data/docs/guides/how-react-on-rails-works.md

@@ -32,7 +32,7 @@ Each time you change your client code, you will need to re-generate the bundles
 
 For example, you might create a [Procfile.dev](https://github.com/shakacode/react_on_rails/tree/master/spec/dummy/Procfile.dev).
 
-On production deployments that use asset precompilation, such as Heroku deployments, `rails/webpacker`, by default, will automatically run webpack to build your JavaScript bundles, running the command `bin/webpack` in your app.
+On production deployments that use asset precompilation, such as Heroku deployments, `rails/webpacker`, by default, will automatically run webpack to build your JavaScript bundles, running the command `bin/webpacker` in your app.
 
 However, if you want to run a custom command to run webpack to build your bundles, then you will:
 1. Define `config.build_production_command` in your [config/initializers/react_on_rails.rb](https://www.shakacode.com/react-on-rails/docs/guides/configuration/)

data/docs/guides/rspec-configuration.md

@@ -12,7 +12,7 @@ compiled by webpack before running tests and during production deployment:
 2. **Use the react_on_rails settings and helpers**. Use the settings in `config/initializers/react_on_rails.rb`. Refer to [docs/configuration](https://www.shakacode.com/react-on-rails/docs/guides/configuration/).
 
 ```yml
-  config.build_test_command = "NODE_ENV=test RAILS_ENV=test bin/webpack"
+  config.build_test_command = "NODE_ENV=test RAILS_ENV=test bin/webpacker"
 ```
 
 Which should you use? If you're already using the `rails/webpacker` way to configure webpack, then

data/docs/guides/tutorial.md

@@ -4,7 +4,7 @@
 
 -----
 
-*Updated for Ruby 2.7.1, Rails 6.0.3.1, React on Rails v12.5.0, and Webpacker v6*
+*Updated for Ruby 2.7.1, Rails 6.0.3.1, React on Rails v12.5.0, and Shakapacker v6*
 
 This tutorial guides you through setting up a new or existing Rails app with **React on Rails**, demonstrating Rails + React + Redux + Server Rendering.
 
@@ -21,18 +21,16 @@ By the time you read this, the latest may have changed. Be sure to check the ver
 * https://rubygems.org/gems/react_on_rails
 * https://www.npmjs.com/package/react-on-rails
 
-_Note: some of the screen images below show the "npm" command. react_on_rails 6.6.0 and greater uses `yarn`._
-
 ## Setting up your environment
 
-Trying out **React on Rails** is super easy, so long as you have the basic prerequisites. This includes the basics for Rails 6.x and node version 13+. I recommend `rvm` and `nvm` to install Ruby and Node, and [brew](https://brew.sh/) to install [yarn](https://yarnpkg.com/en/docs/install#mac-tab). Rails can be installed as an ordinary gem.
+Trying out **React on Rails** is super easy, so long as you have the basic prerequisites. This includes the basics for Rails 6.x and node version 14+. I recommend `rvm` or `rbevn` and `nvm` to install Ruby and Node. Rails can be installed as an ordinary gem.
 
 ```
 nvm install node                # download and install latest stable Node
 nvm alias default node          # make it default version
 nvm list                        # check
 
-brew install yarn               # you can use other installer if desired
+brew install yarn               # you can use other installer if desired, such as yvm
 rvm install 2.7                 # download and install latest stable Ruby (update to exact version)
 rvm use 2.7 --default           # use it and make it default
 rvm list                        # check
@@ -46,40 +44,37 @@ Then we need to create a fresh Rails application as following.
 
 First be sure to run `rails -v` and check you are using Rails 5.1.3 or above. If you are using an older version of Rails, you'll need to install webpacker with react per the instructions [here](https://github.com/rails/webpacker).
 
-```
+```bash
 cd <directory where you want to create your new Rails app>
 
 # Any name you like for the rails app
 # Skip javascript so will add that next and get the current version
-rails new --skip-sprockets --skip-turbolinks --javascript=webpack test-react-on-rails
+rails new --skip-turbolinks --skip-javascript test-react-on-rails
 
 cd test-react-on-rails
 ```
 
-## Add the webpacker and react_on_rails gems
+## Add the shakapacker and react_on_rails gems
 To avoid issues regarding inconsistent gem and npm versions, you should specify the exact versions
 of both the gem and npm package. In other words, don't use the `^` or `~` in the version specifications.
-_Use the latest version for react_on_rails._
+_Use the latest version for `react_on_rails` and `shakapacker`._
 
 ```
-gem 'react_on_rails', '12.5.0'         # prefer exact gem version to match npm version
+gem 'react_on_rails', '13.0.0'         # prefer exact gem version to match npm version
+gem 'shakapacker', '6.1.1'             # prefer exact gem version to match npm version
+
 ```
 
 Note: The latest released React On Rails version is considered stable. Please use the latest
 version to ensure you get all the security patches and the best support.
 
-```bash
-bundle add webpacker --git=https://github.com/rails/webpacker.git
-bundle add react_on_rails --version=12.5.0 --strict
-```
-
-## Run the webpacker generator
+## Run the webpacker (shakapacker) generator
 
 ```terminal
 bundle exec rails webpacker:install
 ```
 
-Let's commit everything before installing React on Rails.
+**Let's commit everything before installing React on Rails.**
 
 ```
 # Here are git commands to make a new git repo and commit everything.
@@ -98,10 +93,11 @@ If you want the redux install: `rails generate react_on_rails:install --redux`
 The generator will add `mini_racer`'s latest version. If you're using linux & encounter issues installing `libv8`, here's [a common solution](https://github.com/rubyjs/mini_racer/issues/218).
 
 ```
-rails generate react_on_rails:install
+bundle exec rails generate react_on_rails:install
 ```
 
-Enter `a` to replace all configuration files required by the project.
+Enter `a` to replace all configuration files required by the project. You can check the diffs
+before you commit to see what changed.
 
 Then run the server with one of the following options:
 

data/docs/guides/upgrading-react-on-rails.md

@@ -5,6 +5,21 @@ If you would like help in migrating between React on Rails versions or help with
 
 We specialize in helping companies to quickly and efficiently upgrade. The older versions use the Rails asset pipeline to package client assets. The current and recommended way is to use Webpack 4+ for asset preparation. You may also need help migrating from the `rails/webpacker`'s Webpack configuration to a better setup ready for Server Side Rendering.
 
+## Upgrading to v13
+
+### Breaking Change
+Previously, the gem `webpacker` was a Gem dependency.
+
+v13 has changed slightly to switch to `shakapacker`.
+
+For details, see see the [Shakapacker guide to upgrading](https://github.com/shakacode/shakapacker/blob/master/docs/v6_upgrade.md)
+
+In summary:
+
+1. Change the gem reference from 'webpacker' to 'shakapacker'
+2. Change the npm reference from '@rails/webpacker' to 'shakapacker'
+3. Other updates, depending on what version of rails/webpacker that you had.
+
 ## Upgrading to v12
 ### Recent versions
 Make sure that you are on a relatively more recent version of rails and webpacker. Yes, the [rails/webpacker](https://github.com/rails/webpacker) gem is required!

data/docs/guides/webpack-configuration.md

@@ -33,7 +33,7 @@ Until version 9, all React on Rails apps used the `/client` directory for config
 You can access values in the `config/webpacker.yml`
 
 ```js
-const { config, devServer } = require('@rails/webpacker');
+const { config, devServer } = require('shakapacker');
 ```
 
 You will want consider using some of the same values set in these files:

data/docs/javascript/converting-from-custom-webpack-config-to-rails-webpacker-config.md

@@ -4,7 +4,7 @@
   and avoid any duplicates. We don't want different versions of the same packages.
   We want the versions from rails/webpacker unless we specifically want to override them.
 2. Search the rails/webpacker repo for anything you're not sure about in terms of package names.
-3. run `bin/webpack` and make sure there are zero errors
+3. run `bin/webpacker` and make sure there are zero errors
 4. update webpack plugins and loaders to current or close to current
-5. Make sure that your bin/webpack and bin/webpacker match the latest on
+5. Make sure that your bin/webpacker and bin/webpacker match the latest on
 https://github.com/rails/webpacker/tree/master/lib/install/bin

data/lib/generators/react_on_rails/base_generator.rb

@@ -54,6 +54,7 @@ module ReactOnRails
                         config/webpack/development.js
                         config/webpack/production.js
                         config/webpack/serverWebpackConfig.js
+                        config/webpack/webpack.config.js
                         config/webpack/webpackConfig.js]
         config = {
           message: "// The source code including full typescript support is available at:"
@@ -136,28 +137,28 @@ module ReactOnRails
 
           What to do next:
 
-            - See the documentation on https://github.com/rails/webpacker/blob/master/docs/webpack.md
+            - See the documentation on https://github.com/shakacode/shakapacker#webpack-configuration
               for how to customize the default webpack configuration.
 
             - Include your webpack assets to your application layout.
 
                 <%= javascript_pack_tag 'hello-world-bundle' %>
 
-            - Run `rails s` to start the Rails server and use Webpacker's default lazy compilation.
+            - Run `rails s` to start the Rails server.
 
-            - Visit http://localhost:3000/hello_world and see your React On Rails app running!
-
-            - Run bin/webpack-dev-server to start the Webpack dev server for compilation of Webpack
+            - Run bin/webpacker-dev-server to start the Webpack dev server for compilation of Webpack
               assets as soon as you save. This default setup with the dev server does not work
               for server rendering
 
-            - Alternately, you may turn off compile in config/webpacker.yml and run the foreman
-              command to start the rails server and run webpack in watch mode.
+            - Visit http://localhost:3000/hello_world and see your React On Rails app running!
+
+            - Alternately, run the foreman command to start the rails server and run webpack#{' '}
+              in watch mode.
 
                 foreman start -f Procfile.dev-static
 
             - To turn on HMR, edit config/webpacker.yml and set HMR to true. Restart the rails server
-              and bin/webpack-dev-server. Or use Procfile.dev.
+              and bin/webpacker-dev-server. Or use Procfile.dev.
 
             - To server render, change this line app/views/hello_world/index.html.erb to
               `prerender: true` to see server rendering (right click on page and select "view source").

data/lib/generators/react_on_rails/templates/base/base/Procfile.dev

@@ -1,5 +1,5 @@
 # Procfile for development using HMR
 # You can run these commands in separate shells
 rails: bundle exec rails s -p 3000
-wp-client: HMR=true bin/webpack-dev-server
-wp-server: HMR=true SERVER_BUNDLE_ONLY=yes bin/webpack --watch
+wp-client: HMR=true bin/webpacker-dev-server
+wp-server: HMR=true SERVER_BUNDLE_ONLY=yes bin/webpacker --watch

data/lib/generators/react_on_rails/templates/base/base/Procfile.dev-static

@@ -5,5 +5,5 @@ web: rails s -p 3000
 # When making frequent changes to client side assets, you will prefer building webpack assets
 # upon saving rather than when you refresh your browser page.
 # Note, if using React on Rails localization you will need to run
-# `bundle exec rake react_on_rails:locale` before you run bin/webpack
-webpack: sh -c 'rm -rf public/packs/* || true && bin/webpack -w'
+# `bundle exec rake react_on_rails:locale` before you run bin/webpacker
+webpack: sh -c 'rm -rf public/packs/* || true && bin/webpacker -w'

data/lib/generators/react_on_rails/templates/base/base/babel.config.js.tt

@@ -1,15 +1,32 @@
 <%= add_documentation_reference(config[:message], "// https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/blob/master/babel.config.js") %>
 
-const defaultConfigFunc = require('@rails/webpacker/package/babel/preset.js');
-
 module.exports = function (api) {
-  const resultConfig = defaultConfigFunc(api);
+  const defaultConfigFunc = require('shakapacker/package/babel/preset.js')
+  const resultConfig = defaultConfigFunc(api)
+  const isProductionEnv = api.env('production')
 
   const changesOnDefault = {
-    plugins: [process.env.WEBPACK_SERVE && 'react-refresh/babel'].filter(Boolean),
-  };
+    presets: [
+      [
+        '@babel/preset-react',
+        {
+          development: !isProductionEnv,
+          useBuiltIns: true
+        }
+      ]
+    ].filter(Boolean),
+    plugins: [
+      process.env.WEBPACK_SERVE && 'react-refresh/babel',
+      isProductionEnv && ['babel-plugin-transform-react-remove-prop-types',
+        {
+          removeImport: true
+        }
+      ]
+    ].filter(Boolean),
+  }
 
-  resultConfig.plugins = [...resultConfig.plugins, ...changesOnDefault.plugins];
+  resultConfig.presets = [...resultConfig.presets, ...changesOnDefault.presets]
+  resultConfig.plugins = [...resultConfig.plugins, ...changesOnDefault.plugins ]
 
-  return resultConfig;
-};
+  return resultConfig
+}

data/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb

@@ -6,7 +6,7 @@
 ReactOnRails.configure do |config|
   # This configures the script to run to build the production assets by webpack. Set this to nil
   # if you don't want react_on_rails building this file for you.
-  # If nil, then the standard rails/webpacker assets:precompile will run
+  # If nil, then the standard shakacode/shakapacker assets:precompile will run
   # config.build_production_command = nil
 
   ################################################################################
@@ -25,7 +25,7 @@ ReactOnRails.configure do |config|
   #
   # Alternately, you can remove the `ReactOnRails::TestHelper.configure_rspec_to_compile_assets`
   # and set the config/webpacker.yml option for test to true.
-  config.build_test_command = "RAILS_ENV=test bin/webpack"
+  config.build_test_command = "RAILS_ENV=test bin/webpacker"
 
   ################################################################################
   ################################################################################

data/lib/generators/react_on_rails/templates/base/base/config/webpack/commonWebpackConfig.js.tt

@@ -1,7 +1,7 @@
 <%= add_documentation_reference(config[:message], "// https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/blob/master/config/webpack/commonWebpackConfig.js") %>
 
 // Common configuration applying to client and server configuration
-const { webpackConfig: baseClientWebpackConfig, merge } = require('@rails/webpacker');
+const { webpackConfig: baseClientWebpackConfig, merge } = require('shakapacker');
 
 const commonOptions = {
   resolve: {

data/lib/generators/react_on_rails/templates/base/base/config/webpack/development.js.tt

@@ -2,7 +2,7 @@
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-const { devServer, inliningCss } = require('@rails/webpacker');
+const { devServer, inliningCss } = require('shakapacker');
 
 const webpackConfig = require('./webpackConfig');
 

data/lib/generators/react_on_rails/templates/base/base/config/webpack/serverWebpackConfig.js.tt

@@ -1,6 +1,6 @@
 <%= add_documentation_reference(config[:message], "// https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/blob/master/config/webpack/serverWebpackConfig.js") %>
 
-const { merge, config } = require('@rails/webpacker');
+const { merge, config } = require('shakapacker');
 const commonWebpackConfig = require('./commonWebpackConfig');
 
 const webpack = require('webpack');

data/lib/generators/react_on_rails/templates/base/base/config/webpack/webpack.config.js.tt

@@ -0,0 +1,15 @@
+const { env, webpackConfig } = require('shakapacker')
+const { existsSync } = require('fs')
+const { resolve } = require('path')
+
+const envSpecificConfig = () => {
+  const path = resolve(__dirname, `${env.nodeEnv}.js`)
+  if (existsSync(path)) {
+    console.log(`Loading ENV specific webpack configuration file ${path}`)
+    return require(path)
+  } else {
+    return webpackConfig
+  }
+}
+
+module.exports = envSpecificConfig()

data/lib/generators/react_on_rails/templates/base/base/config/webpacker.yml

@@ -1,4 +1,4 @@
-# Note: You must restart bin/webpack-dev-server for changes to take effect
+# Note: You must restart bin/webpacker-dev-server for changes to take effect
 
 default: &default
   source_path: app/javascript
@@ -17,7 +17,7 @@ default: &default
 
 development:
   <<: *default
-  # This is false since we're running `bin/webpack -w` in Procfile.dev-setic
+  # This is false since we're running `bin/webpacker -w` in Procfile.dev-setic
   compile: false
 
   # Reference: https://webpack.js.org/configuration/dev-server/

data/lib/react_on_rails/configuration.rb

@@ -124,7 +124,7 @@ module ReactOnRails
 
       return if skip_react_on_rails_precompile || build_production_command.blank?
 
-      # Ensure that rails/webpacker does not call bin/webpack if we're providing
+      # Ensure that shakacode/shakapacker does not call bin/webpacker if we're providing
       # the build command.
       ENV["WEBPACKER_PRECOMPILE"] = "false"
 
@@ -132,7 +132,7 @@ module ReactOnRails
         Rake::Task["react_on_rails:assets:webpack"].invoke
         puts "Invoking task webpacker:clean from React on Rails"
 
-        # VERSIONS is per the rails/webpacker clean method definition.
+        # VERSIONS is per the shakacode/shakapacker clean method definition.
         # We set it very big so that it is not used, and then clean just
         # removes files older than 1 hour.
         versions = 100_000
@@ -150,42 +150,6 @@ module ReactOnRails
       end
     end
 
-    # Pending updates to rails/webpacker v6, we may have some message that prints after configuration runs.
-    # def check_deprecated_settings
-    #   if build_production_command.present? &&
-    #      ReactOnRails::WebpackerUtils.webpacker_webpack_production_config_exists?
-    #     msg = <<~MSG
-    #       Setting ReactOnRails configuration for `build_production_command` is
-    #       not necessary if you have config/webpack/production.js. When that file
-    #       exists, React on Rails DOES NOT modify the standard assets:precompile.
-    #       If you want React on Rails to modify to the standard assets:precompile
-    #       to use your config/initializers/react_on_rails.rb config.build_production_command
-    #       then delete the config/webpack/production.js.
-    #     MSG
-    #     Rails.logger.warn(msg)
-    #  end
-    #
-    # msg = <<~MSG
-    #   ReactOnRails configuration for `build_production_command` is removed.
-    #   Move this command into `bin/webpack` converting the script to a shell script.
-    # MSG
-    # raise ReactOnRails::Error, msg
-    # Commenting out until v13 when
-    # https://github.com/rails/webpacker/issues/2640 gets resolved
-    # if node_modules_location.present?
-    #   Rails.logger.warn("ReactOnRails configuration for `node_modules_location` is deprecated. "\
-    #    "Instead, prepend a `cd client` (or whichever location) before your test command.")
-    # end
-    #
-    # return unless build_production_command.present?
-    #
-    # msg = <<~MSG
-    #   ReactOnRails configuration for `build_production_command` is removed.
-    #   Move this command into `bin/webpack` converting the script to a shell script.
-    # MSG
-    # raise ReactOnRails::Error, msg
-    # end
-
     def error_if_using_webpacker_and_generated_assets_dir_not_match_public_output_path
       return unless ReactOnRails::WebpackerUtils.using_webpacker?
 
@@ -195,7 +159,7 @@ module ReactOnRails
 
       if File.expand_path(generated_assets_dir) == webpacker_public_output_path.to_s
         Rails.logger.warn("You specified generated_assets_dir in `config/initializers/react_on_rails.rb` "\
-        "with Webpacker. Remove this line from your configuration file.")
+                          "with Webpacker. Remove this line from your configuration file.")
       else
         msg = <<~MSG
           Error configuring /config/initializers/react_on_rails.rb: You are using webpacker
@@ -257,19 +221,19 @@ module ReactOnRails
       if ReactOnRails::WebpackerUtils.using_webpacker?
         webpacker_public_output_path = ReactOnRails::WebpackerUtils.webpacker_public_output_path
         Rails.logger.warn "Error configuring config/initializers/react_on_rails. Define neither the "\
-        "generated_assets_dirs no the generated_assets_dir when using Webpacker. This is defined by "\
-        "public_output_path specified in webpacker.yml = #{webpacker_public_output_path}."
+                          "generated_assets_dirs no the generated_assets_dir when using Webpacker. This is defined by "\
+                          "public_output_path specified in webpacker.yml = #{webpacker_public_output_path}."
         return
       end
 
       Rails.logger.warn "[DEPRECATION] ReactOnRails: Use config.generated_assets_dir rather than "\
-        "generated_assets_dirs"
+                        "generated_assets_dirs"
       if generated_assets_dir.blank?
         self.generated_assets_dir = generated_assets_dirs
       else
         Rails.logger.warn "[DEPRECATION] ReactOnRails. You have both generated_assets_dirs and "\
-          "generated_assets_dir defined. Define ONLY generated_assets_dir if NOT using Webpacker"\
-          " and define neither if using Webpacker"
+                          "generated_assets_dir defined. Define ONLY generated_assets_dir if NOT using Webpacker"\
+                          " and define neither if using Webpacker"
       end
     end
 

data/lib/react_on_rails/helper.rb

@@ -154,7 +154,7 @@ module ReactOnRails
         @registered_stores_defer_render ||= []
         @registered_stores_defer_render << redux_store_data
         "YOU SHOULD NOT SEE THIS ON YOUR VIEW -- Uses as a code block, like <% redux_store %> "\
-        "and not <%= redux store %>"
+          "and not <%= redux store %>"
       else
         @registered_stores ||= []
         @registered_stores << redux_store_data
@@ -244,7 +244,7 @@ module ReactOnRails
 
       unless hash_or_string.is_a?(String) || hash_or_string.is_a?(Hash)
         raise ReactOnRails::Error, "#{__method__} only accepts String or Hash as argument "\
-            "(#{hash_or_string.class} given)."
+                                   "(#{hash_or_string.class} given)."
       end
 
       json_value = hash_or_string.is_a?(String) ? hash_or_string : hash_or_string.to_json

data/lib/react_on_rails/locales/base.rb

@@ -85,9 +85,7 @@ module ReactOnRails
 
       def generate_file(template, path)
         result = ERB.new(template).result()
-        File.open(path, "w") do |f|
-          f.write(result)
-        end
+        File.write(path, result)
       end
 
       def generate_translations

data/lib/react_on_rails/react_component/render_options.rb

@@ -36,7 +36,7 @@ module ReactOnRails
           end
 
           raise ReactOnRails::Error, "ReactOnRails: your rendering_props_extension module is missing the "\
-                                "required adjust_props_for_client_side_hydration method & can not be used"
+                                     "required adjust_props_for_client_side_hydration method & can not be used"
         end
         props
       end

data/lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb

@@ -133,15 +133,15 @@ module ReactOnRails
             if ReactOnRails.configuration.trace
               Rails.logger.info do
                 "[react_on_rails] Created JavaScript context with file "\
-                "#{ReactOnRails::Utils.server_bundle_js_file_path}"
+                  "#{ReactOnRails::Utils.server_bundle_js_file_path}"
               end
             end
             ExecJS.compile(base_js_code)
           rescue StandardError => e
             msg = "ERROR when compiling base_js_code! "\
-              "See file #{file_name} to "\
-              "correlate line numbers of error. Error is\n\n#{e.message}"\
-              "\n\n#{e.backtrace.join("\n")}"
+                  "See file #{file_name} to "\
+                  "correlate line numbers of error. Error is\n\n#{e.message}"\
+                  "\n\n#{e.backtrace.join("\n")}"
             Rails.logger.error(msg)
             trace_js_code_used("Error when compiling JavaScript code for the context.", base_js_code,
                                file_name, force: true)
@@ -186,7 +186,7 @@ module ReactOnRails
         def undefined_for_exec_js_logging(function_name)
           if ReactOnRails.configuration.trace
             "console.error('[React on Rails Rendering] #{function_name} is not defined for server rendering.');\n"\
-            "  console.error(getStackTrace().join('\\n'));"
+              "  console.error(getStackTrace().join('\\n'));"
           else
             ""
           end

data/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb

@@ -66,10 +66,10 @@ module ReactOnRails
             file_list = make_file_list(make_globs(generated_assets_full_path)).to_ary
             puts "V" * 80
             puts "Please define config.webpack_generated_files (array) so the test helper knows "\
-            "which files are required. If you are using webpacker, you typically need to only "\
-            "include 'manifest.json'."
+                 "which files are required. If you are using webpacker, you typically need to only "\
+                 "include 'manifest.json'."
             puts "Detected the possible following files to check for webpack compilation in "\
-              "#{generated_assets_full_path}"
+                 "#{generated_assets_full_path}"
             puts file_list.join("\n")
             puts "^" * 80
             file_list

data/lib/react_on_rails/test_helper.rb

@@ -72,8 +72,8 @@ module ReactOnRails
         unless @printed_once
           puts
           puts "====> React On Rails: Checking files in "\
-            "#{webpack_assets_status_checker.generated_assets_full_path} for "\
-            "outdated/missing bundles based on source_path #{source_path}"
+               "#{webpack_assets_status_checker.generated_assets_full_path} for "\
+               "outdated/missing bundles based on source_path #{source_path}"
           puts
           @printed_once = true
 

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "12.6.0"
+  VERSION = "13.0.0.beta.0"
 end

data/lib/react_on_rails/webpacker_utils.rb

@@ -7,13 +7,8 @@ module ReactOnRails
     def self.using_webpacker?
       return @using_webpacker if defined?(@using_webpacker)
 
-      @using_webpacker = ReactOnRails::Utils.gem_available?("webpacker")
-    end
-
-    def self.webpacker_webpack_production_config_exists?
-      webpacker_webpack_config_abs_path = File.join(Rails.root,
-                                                    "config/webpack/production.js")
-      File.exist?(webpacker_webpack_config_abs_path)
+      @using_webpacker = ReactOnRails::Utils.gem_available?("webpacker") ||
+                         ReactOnRails::Utils.gem_available?("shakapacker")
     end
 
     def self.dev_server_running?

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "12.6.0",
+  "version": "13.0.0-beta.0",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {

data/rakelib/example_type.rb

@@ -45,7 +45,10 @@ module ReactOnRails
       # Gems we need to add to the Gemfile before bundle installing
       def required_gems
         relative_gem_root = Pathname(gem_root).relative_path_from(Pathname(dir))
-        ["gem 'react_on_rails', path: '#{relative_gem_root}'"]
+        [
+          "gem 'react_on_rails', path: '#{relative_gem_root}'",
+          "gem 'shakapacker'"
+        ]
       end
 
       # Options we pass when running `rails new` from the command-line.
@@ -78,7 +81,7 @@ module ReactOnRails
       # Assumes we are inside a rails app's folder and necessary gems have been installed
       def generator_shell_commands
         shell_commands = []
-        shell_commands << "rails generate react_on_rails:install #{generator_options} --ignore-warnings"
+        shell_commands << "rails generate react_on_rails:install #{generator_options} --ignore-warnings --force"
         shell_commands << "rails generate react_on_rails:dev_tests #{generator_options}"
       end
 

data/rakelib/examples.rake

@@ -30,19 +30,12 @@ namespace :examples do # rubocop:disable Metrics/BlockLength
     desc "Generates #{example_type.name_pretty}"
     task example_type.gen_task_name_short => example_type.clobber_task_name do
       mkdir_p(example_type.dir)
-      if Rails::VERSION::MAJOR < 6
-        example_type.rails_options += " --webpack"
-      elsif Rails::VERSION::MAJOR >= 7
-        example_type.rails_options += "--javascript=webpack"
-      end
+      example_type.rails_options += "--skip-javascript"
       sh_in_dir(examples_dir, "rails new #{example_type.name} #{example_type.rails_options}")
       sh_in_dir(example_type.dir, "touch .gitignore")
-      copy_generator_webpacker_yml_to(example_type.dir)
-      sh_in_dir(example_type.dir, "bundle add webpacker --version 6.0.0.rc.6")
-      sh_in_dir(example_type.dir, "rake webpacker:install")
-      sh_in_dir(example_type.dir, "bundle binstubs --path=#{example_type.dir}/bin webpacker")
       append_to_gemfile(example_type.gemfile, example_type.required_gems)
       bundle_install_in(example_type.dir)
+      sh_in_dir(example_type.dir, "rake webpacker:install")
       sh_in_dir(example_type.dir, example_type.generator_shell_commands)
       sh_in_dir(example_type.dir, "yarn")
     end

data/rakelib/task_helpers.rb

@@ -12,13 +12,6 @@ module ReactOnRails
       File.join(gem_root, "gen-examples", "examples")
     end
 
-    # This method is used to prevent an error that when installing webpacker 6.0.0.rc.6
-    # without a previous config/webpacker.yml will throw and error
-    def copy_generator_webpacker_yml_to(destination)
-      webpacker_file = File.join(gem_root, "lib/generators/react_on_rails/templates/base/base/config/webpacker.yml")
-      sh %( cp #{webpacker_file} #{destination}/config/webpacker.yml )
-    end
-
     def dummy_app_dir
       File.join(gem_root, "spec/dummy")
     end

data/react_on_rails.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
   s.add_dependency "execjs", "~> 2.5"
   s.add_dependency "rails", ">= 5.2"
   s.add_dependency "rainbow", "~> 3.0"
-  s.add_dependency "webpacker", ">= 4.2"
 
   s.add_development_dependency "bundler", "~> 2"
   s.add_development_dependency "gem-release"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 12.6.0
+  version: 13.0.0.beta.0
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: webpacker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +248,7 @@ files:
 - lib/generators/react_on_rails/templates/base/base/config/webpack/development.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpack/production.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpack/serverWebpackConfig.js.tt
+- lib/generators/react_on_rails/templates/base/base/config/webpack/webpack.config.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpack/webpackConfig.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/webpacker.yml
 - lib/generators/react_on_rails/templates/dev_tests/.eslintrc
@@ -346,9 +333,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: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.32
 signing_key: