spree_frontend 4.6.0 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e47fb4519b72315d61a790677b3592cf1d03cebaa77a8b4f483a5cad9bfb8573
-  data.tar.gz: 1ccd7a7756fcd9a45df1de4881128621a1dc4dba0f95db9ad287a0e3cc88b16d
+  metadata.gz: caad5de0edbc610a11d2fcf5a66ccd2f7b72df02586c6ecbbcd44361c723a8d0
+  data.tar.gz: 0a827e9e0b7c0b105d5f607053ddca0b32b121407307071f68339b3a96815601
 SHA512:
-  metadata.gz: d300612e8c06e3e6444ef44922bf71912ca3bf9a2d296abca6f1e4a951c984c4af5222f5f92312c4a8471a0e5ad57d12aff42edc61d41b9667bc4f0b7782feef
-  data.tar.gz: ce09a386bb4c4488b3cd7369b265dfbe3cbe5578926d152e094c4437c53a30f180ad48d58aec9b38e8979fbee5a68292de4bd09265c043a07ac8bfdf5a432711
+  metadata.gz: 107a0e3580ffc8e63d16158fba7d886cedf4fd765cac03497281ab09ee141355cf75905f75b1824a8e1496f1ae8e657f9ea12c90973a31aa586d0fe3aa243b6f
+  data.tar.gz: 4fa6f2841ebe6b61515542b98386f66d62f56bd8a124db6d5771143d7d33f9f554359276f6a9a3adf63f4eb6b89f2325850593607e87e3b9a08db53dcfc6e4e7

data/.circleci/config.yml

@@ -1,4 +1,4 @@
-version: 2.1 # use CircleCI 2.0
+version: 2.1
 
 defaults: &defaults
   environment: &environment
@@ -7,27 +7,19 @@ defaults: &defaults
     BUNDLE_JOBS: 4
     BUNDLE_RETRY: 3
     BUNDLE_PATH: ~/spree/vendor/bundle
-    RAILS_VERSION: '~> 7.0'
   working_directory: ~/spree
   docker:
-    - image: &ruby_2_7_image circleci/ruby:2.7-node-browsers
-    - image: &redis_image circleci/redis:6.2-alpine
+    - image: &ruby_image cimg/ruby:3.3.0-browsers
 
-defaults_3_2: &defaults_3_2
-  <<: *defaults
-  docker:
-    - image: &ruby_3_2_image circleci/ruby:3.0-node-browsers
-    - image: *redis_image
-
-run_tests_2_7: &run_tests_2_7
+run_tests: &run_tests
   <<: *defaults
   parallelism: 8
   steps:
     - checkout
     - restore_cache:
         keys:
-          - spree-storefront-old-bundle-v10-ruby-2-7-{{ .Branch }}
-          - spree-storefront-old-bundle-v10-ruby-2-7
+          - spree-storefront-bundle-{{ checksum ".ruby-version" }}-{{ .Branch }}
+          - spree-storefront-bundle-{{ checksum ".ruby-version" }}
     - run:
         name: Add keyserver
         command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
@@ -35,51 +27,12 @@ run_tests_2_7: &run_tests_2_7
         name: Install libvips
         command: sudo apt-get update && sudo apt-get install libvips
     - run:
-          name: Set bundle path
-          command: bundle config --local path vendor/bundle
+        name: Set bundle path
+        command: bundle config --local path vendor/bundle
     - run:
-          name: Ensure bundle Install
-          command: |
-            bundle check || bundle install
-    - run:
-        name: Create test app
+        name: Ensure Bundle Install
         command: |
-          bundle exec rake test_app
-    - run:
-          name: Run Rspec
-          command: |
-            TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-            bundle exec rspec --format documentation \
-                              --format RspecJunitFormatter \
-                              -o ~/rspec/rspec.xml \
-                              -- ${TESTFILES}
-    - store_test_results:
-          path: ~/rspec
-    - store_artifacts:
-          path: tmp/capybara
-
-run_tests_3_2: &run_tests_3_2
-  <<: *defaults_3_2
-  parallelism: 8
-  steps:
-    - checkout
-    - restore_cache:
-        keys:
-          - spree-storefront-old-bundle-v10-ruby-3-2-{{ .Branch }}
-          - spree-storefront-old-bundle-v10-ruby-3-2
-    - run:
-        name: Add keyserver
-        command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
-    - run:
-        name: Install libvips
-        command: sudo apt-get update && sudo apt-get install libvips
-    - run:
-          name: Set bundle path
-          command: bundle config --local path vendor/bundle
-    - run:
-          name: Ensure bundle Install
-          command: |
-            bundle check || bundle install
+          bundle check || bundle install
     - run:
         name: Create test app
         command: |
@@ -98,14 +51,14 @@ run_tests_3_2: &run_tests_3_2
           path: tmp/capybara
 
 jobs:
-  bundle_ruby_2_7:
+  bundle:
     <<: *defaults
     steps:
       - checkout
       - restore_cache:
           keys:
-            - spree-storefront-old-bundle-v10-ruby-2-7-{{ .Branch }}
-            - spree-storefront-old-bundle-v10-ruby-2-7
+            - spree-storefront-bundle-{{ checksum ".ruby-version" }}-{{ .Branch }}
+            - spree-storefront-bundle-{{ checksum ".ruby-version" }}
       - run:
           name: Add keyserver
           command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
@@ -122,60 +75,11 @@ jobs:
       - save_cache:
           paths:
             - vendor/bundle
-          key: spree-storefront-old-bundle-v10-ruby-2-7-{{ checksum "Gemfile.lock" }}
+          key: spree-storefront-bundle-{{ checksum ".ruby-version" }}-{{ .Branch }}
 
-  bundle_ruby_3_2:
-    <<: *defaults_3_2
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - spree-storefront-old-bundle-v10-ruby-3-2-{{ .Branch }}
-            - spree-storefront-old-bundle-v10-ruby-3-2
-      - run:
-          name: Add keyserver
-          command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
-      - run:
-          name: Install libvips
-          command: sudo apt-get update && sudo apt-get install libvips
-      - run:
-          name: Set bundle path
-          command: bundle config --local path vendor/bundle
-      - run:
-          name: Bundle Install
-          command: |
-            bundle check || bundle install
-      - save_cache:
-          paths:
-            - vendor/bundle
-          key: spree-storefront-old-bundle-v10-ruby-3-2-{{ checksum "Gemfile.lock" }}
-
-  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_2_7_image
-      - image: *redis_image
-      - image: &postgres_image circleci/postgres:12-alpine
-        environment:
-          POSTGRES_USER: postgres
-
-  tests_ruby_3_2_rails_7_0_postgres:
-    <<: *run_tests_3_2
+  tests_mysql:
+    <<: *run_tests
     environment:
-      <<: *postgres_environment
-    docker:
-      - image: *ruby_3_2_image
-      - image: *postgres_image
-      - image: *redis_image
-
-  tests_ruby_2_7_rails_7_0_mysql:
-    <<: *run_tests_2_7
-    environment: &mysql_environment
       <<: *environment
       DB: mysql
       DB_HOST: 127.0.0.1
@@ -183,22 +87,29 @@ jobs:
       COVERAGE: true
       COVERAGE_DIR: /tmp/workspace/simplecov
     docker:
-      - image: *ruby_2_7_image
-      - image: *redis_image
-      - image: &mysql_image circleci/mysql:8-ram
+      - image: *ruby_image
+      - image: cimg/mysql:8.0
+
+  tests_postgres:
+    <<: *run_tests
+    environment:
+      <<: *environment
+      DB: postgres
+      DB_HOST: localhost
+      DB_USERNAME: postgres
+    docker:
+      - image: *ruby_image
+      - image: cimg/postgres:16.2
+        environment:
+          POSTGRES_USER: postgres
 
 workflows:
-  version: 2
   main:
     jobs:
-      - bundle_ruby_2_7
-      - bundle_ruby_3_2
-      - tests_ruby_3_2_rails_7_0_postgres:
-          requires:
-            - bundle_ruby_3_2
-      - tests_ruby_2_7_rails_7_0_postgres:
+      - bundle
+      - tests_postgres:
           requires:
-            - bundle_ruby_2_7
-      - tests_ruby_2_7_rails_7_0_mysql:
+            - bundle
+      - tests_mysql:
           requires:
-            - bundle_ruby_2_7
+            - bundle

data/.codeclimate.yml

@@ -15,8 +15,8 @@ plugins:
         enabled: false
     config:
       file: .rubocop.yml
-    channel: "rubocop-0-80" # need to keep this value the same as rubocop version
-                            # https://docs.codeclimate.com/v1.0/docs/rubocop#section-using-rubocop-s-newer-versions
+    channel: "rubocop-1-50-3" # need to keep this value the same as rubocop version
+                              # https://docs.codeclimate.com/v1.0/docs/rubocop#section-using-rubocop-s-newer-versions
   eslint:
     enabled: true
     config:

data/.gem_release.yml

@@ -1,7 +1,7 @@
 
 bump:
   recurse: false
-  file: 'frontend/lib/spree/frontend/version.rb'
+  file: 'lib/spree/frontend/version.rb'
 
 release:
   recurse: true

data/.github/CONTRIBUTING.md

@@ -1 +1 @@
-Please visit [Contributing section](https://dev-docs.spreecommerce.org/contributing/index) of Spree Guides. Thank you!
+Please visit [Contributing section](https://docs.spreecommerce.org/developer/contributing/quickstart) of Spree Guides. Thank you!

data/.github/dependabot.yml

@@ -1,32 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
 version: 2
 updates:
-- package-ecosystem: bundler
-  directory: "/backend"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-- package-ecosystem: bundler
-  directory: "/frontend"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-- package-ecosystem: bundler
-  directory: "/core"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-- package-ecosystem: bundler
-  directory: "/cli"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-- package-ecosystem: bundler
-  directory: "/api"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-- package-ecosystem: bundler
-  directory: "/sample"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

data/.rubocop.yml

@@ -1,197 +1,24 @@
-require: rubocop-rspec
-
 AllCops:
-  TargetRubyVersion: 2.5
-  Exclude:
-    - '**/sandbox/**/*'
-    - '**/db/migrate/*'
+  DisplayCopNames: true
+  TargetRubyVersion: 3.0
+  Include:
     - '**/Gemfile'
-    - '**/Gemfile.lock'
     - '**/Rakefile'
-    - '**/rails'
-    - '**/*.gemspec'
-    - '**/dummy/**/*'
-    - '**/vendor/**/*'
-    - '**/spec_helper.rb'
-    - '**/templates/**/*'
-
-Layout/MultilineOperationIndentation:
-  EnforcedStyle: indented
+    - '**/Appraisals'
+  Exclude:
+    - 'spec/dummy/**/*'
+    - 'lib/generators/**/*'
 
-Layout/ParameterAlignment:
-  Enabled: false
+Rails:
+  Enabled: true
 
-Metrics/ClassLength:
-  CountComments: false
+Metrics/LineLength:
   Max: 150
 
-Metrics/ModuleLength:
-  CountComments: false
-  Max: 250
-  Exclude:
-    - '**/spec/**/*'
+# DISABLED
 
 Style/Documentation:
   Enabled: false
 
-Layout/LineLength:
-  Max: 150
-  Exclude:
-    - '**/spec/**/*'
-
-Metrics/MethodLength:
-  CountComments: false
-  Max: 50
-
-Metrics/BlockLength:
-  CountComments: false
-  Max: 50
-  Exclude:
-    - '**/spec/**/*'
-    - '**/*.rake'
-    - '**/factories/**/*'
-    - '**/config/routes.rb'
-
-Metrics/AbcSize:
- Max: 45
-
-Style/StringLiterals:
-  EnforcedStyle: single_quotes
-
-Layout/DotPosition:
-  EnforcedStyle: trailing
-  Enabled: true
-
-Layout/SpaceInsideArrayLiteralBrackets:
-  Exclude:
-    - 'api/spec/integration/**/*.rb'
-    - 'api/lib/spree/api/testing_support/v2/platform_contexts.rb'
-
 Style/FrozenStringLiteralComment:
   Enabled: false
-
-Style/RegexpLiteral:
-  Enabled: false
-
-Style/WordArray:
-  Enabled: false
-
-Style/SymbolArray:
-  Enabled: false
-
-Style/SymbolProc:
-  Exclude:
-    - '**/app/serializers/**/*'
-
-Style/GuardClause:
-  Enabled: false
-
-Style/TrailingCommaInArrayLiteral:
-  Enabled: false
-
-Style/TrailingCommaInHashLiteral:
-  Enabled: false
-
-Style/BarePercentLiterals:
-  Enabled: false
-
-Style/MutableConstant:
-  Enabled: false
-
-Style/PercentLiteralDelimiters:
-  Enabled: false
-
-Style/IfUnlessModifier:
-  Enabled: false
-
-Naming/VariableNumber:
-  Enabled: false
-
-Style/RedundantPercentQ:
-  Enabled: false
-
-Lint/ParenthesesAsGroupedExpression:
-  Enabled: false
-
-Style/NumericPredicate:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Max: 10
-
-Metrics/CyclomaticComplexity:
-  Max: 10
-
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-Style/AndOr:
-  Exclude:
-    - '**/*controller.rb'
-
-Style/HashEachMethods:
-  Enabled: false
-
-Style/HashTransformKeys:
-  Enabled: false
-
-Style/HashTransformValues:
-  Enabled: false
-
-RSpec/NestedGroups:
-  Max: 7
-
-Lint/AmbiguousBlockAssociation:
-  Exclude:
-    - '**/spec/**/*'
-
-Style/NumericLiterals:
-  Enabled: false
-
-RSpec/DescribeClass:
-  Enabled: false
-
-RSpec/VerifiedDoubles:
-  Enabled: false
-
-RSpec/MessageChain:
-  Enabled: false
-
-RSpec/AnyInstance:
-  Enabled: false
-
-RSpec/InstanceVariable:
-  Enabled: false
-
-RSpec/ContextWording:
-  Enabled: false
-
-RSpec/ExpectInHook:
-  Enabled: false
-
-RSpec/ExampleLength:
-  Enabled: false
-
-RSpec/MessageSpies:
-  Enabled: false
-
-RSpec/NamedSubject:
-  Enabled: false
-
-RSpec/MultipleExpectations:
-  Enabled: false
-
-RSpec/FilePath:
-  Enabled: false
-
-RSpec/LetSetup:
-  Enabled: false
-
-RSpec/SubjectStub:
-  Enabled: false
-
-RSpec/VoidExpect:
-  Enabled: false
-
-RSpec/BeforeAfterAll:
-  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+3.3.0

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', '~> 7.0.0'), require: false
+  gem rails_gem, ENV.fetch('RAILS_VERSION', '~> 7.1.0'), require: false
 end
 
 platforms :jruby do
@@ -16,27 +16,28 @@ end
 platforms :ruby do
   if ENV['DB'] == 'mysql'
     gem 'mysql2'
+  elsif ENV['DB'] == 'postgres'
+    gem 'pg'
   else
-    gem 'pg', '~> 1.1'
+    gem 'sqlite3', '~> 1.4'
   end
 end
 
 group :test do
-  gem 'capybara', '~> 3.24'
-  gem 'capybara-screenshot', '~> 1.0'
+  gem 'capybara'
+  gem 'capybara-screenshot'
   gem 'capybara-select-2'
   gem 'database_cleaner', '~> 2.0'
-  gem 'email_spec'
   gem 'factory_bot_rails', '~> 6.0'
   gem 'multi_json'
-  gem 'rspec-activemodel-mocks', '~> 1.0'
-  gem 'rspec-rails', '~> 5.0'
+  gem 'rspec-activemodel-mocks'
+  gem 'rspec-rails'
   gem 'rspec-retry'
   gem 'rspec_junit_formatter'
   gem 'rswag-specs'
   gem 'jsonapi-rspec'
-  gem 'simplecov', '0.17.1'
-  gem 'webmock', '~> 3.7'
+  gem 'simplecov'
+  gem 'webmock'
   gem 'timecop'
   gem 'rails-controller-testing'
 end
@@ -44,13 +45,11 @@ end
 group :test, :development do
   gem 'awesome_print'
   gem 'gem-release'
-  gem 'redis'
   gem 'rubocop', '~> 1.22.3', require: false # bumped
   gem 'rubocop-rspec', require: false
   gem 'pry-byebug'
-  gem 'webdrivers', '~> 4.1'
-  # Puma 6.0 causes issues in specs due to conflict with capybara version
-  gem 'puma', '< 6.0'
+  gem 'webdrivers'
+  gem 'puma'
   gem 'ffaker'
 end
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2021, Spree Commerce, Inc., Spark Solutions Sp. z o.o. and other contributors
+Copyright (c) 2007-2024, Spree Commerce, Inc., Spark Solutions Sp. z o.o. and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/README.md

@@ -1,48 +1,53 @@
-# Spree (Legacy) Frontend
+# Spree Rails Frontend
 
-This is the old Spree Storefront extracted from Spree < 4.3 which was upgraded to Turbo/Hotwire.
+This is the Spree Storefront extracted from Spree < 4.3 which was upgraded to Turbo and Hotwire.
+It is based on Bootstrap 4. It is battle tested and is used in production by many stores.
+
+This storefront includes also Checkout and Cart functionality providing a complete shopping experience.
 
 ## Developed by
 
-[![Vendo](https://assets-global.website-files.com/6230c485f2c32ea1b0daa438/623372f40a8c54ca9aea34e8_vendo%202.svg)](https://getvendo.com?utm_source=spree_frontend_github)
+<a href="https://getvendo.com?utm_source=spree_auth_github"><img src="https://cdn.getvendo.com/assets/vendo-logo-4bda02af8c99bc2ecc5a400120f0ebe4eafcd385e02e25f198a8c355ab75d1ff.png" height=50 alt="Vendo - Start your own multi-brand marketplace" /></a>
 
-> 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)
+<a href="http://sparksolutions.co?utm_source=github"><img src="https://sparksolutions.co/wp-content/themes/sparksolutions/images/logo.svg" height=50 alt="Spark Solutions - Ruby on Rails and Spree Commerce developers"></a>
 
 ## Installation
 
-Add
+Run
 
-```ruby
-gem 'spree_frontend'
+```bash
+bundle add 'spree_frontend'
 ```
 
-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.
+Make sure that the `spree_frontend` gem is before `spree_auth_devise`.
 
 Run:
 
 ```bash
 bundle install
-bin/rails javascript:install:esbuild
-bin/rails turbo:install
 bin/rails g spree:frontend:install
-yarn build
 ```
 
+### Development
+
+You can easily import all storefront templates to your application by running:
+
+```bash
+bin/rails g spree:frontend:copy_storefront
+```
+
+This will allow you to easily customize the look and feel of your storefront.
+
 ### 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
+  
+  ```bash
   bin/rails turbo:install
   bin/rails g spree:frontend:install
-  yarn build
-  rake assets:clean assets:precompile
+  bundle exec rake assets:clean assets:precompile
   ```
 
 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.
@@ -55,35 +60,23 @@ This error results from the routes defined in `spree_frontend` and `spree_auth_d
 
 ## 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:
-```          
+
+```bash
 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:
-```
+
+```bash
 gem 'webdrivers', '~> 5.0'
 ```
 
-## Maintanence policy
-
-This gem is in maintainence mode.
-
-We only accept bug fixes, Spree/Rails compatibility improvements & security patches.
-
-For new project we recommend using [Storefront API](https://api.spreecommerce.org/) to create your own unique storefront or use one of the pre-built starters: 
-
-* [Next.js](https://dev-docs.spreecommerce.org/storefronts/next.js-commerce)
-* [Vue Storefront](https://dev-docs.spreecommerce.org/storefronts/vue-storefront)
-
 ## Customization
 
-[Developer documentation](https://dev-docs.spreecommerce.org/customization/storefront)
+[Developer documentation](https://docs.spreecommerce.org/customization/storefront)