shakapacker 6.5.6 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17c0e222ab613e6f12721d7bdb999428753be2ad5543908699ee9c6a935e925b
-  data.tar.gz: b308833c1dece4246d9d427f794abb37bcfd7be30ff11c1471fa70ae3c549ccb
+  metadata.gz: 667631baa338ba0105550f29536e148bed8b21475daf816b148ab22be98209f9
+  data.tar.gz: 1f49260d3dd206242d022a07200c8d5dbf370fbc72e1dedf10ab033add63dc52
 SHA512:
-  metadata.gz: 28136e6a11fd60abd2d5a83554e13d3405a24ea1c7bda76b3c7d689fef6dc4f98352d6a963f26b9cc888cc0c870e840bec662f5cbdfbc89f7e21938c366d4067
-  data.tar.gz: e5aa229a81dfc4435d4219891f4e8e28560797d365e0ee13584f53743b6cb7c5b8f473690fce75b58d3d47a301ad7862ff8fca1397eacedfb75c450acf8faaaa
+  metadata.gz: c830769b5fc9a2c40c0e686848421ee39b6df1ae4866f6ad0f00a60b34e1d3262c2fa7b39012e92cbc5d1a985f200c38a636597a8a4adf339c5961960d457fe2
+  data.tar.gz: 818526e1d7b2f5a355a4ffe86c3b09e30ae1ca957fd077e685475aab512fe1107ce3f548e1100811a226c8cce6ed3a5f5a2e1511a9f822112eee9b091e9704c1

data/.eslintrc.js

@@ -5,6 +5,7 @@ module.exports = {
     'import/no-unresolved': 'off',
     'import/no-extraneous-dependencies': 'off',
     'import/extensions': 'off',
+    "indent": ["error", 2],
     semi: ['error', 'never']
   },
   env: {

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [shakacode]

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+### Summary
+
+_Remove this paragraph and provide a general description of the code changes in your pull
+request... were there any bugs you had fixed? If so, mention them. If
+these bugs have open GitHub issues, be sure to tag them here as well,
+to keep the conversation linked together._
+
+### Pull Request checklist
+_Remove this line after checking all the items here. If the item is not applicable to the PR, both check it out and wrap it by `~`._
+
+- [ ] Add/update test to cover these changes
+- [ ] Update documentation
+- [ ] Update CHANGELOG file  
+  _Add the CHANGELOG entry at the top of the file._
+
+### Other Information
+
+_Remove this parapraph and mention any other important and relevant information such as benchmarks._

data/CHANGELOG.md

@@ -8,18 +8,19 @@ Changes since last non-beta release.
 
 _Please add entries here for your pull requests that are not yet released._
 
-## [6.5.6] - February 11, 2023
+## [v6.6.0] - March 7, 2023
+### Improved
+- Allow configuration of webpacker.yml through env variable. [PR 254](https://github.com/shakacode/shakapacker/pull/254) by [alecslupu](https://github.com/alecslupu)
+
+## [v6.5.6] - February 11, 2023
 ### Fixed
-- Fixed failing to update `bin/setup` file due to different formats of the file in different versions of Rails. [PR229](https://github.com/shakacode/shakapacker/pull/229) by [ahangarha](https://github.com/ahangarha)
+- Fixed failing to update `bin/setup` file due to different formats of the file in different versions of Rails. [PR 229](https://github.com/shakacode/shakapacker/pull/229) by [ahangarha](https://github.com/ahangarha)
 
 - Upgrade several JS dependencies to fix security issues. [PR 243](https://github.com/shakacode/shakapacker/pull/243) by [ahangarha](https://github.com/ahangarha).
 
 - Added `prepend_javascript_pack_tag` to helpers. Allows to move an entry to the top of queue. Handy when calling from the layout to make sure an entry goes before the view and partial `append_javascript_pack_tag` entries. [PR 235](https://github.com/shakacode/shakapacker/pull/235) by [paypro-leon](https://github.com/paypro-leon).
 
 - Fixed [issue](https://github.com/shakacode/shakapacker/issues/208) to support directories under `node_modules/*` in the `additional_paths` property of `webpacker.yml` [PR 238](https://github.com/shakacode/shakapacker/pull/238) by [vaukalak](https://github.com/vaukalak).
-
-## [6.5.6] - January 15, 2023
-### Fixed
 - Remove duplicate yarn installs. [PR 238](https://github.com/shakacode/shakapacker/pull/238) by [justin808](https://github/justin808).
 - Remove unneeded code related to CSP config for generator. [PR 223](https://github.com/shakacode/shakapacker/pull/223) by [ahangarha](https://github/ahangarha). 
 
@@ -208,7 +209,8 @@ Note: [Rubygem is 6.3.0.pre.rc.1](https://rubygems.org/gems/shakapacker/versions
 ## 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/v6.5.6...master
+[Unreleased]: https://github.com/shakacode/shakapacker/compare/v6.6.0...master
+[v6.6.0]: https://github.com/shakacode/shakapacker/compare/v6.5.6...v6.6.0
 [v6.5.6]: https://github.com/shakacode/shakapacker/compare/v6.5.5...v6.5.6
 [v6.5.5]: https://github.com/shakacode/shakapacker/compare/v6.5.4...v6.5.5
 [v6.5.4]: https://github.com/shakacode/shakapacker/compare/v6.5.3...v6.5.4

data/docs/v6_upgrade.md

@@ -19,7 +19,7 @@ See an example migration here: [PR 27](https://github.com/shakacode/react_on_rai
 1. Remove setting the NODE_ENV in your `bin/webpacker` and `bin/webpacker-dev-server` bin stubs as these are not set in the webpack runner file.
 
 ### 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._
+_If you're on webpacker v5, follow [how to upgrade to webpacker v6.0.0.rc.6 from v5](#how-to-upgrade-to-webpacker-v600rc6-from-v5) 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`. You may have old versions of libraries. Run `yarn install` and check for warnings like `warning " > shakapacker@6.1.1" has incorrect peer dependency "compression-webpack-plugin@^9.0.0"` and `file-loader@1.1.11" has incorrect peer dependency "webpack@^2.0.0 || ^3.0.0 || ^4.0.0"`. In other words, warnings like these are **serious** and will cause considerable confusion if not respected.

data/lib/webpacker/instance.rb

@@ -1,10 +1,12 @@
+require "pathname"
 class Webpacker::Instance
   cattr_accessor(:logger) { ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT)) }
 
   attr_reader :root_path, :config_path
 
   def initialize(root_path: Rails.root, config_path: Rails.root.join("config/webpacker.yml"))
-    @root_path, @config_path = root_path, config_path
+    @root_path = root_path
+    @config_path = Pathname.new(ENV["WEBPACKER_CONFIG"] || config_path)
   end
 
   def env

data/lib/webpacker/version.rb

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

data/package/rules/babel.js

@@ -6,16 +6,16 @@ const { isProduction } = require('../env')
 const jscommon = require('./jscommon')
 
 module.exports = loaderMatches(webpackLoader, 'babel', () => ({
-    test: /\.(js|jsx|mjs|ts|tsx|coffee)?(\.erb)?$/,
-    ...jscommon,
-    use: [
-      {
-        loader: require.resolve('babel-loader'),
-        options: {
-          cacheDirectory: true,
-          cacheCompression: isProduction,
-          compact: isProduction
-        }
+  test: /\.(js|jsx|mjs|ts|tsx|coffee)?(\.erb)?$/,
+  ...jscommon,
+  use: [
+    {
+      loader: require.resolve('babel-loader'),
+      options: {
+        cacheDirectory: true,
+        cacheCompression: isProduction,
+        compact: isProduction
       }
-    ]
+    }
+  ]
 }))

data/package/rules/jscommon.js

@@ -1,26 +1,26 @@
 const { resolve } = require('path')
 const { realpathSync } = require('fs')
 const {
-    source_path: sourcePath,
-    additional_paths: additionalPaths
+  source_path: sourcePath,
+  additional_paths: additionalPaths
 } = require('../config')
 
 const inclusions = [sourcePath, ...additionalPaths].map(p => {
-    try {
-        return realpathSync(p)
-    } catch (e) {
-        return resolve(p)
-    }
+  try {
+    return realpathSync(p)
+  } catch (e) {
+    return resolve(p)
+  }
 })
 
 module.exports = {
-    include: inclusions,
-    exclude: [
-        {
-            // exclude all node_modules from running through babel-loader
-            and: [resolve('node_modules')],
-            // Do not exclude inclusions, as otherwise these won't be transpiled
-            not: [...inclusions]
-        }
-    ]
+  include: inclusions,
+  exclude: [
+    {
+      // exclude all node_modules from running through babel-loader
+      and: [resolve('node_modules')],
+      // Do not exclude inclusions, as otherwise these won't be transpiled
+      not: [...inclusions]
+    }
+  ]
 }

data/package.json

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

data/spec/webpacker_spec.rb

@@ -33,6 +33,28 @@ describe "Webpacker" do
     end
   end
 
+  describe "configurable config" do
+    before do
+      @original_webpacker_config = ENV["WEBPACKER_CONFIG"]
+    end
+
+    after do
+      ENV["WEBPACKER_CONFIG"] = @original_webpacker_config
+    end
+
+    it "allows config file to be changed based on ENV variable" do
+      ENV.delete("WEBPACKER_CONFIG")
+      Webpacker.instance = nil
+      expect(Webpacker.config.config_path.to_s).to eq(Rails.root.join("config/webpacker.yml").to_s)
+    end
+
+    it "allows config file to be changed based on ENV variable" do
+      ENV["WEBPACKER_CONFIG"] = "/some/random/path.yml"
+      Webpacker.instance = nil
+      expect(Webpacker.config.config_path.to_s).to eq("/some/random/path.yml")
+    end
+  end
+
   it "has app_autoload_paths cleanup" do
     expect($test_app_autoload_paths_in_initializer).to eq []
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakapacker
 version: !ruby/object:Gem::Version
-  version: 6.5.6
+  version: 6.6.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-12 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -121,8 +121,10 @@ extra_rdoc_files: []
 files:
 - ".eslintignore"
 - ".eslintrc.js"
+- ".github/FUNDING.yml"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/jest.yml"
 - ".github/workflows/js-lint.yml"
 - ".github/workflows/rubocop.yml"
@@ -342,7 +344,7 @@ homepage: https://github.com/shakacode/shakapacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/shakacode/shakapacker/tree/v6.5.6
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v6.6.0
 post_install_message:
 rdoc_options: []
 require_paths: