From ab6cdd4c7851b459324af0e860dce79f7572e7ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 09:58:37 +0000 Subject: [PATCH 1/4] Bump stimulus_reflex from 3.5.0-pre9 to 3.5.0-rc2 Updating JS and Ruby libraries. This commit was started by Dependabot for 3.5.0-rc1. Then we updated to rc2. Old Dependabot message about rc1: Bumps [stimulus_reflex](https://github.com/stimulusreflex/stimulus_reflex) from 3.5.0-pre9 to 3.5.0-rc1. - [Release notes](https://github.com/stimulusreflex/stimulus_reflex/releases) - [Changelog](https://github.com/stimulusreflex/stimulus_reflex/blob/main/CHANGELOG.md) - [Commits](https://github.com/stimulusreflex/stimulus_reflex/commits) --- updated-dependencies: - dependency-name: stimulus_reflex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Bump cable_ready from 5.0.0-pre10 to 5.0.0-rc1 Bumps [cable_ready](https://github.com/stimulusreflex/cable_ready) from 5.0.0-pre10 to 5.0.0-rc1. - [Release notes](https://github.com/stimulusreflex/cable_ready/releases) - [Changelog](https://github.com/stimulusreflex/cable_ready/blob/main/CHANGELOG.md) - [Commits](https://github.com/stimulusreflex/cable_ready/commits) --- updated-dependencies: - dependency-name: cable_ready dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile | 4 ++-- Gemfile.lock | 28 +++++++++++++--------------- package.json | 4 ++-- yarn.lock | 41 +++++++++++++++++------------------------ 4 files changed, 34 insertions(+), 43 deletions(-) diff --git a/Gemfile b/Gemfile index f3e2c8ca40..a157a0205b 100644 --- a/Gemfile +++ b/Gemfile @@ -100,8 +100,8 @@ gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis'] gem 'sidekiq' gem 'sidekiq-scheduler' -gem "cable_ready", "5.0.0.pre9" -gem "stimulus_reflex", "3.5.0.pre9" +gem "cable_ready", "5.0.0.rc2" +gem "stimulus_reflex", "3.5.0.rc2" gem 'combine_pdf' gem 'wicked_pdf' diff --git a/Gemfile.lock b/Gemfile.lock index fb3a5fabcd..62eacff65f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -184,11 +184,9 @@ GEM bullet (7.0.7) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - cable_ready (5.0.0.pre9) - actioncable (>= 5.2) + cable_ready (5.0.0.rc2) actionpack (>= 5.2) actionview (>= 5.2) - activerecord (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) thread-local (>= 1.1.0) @@ -689,16 +687,16 @@ GEM state_machines-activerecord (0.8.0) activerecord (>= 5.1) state_machines-activemodel (>= 0.8.0) - stimulus_reflex (3.5.0.pre9) - actioncable (>= 5.2) - actionpack (>= 5.2) - actionview (>= 5.2) - activesupport (>= 5.2) - cable_ready (>= 5.0.0.pre9) - nokogiri - rack - railties (>= 5.2) - redis + stimulus_reflex (3.5.0.rc2) + actioncable (>= 5.2, < 8) + actionpack (>= 5.2, < 8) + actionview (>= 5.2, < 8) + activesupport (>= 5.2, < 8) + cable_ready (>= 5.0.0.rc2) + nokogiri (~> 1.0) + rack (>= 2, < 4) + railties (>= 5.2, < 8) + redis (>= 4.0, < 6.0) stringex (2.8.5) stripe (8.3.0) swd (1.3.0) @@ -793,7 +791,7 @@ DEPENDENCIES bootsnap bugsnag bullet - cable_ready (= 5.0.0.pre9) + cable_ready (= 5.0.0.rc2) cancancan (~> 1.15.0) capybara catalog! @@ -891,7 +889,7 @@ DEPENDENCIES spring spring-commands-rspec state_machines-activerecord - stimulus_reflex (= 3.5.0.pre9) + stimulus_reflex (= 3.5.0.rc2) stringex (~> 2.8.5) stripe test-unit (~> 3.5) diff --git a/package.json b/package.json index d1fb91af9b..87d4733c21 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@hotwired/turbo": "^7.3.0", "@rails/webpacker": "5.4.4", "babel-loader": "^8.2.3", - "cable_ready": "5.0.0-pre10", + "cable_ready": "5.0.0-rc2", "debounced": "^0.0.5", "flatpickr": "^4.6.9", "foundation-sites": "^5.5.2", @@ -36,7 +36,7 @@ "shortcut-buttons-flatpickr": "^0.4.0", "stimulus": "^3.0.1", "stimulus-flatpickr": "^1.4.0", - "stimulus_reflex": "3.5.0-pre9", + "stimulus_reflex": "3.5.0-rc2", "tom-select": "^2.0.0", "webpack": "~4", "webpack-cli": "~4", diff --git a/yarn.lock b/yarn.lock index 3cc6000ef4..014805bf65 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1419,7 +1419,7 @@ resolved "https://registry.yarnpkg.com/@hotwired/stimulus-webpack-helpers/-/stimulus-webpack-helpers-1.0.1.tgz#4cd74487adeca576c9865ac2b9fe5cb20cef16dd" integrity sha512-wa/zupVG0eWxRYJjC1IiPBdt3Lruv0RqGN+/DTMmUWUyMAEB27KXmVY6a8YpUVTM7QwVuaLNGW4EqDgrS2upXQ== -"@hotwired/stimulus@>= 3.0", "@hotwired/stimulus@^3.2.1": +"@hotwired/stimulus@^3", "@hotwired/stimulus@^3.2.1": version "3.2.1" resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.1.tgz#e3de23623b0c52c247aba4cd5d530d257008676b" integrity sha512-HGlzDcf9vv/EQrMJ5ZG6VWNs8Z/xMN+1o2OhV1gKiSG6CqZt5MCBB1gRg5ILiN3U0jEAxuDTNPRfBcnZBDmupQ== @@ -1685,10 +1685,10 @@ resolved "https://registry.yarnpkg.com/@orchidjs/unicode-variants/-/unicode-variants-1.0.4.tgz#6d2f812e3b19545bba2d81caffff1204de9a6a58" integrity sha512-NvVBRnZNE+dugiXERFsET1JlKZfM5lJDEpSMilKW4bToYJ7pxf0Zne78xyXB2ny2c2aHfJ6WLnz1AaTNHAmQeQ== -"@rails/actioncable@>= 6.0": - version "7.0.3" - resolved "https://registry.npmjs.org/@rails/actioncable/-/actioncable-7.0.3.tgz#71f08e958883af64f6a20489318b5e95d2c6dc5b" - integrity sha512-Iefl21FZD+ck1di6xSHMYzSzRiNJTHV4NrAzCfDfqc/wPz4xncrP8f2/fJ+2jzwKIaDn76UVMsALh7R5OzsF8Q== +"@rails/actioncable@^6 || ^7": + version "7.0.4" + resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.4.tgz#70a3ca56809f7aaabb80af2f9c01ae51e1a8ed41" + integrity sha512-tz4oM+Zn9CYsvtyicsa/AwzKZKL+ITHWkhiu7x+xF77clh2b4Rm+s6xnOgY/sGDWoFWZmtKsE95hxBPkgQQNnQ== "@rails/webpacker@5.4.4": version "5.4.4" @@ -2841,20 +2841,13 @@ bytes@3.1.2: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== -cable_ready@5.0.0-pre10: - version "5.0.0-pre10" - resolved "https://registry.yarnpkg.com/cable_ready/-/cable_ready-5.0.0-pre10.tgz#e92ca5b481335dfff95ae148b7b0da86e98001c0" - integrity sha512-NevHcu5N5zzUKxyS/cYtkIY6mm7y1anQr9zxu65fqptMOBZS2fukXpz9YEn659yGKyqtCMVNrzkNtkICkBoGAQ== +cable_ready@5.0.0-rc2: + version "5.0.0-rc2" + resolved "https://registry.yarnpkg.com/cable_ready/-/cable_ready-5.0.0-rc2.tgz#ccc99dfdd46a8358d6bdcbe285bed16b99220be5" + integrity sha512-Yq5lDy8gQ7NHJIxL0ANFYn/I6/dpLZTUxDio1MfhSyrbJ21eYlieqO/2JnLey7l+FUq1JGDHT1/6egzF5e++rw== dependencies: morphdom "2.6.1" -"cable_ready@>= 5.0.0-pre9": - version "5.0.0-pre9" - resolved "https://registry.npmjs.org/cable_ready/-/cable_ready-5.0.0-pre9.tgz#9c082b796f7b7add7965ce637a8d8717726be5ab" - integrity sha512-m7XggG+LRPFLsbH78G603F3AAYpkv+VfGCouN6RrP20Mgz9H0+xr7v2DN2F1CeJBBAliYPKcAt/48uTGjSrBaA== - dependencies: - morphdom "^2.6.1" - cacache@^12.0.2: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" @@ -6467,7 +6460,7 @@ moment@^2.29.1: resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== -morphdom@2.6.1, "morphdom@>=2.6.0 <3.0.0", morphdom@^2.6.1: +morphdom@2.6.1, "morphdom@>=2.6.0 <3.0.0": version "2.6.1" resolved "https://registry.yarnpkg.com/morphdom/-/morphdom-2.6.1.tgz#e868e24f989fa3183004b159aed643e628b4306e" integrity sha512-Y8YRbAEP3eKykroIBWrjcfMw7mmwJfjhqdpSvoqinu8Y702nAwikpXcNFDiIkyvfCLxLM9Wu95RZqo4a9jFBaA== @@ -8665,14 +8658,14 @@ stimulus@^3.0.1: "@hotwired/stimulus" "^3.2.1" "@hotwired/stimulus-webpack-helpers" "^1.0.0" -stimulus_reflex@3.5.0-pre9: - version "3.5.0-pre9" - resolved "https://registry.npmjs.org/stimulus_reflex/-/stimulus_reflex-3.5.0-pre9.tgz#e99eaf11e9e7476df10cd8f5c557d368f54446b3" - integrity sha512-ZhGUuJaKaWhHU5eGnZQ3pgnv0/pJ4dtNABDtMZRAHNm3ngsHY5dpR/H801a1ozD6J5rpadONvhhBcPjPY/x6NQ== +stimulus_reflex@3.5.0-rc2: + version "3.5.0-rc2" + resolved "https://registry.yarnpkg.com/stimulus_reflex/-/stimulus_reflex-3.5.0-rc2.tgz#94ffa16d6c96220909ac18da74ebc73e718d2978" + integrity sha512-vDF1TN9Ts2HlAjvVUV9gpv75zo+nZvVFLMKWPUFzjY6DK8VJEQMEYoZB36TQePlf1z6emw7YBVEPPSV+GGguPw== dependencies: - "@hotwired/stimulus" ">= 3.0" - "@rails/actioncable" ">= 6.0" - cable_ready ">= 5.0.0-pre9" + "@hotwired/stimulus" "^3" + "@rails/actioncable" "^6 || ^7" + cable_ready "5.0.0-rc2" stream-browserify@^2.0.1: version "2.0.2" From 6f8ab56d2edbc660ece5f5a0f61585da3ee33d1a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 28 Mar 2023 10:44:02 +0200 Subject: [PATCH 2/4] Replace deprecated call `render operations:` ``` DEPRECATED: CableReady's `render operations:` call has been renamed to `render cable_ready:`. Please update your render call. ``` --- app/controllers/admin/enterprises_controller.rb | 2 +- app/controllers/concerns/order_stock_check.rb | 2 +- app/controllers/split_checkout_controller.rb | 6 +++--- app/controllers/spree/orders_controller.rb | 2 +- app/controllers/spree/user_sessions_controller.rb | 6 +++--- app/controllers/spree/users_controller.rb | 6 +++--- app/controllers/user_confirmations_controller.rb | 2 +- app/controllers/user_passwords_controller.rb | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/controllers/admin/enterprises_controller.rb b/app/controllers/admin/enterprises_controller.rb index ddd242e71e..b618aba67e 100644 --- a/app/controllers/admin/enterprises_controller.rb +++ b/app/controllers/admin/enterprises_controller.rb @@ -50,7 +50,7 @@ module Admin if params[:stimulus] @enterprise.is_primary_producer = params[:is_primary_producer] @enterprise.sells = params[:enterprise_sells] - render operations: cable_car.morph("#side_menu", partial("admin/shared/side_menu")) + render cable_ready: cable_car.morph("#side_menu", partial("admin/shared/side_menu")) .morph("#permalink", partial("admin/enterprises/form/permalink")) end end diff --git a/app/controllers/concerns/order_stock_check.rb b/app/controllers/concerns/order_stock_check.rb index acc37529fc..7ada12ab73 100644 --- a/app/controllers/concerns/order_stock_check.rb +++ b/app/controllers/concerns/order_stock_check.rb @@ -31,7 +31,7 @@ module OrderStockCheck flash[:info] = I18n.t('order_cycle_closed') respond_to do |format| format.cable_ready { - render status: :see_other, operations: cable_car.redirect_to(url: main_app.shop_path) + render status: :see_other, cable_ready: cable_car.redirect_to(url: main_app.shop_path) } format.json { render json: { path: main_app.shop_path }, status: :see_other } format.html { redirect_to main_app.shop_path, status: :see_other } diff --git a/app/controllers/split_checkout_controller.rb b/app/controllers/split_checkout_controller.rb index c1a63c2c44..d65a661f32 100644 --- a/app/controllers/split_checkout_controller.rb +++ b/app/controllers/split_checkout_controller.rb @@ -43,7 +43,7 @@ class SplitCheckoutController < ::BaseController rescue Spree::Core::GatewayError => e flash[:error] = I18n.t(:spree_gateway_error_flash_for_checkout, error: e.message) @order.update_column(:state, "payment") - render operations: cable_car.redirect_to(url: checkout_step_path(:payment)) + render cable_ready: cable_car.redirect_to(url: checkout_step_path(:payment)) end private @@ -54,7 +54,7 @@ class SplitCheckoutController < ::BaseController messages: order_error_messages ) - render status: :unprocessable_entity, operations: cable_car. + render status: :unprocessable_entity, cable_ready: cable_car. replace("#checkout", partial("split_checkout/checkout")). replace("#flashes", partial("shared/flashes", locals: { flashes: flash })) end @@ -132,7 +132,7 @@ class SplitCheckoutController < ::BaseController return unless selected_payment_method&.external_gateway? return unless (redirect_url = selected_payment_method.external_payment_url(order: @order)) - render operations: cable_car.redirect_to(url: redirect_url) + render cable_ready: cable_car.redirect_to(url: redirect_url) true end diff --git a/app/controllers/spree/orders_controller.rb b/app/controllers/spree/orders_controller.rb index e0a8d2281b..026590c494 100644 --- a/app/controllers/spree/orders_controller.rb +++ b/app/controllers/spree/orders_controller.rb @@ -104,7 +104,7 @@ module Spree flash[:error] = I18n.t(:orders_could_not_cancel) end render status: :found, - operations: cable_car.redirect_to(url: request.referer || main_app.order_path(@order)) + cable_ready: cable_car.redirect_to(url: request.referer || main_app.order_path(@order)) end private diff --git a/app/controllers/spree/user_sessions_controller.rb b/app/controllers/spree/user_sessions_controller.rb index c7b4d9bde9..c22c6162fd 100644 --- a/app/controllers/spree/user_sessions_controller.rb +++ b/app/controllers/spree/user_sessions_controller.rb @@ -24,11 +24,11 @@ module Spree if spree_user_signed_in? flash[:success] = t('devise.success.logged_in_succesfully') - render operations: cable_car.redirect_to( + render cable_ready: cable_car.redirect_to( url: return_url_or_default(after_sign_in_path_for(spree_current_user)) ) else - render status: :unauthorized, operations: cable_car.inner_html( + render status: :unauthorized, cable_ready: cable_car.inner_html( "#login-feedback", partial("layouts/alert", locals: { type: "alert", message: t('devise.failure.invalid') }) ) @@ -60,7 +60,7 @@ module Spree end def render_unconfirmed_response - render status: :unprocessable_entity, operations: cable_car.inner_html( + render status: :unprocessable_entity, cable_ready: cable_car.inner_html( "#login-feedback", partial("layouts/alert", locals: { type: "alert", message: t(:email_unconfirmed), unconfirmed: true, tab: "login" }) diff --git a/app/controllers/spree/users_controller.rb b/app/controllers/spree/users_controller.rb index dc5629612a..c457d7ce5e 100644 --- a/app/controllers/spree/users_controller.rb +++ b/app/controllers/spree/users_controller.rb @@ -30,7 +30,7 @@ module Spree registered = Spree::User.find_by(email: params[:email]).present? if registered - render status: :ok, operations: cable_car. + render status: :ok, cable_ready: cable_car. inner_html( "#login-feedback", partial("layouts/alert", locals: { type: "alert", message: t('devise.failure.already_registered') }) @@ -45,12 +45,12 @@ module Spree @user = Spree::User.new(user_params) if @user.save - render operations: cable_car.inner_html( + render cable_ready: cable_car.inner_html( "#signup-feedback", partial("layouts/alert", locals: { type: "success", message: t('devise.user_registrations.spree_user.signed_up_but_unconfirmed') }) ) else - render status: :unprocessable_entity, operations: cable_car.morph( + render status: :unprocessable_entity, cable_ready: cable_car.morph( "#signup-tab", partial("layouts/signup_tab", locals: { signup_form_user: @user }) ) diff --git a/app/controllers/user_confirmations_controller.rb b/app/controllers/user_confirmations_controller.rb index 312b5b7a2a..c7bc9e3ce2 100644 --- a/app/controllers/user_confirmations_controller.rb +++ b/app/controllers/user_confirmations_controller.rb @@ -22,7 +22,7 @@ class UserConfirmationsController < DeviseController set_flash_message(:error, :confirmation_not_sent) end else - render operations: cable_car.inner_html( + render cable_ready: cable_car.inner_html( "##{params[:tab] || 'forgot'}-feedback", partial("layouts/alert", locals: { type: "success", message: t("devise.confirmations.send_instructions") }) ) diff --git a/app/controllers/user_passwords_controller.rb b/app/controllers/user_passwords_controller.rb index b125d26011..b0ad3970d1 100644 --- a/app/controllers/user_passwords_controller.rb +++ b/app/controllers/user_passwords_controller.rb @@ -11,12 +11,12 @@ class UserPasswordsController < Spree::UserPasswordsController self.resource = resource_class.send_reset_password_instructions(raw_params[resource_name]) if resource.errors.empty? - render operations: cable_car.inner_html( + render cable_ready: cable_car.inner_html( "#forgot-feedback", partial("layouts/alert", locals: { type: "success", message: t(:password_reset_sent) }) ) else - render status: :not_found, operations: cable_car.inner_html( + render status: :not_found, cable_ready: cable_car.inner_html( "#forgot-feedback", partial("layouts/alert", locals: { type: "alert", message: t(:email_not_found) }) ) @@ -26,7 +26,7 @@ class UserPasswordsController < Spree::UserPasswordsController private def render_unconfirmed_response - render status: :unprocessable_entity, operations: cable_car.inner_html( + render status: :unprocessable_entity, cable_ready: cable_car.inner_html( "#forgot-feedback", partial("layouts/alert", locals: { type: "alert", message: t(:email_unconfirmed), From 65084422cbd3e31ffef1d01468b7026cc62999ad Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Thu, 30 Mar 2023 11:13:06 +0200 Subject: [PATCH 3/4] cable_ready is already imported in `app/webpacker/controllers/index.js` --- app/webpacker/controllers/login_modal_controller.js | 1 - app/webpacker/controllers/primary_details_controller.js | 1 - 2 files changed, 2 deletions(-) diff --git a/app/webpacker/controllers/login_modal_controller.js b/app/webpacker/controllers/login_modal_controller.js index c75f709627..7fc2111ab1 100644 --- a/app/webpacker/controllers/login_modal_controller.js +++ b/app/webpacker/controllers/login_modal_controller.js @@ -1,5 +1,4 @@ import { Controller } from "stimulus"; -import CableReady from "cable_ready"; export default class extends Controller { static targets = ["background", "modal", "email"]; diff --git a/app/webpacker/controllers/primary_details_controller.js b/app/webpacker/controllers/primary_details_controller.js index 78ce554246..b4e72be4cf 100644 --- a/app/webpacker/controllers/primary_details_controller.js +++ b/app/webpacker/controllers/primary_details_controller.js @@ -1,5 +1,4 @@ import { Controller } from "stimulus"; -import CableReady from "cable_ready"; export default class extends Controller { static values = { primaryProducer: String, enterpriseSells: String }; From 66307c9277f53f7cb11cd233f55d3b1226905b66 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Thu, 30 Mar 2023 11:14:23 +0200 Subject: [PATCH 4/4] cable_ready changed its Content-Type ; update the mrujs one as well Thanks @marcoroth for the great debugging session! :pray: --- app/webpacker/packs/application.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/webpacker/packs/application.js b/app/webpacker/packs/application.js index 21b1ffce26..66a2fd7cb5 100644 --- a/app/webpacker/packs/application.js +++ b/app/webpacker/packs/application.js @@ -7,7 +7,9 @@ import * as Turbo from "@hotwired/turbo"; window.Turbo = Turbo; window.CableReady = CableReady; mrujs.start({ - plugins: [new CableCar(CableReady)], + plugins: [ + new CableCar(CableReady, { mimeType: "text/vnd.cable-ready.json" }), + ], }); require.context("../fonts", true);