solidus_core 4.3.1 → 4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3154fd1401eef3187a12d7942c30e883bcc8e229e289f097c30d8fe50f0bfd04
-  data.tar.gz: e2ac175d41b1ee220217de2b5ffa3b7a27dfd0931ad0ef362edaa1317b90c922
+  metadata.gz: 68e51391276826cbe0b09d52ea9c4952a9f8548b80c166944a88a86de2123c2b
+  data.tar.gz: 1204774da0e171b910f618e86aa400d08e2979b5743f28b6b7496776a6dfcf7c
 SHA512:
-  metadata.gz: baf556b1e3a617526ff3963637f98fb643f3ccca0d3b1504cc65740b9fb7213a6f26692ad085ecfba9a10d1dcaecd9a8ed3e6946b52b46169f6ce9001d8a793b
-  data.tar.gz: 1ec1d893433de9e85e181a1c1caa2257310b9bebdaa23c74a0bbb1115f1506745701bd3c31b1cdad433c93cdb2eea20d467d39b5b0d85f1b290703f85d00b475
+  metadata.gz: 202576e624d071884b676be8aa6eeb4a2e78e0430d87eecd203ae762e3f77f62de05eb1ce8dbb2462b1158a12ec4c7b044040154f624d0a6da75880517ac9a14
+  data.tar.gz: 422aa33081ab9acff0e9d50afa9cf2861467542e7e9ec061613c2be24c34f3481000084ddb2ed41bf667987aaf4c6b1d78ce82a4633a6c4fd878c32e1568d0e7

data/lib/generators/solidus/install/install_generator.rb

@@ -35,6 +35,7 @@ module Solidus
     class_option :sample, type: :boolean, default: true, banner: 'Load sample data (migrations and seeds must be run)'
     class_option :active_storage, type: :boolean, default: true, banner: 'Install ActiveStorage as image attachments handler for products and taxons'
     class_option :admin_preview, type: :boolean, default: true, desc: 'Install the admin preview'
+    class_option :build_admin_tailwind, type: :boolean, default: true, desc: 'Build and install Solidus Admin Tailwind CSS file and rake tasks'
     class_option :auto_accept, type: :boolean
     class_option :user_class, type: :string
     class_option :admin_email, type: :string
@@ -175,20 +176,22 @@ module Solidus
       end
     end
 
-    def install_solidus_admin
-      return unless options[:admin_preview]
-
-      say_status :installing, "SolidusAdmin", :blue
-      bundle_command 'add solidus_admin'
-      generate 'solidus_admin:install'
-    end
-
     def install_subcomponents
       apply_template_for :authentication, @selected_authentication
       apply_template_for :frontend, @selected_frontend
       apply_template_for :payment_method, @selected_payment_method
     end
 
+    def install_solidus_admin
+      return unless options[:admin_preview]
+
+      say_status :installing, "SolidusAdmin", :blue
+      unless File.read(app_path.join('Gemfile')).include?('solidus_admin')
+        bundle_command 'add solidus_admin -v ">= 0.2"'
+      end
+      generate "solidus_admin:install #{'--tailwind' if options[:build_admin_tailwind]}"
+    end
+
     def populate_seed_data
       if @load_seed_data
         say_status :loading, "seed data"

data/lib/spree/app_configuration.rb

@@ -22,6 +22,8 @@ require "spree/core/search/variant"
 require 'spree/preferences/configuration'
 require 'spree/core/environment'
 
+require 'uri'
+
 module Spree
   class AppConfiguration < Preferences::Configuration
     # Preferences (alphabetized to more easily lookup particular preferences)

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "4.3.1"
+  VERSION = "4.3.3"
 
   def self.solidus_version
     VERSION

data/lib/spree/testing_support/common_rake.rb

@@ -31,6 +31,7 @@ class CommonRakeTasks
           'solidus:install',
           Dir.pwd, # use the current dir as Rails.root
           "--auto-accept",
+          "--admin-preview=#{ENV.fetch('ADMIN_PREVIEW', 'false')}",
           "--authentication=none",
           "--payment-method=none",
           "--migrate=false",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.3
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-05 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1052,7 +1052,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.