Skip to content

Commit

Permalink
shakapacker v8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
meltheadorable committed Jul 30, 2024
1 parent 9458d8f commit 9d669ac
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ gem "react-rails", "~> 3.0.0"
gem "select2-rails", "~> 4.0"
gem "spinjs-rails", "~> 1.3.0" # Breaking changes in v1.4 (spin.js v2.0).
gem "uglifier", "~> 4.2"
gem "shakapacker", "~> 7.0"
gem "shakapacker", "~> 8.0.0"

# Authz and Authn
gem "authlogic", "~> 6.1"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ GEM
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
sexp_processor (4.17.2)
shakapacker (7.2.3)
shakapacker (8.0.1)
activesupport (>= 5.2)
package_json
rack-proxy (>= 0.6.1)
Expand Down Expand Up @@ -772,7 +772,7 @@ DEPENDENCIES
selenium-webdriver (~> 4.15.0)
sentry-rails (~> 5.0)
sentry-ruby (~> 5.0)
shakapacker (~> 7.0)
shakapacker (~> 8.0.0)
spinjs-rails (~> 1.3.0)
spreadsheet
sprockets
Expand Down
6 changes: 2 additions & 4 deletions config/webpack/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { globalMutableWebpackConfig: webpackConfig, merge } = require('shakapacker')
const { generateWebpackConfig, merge } = require('shakapacker')

module.exports = merge(
webpackConfig,
generateWebpackConfig(),
{
rules: [
{
Expand All @@ -15,5 +15,3 @@ module.exports = merge(
]
}
)

module.exports = webpackConfig
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"packageManager": "[email protected]",
"scripts": {
"i18n:export": "bundle exec rake i18n:js:export",
"test": "jest",
Expand Down Expand Up @@ -74,7 +75,7 @@
"react-with-direction": "^1.3.1",
"react_ujs": "2.6.1",
"regenerator-runtime": "0.13.9",
"shakapacker": "^ 7.0.0",
"shakapacker": "~ 8.0.0",
"style-loader": "1.2.1",
"terser-webpack-plugin": "^5.3.10",
"webpack": "^5.53.0",
Expand Down
11 changes: 5 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4271,7 +4271,7 @@ glob-to-regexp@^0.4.1:
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==

glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
version "7.2.3"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
Expand Down Expand Up @@ -7223,12 +7223,11 @@ [email protected]:
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==

"shakapacker@^ 7.0.0":
version "7.2.3"
resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-7.2.3.tgz#12613e8ca3139e47d42003f8d01846dea28f6c40"
integrity sha512-+qF74Y6+hEARqtsmJmBtdc2L0q6eXO21PlPsvtw6aqoxtqhM2VpCCDt51/5Cqnj/5IyEOEICZqStRCSO/q38hg==
"shakapacker@~ 8.0.0":
version "8.0.1"
resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-8.0.1.tgz#96c893ccc414d47aaf86689eb5ef732259c592c7"
integrity sha512-VjIWgJqh4680Kf2NSmupB3h6dWxlOkGvceJJuJZ0az/6wUL5d/ovmKUc2swrpWC8UgBY67YjXI92zT07EQevbQ==
dependencies:
glob "^7.2.0"
js-yaml "^4.1.0"
path-complete-extname "^1.0.0"

Expand Down

0 comments on commit 9d669ac

Please sign in to comment.