diff --git a/Gemfile b/Gemfile index 6fd60216b..19ef397bb 100644 --- a/Gemfile +++ b/Gemfile @@ -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.0" +gem "shakapacker", "~> 7.0" # Authz and Authn gem "authlogic", "~> 6.1" diff --git a/Gemfile.lock b/Gemfile.lock index e714fc46a..574cab6ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -379,6 +379,7 @@ GEM mini_portile2 (~> 2.8.2) racc (~> 1.4) observer (0.1.2) + package_json (0.1.0) parallel (1.25.1) parser (3.3.4.0) ast (~> 2.4.1) @@ -597,8 +598,9 @@ GEM bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) sexp_processor (4.17.2) - shakapacker (7.0.3) + shakapacker (7.2.3) activesupport (>= 5.2) + package_json rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) @@ -770,7 +772,7 @@ DEPENDENCIES selenium-webdriver (~> 4.15.0) sentry-rails (~> 5.0) sentry-ruby (~> 5.0) - shakapacker (~> 7.0.0) + shakapacker (~> 7.0) spinjs-rails (~> 1.3.0) spreadsheet sprockets diff --git a/package.json b/package.json index 0fd94d445..fd85a3a5f 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "react-with-direction": "^1.3.1", "react_ujs": "2.6.1", "regenerator-runtime": "0.13.9", - "shakapacker": "~7.0.0", + "shakapacker": "^ 7.0.0", "style-loader": "1.2.1", "terser-webpack-plugin": "^5.3.10", "webpack": "^5.53.0", diff --git a/yarn.lock b/yarn.lock index 7d9f3cebb..70939ec63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7223,10 +7223,10 @@ setprototypeof@1.2.0: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== -shakapacker@~7.0.0: - version "7.0.3" - resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-7.0.3.tgz#e67fca4e74c3ef380e1acf53a1d51ab4784ca01c" - integrity sha512-2kwNP8kadkmGOqb7Bp/iNzF3bV31zni8b35Uzst2DZHjnFcnDbW96MERXHc7lS3p3AmKJVbUBmHAFCPsLT9tcw== +"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== dependencies: glob "^7.2.0" js-yaml "^4.1.0"