diff --git a/Gemfile b/Gemfile index 7bfe2a36..875d6bbe 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ ruby "3.1.2" gem "cpl", "~> 0.3.3" gem "react_on_rails", "13.2.0" -gem "shakapacker", "7.0.0" +gem "shakapacker", "7.0.2" # Bundle edge Rails instead: gem "rails", github: "rails/rails" gem "listen" diff --git a/Gemfile.lock b/Gemfile.lock index 38000fe3..9de1a17f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -335,7 +335,7 @@ GEM websocket (~> 1.0) semantic_range (3.0.0) sexp_processor (4.17.0) - shakapacker (7.0.0) + shakapacker (7.0.2) activesupport (>= 5.2) rack-proxy (>= 0.6.1) railties (>= 5.2) @@ -429,7 +429,7 @@ DEPENDENCIES scss_lint sdoc selenium-webdriver (~> 4) - shakapacker (= 7.0.0) + shakapacker (= 7.0.2) spring spring-commands-rspec uglifier diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js index 1a598293..cde58c7c 100644 --- a/config/webpack/webpack.config.js +++ b/config/webpack/webpack.config.js @@ -1,4 +1,4 @@ -const { env, webpackConfig } = require('shakapacker'); +const { env, generateWebpackConfig } = require('shakapacker'); const { existsSync } = require('fs'); const { resolve } = require('path'); @@ -7,9 +7,9 @@ const envSpecificConfig = () => { if (existsSync(path)) { console.log(`Loading ENV specific webpack configuration file ${path}`); return require(path); - } else { - return webpackConfig; } + + return generateWebpackConfig(); }; module.exports = envSpecificConfig(); diff --git a/package.json b/package.json index 1f45ae23..dbc0fa8a 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "sass": "^1.58.3", "sass-loader": "^12.6.0", "sass-resources-loader": "^2.2.5", - "shakapacker": "7.0.0", + "shakapacker": "7.0.2", "style-loader": "^3.3.1", "terser-webpack-plugin": "5", "turbolinks": "^5.2.0", diff --git a/yarn.lock b/yarn.lock index af1c740e..b1297f71 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8937,10 +8937,10 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shakapacker@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-7.0.0.tgz#788c96e86eb78e44ee84c3cc03b7c091e4621fc3" - integrity sha512-yL5lbCdgtI8nUxZHarL7X5aB40r069wAunHwb59Hgw1gPg6/nMuYo7ofNTGXg11v1eunwAdjx8EfYnk4XwX27Q== +shakapacker@7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-7.0.2.tgz#cd7cb5075fdbf4d06e60d894f9076c8e56643a98" + integrity sha512-TF2GFb0E28fvQpn2L6RdvAHJRZmFMTvpJg93102tCbFywHq3tmTqwD/ijvlD+eMuZ8d1i3AMTnhO+45ayN3dYg== dependencies: glob "^7.2.0" js-yaml "^4.1.0"