shakapacker 6.1.0.beta.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4167db4aea00b8ed494df2151cb5fd7ad414dc6617e8c1b0ee5537d461c7c968
-  data.tar.gz: 7cc1c3c5f9c5a39801ac1801b252ee609e01a6c06508541b64d30fadcf7464ed
+  metadata.gz: 1ed9a099f6d2af01d86664505f7a8cd13196d666beb526d5f7a360fb1473ce77
+  data.tar.gz: 2e87b7d185a54fbbee7f717507c58a77093cc23eaaab500f28ccebde3560c738
 SHA512:
-  metadata.gz: 56ce966357cbf20bcf9fb92839e94988a9f91768118aca2960ec53b0b0ed377df04b0bbb6801e885a9011eafa63655537dc36c63a50eda6cca4d46cba319beee
-  data.tar.gz: 163807c57c4e543967a58a3dc96630d92d50fd798bac7d78536c39eaf055281c150922e98e66ad5af5e41daf3b2739b48a0cc5d1285f3251f875fda3581389f4
+  metadata.gz: ad534bf595ba05e3b4a2bb1eb44132c2eb0762b61de98390745940043873878d70cc1e391f4a8e51432c51e433463a9ca01f0fb6a205e990e1cf77daa0c68214
+  data.tar.gz: a53836485058bf673e8fecd3db4f22660dd104fef0c71be543bfada101c0cce20ad83706f9ceb8e50057cce79d6e24a921d8bf8965a87a32e3f24d66d5773a17

data/.github/workflows/jest.yml

@@ -20,11 +20,8 @@ jobs:
           node-version: ${{ matrix.node }}
           cache: yarn
 
-      - name: Install yarn maybe
-        run: which yarn || npm install -g yarn
-
       - name: Install dependencies
-        run: yarn --frozen-lockfile
+        run: yarn --frozen-lockfile --non-interactive --prefer-offline
 
       - name: Jest Specs
         run: yarn test

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

@@ -3,13 +3,12 @@ name: JS lint
 on: [push, pull_request]
 
 jobs:
-  js-lint:
+  lint:
     name: JS Lint
-
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [14]
+        node: [12.x, 14.x, 16.x]
 
     runs-on: ${{ matrix.os }}
 
@@ -21,11 +20,8 @@ jobs:
           node-version: ${{ matrix.node }}
           cache: yarn
 
-      - name: Install yarn maybe
-        run: which yarn || npm install -g yarn
-
       - name: Install dependencies
-        run: yarn --frozen-lockfile
+        run: yarn --frozen-lockfile --non-interactive --prefer-offline
 
       - name: Lint
         run: yarn lint

data/.github/workflows/rubocop.yml

@@ -6,34 +6,17 @@ jobs:
   rubocop:
     name: Rubocop
     runs-on: ${{ matrix.os }}
-    env:
-      BUNDLE_JOBS: 4
-      BUNDLE_RETRY: 3
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby: [
-          2.7
-        ]
+        ruby: ['2.7', '3.0']
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: /home/runner/bundle
-          key: bundle-use-ruby-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            bundle-use-ruby-gems-
-
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
 
-      - name: Bundle install
-        run: |
-          gem install bundler -v 2.1.4
-          bundle config path /home/runner/bundle
-          bundle install
-
-      - name: Ruby linter
+      - name: Ruby rubocop
         run: bundle exec rubocop

data/.github/workflows/ruby.yml

@@ -6,43 +6,36 @@ jobs:
   test:
     name: Ruby specs
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' || matrix.experimental }}
     strategy:
-      fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ruby:
-          - 2.7
-          - "3.0"
+        ruby: ['2.6', '2.7', '3.0']
         gemfile:
           - gemfiles/Gemfile-rails.5.2.x
           - gemfiles/Gemfile-rails.6.0.x
           - gemfiles/Gemfile-rails.6.1.x
+          - gemfiles/Gemfile-rails.7.0.x
+          - gemfiles/Gemfile-rails-edge
         exclude:
-          - ruby: 2.5
-            gemfile: gemfiles/Gemfile-rails.6.1.x
-          - ruby: "3.0"
-            gemfile: gemfiles/Gemfile-rails.5.2.x
-        experimental: [false]
-        include:
-          - ruby: 2.7
+          - ruby: 2.6
             os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails-edge
-            experimental: true
-          - ruby: "3.0"
+            gemfile: gemfiles/Gemfile-rails.7.0.x
+          - ruby: 2.6
             os: ubuntu-latest
             gemfile: gemfiles/Gemfile-rails-edge
-            experimental: true
+          - ruby: 3.0
+            os: ubuntu-latest
+            gemfile: gemfiles/Gemfile-rails.5.2.x
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+
     steps:
       - uses: actions/checkout@v2
-
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true # Run "bundle install", and cache the result automatically.
+          bundler-cache: true
 
       - name: Ruby specs
-        run: bundle exec rake
+        run: bundle exec rake test

data/.node-version

@@ -1 +1 @@
-16.7.0
+16

data/.rubocop.yml

@@ -1,6 +1,5 @@
 require: rubocop-performance
 AllCops:
-  TargetRubyVersion: 2.7
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true

data/CHANGELOG.md

@@ -1,11 +1,19 @@
 * For versions prior to v6, see the [5.x stable branch of rails/webpacker](https://github.com/rails/webpacker/tree/5-x-stable).
-* Please see [UPGRADE GUIDE](./docs/v6_upgrade.md).
+* Please see [v6 Upgrade Guide](./docs/v6_upgrade.md) to go from version prior to v6.
 
 ## Versions
-### [Unreleased]
+## [Unreleased]
 Changes since last non-beta release.
 
 *Please add entries here for your pull requests that are not yet released.*
+
+## [v6.1.0] - February 4, 2020
+### Added
+- Support for SWC loader. [PR 29](https://github.com/shakacode/shakapacker/pull/29) by [tomdracz](https://github.com/tomdracz).
+
+### Fixed
+- Static asset subdirectories are retained after compilation, matching Webpacker v5 behaviour. [PR 47](https://github.com/shakacode/shakapacker/pull/47) by [tomdracz](https://github.com/tomdracz). Fixes issues [rails/webpacker#2956](https://github.com/rails/webpacker/issues/2956) which broke in [rails/webpacker#2802](https://github.com/rails/webpacker/pull/2802).
+
 ## [v6.0.2] - January 25, 2022
 ### Improved
 - Fix incorrect command name in warning. [PR 33](https://github.com/shakacode/shakapacker/pull/33) by [tricknotes](https://github.com/tricknotes).
@@ -58,8 +66,11 @@ Changes since last non-beta release.
 - Splitchunks enabled by default
 - CSS extraction enabled by default, except when devServer is configured and running
 
+## v5.4.3 and prior changes from rails/webpacker
+See [CHANGELOG.md in rails/webpacker (up to v5.4.3)](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) 
 
-[Unreleased]: https://github.com/shakacode/shakapacker/compare/6.0.2...master
+[Unreleased]: https://github.com/shakacode/shakapacker/compare/v6.1.0...master
+[v6.1.0]: https://github.com/shakacode/shakapacker/compare/v6.0.2...v6.1.0
 [v6.0.2]: https://github.com/shakacode/shakapacker/compare/v6.0.1...v6.0.2
 [v6.0.1]: https://github.com/shakacode/shakapacker/compare/v6.0.0...v6.0.1
 [v6.0.0 changes from v6.0.0.rc.6]: https://github.com/shakacode/shakapacker/compare/aba79635e6ff6562ec04d3c446d57ef19a5fef7d...v6.0.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shakapacker (6.0.0)
+    shakapacker (6.1.0.beta.0)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)

data/README.md

@@ -1,6 +1,8 @@
 # Shakapacker
 
-_Official, actively maintained fork of [rails/webpacker](https://github.com/rails/webpacker). Internal naming for `shakapacker` will continue to use `webpacker` where possible. Notably, the NPM package name is `shakapacker`._
+_Official, actively maintained successor to [rails/webpacker](https://github.com/rails/webpacker). Internal naming for `shakapacker` will continue to use `webpacker` where possible for v6. ShakaCode stands behind long-term maintainence and development of this project for the Rails community._
+
+
 * 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)
@@ -12,11 +14,12 @@ _Official, actively maintained fork of [rails/webpacker](https://github.com/rail
 [![Gem](https://img.shields.io/gem/v/shakapacker.svg)](https://rubygems.org/gems/shakapacker)
 [![npm version](https://badge.fury.io/js/shakapacker.svg)](https://badge.fury.io/js/shakapacker)
 
-Webpacker makes it easy to use the JavaScript pre-processor and bundler
-[Webpack v5](https://webpack.js.org/)
+Webpacker makes it easy to use the JavaScript pre-processor and bundler [Webpack v5+](https://webpack.js.org/)
 to manage application-like JavaScript in Rails. It can coexist with the asset pipeline,
 leaving Webpack responsible solely for app-like JavaScript, or it can be used exclusively, making it also responsible for images, fonts, and CSS.
 
+Check out 6.1.0.beta.0 for [SWC](https://swc.rs/) support! It's way faster than babel.
+
 See a comparison of [webpacker with jsbundling-rails](https://github.com/rails/jsbundling-rails/blob/main/docs/comparison_with_webpacker.md).
 
 Discussion forums to discuss debugging and troubleshooting tips. Please open issues for bugs and feature requests:
@@ -34,6 +37,7 @@ Discussion forums to discuss debugging and troubleshooting tips. Please open iss
 - [Installation](#installation)
   - [Rails v6+](#rails-v6)
   - [Note for Sprockets usage](#note-for-sprockets-usage)
+  - [Note for Yarn v2 usage](#note-for-yarn-v2-usage)
 - [Usage](#usage)
   - [View Helpers](#view-helpers)
   - [Defer for `javascript_pack_tag`](#defer-for-javascript_pack_tag)
@@ -67,7 +71,7 @@ Discussion forums to discuss debugging and troubleshooting tips. Please open iss
 
 ## Prerequisites
 
-- Ruby 2.7+
+- Ruby 2.6+
 - Rails 5.2+
 - Node.js 12.13.0+ || 14+
 - Yarn
@@ -142,6 +146,12 @@ In order to enable this, make sure you add `node_modules` to the asset load path
 Rails.application.config.assets.paths << Rails.root.join('node_modules')
 ```
 
+### Note for Yarn v2 usage
+
+If you are using Yarn v2 (berry), please note that PnP modules are not supported.
+
+In order to use Shakapacker with Yarn v2, make sure you set `nodeLinker: node-modules` in your `.yarnrc.yml` file as per the [Yarn docs](https://yarnpkg.com/getting-started/migration#step-by-step) to opt out of Plug'n'Play behaviour.
+
 ## Usage
 
 ### View Helpers

data/docs/using_swc_loader.md

@@ -1,6 +1,8 @@
 # Using SWC Loader
 
-:warning: This feature is currently experimental. If you face any issues, please report at https://github.com/shakacode/shakapacker/issues.
+:warning: This feature is currently experimental. The configuration and API are subject to change during the beta release cycle.
+
+If you face any issues, please report at https://github.com/shakacode/shakapacker/issues.
 
 ## About SWC
 
@@ -23,7 +25,7 @@ yarn add -D @swc/core swc-loader
 2. Add or change `webpacker_loader` value in your default `webpacker.yml` config to `swc`
 The default configuration of babel is done by using `package.json` to use the file within the `shakapacker` package.
 
-```json
+```yml
 default: &default
   source_path: app/javascript
   source_entry_path: /

data/docs/v6_upgrade.md

@@ -1,25 +1,45 @@
-# Upgrading from Webpacker 5 to 6
+# Upgrading from Webpacker v5 to Shakapacker v6
 
-There are several substantial changes in Webpacker 6 that you need to manually account for when coming from Webpacker 5. This guide will help you through it.
+There are several substantial changes in Shakapacker v6 that you need to manually account for when coming from Webpacker 5. This guide will help you through it.
 
-## Webpacker has become a slimmer wrapper around Webpack
+## Webpacker/Shakapacker has become a slimmer wrapper around Webpack
 
 By default, Webpacker 6 is focused on compiling and bundling JavaScript. This pairs with the existing asset pipeline in Rails that's setup to transpile CSS and static images using [Sprockets](https://github.com/rails/sprockets). For most developers, that's the recommended combination. But if you'd like to use Webpacker for CSS and static assets as well, please see [integrations](https://github.com/shakacode/shakapacker#integrations) for more information.
 
-Webpacker used to configure Webpack indirectly, which lead to a [complicated secondary configuration process](https://github.com/rails/webpacker/blob/5-x-stable/docs/webpack.md). This was done in order to provide default configurations for the most popular frameworks, but ended up creating more complexity than it cured. So now Webpacker delegates all configuration directly to Webpack's default configuration setup.
+Webpacker used to configure Webpack indirectly, which lead to a [complicated secondary configuration process](https://github.com/rails/webpacker/blob/5-x-stable/docs/webpack.md). This was done in order to provide default configurations for the most popular frameworks, but ended up creating more complexity than it cured. So now Webpacker delegates all configuration directly to Webpack's default configuration setup. Additionally, all major dependencies, like `webpack` and `babel` are now **peer** dependencies, so you are free to upgrade those.
 
-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).
+While you have to configure integration with frameworks yourself, [`webpack-merge`](https://github.com/survivejs/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
+## webpacker v6.0.0.rc.6 to shakapacker v6.0.0 
 See an example migration here: [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 terser-webpack-plugin webpack webpack-assets-manifest webpack-cli webpack-merge webpack-sources webpack-dev-server`
+### Update Steps to v6.0.0 from v6.0.0.rc.6
+_If you're on webpacker v5, follow below steps to get to v6.0.0.rc.6 first._
+
+1. Change the gem name from `webpacker` to `shakapacker` and the NPM package from `@rails/webpacker` to `shakapacker`.
+1. Install the peer dependencies. Run `yarn add @babel/core @babel/plugin-transform-runtime @babel/preset-env @babel/runtime babel-loader compression-webpack-plugin terser-webpack-plugin webpack webpack-assets-manifest webpack-cli webpack-merge webpack-sources webpack-dev-server`
 1. Update any scripts that called `bin/webpack` or `bin/webpack-dev-server` to `bin/webpacker` or `bin/webpacker-dev-server`
-1. Update your webpack config for a single config file, `config/webpack/webpack.config.js`. 
-1. Update `babel.config.js` if you need JSX support. 
+1. Update your webpack config for a single config file, `config/webpack/webpack.config.js`. If you want to use the prior style of having a separate file for each NODE_ENV, you can use this shim for `config/webpack/webpack.config.js`:
+   ```js
+   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()
+   ```
+1. Update `babel.config.js` if you need JSX support. See [Customizing Babel Config](./customizing_babel_config.md)
 
-## How to upgrade to Webpacker v6 from v5
+## How to upgrade to Webpacker v6.0.0.rc.6 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.
 
 1. Consider changing from the v5 default for `source_entry_path` in `webpacker.yml`.
@@ -159,7 +179,7 @@ See an example migration here: [PR 27](https://github.com/shakacode/react_on_rai
 
 1. Update any scripts that called `/bin/webpack` or `bin/webpack-dev-server` to `/bin/webpacker` or `bin/webpacker-dev-server`
 
-1. Try your app!
+1. Now, follow the steps above to get to shakapacker v6 from webpacker v6.0.0.rc.6[
 
 ## Examples of v5 to v6
 

data/gemfiles/Gemfile-rails.7.0.x

@@ -0,0 +1,12 @@
+source "https://rubygems.org"
+
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gemspec path: "../"
+
+gem "rails", '~>7.0.0'
+gem "arel", github: "rails/arel"
+gem "rake", ">= 11.1"
+gem "rack-proxy", require: false
+gem "minitest", "~> 5.0"
+gem "byebug"

data/lib/webpacker/version.rb

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

data/package/rules/file.js

@@ -1,3 +1,6 @@
+const { dirname, join } = require('path')
+const { source_path: sourcePath } = require('../config')
+
 module.exports = {
   test: [
     /\.bmp$/,
@@ -18,6 +21,14 @@ module.exports = {
   exclude: [/\.(js|mjs|jsx|ts|tsx)$/],
   type: 'asset/resource',
   generator: {
-    filename: 'static/[name]-[hash][ext][query]'
+    filename: (pathData) => {
+      const folders = dirname(pathData.filename)
+        .replace(`${sourcePath}/`, '')
+        .split('/')
+        .slice(1)
+
+      const foldersWithStatic = join('static', ...folders)
+      return `${foldersWithStatic}/[name]-[hash][ext][query]`
+    }
   }
 }

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shakapacker",
-  "version": "6.1.0-beta.0",
+  "version": "6.1.0",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "main": "package/index.js",
   "files": [

data/webpacker.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
     "source_code_uri" => "https://github.com/shakacode/shakapacker/tree/v#{npm_version}",
   }
 
-  s.required_ruby_version = ">= 2.7.0"
+  s.required_ruby_version = ">= 2.6.0"
 
   s.add_dependency "activesupport", ">= 5.2"
   s.add_dependency "railties",      ">= 5.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakapacker
 version: !ruby/object:Gem::Version
-  version: 6.1.0.beta.0
+  version: 6.1.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-28 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -149,6 +149,7 @@ files:
 - gemfiles/Gemfile-rails.5.2.x
 - gemfiles/Gemfile-rails.6.0.x
 - gemfiles/Gemfile-rails.6.1.x
+- gemfiles/Gemfile-rails.7.0.x
 - lib/install/application.js
 - lib/install/bin/webpacker
 - lib/install/bin/webpacker-dev-server
@@ -272,7 +273,7 @@ homepage: https://github.com/shakacode/shakapacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/shakacode/shakapacker/tree/v6.1.0.beta.0
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v6.1.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -281,12 +282,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.32
 signing_key: