shakapacker 6.5.0 → 6.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b82b9f5ec11e2c2f705b17b2c36bcdc4446dc966c8f08ed0f620b9b0325b6a7a
-  data.tar.gz: 422c4152faf9cc24b1b10a84da9c5e2eda53c52c8a9369e2b01b7a4107a4cde0
+  metadata.gz: b9174a8c729f67ee442afd4db423a2c2f5e412ba448283c9d691dea1b565cf7e
+  data.tar.gz: 940e267827d81bf4febd2ab41748efb2d8862ac653e7d234ce5016448cca4026
 SHA512:
-  metadata.gz: edbc0fc84e0cd99618aeacf63066f2e5bd4abb8a6f160a2d4b3dcfbb8ddd50879add52a4acce0d25c559801b017c20bc8a1d32e2667a97672b383ec668468786
-  data.tar.gz: 9d3ba188baa5731713e472f11dd812ef8a0f33ac6e6cea3ce84c1984c0b3073bec3eefccb5728b5181164db61db1e363cde7affce2a3d3a8d3dce433c7171e58
+  metadata.gz: 4553b937730995bf743ba9a3d11941096d0eda4e7cd37d69c9dc0fcb97b9f3d6f7e550e58e5d2106882686ff01c3a2ff0740e6758fd8759fed1221513eff66f2
+  data.tar.gz: 287b01999fcc9e13230a4ea90d2fd36cf9f71775435912283599f6db3630390a3f10e7c0810f92cb21ddb363cb80f3aa7f3f8e719a61afa7fc1c3fef6749e890

data/.gitignore

@@ -1,4 +1,5 @@
 /.bundle
+Gemfile.lock
 /pkg
 /test/mounted_app/test/dummy/log
 /test/test_app/log

data/CHANGELOG.md

@@ -8,6 +8,17 @@ Changes since last non-beta release.
 
 _Please add entries here for your pull requests that are not yet released._
 
+## [v6.5.1] - August 12, 2022
+
+### Improved
+- Resolve exact npm package version from lockfiles for constraint checking. [PR 170](https://github.com/shakacode/shakapacker/pull/170) by [G-Rath](https://github.com/G-Rath).
+
+### Fixed
+- `append_javascript_pack_tag` and `append_stylesheet_pack_tag` helpers return `nil` to prevent rendering the queue into view when using `<%= … %>` ERB syntax. [PR 167](https://github.com/shakacode/shakapacker/pull/167) by [ur5us](https://github.com/ur5us). While `<%=` should not be used, it's OK to return nil in case it's misused.
+- Fixed non-runnable test due to wrong code nesting. [PR 173](https://github.com/shakacode/shakapacker/pull/173) by [ur5us](https://github.com/ur5us).
+- Fixed default configurations not working for custom Rails environments [PR 168](https://github.com/shakacode/shakapacker/pull/168) by [ur5us](https://github.com/ur5us).
+- Added accessor method for `nested_entries` configuration. [PR 176](https://github.com/shakacode/shakapacker/pull/176) by [pulkitkkr](https://github.com/pulkitkkr).
+
 ## [v6.5.0] - July 4, 2022
 ### Added
 - `append_stylesheet_pack_tag` helper. It helps in configuring stylesheet pack names from the view for a route or partials. It is also required for filesystem-based automated Component Registry API on React on Rails gem. [PR 144](https://github.com/shakacode/shakapacker/pull/144) by [pulkitkkr](https://github.com/pulkitkkr).
@@ -28,7 +39,7 @@ _Please add entries here for your pull requests that are not yet released._
 - Fixed [Issue 123: Rails 7.0.3 - Webpacker configuration file not found when running rails webpacker:install (shakapacker v6.3)](https://github.com/shakacode/shakapacker/issues/123) in [PR 136: Don't enhance precompile if no config #136](https://github.com/shakacode/shakapacker/pull/136) by [justin808](https://github.com/justin808).
 
 ### Added
-- Configuration boolean option `nested_entries` to use nested entries. This was the default prior to v6.0. Because entries maybe generated, it's useful to allow a `generated` subdirectory. [PR 121](https://github.com/shakacode/shakapacker/pull/121) by [justin808](https://github.com/justin808). 
+- Configuration boolean option `nested_entries` to use nested entries. This was the default prior to v6.0. Because entries maybe generated, it's useful to allow a `generated` subdirectory. [PR 121](https://github.com/shakacode/shakapacker/pull/121) by [justin808](https://github.com/justin808).
 
 ### Improved
 - Allow v10 of `compression-webpack-plugin` as a peer dependency. [PR 117](https://github.com/shakacode/shakapacker/pull/117) by [aried3r](https://github.com/aried3r).
@@ -38,7 +49,7 @@ _Please add entries here for your pull requests that are not yet released._
 ## [v6.3.0] - May 19, 2022
 
 ### Improved
-- Add ability to configure usage of either last modified timestamp and digest strategies when checking asset freshness. [PR 112](https://github.com/shakacode/shakapacker/pull/112) by [tomdracz](https://github.com/tomdracz). 
+- Add ability to configure usage of either last modified timestamp and digest strategies when checking asset freshness. [PR 112](https://github.com/shakacode/shakapacker/pull/112) by [tomdracz](https://github.com/tomdracz).
 
 ### Fixed
 - On Windows CSS urls no longer contain backslashes resulting in 404 errors. [PR 115](https://github.com/shakacode/shakapacker/pull/115) by [daniel-rikowski](https://github.com/daniel-rikowski).
@@ -50,10 +61,10 @@ Note: [Rubygem is 6.3.0.pre.rc.1](https://rubygems.org/gems/shakapacker/versions
 ### Changed
 - Remove Loose mode from the default @babel-preset/env configuration. [PR 107](https://github.com/shakacode/shakapacker/pull/107) by [Jeremy Liberman](https://github.com/MrLeebo).
 
-  Loose mode compiles the bundle down to be compatible with ES5, but saves space by skipping over behaviors that are considered edge cases. Loose mode can affect how your code runs in a variety of ways, but in newer versions of Babel it's better to use [Compiler Assumptions](https://babeljs.io/docs/en/assumptions) to have finer-grained control over which edge cases you're choosing to ignore. 
+  Loose mode compiles the bundle down to be compatible with ES5, but saves space by skipping over behaviors that are considered edge cases. Loose mode can affect how your code runs in a variety of ways, but in newer versions of Babel it's better to use [Compiler Assumptions](https://babeljs.io/docs/en/assumptions) to have finer-grained control over which edge cases you're choosing to ignore.
 
   This change may increase the file size of your bundles, and may change some behavior in your app if your code touches upon one of the edge cases where Loose mode differs from native JavaScript. There are notes in the linked PR about how to turn Loose mode back on if you need to, but consider migrating to Compiler Assumptions when you can. If you have already customized your babel config, this change probably won't affect you.
-  
+
 ### Added
 - Adds `webpacker_precompile` setting to `webpacker.yml` to allow controlling precompile behaviour, similar to existing `ENV["WEBPACKER_PRECOMPILE"]` variable. [PR 102](https://github.com/shakacode/shakapacker/pull/102) by [Judahmeek](https://github.com/Judahmeek).
 - Adds `append_javascript_pack_tag` helper. Allows for easier usage and coordination of multiple javascript packs. [PR 94](https://github.com/shakacode/shakapacker/pull/94) by [tomdracz](https://github.com/tomdracz).
@@ -150,9 +161,10 @@ Note: [Rubygem is 6.3.0.pre.rc.1](https://rubygems.org/gems/shakapacker/versions
 - 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) 
+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.0...master
+[Unreleased]: https://github.com/shakacode/shakapacker/compare/v6.5.1...master
+[v6.5.1]: https://github.com/shakacode/shakapacker/compare/v6.5.0...v6.5.1
 [v6.5.0]: https://github.com/shakacode/shakapacker/compare/v6.4.1...v6.5.0
 [v6.4.1]: https://github.com/shakacode/shakapacker/compare/v6.4.0...v6.4.1
 [v6.4.0]: https://github.com/shakacode/shakapacker/compare/v6.3.0...v6.4.0

data/Gemfile

@@ -2,13 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rails", ">= 6.1.6"
-gem "rake", ">= 11.1"
-gem "rack-proxy", require: false
-gem "semantic_range", require: false
-gem "nokogiri", "~> 1.13", ">= 1.13.6"
-
-group :test do
-  gem "minitest", "~> 5.0"
-  gem "byebug"
-end
+eval_gemfile File.expand_path("./Gemfile.development_dependencies", __dir__)

data/Gemfile.development_dependencies

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+gem "rails", ">= 6.1.6"
+gem "rake", ">= 11.1"
+gem "rack-proxy", ">= 0.7.2"
+gem "nokogiri", ">= 1.13.6"
+gem "rails-html-sanitizer", ">= 1.4.3"
+
+
+group :test do
+  gem "minitest", "~> 5.0"
+  gem "byebug"
+end

data/README.md

@@ -62,13 +62,12 @@ Discussion forum and Slack to discuss debugging and troubleshooting tips. Please
     - [Integrations](#integrations)
       - [React](#react)
       - [Typescript](#typescript)
-      - [CoffeeScript](#coffeescript)
-      - [TypeScript](#typescript)
       - [CSS](#css)
       - [Postcss](#postcss)
       - [Sass](#sass)
       - [Less](#less)
       - [Stylus](#stylus)
+      - [CoffeeScript](#coffeescript)
       - [Other frameworks](#other-frameworks)
     - [Custom Rails environments](#custom-rails-environments)
     - [Upgrading](#upgrading)
@@ -171,7 +170,7 @@ You will need your file system to correspond to the setup of your `webpacker.yml
 
 Suppose you have the following configuration:
 
-`webacker.yml`
+`webpacker.yml`
 ```yml
 default: &default
   source_path: app/javascript
@@ -527,34 +526,6 @@ See here for detailed instructions on how to [configure Shakapacker to bundle a
 
 See also [Customizing Babel Config](./docs/customizing_babel_config.md) for an example React configuration.
 
-#### Typescript
-...if you are using typescript, update your `tsconfig.json`
-
-```json
-{
-  "compilerOptions": {
-    "declaration": false,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "lib": ["es6", "dom"],
-    "module": "es6",
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "target": "es5",
-    "jsx": "react",
-    "noEmit": true
-  },
-  "exclude": ["**/*.spec.ts", "node_modules", "vendor", "public"],
-  "compileOnSave": false
-}
-```
-
-#### CoffeeScript
-
-```bash
-yarn add coffeescript coffee-loader
-```
-
 #### TypeScript
 
 ```bash
@@ -578,12 +549,9 @@ Add tsconfig.json
     "lib": ["es6", "dom"],
     "module": "es6",
     "moduleResolution": "node",
-    "baseUrl": ".",
-    "paths": {
-      "*": ["node_modules/*", "app/javascript/*"]
-    },
     "sourceMap": true,
     "target": "es5",
+    "jsx": "react",
     "noEmit": true
   },
   "exclude": ["**/*.spec.ts", "node_modules", "vendor", "public"],
@@ -657,6 +625,12 @@ yarn add less less-loader
 yarn add stylus stylus-loader
 ```
 
+#### CoffeeScript
+
+```bash
+yarn add coffeescript coffee-loader
+```
+
 #### Other frameworks
 
 Please follow webpack integration guide for relevant framework or library,

data/docs/react.md

@@ -8,7 +8,16 @@ Before starting, ensure that you have Yarn installed, for example:
 npm i -g yarn
 ```
 
-## Basic Setup
+## Easy Setup
+If you'd like easy integration of React with Ruby on Rails, see [React on Rails](https://github.com/shakacode/react_on_rails).
+
+The below information applies to a React on Rails app, except that you need to setup some environment variables as follows:
+
+```
+EXECJS_RUNTIME=Node
+```
+
+## Basic Manual Setup
 
 Create a new Rails app as per the [installation instructions in the README](https://github.com/shakacode/shakapacker#installation).
 

data/docs/v6_upgrade.md

@@ -21,8 +21,10 @@ _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`. 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.
 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`. 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`. WARNING, previously, if you did not set `NODE_ENV`, `NODE_ENV` defaulted to `development`. Thus, you might expect `config/webpack/development.js` to run, but you'll instead be using the `config/webpack/RAILS_ENV.js`
-   ```js
+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`. WARNING, previously, if you did not set `NODE_ENV`, `NODE_ENV` defaulted to `development`. Thus, you might expect `config/webpack/development.js` to run, but you'll instead be using the the configuration file that corresponds to your `RAILS_ENV`. If your `RAILS_ENV` is `test`, you'd be running `config/webpack/test.js`.
+ 
+  ```js
+   // name this file config/webpack/webpack.config.js
    const { env, webpackConfig } = require('shakapacker')
    const { existsSync } = require('fs')
    const { resolve } = require('path')
@@ -45,23 +47,9 @@ _If you're on webpacker v5, follow below steps to get to v6.0.0.rc.6 first._
 ## 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`.
-   ```yml
-     source_path: app/javascript
-     source_entry_path: packs
-   ```
-   consider changing to the v6 default:
-   ```yml
-     source_path: app/javascript
-     source_entry_path: /
-   ```
-   Then consider moving your `app/javascript/packs/*` (including `application.js`) to `app/javascript/` and updating the configuration file.
-
-   Note, moving your files is optional, as you can stil keep your entries in a separate directory, called something like `packs`, or `entries`. This directory is defined within the source_path.
-
-1. **Ensure no nested directories in your `source_entry_path`.** Check if you had any entry point files in child directories of your `source_entry_path`. Files for entry points in child directories are not supported by shakacode/shakapacker v6. Move those files to the top level, adjusting any imports in those files.
+1. **Ensure no nested directories in your `source_entry_path`. or set option `nested_entries: true`** Check if you had any entry point files in child directories of your `source_entry_path`.
 
-   The new v6 configuration does not allow nesting, so as to allow placing the entry points at in the root directory of JavaScript. You can find this change [here](https://github.com/rails/webpacker/commit/5de0fbc1e16d3db0c93202fb39f5b4d80582c682#diff-7af8667a3e36201db57c02b68dd8651883d7bfc00dc9653661be11cd31feeccdL19).
+   The new v6 configuration **defaults** to not allow nesting, so as to allow placing the entry points at in the root directory of JavaScript. You can find this change [here](https://github.com/rails/webpacker/commit/5de0fbc1e16d3db0c93202fb39f5b4d80582c682#diff-7af8667a3e36201db57c02b68dd8651883d7bfc00dc9653661be11cd31feeccdL19).
 
 1. Upgrade the Webpacker Ruby gem and the NPM package
 
@@ -110,7 +98,7 @@ _If you're on webpacker v5, follow below steps to get to v6.0.0.rc.6 first._
 
 1. **Ensure no nested directories in your `source_entry_path`.** Check if you had any entry point files in child directories of your `source_entry_path`. Files for entry points in child directories are not supported by shakacode/shakapacker v6. Move those files to the top level, adjusting any imports in those files.
 
-   The new v6 configuration does not allow nesting, so as to allow placing the entry points at in the root directory of JavaScript. You can find this change [here](https://github.com/rails/webpacker/commit/5de0fbc1e16d3db0c93202fb39f5b4d80582c682#diff-7af8667a3e36201db57c02b68dd8651883d7bfc00dc9653661be11cd31feeccdL19).
+   The v6 configuration does not allow nesting, so as to allow placing the entry points at in the root directory of JavaScript. You can find this change [here](https://github.com/rails/webpacker/commit/5de0fbc1e16d3db0c93202fb39f5b4d80582c682#diff-7af8667a3e36201db57c02b68dd8651883d7bfc00dc9653661be11cd31feeccdL19).
 
 1. Update `webpack-dev-server` to the current version, greater than 4.2, updating `package.json`.
 

data/lib/webpacker/configuration.rb

@@ -23,6 +23,10 @@ class Webpacker::Configuration
     fetch(:compile)
   end
 
+  def nested_entries?
+    fetch(:nested_entries)
+  end
+
   def ensure_consistent_versioning?
     fetch(:ensure_consistent_versioning)
   end
@@ -30,7 +34,7 @@ class Webpacker::Configuration
   def webpacker_precompile?
     # ENV of false takes precedence
     return false if %w(no false n f).include?(ENV["WEBPACKER_PRECOMPILE"])
-    return true if %w(yes true t).include?(ENV["WEBPACKER_PRECOMPILE"])
+    return true if %w(yes true y t).include?(ENV["WEBPACKER_PRECOMPILE"])
 
     return false unless config_path.exist?
     fetch(:webpacker_precompile)
@@ -130,7 +134,7 @@ class Webpacker::Configuration
         rescue ArgumentError
           YAML.load_file(path)
         end
-        HashWithIndifferentAccess.new(config[env])
+        HashWithIndifferentAccess.new(config[env] || config[Webpacker::DEFAULT_ENV])
       end
     end
 end

data/lib/webpacker/env.rb

@@ -1,6 +1,4 @@
 class Webpacker::Env
-  DEFAULT = "production".freeze
-
   delegate :config_path, :logger, to: :@webpacker
 
   def self.inquire(webpacker)
@@ -13,7 +11,7 @@ class Webpacker::Env
 
   def inquire
     fallback_env_warning if config_path.exist? && !current
-    current || DEFAULT.inquiry
+    current || Webpacker::DEFAULT_ENV.inquiry
   end
 
   private
@@ -22,7 +20,7 @@ class Webpacker::Env
     end
 
     def fallback_env_warning
-      logger.info "RAILS_ENV=#{Rails.env} environment is not defined in config/webpacker.yml, falling back to #{DEFAULT} environment"
+      logger.info "RAILS_ENV=#{Rails.env} environment is not defined in config/webpacker.yml, falling back to #{Webpacker::DEFAULT_ENV} environment"
     end
 
     def available_environments

data/lib/webpacker/helper.rb

@@ -174,6 +174,9 @@ module Webpacker::Helper
 
     @stylesheet_pack_tag_queue ||= []
     @stylesheet_pack_tag_queue.concat names
+
+    # prevent rendering Array#to_s representation when used with <%= … %> syntax
+    nil
   end
 
   def append_javascript_pack_tag(*names, defer: true)
@@ -184,6 +187,9 @@ module Webpacker::Helper
 
     hash_key = defer ? :deferred : :non_deferred
     javascript_pack_tag_queue[hash_key] |= names
+
+    # prevent rendering Array#to_s representation when used with <%= … %> syntax
+    nil
   end
 
   private

data/lib/webpacker/version.rb

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

data/lib/webpacker/version_checker.rb

@@ -29,7 +29,7 @@ module Webpacker
 
       if !Webpacker.config.ensure_consistent_versioning? && (uses_wildcard || !versions_match)
         check_failed = if uses_wildcard
-          "Semver wildcard detected"
+          "Semver wildcard without a lockfile detected"
         else
           "Version mismatch detected"
         end
@@ -37,7 +37,7 @@ module Webpacker
         warn <<-MSG.strip_heredoc
           Webpacker::VersionChecker - #{check_failed}
 
-          You are currently not checking for consistent versions of shakapacker gem and npm package. A version mismatch or usage of semantic versioning wildcard (~ or ^) has been detected.
+          You are currently not checking for consistent versions of shakapacker gem and npm package. A version mismatch or usage of semantic versioning wildcard (~ or ^) without a lockfile has been detected.
 
           Version mismatch can lead to incorrect behavior and bugs. You should ensure that both the gem and npm package dependencies are locked to the same version.
 
@@ -61,9 +61,9 @@ module Webpacker
          Detected: #{node_package_version.raw}
               gem: #{gem_version}
          Ensure the installed version of the gem is the same as the version of
-         your installed node package. Do not use >= or ~> in your Gemfile for shakapacker.
-         Do not use ^ or ~ in your package.json for shakapacker.
-         Run `yarn add shakapacker --exact` in the directory containing folder node_modules.
+         your installed node package.
+         Do not use >= or ~> in your Gemfile for shakapacker without a lockfile.
+         Do not use ^ or ~ in your package.json for shakapacker without a lockfile.
       MSG
       end
 
@@ -91,20 +91,29 @@ module Webpacker
         attr_reader :package_json
 
         def self.build
-          new(package_json_path)
+          new(package_json_path, yarn_lock_path, package_lock_path)
         end
 
         def self.package_json_path
           Rails.root.join("package.json")
         end
 
-        def initialize(package_json)
+        def self.yarn_lock_path
+          Rails.root.join("yarn.lock")
+        end
+
+        def self.package_lock_path
+          Rails.root.join("package-lock.json")
+        end
+
+        def initialize(package_json, yarn_lock, package_lock)
           @package_json = package_json
+          @yarn_lock = yarn_lock
+          @package_lock = package_lock
         end
 
         def raw
-          parsed_package_contents = JSON.parse(package_json_contents)
-          parsed_package_contents.dig("dependencies", "shakapacker").to_s
+          @raw ||= find_version
         end
 
         def semver_wildcard?
@@ -147,6 +156,60 @@ module Webpacker
           def package_json_contents
             @package_json_contents ||= File.read(package_json)
           end
+
+          def find_version
+            if File.exist?(@yarn_lock)
+              version = from_yarn_lock
+
+              return version unless version.nil?
+            end
+
+            if File.exist?(@package_lock)
+              version = from_package_lock
+
+              return version unless version.nil?
+            end
+
+            parsed_package_contents = JSON.parse(package_json_contents)
+            parsed_package_contents.dig("dependencies", "shakapacker").to_s
+          end
+
+          def from_package_lock
+            package_lock_contents = File.read(@package_lock)
+            parsed_lock_contents = JSON.parse(package_lock_contents)
+
+            pkg = parsed_lock_contents.dig("packages", "node_modules/shakapacker")
+            pkg = parsed_lock_contents.dig("dependencies", "shakapacker") if pkg.nil?
+
+            pkg&.fetch("version", nil)
+          end
+
+          def from_yarn_lock
+            found_pkg = false
+            version = nil
+            matcher = /\A"?shakapacker@.+:/
+
+            File.foreach(@yarn_lock, chomp: true) do |line|
+              next if line.start_with?("#")
+
+              # if we've found the start of the packages details and then come across
+              # a line that is not indented we've hit the end of the package details
+              break if found_pkg && !line.start_with?("  ")
+
+              if found_pkg
+                m = line.match(/\A {2}version:? "?(?<package_version>[\w.-]+)"?\z/)
+
+                next unless m
+
+                version = m[:package_version]
+                break
+              end
+
+              found_pkg = true if matcher.match(line)
+            end
+
+            version
+          end
       end
   end
 end

data/lib/webpacker.rb

@@ -6,6 +6,8 @@ require "active_support/tagged_logging"
 module Webpacker
   extend self
 
+  DEFAULT_ENV = "production".freeze
+
   def instance=(instance)
     @instance = instance
   end

data/package.json

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

data/test/configuration_test.rb

@@ -90,6 +90,18 @@ class ConfigurationTest < Webpacker::Test
     end
   end
 
+  def test_nested_entries?
+    refute @config.nested_entries?
+
+    with_rails_env("development") do
+      refute Webpacker.config.nested_entries?
+    end
+
+    with_rails_env("test") do
+      refute Webpacker.config.nested_entries?
+    end
+  end
+
   def test_ensure_consistent_versioning?
     refute @config.ensure_consistent_versioning?
 
@@ -100,25 +112,75 @@ class ConfigurationTest < Webpacker::Test
     with_rails_env("test") do
       refute Webpacker.config.ensure_consistent_versioning?
     end
+  end
 
-    def test_webpacker_precompile
-      assert @config.webpacker_precompile
+  def test_webpacker_precompile
+    assert @config.webpacker_precompile?
 
-      ENV["WEBPACKER_PRECOMPILE"] = "false"
+    ENV["WEBPACKER_PRECOMPILE"] = "no"
+    refute Webpacker.config.webpacker_precompile?
 
-      refute Webpacker.config.webpacker_precompile?
+    ENV["WEBPACKER_PRECOMPILE"] = "yes"
+    assert Webpacker.config.webpacker_precompile?
 
-      ENV["WEBPACKER_PRECOMPILE"] = "yes"
+    ENV["WEBPACKER_PRECOMPILE"] = "false"
+    refute Webpacker.config.webpacker_precompile?
 
-      assert Webpacker.config.webpacker_precompile?
+    ENV["WEBPACKER_PRECOMPILE"] = "true"
+    assert Webpacker.config.webpacker_precompile?
 
-      @no_precompile_config = Webpacker::Configuration.new(
-        root_path: @config.root_path,
-        config_path: Pathname.new(File.expand_path("./test_app/config/webpacker_no_precompile.yml", __dir__)),
-        env: "production"
-      )
+    ENV["WEBPACKER_PRECOMPILE"] = "n"
+    refute Webpacker.config.webpacker_precompile?
 
-      refute @no_precompile_config.webpacker_precompile
-    end
+    ENV["WEBPACKER_PRECOMPILE"] = "y"
+    assert Webpacker.config.webpacker_precompile?
+
+    ENV["WEBPACKER_PRECOMPILE"] = "f"
+    refute Webpacker.config.webpacker_precompile?
+
+    ENV["WEBPACKER_PRECOMPILE"] = "t"
+    assert Webpacker.config.webpacker_precompile?
+
+    @no_precompile_config = Webpacker::Configuration.new(
+      root_path: @config.root_path,
+      config_path: Pathname.new(File.expand_path("./test_app/config/webpacker_no_precompile.yml", __dir__)),
+      env: "production"
+    )
+
+    assert @no_precompile_config.webpacker_precompile?
+
+    ENV["WEBPACKER_PRECOMPILE"] = nil
+
+    refute @no_precompile_config.webpacker_precompile?
+
+    @invalid_path_config = Webpacker::Configuration.new(
+      root_path: @config.root_path,
+      config_path: Pathname.new(File.expand_path("./test_app/config/invalid_path.yml", __dir__)),
+      env: "default"
+    )
+
+    refute @invalid_path_config.webpacker_precompile?
+  end
+
+  def test_fall_back_to_bundled_config_with_the_same_name_for_standard_environments
+    @no_default_config = Webpacker::Configuration.new(
+      root_path: @config.root_path,
+      config_path: Pathname.new(File.expand_path("./test_app/config/webpacker_defaults_fallback.yml", __dir__)),
+      env: "default"
+    )
+
+    refute @no_default_config.cache_manifest? # fall back to "default" config from bundled file
+    refute @no_default_config.webpacker_precompile? # use "default" config from custom file
+  end
+
+  def test_fall_back_to_bundled_production_config_for_custom_environments
+    @no_env_config = Webpacker::Configuration.new(
+      root_path: @config.root_path,
+      config_path: Pathname.new(File.expand_path("./test_app/config/webpacker_defaults_fallback.yml", __dir__)),
+      env: "staging"
+    )
+
+    assert @no_env_config.cache_manifest? # fall back to "production" config from bundled file
+    refute @no_env_config.webpacker_precompile? # use "staging" config from custom file
   end
 end

data/test/env_test.rb

@@ -18,6 +18,6 @@ class EnvTest < Webpacker::Test
   end
 
   def test_default
-    assert_equal Webpacker::Env::DEFAULT, "production"
+    assert_equal Webpacker::DEFAULT_ENV, "production"
   end
 end