spree_frontend 4.4.0 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8869ebc4be30c0c2bf7e2527048cadda71ec5cc14891b4e74cd00304e64f7faa
-  data.tar.gz: 4ab3f2fb4fe452d35ee0fd63c5a5c915555f0afbfd97020a9bac37691dc21cf3
+  metadata.gz: 1402fb31c7f3b252aa0143299ea5a3d7fbacda30d8d28fb535c26fef9e06bbf4
+  data.tar.gz: 6ae0c987bc34ff834db6b02c2133277412175aba67f5586f9d938813677a3150
 SHA512:
-  metadata.gz: 10ddbe145b8b328d4545e64538785ef5990cd745b873c217f8a571d820f2e5499a1c333f2d86867a3eaab3b756a07b33311342981e35c747f7ac5ae3636e9b00
-  data.tar.gz: b39decf33e2597c9b6dfca8647b514c000033b758cad9fb900a8be7c41231b8abca2918389d25adccbc373a6d5f1a88f9906a2f537d2f95ee299a715c50ff757
+  metadata.gz: 899e115454881c1e7c759cfb95ed0e9990d7bbe519c0b114dbf506426864f296f557b5ecebe3196c42b6f59ce0d33a66038f8eea8bf6e37013b35fac2c2871fc
+  data.tar.gz: a51ca9229e1f1130ab4c6d951f9c415410f5c9980d65937a417131eb99164b09dde80045bd5b8c086efa02842572318c60aaaff2ffd244d23234f4b0f99758fd

data/.circleci/config.yml

@@ -7,9 +7,10 @@ defaults: &defaults
     BUNDLE_JOBS: 4
     BUNDLE_RETRY: 3
     BUNDLE_PATH: ~/spree/vendor/bundle
+    RAILS_VERSION: '~> 7.0'
   working_directory: ~/spree
   docker:
-    - image: &ruby_image circleci/ruby:2.7-node-browsers
+    - image: &ruby_2_7_image circleci/ruby:2.7-node-browsers
     - image: &redis_image circleci/redis:6.2-alpine
 
 defaults_3_0: &defaults_3_0
@@ -18,7 +19,7 @@ defaults_3_0: &defaults_3_0
     - image: &ruby_3_0_image circleci/ruby:3.0-node-browsers
     - image: *redis_image
 
-run_tests: &run_tests
+run_tests_2_7: &run_tests_2_7
   <<: *defaults
   parallelism: 8
   steps:
@@ -91,7 +92,7 @@ run_tests_3_0: &run_tests_3_0
           path: tmp/capybara
 
 jobs:
-  bundle:
+  bundle_ruby_2_7:
     <<: *defaults
     steps:
       - checkout
@@ -137,21 +138,21 @@ jobs:
             - vendor/bundle
           key: spree-storefront-old-bundle-v10-ruby-3-0-{{ checksum "Gemfile.lock" }}
 
-  tests_postgres: &tests_postgres
-    <<: *run_tests
+  tests_ruby_2_7_rails_7_0_postgres:
+    <<: *run_tests_2_7
     environment: &postgres_environment
       <<: *environment
       DB: postgres
       DB_HOST: localhost
       DB_USERNAME: postgres
     docker:
-      - image: *ruby_image
+      - image: *ruby_2_7_image
       - image: *redis_image
       - image: &postgres_image circleci/postgres:12-alpine
         environment:
           POSTGRES_USER: postgres
 
-  tests_postgres_ruby_3_0: &tests_postgres_ruby_3_0
+  tests_ruby_3_0_rails_7_0_postgres:
     <<: *run_tests_3_0
     environment:
       <<: *postgres_environment
@@ -160,8 +161,8 @@ jobs:
       - image: *postgres_image
       - image: *redis_image
 
-  tests_mysql: &tests_mysql
-    <<: *run_tests
+  tests_ruby_2_7_rails_7_0_mysql:
+    <<: *run_tests_2_7
     environment: &mysql_environment
       <<: *environment
       DB: mysql
@@ -170,7 +171,7 @@ jobs:
       COVERAGE: true
       COVERAGE_DIR: /tmp/workspace/simplecov
     docker:
-      - image: *ruby_image
+      - image: *ruby_2_7_image
       - image: *redis_image
       - image: &mysql_image circleci/mysql:8-ram
 
@@ -178,14 +179,14 @@ workflows:
   version: 2
   main:
     jobs:
-      - bundle
+      - bundle_ruby_2_7
       - bundle_ruby_3_0
-      - tests_postgres:
-          requires:
-            - bundle
-      - tests_postgres_ruby_3_0:
+      - tests_ruby_3_0_rails_7_0_postgres:
           requires:
             - bundle_ruby_3_0
-      - tests_mysql:
+      - tests_ruby_2_7_rails_7_0_postgres:
+          requires:
+            - bundle_ruby_2_7
+      - tests_ruby_2_7_rails_7_0_mysql:
           requires:
-            - bundle
+            - bundle_ruby_2_7

data/.eslintrc

@@ -16,7 +16,7 @@ globals:
   SpreePaths: true
   CouponManager: true
   ThumbnailsCarousel: true
-  Turbolinks: true
+  Turbo: true
   ADDRESS_FIELDS: true
   AUTH_TOKEN: true
   SPREE_LOCALE: true

data/Gemfile

@@ -6,7 +6,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
   actionmailer actionpack actionview activejob activemodel activerecord
   activestorage activesupport railties
 ].each do |rails_gem|
-  gem rails_gem, ENV.fetch('RAILS_VERSION', '~> 6.1.0'), require: false
+  gem rails_gem, ENV.fetch('RAILS_VERSION', '~> 7.0.0'), require: false
 end
 
 platforms :jruby do
@@ -49,16 +49,12 @@ group :test, :development do
   gem 'rubocop-rspec', require: false
   gem 'pry-byebug'
   gem 'webdrivers', '~> 4.1'
-  gem 'puma'
+  # Puma 6.0 causes issues in specs due to conflict with capybara version
+  gem 'puma', '< 6.0'
   gem 'ffaker'
 end
 
-group :development do
-  gem 'github_fast_changelog'
-  gem 'solargraph'
-end
-
-spree_opts = { github: 'spree/spree', branch: ENV.fetch('SPREE_BRANCH', '4-4-stable') }
+spree_opts = { github: 'spree/spree', branch: ENV.fetch('SPREE_BRANCH', 'main') }
 gem 'spree_core', spree_opts
 gem 'spree_api', spree_opts
 

data/README.md

@@ -1,6 +1,12 @@
 # Spree (Legacy) Frontend
 
-This is the old Spree Storefront extracted from Spree < 4.3.
+This is the old Spree Storefront extracted from Spree < 4.3 which was upgraded to Turbo/Hotwire.
+
+## Developed by
+
+[![Vendo](https://assets-global.website-files.com/6230c485f2c32ea1b0daa438/623372f40a8c54ca9aea34e8_vendo%202.svg)](https://getvendo.com?utm_source=spree_frontend_github)
+
+> All-in-one platform for all your Marketplace and B2B eCommerce needs. [Start your 30-day free trial](https://e98esoirr8c.typeform.com/contactvendo?typeform-source=spree_sdk_github)
 
 ## Installation
 
@@ -10,13 +16,60 @@ Add
 gem 'spree_frontend'
 ```
 
-to your `Gemfile`.
+to your `Gemfile`, making sure that the `spree_frontend` gem is before `spree_auth_devise`.
+
+Make sure both `gem 'jsbundling-rails'` and `gem 'turbo-rails'` are added as well.
 
 Run:
 
 ```bash
 bundle install
+bin/rails javascript:install:esbuild
+bin/rails turbo:install
 bin/rails g spree:frontend:install
+yarn build
+```
+
+### Troubleshooting
+
+#### Disabled 'Add to Cart' Button Issue
+
+If you notice that the 'Add to Cart' button is disabled on product pages, try the following:
+* run `yarn build` again in your main repo
+* if that doesn't fix the issue, try running the following setup commands again:
+  ```
+  bin/rails javascript:install:esbuild
+  bin/rails turbo:install
+  bin/rails g spree:frontend:install
+  yarn build
+  ```
+
+This issue may come up if you switch the source of your `spree_frontend` in your Gemfile, e.g. from github to a local path, etc.
+
+#### Checkout without logging in results in 500 error
+
+When you navigate to checkout without logging in first, you may get a a 500 error notifying you that "yourdomain.com redirected you too many times."
+
+This error results from the routes defined in `spree_frontend` and `spree_auth_devise` not being built in the correct order. Make sure the `spree_frontend` gem is listed before `spree_auth_devise` in your main project's gemfile, then try again.
+
+## Running Tests
+
+In order to generate the dummy app required for running tests, you’ll need to have the following installed on your machine:
+* node v16.13.1 (npm v8.1.2)
+* yarn ≥ v1.22.15
+* ruby v3.0.3
+
+To run tests locally, first run `bundle exec rake test_app`, then `bundle exec rspec`.
+
+### Troubleshooting
+If you are running on a Mac with an M1 processor, you may run into the following error when running tests:
+```          
+Webdrivers::NetworkError:
+Net::HTTPServerException: 404 "Not Found"
+```
+If so, update your gemfile locally to get version 5.0 or higher for the web drivers gem:
+```
+gem 'webdrivers', '~> 5.0'
 ```
 
 ## Maintanence policy

data/app/assets/config/spree_frontend_manifest.js

@@ -2,3 +2,4 @@
 //
 //= link spree/frontend/all.js
 //= link spree/frontend/all.css
+//= link application.js

data/app/assets/javascripts/spree/{api → frontend/api}/main.js

@@ -1,4 +1,4 @@
-//= require spree
+//= require spree/frontend/main
 
 var SpreeAPI = {
   oauthToken: null, // user Bearer token to authorize operations for the given user
@@ -9,9 +9,9 @@ SpreeAPI.Storefront = {}
 SpreeAPI.Platform = {}
 
 // API routes
-Spree.routes.api_v2_storefront_cart_create = Spree.pathFor('api/v2/storefront/cart')
-Spree.routes.api_v2_storefront_cart_add_item = Spree.pathFor('api/v2/storefront/cart/add_item')
-Spree.routes.api_v2_storefront_cart_apply_coupon_code = Spree.pathFor('api/v2/storefront/cart/apply_coupon_code')
+Spree.routes.api_v2_storefront_cart_create = Spree.localizedPathFor('api/v2/storefront/cart')
+Spree.routes.api_v2_storefront_cart_add_item = Spree.localizedPathFor('api/v2/storefront/cart/add_item')
+Spree.routes.api_v2_storefront_cart_apply_coupon_code = Spree.localizedPathFor('api/v2/storefront/cart/apply_coupon_code')
 
 // helpers
 SpreeAPI.handle500error = function () {

data/app/assets/javascripts/spree/{api → frontend/api}/storefront/cart.js

@@ -1,4 +1,4 @@
-//= require spree/api/main
+//= require spree/frontend/api/main
 
 SpreeAPI.Storefront.createCart = function (successCallback, failureCallback) {
   fetch(Spree.routes.api_v2_storefront_cart_create, {

data/app/assets/javascripts/spree/frontend/checkout/address.js

@@ -69,11 +69,11 @@ Spree.ready(function($) {
         var stateSpanRequired = statePara.find('abbr')
 
         if (states.length > 0) {
-          selected = parseInt(stateSelect.val())
+          selected = stateSelect.val()
           stateSelect.html('')
           $.each(states, function(idx, state) {
-            var opt = $(document.createElement('option')).attr('value', state.id).html(state.name)
-            if (selected.toString(10) === state.id.toString(10)) {
+            var opt = $(document.createElement('option')).attr('value', state.id.toString()).html(state.name)
+            if (selected && selected.toString() === state.id.toString()) {
               opt.prop('selected', true)
             }
             stateSelect.append(opt)

data/app/assets/javascripts/spree/frontend/currency.js

@@ -1,12 +1,11 @@
-document.addEventListener('turbolinks:load', function(event) {
-  // this condition checks if this is the first initial load of turbolinks application
-  if (!event.data.timing.visitStart) {
+document.addEventListener('turbo:load', function(event) {
+  // this condition checks if this is the first initial load of turbo application
+  if (!event.detail.timing.visitStart) {
     var currencySelect = document.querySelectorAll('select[name=switch_to_currency]')
 
     if (currencySelect.length) {
       currencySelect.forEach(function (element) {
         element.addEventListener('change', function () {
-          Spree.showProgressBar()
           var newCurrency = this.value
 
           // we need to make AJAX call here to the backend to set currency in session
@@ -28,16 +27,16 @@ document.addEventListener('turbolinks:load', function(event) {
 
 // fix back button issue with different currency set
 // invalidate page if cached page has different currency then the current one
-document.addEventListener('turbolinks:load', function(event) {
+document.addEventListener('turbo:load', function(event) {
   if (typeof (SPREE_DEFAULT_CURRENCY) !== 'undefined' && typeof (SPREE_CURRENCY) !== 'undefined') {
     if (SPREE_CURRENCY === SPREE_DEFAULT_CURRENCY) {
       var regexAnyCurrency = new RegExp('currency=')
-      if (event.data.url.match(regexAnyCurrency) && !event.data.url.match(SPREE_CURRENCY)) {
+      if (event.detail.url.match(regexAnyCurrency) && !event.detail.url.match(SPREE_CURRENCY)) {
         Spree.setCurrency(SPREE_CURRENCY)
       }
     } else {
       var regex = new RegExp('currency=' + SPREE_CURRENCY)
-      if (!event.data.url.match(regex)) {
+      if (!event.detail.url.match(regex)) {
         Spree.setCurrency(SPREE_CURRENCY)
       }
     }

data/app/assets/javascripts/spree/frontend/locale.es6

@@ -1,11 +1,10 @@
-document.addEventListener('turbolinks:load', () => {
+document.addEventListener('turbo:load', () => {
   const localeSelect = document.querySelectorAll('select[name=switch_to_locale]')
 
   if (localeSelect.length) {
     localeSelect.forEach((element) => {
       element.addEventListener('change', () => {
         Spree.clearCache()
-        Spree.showProgressBar()
         element.form.submit()
       })
     })

data/app/assets/javascripts/{spree.js → spree/frontend/main.js}

@@ -2,7 +2,7 @@
 function Spree () {}
 
 Spree.ready = function (callback) {
-  return jQuery(document).on('page:load turbolinks:load', function () {
+  return jQuery(document).on('page:load turbo:load', function () {
     return callback(jQuery)
   })
 }
@@ -32,7 +32,7 @@ Spree.localizedPathFor = function(path) {
     if (pathName.match(/api\/v/)) {
       params.set('locale', SPREE_LOCALE)
     } else {
-      pathName = (this.mountedAt()) + SPREE_LOCALE + '/' + path
+      pathName = (this.mountedAt()) + SPREE_LOCALE + '/' + pathName
     }
     return fullUrl.origin + pathName + '?' + params.toString()
   }
@@ -68,11 +68,11 @@ Spree.ajax = function (urlOrSettings, settings) {
 }
 
 Spree.routes = {
-  states_search: Spree.pathFor('api/v1/states'),
+  states_search: Spree.localizedPathFor('api/v1/states'),
   apply_coupon_code: function (orderId) {
-    return Spree.pathFor('api/v1/orders/' + orderId + '/apply_coupon_code')
+    return Spree.localizedPathFor('api/v1/orders/' + orderId + '/apply_coupon_code')
   },
-  cart: Spree.pathFor('cart')
+  cart: Spree.localizedPathFor('cart')
 }
 
 Spree.url_params = {}

data/app/assets/javascripts/spree/frontend/{turbolinks_scroll_fix.js → turbo_scroll_fix.js}

@@ -15,8 +15,8 @@
 
   // Invalidate the page when the next page is different from the current page
   // Persist scroll information across pages
-  document.addEventListener('turbolinks:before-visit', function (event) {
-    if (event.data.url !== location.href) {
+  document.addEventListener('turbo:before-visit', function (event) {
+    if (event.detail.url !== location.href) {
       sessionStorage.setItem(PAGE_INVALIDATED, 'true')
     }
     sessionStorage.setItem(SCROLL_POSITION, JSON.stringify(scrollData()))
@@ -28,7 +28,7 @@
   // invalidation,
   // 3. scroll to the persisted position if there, or to the top otherwise
   // 4. Remove the persisted information
-  addEventListener('turbolinks:load', function (event) {
+  addEventListener('turbo:load', function (event) {
     var scrollPosition = JSON.parse(sessionStorage.getItem(SCROLL_POSITION))
 
     if (shouldScroll(scrollPosition)) {

data/app/assets/javascripts/spree/frontend/views/spree/home/product_carousels.js

@@ -26,7 +26,7 @@ Spree.loadsCarouselElements = function () {
   $('div[data-product-carousel-taxon-id]').each(function (_index, element) { Spree.loadCarousel(element, this) })
 }
 
-document.addEventListener('turbolinks:load', function () {
+document.addEventListener('turbo:load', function () {
   var carouselPresent = $('div[data-product-carousel-taxon-id]')
 
   if (carouselPresent.length) {

data/app/assets/javascripts/spree/frontend/views/spree/product/related.js

@@ -9,7 +9,7 @@ Spree.fetchRelatedProducts = function (id, htmlContainer) {
   })
 }
 
-document.addEventListener('turbolinks:load', function () {
+document.addEventListener('turbo:load', function () {
   var productDetailsPage = $('body#product-details')
 
   if (productDetailsPage.length) {

data/app/assets/javascripts/spree/frontend/views/spree/products/cart_form.js

@@ -1,4 +1,4 @@
-//= require spree/api/storefront/cart
+//= require spree/frontend/api/storefront/cart
 //= require ../shared/product_added_modal
 //= require ../shared/variant_select
 
@@ -89,7 +89,7 @@ function CartForm($, $cartForm) {
     this.selectedOptionValueIds.splice(
       optionTypeIndex,
       this.selectedOptionValueIds.length,
-      parseInt($optionValue.val())
+      $optionValue.val().toString()
     )
   }
 
@@ -104,7 +104,7 @@ function CartForm($, $cartForm) {
         .find(OPTION_VALUE_SELECTOR)
         .each(function(_index, ov) {
           var $ov = $(ov)
-          var id = parseInt($ov.val())
+          var id = $ov.val().toString()
 
           $ov.prop('checked', false)
           $ov.prop('disabled', !availableOptionValueIds.includes(id))
@@ -121,7 +121,7 @@ function CartForm($, $cartForm) {
 
     return this.variants.reduce(function(acc, variant) {
       var optionValues = variant.option_values.map(function(ov) {
-        return ov.id
+        return ov.id.toString()
       })
 
       var isPossibleVariantFound = selectedOptionValueIds.every(function(ov) {
@@ -180,7 +180,7 @@ function CartForm($, $cartForm) {
 
     if (!this.withOptionValues) {
       return this.variants.find(function(variant) {
-        return variant.id === parseInt(self.$variantIdInput.val())
+        return variant.id && self.$variantIdInput.val() && variant.id.toString() === self.$variantIdInput.val().toString()
       })
     }
 
@@ -190,7 +190,7 @@ function CartForm($, $cartForm) {
 
     return this.variants.find(function(variant) {
       var optionValueIds = variant.option_values.map(function(ov) {
-        return ov.id
+        return ov.id.toString()
       })
 
       return self.areArraysEqual(optionValueIds, self.selectedOptionValueIds)
@@ -298,7 +298,7 @@ Spree.ready(function($) {
         quantity,
         options, // options hash - you can pass additional parameters here, your backend
         // needs to be aware of those, see API docs:
-        // https://github.com/spree/spree/blob/master/api/docs/v2/storefront/index.yaml#L42
+        // https://github.com/spree/spree/blob/d894358e49b8c3a7f6944e838de7cd92510e31d0/api/docs/v2/storefront/index.yaml#L442
         function(response) {
           $addToCart.prop('disabled', false)
           Spree.fetchCart()
@@ -331,7 +331,7 @@ Spree.ready(function($) {
     CartForm($, $cartForm)
   })
 
-  document.addEventListener('turbolinks:request-start', function () {
+  document.addEventListener('turbo:request-start', function () {
     Spree.hideProductAddedModal()
   })
 })

data/app/assets/javascripts/spree/frontend/views/spree/products/description.js

@@ -1,4 +1,4 @@
-document.addEventListener('turbolinks:load', function () {
+document.addEventListener('turbo:load', function () {
   $('#product-description-arrow').click(function () {
     document.getElementById('product-description-long').classList.remove('d-none')
     document.getElementById('product-description-short').classList.add('d-none')

data/app/assets/javascripts/spree/frontend/views/spree/products/index.js

@@ -35,7 +35,7 @@ Spree.ready(function ($) {
         '?' +
         customEncodeURI(decodeURIComponent(searchParams.toString()))
     );
-    Turbolinks.visit(location);
+    Turbo.visit(location);
   }
 
   function updateFilters(event, $this, removeValue) {

data/app/assets/javascripts/spree/frontend/views/spree/shared/mobile_navigation.js

@@ -21,7 +21,7 @@ Spree.ready(function($) {
       this.closeAllCategories = this.closeAllCategories.bind(this);
 
       window.addEventListener('resize', this.onResize);
-      window.addEventListener('turbolinks:request-start', this.onCloseClick);
+      window.addEventListener('turbo:request-start', this.onCloseClick);
 
       this.burgerButton.addEventListener('click', this.onBurgerClick, false);
       this.closeButton.addEventListener('click', this.onCloseClick, false);
@@ -77,7 +77,7 @@ Spree.ready(function($) {
 
   MobileNavigationManager.prototype.openCategory = function(category) {
     this.openedCategories.push(category);
-    var subList = document.querySelector('ul[data-category=' + category + ']');
+    var subList = document.querySelector('ul[data-category="' + category + '"]');
     if (subList) {
       this.mobileNavigationList.classList.add('mobile-navigation-list-subcategory-shown');
       this.mobileNavigationList.scrollTop = 0
@@ -89,7 +89,7 @@ Spree.ready(function($) {
 
   MobileNavigationManager.prototype.closeCurrentCategory = function() {
     var category = this.openedCategories.pop();
-    var subList = document.querySelector('ul[data-category=' + category + ']');
+    var subList = document.querySelector('ul[data-category="' + category + '"]');
     if (subList) {
       subList.classList.remove('shown');
     }
@@ -101,7 +101,7 @@ Spree.ready(function($) {
   }
 
   MobileNavigationManager.prototype.closeCategory = function(category) {
-    var subList = document.querySelector('ul[data-category=' + category + ']');
+    var subList = document.querySelector('ul[data-category="' + category + '"]');
     subList.style.transition = 'none';
     subList.classList.remove('shown');
     setTimeout(function(){ subList.style.transition = ''; }, 500);

data/app/assets/javascripts/spree/frontend/views/spree/shared/variant_select.js

@@ -8,7 +8,7 @@ this.initializeQueryParamsCheck = function () {
 
 function verifyVariantIdMatch() {
   this.variants.forEach(function(variant) {
-    if (parseInt(variant.id) === parseInt(variantIdFromUrl)) this.urlQueryMatchFound = true
+    if (variant.id.toString() === variantIdFromUrl.toString()) this.urlQueryMatchFound = true
   })
 }
 
@@ -23,7 +23,7 @@ this.setSelectedVariantFromUrl = function () {
 
 this.getVariantOptionsById = function(variantIdFromUrl) {
   this.variants.forEach(function(variant) {
-    if (parseInt(variant.id) === parseInt(variantIdFromUrl)) this.sortOptionValues(variant.option_values)
+    if (variant.id.toString() === variantIdFromUrl.toString()) this.sortOptionValues(variant.option_values)
   })
 }
 
@@ -36,7 +36,7 @@ function buildArray(item) {
   var target = container.querySelectorAll('.product-variants-variant-values-radio')
 
   target.forEach(function(inputTag) {
-    if (parseInt(inputTag.value) === item.id && inputTag.dataset.presentation === item.presentation) {
+    if (inputTag.value.toString() === item.id.toString() && inputTag.dataset.presentation === item.presentation) {
       this.selectedOptions.push(inputTag)
     }
   })

data/app/assets/javascripts/spree/frontend.js

@@ -4,14 +4,13 @@
 //= require bootstrap
 //= require jquery.payment
 //= require cleave
-//= require spree
+//= require spree/frontend/main
 //= require polyfill.min
 //= require fetch.umd
-//= require spree/api/main
+//= require spree/frontend/api/main
 //= require ./lazysizes.config
 //= require lazysizes.min
 //= require accounting.min
-//= require turbolinks
 //= require spree/frontend/account
 //= require spree/frontend/api_tokens
 //= require spree/frontend/carousel-noconflict
@@ -40,31 +39,25 @@
 //= require spree/frontend/views/spree/shared/nav_bar
 //= require spree/frontend/views/spree/shared/product_added_modal
 //= require spree/frontend/views/spree/shared/quantity_select
-//= require spree/frontend/turbolinks_scroll_fix
+//= require spree/frontend/turbo_scroll_fix
 //= require spree/frontend/main_nav_bar
 //= require spree/frontend/login
 
-Spree.routes.api_tokens = Spree.pathFor('api_tokens')
-Spree.routes.ensure_cart = Spree.pathFor('ensure_cart')
+Spree.routes.api_tokens = Spree.localizedPathFor('api_tokens')
+Spree.routes.ensure_cart = Spree.localizedPathFor('ensure_cart')
 Spree.routes.api_v2_storefront_cart_apply_coupon_code = Spree.localizedPathFor('api/v2/storefront/cart/apply_coupon_code')
 Spree.routes.api_v2_storefront_cart_remove_coupon_code = function(couponCode) { return Spree.localizedPathFor('api/v2/storefront/cart/remove_coupon_code/' + couponCode) }
 Spree.routes.api_v2_storefront_destroy_credit_card = function(id) { return Spree.localizedPathFor('api/v2/storefront/account/credit_cards/' + id) }
 Spree.routes.product = function(id) { return Spree.localizedPathFor('products/' + id) }
 Spree.routes.product_related = function(id) { return Spree.localizedPathFor('products/' + id + '/related') }
 Spree.routes.product_carousel = function (taxonId) { return Spree.localizedPathFor('product_carousel/' + taxonId) }
-Spree.routes.set_locale = function(locale) { return Spree.pathFor('locale/set?switch_to_locale=' + locale) }
-Spree.routes.set_currency = function(currency) { return Spree.pathFor('currency/set?switch_to_currency=' + currency) }
-
-Spree.showProgressBar = function () {
-  if (!Turbolinks.supported) { return }
-  Turbolinks.controller.adapter.progressBar.setValue(0)
-  Turbolinks.controller.adapter.progressBar.show()
-}
+Spree.routes.set_locale = function(locale) { return Spree.localizedPathFor('locale/set?switch_to_locale=' + locale) }
+Spree.routes.set_currency = function(currency) { return Spree.localizedPathFor('currency/set?switch_to_currency=' + currency) }
 
 Spree.clearCache = function () {
-  if (!Turbolinks.supported) { return }
+  if (!window.Turbo) { return }
 
-  Turbolinks.clearCache()
+  Turbo.clearCache()
 }
 
 Spree.setCurrency = function (currency) {
@@ -81,5 +74,5 @@ Spree.setCurrency = function (currency) {
 
   SPREE_CURRENCY = currency
 
-  Turbolinks.visit(window.location.pathname + queryString, { action: 'replace' })
+  Turbo.visit(window.location.pathname + queryString, { action: 'replace' })
 }

data/app/controllers/spree/addresses_controller.rb

@@ -10,7 +10,7 @@ module Spree
         flash[:notice] = I18n.t(:successfully_created, scope: :address_book)
         redirect_to spree.account_path
       else
-        render action: 'new'
+        render action: 'new', status: :unprocessable_entity
       end
     end
 
@@ -27,7 +27,7 @@ module Spree
         flash[:notice] = Spree.t(:successfully_updated, scope: :address_book)
         redirect_back_or_default(addresses_path)
       else
-        render :edit
+        render :edit, status: :unprocessable_entity
       end
     end
 

data/app/controllers/spree/checkout_controller.rb

@@ -46,7 +46,7 @@ module Spree
           redirect_to spree.checkout_state_path(@order.state)
         end
       else
-        render :edit
+        render :edit, status: :unprocessable_entity
       end
     end
 
@@ -190,7 +190,7 @@ module Spree
     def rescue_from_spree_gateway_error(exception)
       flash.now[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
       @order.errors.add(:base, exception.message)
-      render :edit
+      render :edit, status: :unprocessable_entity
     end
 
     def check_authorization