shakapacker 6.0.0.rc.12 → 6.0.0.rc.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ba657aae9dfeb59090b6199029f76386c42623c57f3a97a95f91ef34e6aafc6
-  data.tar.gz: 26ee13bf4652772256fd0ef3e2e1e2013a08bde979172660ec4c17778fe8f582
+  metadata.gz: d56f3bf25f84819a60ea5e8ad408d654eec2a208886d7ebb6b84e27dd09af4a0
+  data.tar.gz: f71bf10af00c11400e4fc2edd43e60d6dee2be79ca79cbdd6202c9cc9442e36d
 SHA512:
-  metadata.gz: 95e60f443c8cff3af9c486e5654b6c57ee6a8a47458659ba6df09c4ed59eef16822c8de9d39b4e877b93e7a235230c9a176763ae1c2e6bb762fd721a99a5edf9
-  data.tar.gz: ae7fcfed84f078ad216b48dcd4d5f227819132e30f642ffaa2fbe5b566aa6c29e4ae46d49da7e769947228be877829bac60ae13e93cb359e9400a0a6fa2786f1
+  metadata.gz: 3d2efc92056730fa4cd322aff21e9dc328dbf4d2e1699f2792dbab4b633445914c5f224e5aa322721570903cc3610cce6301dc83b46c0fa853606bbc225ab3ec
+  data.tar.gz: 62a8fc9cfb3fec708e1dbd0bdb405c5b66edec87d818f5624d94e09acae73a0f558865b504f6cf3c506e230df9b47730712fa002f1d833bd88b8ae8060852cae

data/CHANGELOG.md

@@ -49,5 +49,5 @@ Please see [UPGRADE GUIDE](./docs/v6_upgrade.md) for more information.
 
 
 [Unreleased]: https://github.com/shakacode/shakapacker/compare/6.0.0-rc.11...master
-[6.0.0.rc.12]: https://github.com/shakacode/shakapacker/compare/aba79635e6ff6562ec04d3c446d57ef19a5fef7d...6.0.0-rc.12
+[6.0.0.rc.12]: https://github.com/shakacode/shakapacker/compare/aba79635e6ff6562ec04d3c446d57ef19a5fef7d...v6.0.0-rc.12
 [6.0.0.rc.6]: https://github.com/rails/webpacker/compare/v5.4.3...aba79635e6ff6562ec04d3c446d57ef19a5fef7d

data/README.md

@@ -1,15 +1,16 @@
 # Shakapacker
 
-_Actively maintained fork of [rails/webpacker](https://github.com/rails/webpacker). For pre v6, see [rails/webpacker 5-x-stable](https://github.com/rails/webpacker/tree/5-x-stable). Be sure to see the [CHANGELOG](./CHANGELOG.md)._
+_Official, actively maintained fork of [rails/webpacker](https://github.com/rails/webpacker). For pre v6, see [rails/webpacker 5-x-stable](https://github.com/rails/webpacker/tree/5-x-stable). Be sure to see the [CHANGELOG](./CHANGELOG.md)._
 
-Note, internal naming will continue to use `webpacker` where possible.
+* Note, internal naming will continue to use `webpacker` where possible.
+* See [V6 Upgrade](./docs/v6_upgrade.md) for upgrading from v5 or prior v6 releases.
 
 [![Ruby specs](https://github.com/shakacode/shakapacker/workflows/Ruby%20specs/badge.svg)](https://github.com/shakacode/shakapacker/actions)
 [![Jest specs](https://github.com/shakacode/shakapacker/workflows/Jest%20specs/badge.svg)](https://github.com/shakacode/shakapacker/actions)
 [![Rubocop](https://github.com/shakacode/shakapacker/workflows/Rubocop/badge.svg)](https://github.com/shakacode/shakapacker/actions)
 [![JS lint](https://github.com/shakacode/shakapacker/workflows/JS%20lint/badge.svg)](https://github.com/shakacode/shakapacker/actions)
 
-[![node.js](https://img.shields.io/badge/node-%3E%3D%2012.0.0-brightgreen.svg)](https://www.npmjs.com/package/@shakacode/shakapacker)
+[![node.js](https://img.shields.io/badge/node-%3E%3D%2012.0.0-brightgreen.svg)](https://www.npmjs.com/package/shakapacker)
 [![Gem](https://img.shields.io/gem/v/shakapacker.svg)](https://rubygems.org/gems/shakapacker)
 
 Webpacker makes it easy to use the JavaScript pre-processor and bundler
@@ -19,8 +20,6 @@ leaving Webpack responsible solely for app-like JavaScript, or it can be used ex
 
 See a comparison of [webpacker with jsbundling-rails](https://github.com/rails/jsbundling-rails/blob/main/docs/comparison_with_webpacker.md).
 
-Visit [Shipping Webpacker v6 – Status](https://discuss.rubyonrails.org/t/shipping-webpacker-v6-status/79683) for the latest news on a v6 release.
-
 Discussion forums to discuss debugging and troubleshooting tips. Please open issues for bugs and feature requests:
 1. [rails/webpacker discussion forum](https://discuss.rubyonrails.org/c/webpacker/10)
 2. [Discussions tab](https://github.com/shakacode/shakapacker/discussions)
@@ -111,10 +110,10 @@ Update your `Gemfile`:
 
 ```ruby
 # Gemfile
-gem 'webpacker', '~> 6.0'
+gem 'shakapacker', '~> 6.0'
 
 # OR if you prefer to use master
-gem 'webpacker', git: 'https://github.com/shakacode/shakapacker.git'
+gem 'shakapacker', git: 'https://github.com/shakacode/shakapacker.git'
 yarn add https://github.com/shakacode/shakapacker.git
 ```
 
@@ -139,7 +138,7 @@ yarn add @babel/core @babel/plugin-transform-runtime @babel/preset-env @babel/ru
   webpack webpack-assets-manifest webpack-cli webpack-merge webpack-sources webpack-dev-server
 ```
 
-Previously, these "webpack" and "babel" packages were direct dependencies for `@shakacode/shakapacker`. By
+Previously, these "webpack" and "babel" packages were direct dependencies for `webpacker`. By
 making these peer dependencies, you have control over the versions used in your webpack and babel configs.
 
 ## Usage
@@ -314,7 +313,7 @@ Then `require` this file in your `config/webpack/webpack.config.js`:
 
 ```js
 // config/webpack/webpack.config.js
-const { webpackConfig, merge } = require('@shakacode/shakapacker')
+const { webpackConfig, merge } = require('shakapacker')
 const customConfig = require('./custom')
 
 module.exports = merge(webpackConfig, customConfig)
@@ -324,7 +323,7 @@ If you need access to configs within Webpacker's configuration, you can import t
 
 ```js
 // config/webpack/webpack.config.js
-const { webpackConfig } = require('@shakacode/shakapacker')
+const { webpackConfig } = require('shakapacker')
 
 console.log(webpackConfig.output_path)
 console.log(webpackConfig.source_path)
@@ -340,7 +339,7 @@ By default, you will find the Webpacker preset in your `package.json`.
 ```json
 "babel": {
   "presets": [
-    "./node_modules/@shakacode/shakapacker/package/babel/preset.js"
+    "./node_modules/shakapacker/package/babel/preset.js"
   ]
 },
 ```
@@ -423,7 +422,7 @@ Then modify the webpack config to use it as a plugin:
 
 ```js
 // config/webpack/webpack.config.js
-const { webpackConfig, merge } = require("@shakacode/shakapacker");
+const { webpackConfig, merge } = require("shakapacker");
 const ForkTSCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
 
 module.exports = merge(webpackConfig, {
@@ -443,7 +442,7 @@ Optionally, add the `CSS` extension to webpack config for easy resolution.
 
 ```js
 // config/webpack/webpack.config.js
-const { webpackConfig, merge } = require('@shakacode/shakapacker')
+const { webpackConfig, merge } = require('shakapacker')
 const customConfig = {
   resolve: {
     extensions: ['.css']
@@ -516,7 +515,7 @@ module.exports = {
 
 ```js
 // config/webpack/webpack.config.js
-const { webpackConfig, merge } = require('@shakacode/shakapacker')
+const { webpackConfig, merge } = require('shakapacker')
 const vueConfig = require('./rules/vue')
 
 module.exports = merge(vueConfig, webpackConfig)
@@ -581,15 +580,15 @@ bundle update webpacker
 rails webpacker:install
 
 # yarn 1 instructions
-yarn upgrade @shakacode/shakapacker --latest
+yarn upgrade shakapacker --latest
 yarn upgrade webpack-dev-server --latest
 
 # yarn 2 instructions
-yarn up @shakacode/shakapacker@latest
+yarn up shakapacker@latest
 yarn up webpack-dev-server@latest
 
 # Or to install the latest release (including pre-releases)
-yarn add @shakacode/shakapacker@next
+yarn add shakapacker@next
 ```
 
 Also, consult the [CHANGELOG](./CHANGELOG.md) for additional upgrade links.

data/docs/customizing_babel_config.md

@@ -1,13 +1,13 @@
 # Customizing Babel Config
 
 ## Default Configuration
-The default configuration of babel is done by using `package.json` to use the file within the `@shakacode/shakapacker` package.
+The default configuration of babel is done by using `package.json` to use the file within the `shakapacker` package.
 
 ```json
 {
   "babel": {
     "presets": [
-      "./node_modules/@shakacode/shakapacker/package/babel/preset.js"
+      "./node_modules/shakapacker/package/babel/preset.js"
     ]
   }
 }
@@ -27,7 +27,7 @@ yarn add --dev @pmmmwh/react-refresh-webpack-plugin react-refresh
 ```js
 // babel.config.js
 module.exports = function (api) {
-  const defaultConfigFunc = require('@shakacode/shakapacker/package/babel/preset.js')
+  const defaultConfigFunc = require('shakapacker/package/babel/preset.js')
   const resultConfig = defaultConfigFunc(api)
   const isProductionEnv = api.env('production')
 

data/docs/developing_webpacker.md

@@ -13,7 +13,7 @@ Let's call the shakacode/shakapacker directory `WEBPACKER_DIR` which has shakaco
 ### Setup with Yalc
 Use [`yalc`](https://github.com/wclr/yalc) unless you like yak shaving weird errors.
 1. In `WEBPACKER_DIR`, run `yalc publish`
-2. In `TEST_APP_DIR`, run `yalc link @shakacode/shakapacker`
+2. In `TEST_APP_DIR`, run `yalc link shakapacker`
 
 ## Update the Package Code
 1. Make some JS change in WEBPACKER_DIR

data/docs/troubleshooting.md

@@ -132,7 +132,7 @@ To silent these warnings, please update `config/webpack/webpack.config.js`:
 ```js
 const webpack = require('webpack')
 const { resolve } = require('path')
-const { webpackConfig, merge } = require('@shakacode/shakapacker')
+const { webpackConfig, merge } = require('shakapacker')
 
 module.exports = merge(webpackConfig, {
   plugins: [
@@ -181,7 +181,7 @@ Instead do:
 // config/webpack/webpack.config.js
 
 const webpack = require('webpack')
-const { webpackConfig, merge } = require('@shakacode/shakapacker')
+const { webpackConfig, merge } = require('shakapacker')
 
 module.exports = merge(webpackConfig, {
   plugins: [

data/docs/v6_upgrade.md

@@ -10,6 +10,14 @@ Webpacker used to configure Webpack indirectly, which lead to a [complicated sec
 
 This means you have to configure integration with frameworks yourself, but webpack-merge helps with this. See this example for [Vue](https://github.com/shakacode/shakapacker#other-frameworks) and scroll to the bottom for [more examples](#examples-of-v5-to-v6).
 
+## webpacker v6.0.0.rc.6 to shakapacker
+See example migration, [PR 27](https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/pull/27).
+          
+### Update
+1. Peer dependencies. Run `yarn add @babel/core @babel/plugin-transform-runtime @babel/preset-env @babel/runtime babel-loader compression-webpack-plugin pnp-webpack-plugin terser-webpack-plugin webpack webpack-assets-manifest webpack-cli webpack-merge webpack-sources webpack-dev-server`
+2. Update your webpack config for a single config file, `config/webpack/webpack.config.js`. 
+3. Update `babel.config.js` if you need JSX support. 
+
 ## How to upgrade to Webpacker v6 from v5
 1. Ensure you have a clean working git branch. You will be overwriting all your files and reverting the changes that you don't want.
 
@@ -33,13 +41,13 @@ This means you have to configure integration with frameworks yourself, but webpa
 
 1. Upgrade the Webpacker Ruby gem and the NPM package
 
-   Note: [Check the releases page to verify the latest version](https://github.com/rails/webpacker/releases), and make sure to install identical version numbers of webpacker gem and `@shakacode/shakapacker` npm package. (Gems use a period and packages use a dot between the main version number and the beta version.)
+   Note: [Check the releases page to verify the latest version](https://github.com/rails/webpacker/releases), and make sure to install identical version numbers of webpacker gem and `shakapacker` npm package. (Gems use a period and packages use a dot between the main version number and the beta version.)
 
    Example going to a specific version:
 
    ```ruby
    # Gemfile
-   gem 'webpacker', '6.0.0.rc.7'
+   gem 'shakapacker', '6.0.0.rc.13', require: 'webpacker'
    ```
 
    ```bash
@@ -47,7 +55,7 @@ This means you have to configure integration with frameworks yourself, but webpa
    ```
 
    ```bash
-   yarn add @shakacode/shakapacker@6.0.0-rc.7 --exact
+   yarn add shakapacker@6.0.0-rc.7 --exact
    ```
 
   ```bash
@@ -64,7 +72,7 @@ This means you have to configure integration with frameworks yourself, but webpa
 1. There is now a single default configuration file of `config/webpack/webpack.config.js`. Previously, the config file was set
   to `config/webpack/#{NODE_ENV}.js`. In the `config/webpack/` directory, you can either refactor your code in `test.js`, `development.js`, and `production.js` to a single file, `webpack.config.js` or you can replace the contents of `config/webpack/config.webpack.js` to conditionally load the old file based on the NODE_ENV with this snippet:
    ```js
-   const { env, webpackConfig } = require('@shakacode/shakapacker')
+   const { env, webpackConfig } = require('shakapacker')
    const { existsSync } = require('fs')
    const { resolve } = require('path')
 
@@ -109,7 +117,7 @@ This means you have to configure integration with frameworks yourself, but webpa
 1. Import `environment` changed to `webpackConfig`. For example, the new code looks like:
    ```js
    // config/webpack/webpack.config.js
-   const { webpackConfig, merge } = require('@shakacode/shakapacker')
+   const { webpackConfig, merge } = require('shakapacker')
    const customConfig = require('./custom')
 
    module.exports = merge(webpackConfig, customConfig)

data/lib/install/config/webpack/webpack.config.js

@@ -1,4 +1,4 @@
-const { webpackConfig } = require('@shakacode/shakapacker')
+const { webpackConfig } = require('shakapacker')
 
 // See the shakacode/shakapacker README and docs directory for advice on customizing your webpackConfig.
 

data/lib/install/package.json

@@ -6,7 +6,7 @@
   "version": "0.1.0",
   "babel": {
     "presets": [
-      "./node_modules/@shakacode/shakapacker/package/babel/preset.js"
+      "./node_modules/shakapacker/package/babel/preset.js"
     ]
   },
   "browserslist": [

data/lib/install/template.rb

@@ -66,11 +66,11 @@ results = []
 
 Dir.chdir(Rails.root) do
   if Webpacker::VERSION.match?(/^[0-9]+\.[0-9]+\.[0-9]+$/)
-    say "Installing @shakacode/shakapacker@#{Webpacker::VERSION}"
-    results << run("yarn add @shakacode/shakapacker@#{Webpacker::VERSION}")
+    say "Installing shakapacker@#{Webpacker::VERSION}"
+    results << run("yarn add shakapacker@#{Webpacker::VERSION}")
   else
-    say "Installing @shakacode/shakapacker@next"
-    results << run("yarn add @shakacode/shakapacker@next")
+    say "Installing shakapacker@next"
+    results << run("yarn add shakapacker@next")
   end
 
   package_json = File.read("#{__dir__}/../../package.json")
@@ -80,7 +80,7 @@ Dir.chdir(Rails.root) do
     result << "#{package}@#{major_version}"
   end.join(" ")
 
-  say "Adding @shakacode/shakapacker peerDependencies"
+  say "Adding shakapacker peerDependencies"
   results << run("yarn add #{peers_to_add}")
 
   say "Installing webpack-dev-server for live reloading as a development dependency"

data/lib/shakapacker.rb

@@ -0,0 +1 @@
+require "webpacker"

data/lib/tasks/webpacker/info.rake

@@ -11,7 +11,7 @@ namespace :webpacker do
       $stdout.puts "Yarn: #{`yarn --version`}"
 
       $stdout.puts "\n"
-      $stdout.puts "@shakacode/shakapacker: \n#{`npm list @shakacode/shakapacker version`}"
+      $stdout.puts "shakapacker: \n#{`npm list shakapacker version`}"
 
       $stdout.puts "Is bin/webpacker present?: #{File.exist? 'bin/webpacker'}"
       $stdout.puts "Is bin/webpacker-dev-server present?: #{File.exist? 'bin/webpacker-dev-server'}"

data/lib/webpacker/version.rb

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

data/package/babel/preset.js

@@ -1,4 +1,4 @@
-const { moduleExists } = require('@shakacode/shakapacker')
+const { moduleExists } = require('shakapacker')
 
 module.exports = function config(api) {
   const validEnv = ['development', 'test', 'production']

data/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@shakacode/shakapacker",
-  "version": "6.0.0-rc.12",
+  "name": "shakapacker",
+  "version": "6.0.0-rc.13",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "main": "package/index.js",
   "files": [

data/test/mounted_app/test/dummy/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "dependencies": {
-    "@shakacode/shakapacker": "file:../../../../"
+    "shakapacker": "file:../../../../"
   },
   "license": "MIT"
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakapacker
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc.12
+  version: 6.0.0.rc.13
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -157,6 +157,7 @@ files:
 - lib/install/config/webpacker.yml
 - lib/install/package.json
 - lib/install/template.rb
+- lib/shakapacker.rb
 - lib/shakapacker/utils/misc.rb
 - lib/shakapacker/utils/version_syntax_converter.rb
 - lib/tasks/webpacker.rake
@@ -268,7 +269,7 @@ homepage: https://github.com/shakacode/shakapacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/shakacode/shakapacker/tree/v6.0.0-rc.12
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v6.0.0-rc.13
 post_install_message:
 rdoc_options: []
 require_paths: