spree_backend 4.4.0 → 4.5.0

data/lib/spree/backend/testing_support/capybara_utils.rb

@@ -31,8 +31,14 @@ module Spree
         end
 
         def wait_for_turbo(timeout = nil)
-          if has_css?('.turbo-progress-bar', visible: true, wait: 0.5.seconds)
-            has_no_css?('.turbo-progress-bar', wait: timeout.presence || 1.seconds)
+          if has_css?('.turbo-progress-bar', visible: true, wait: 1.seconds)
+            has_no_css?('.turbo-progress-bar', wait: timeout.presence || 5.seconds)
+          end
+        end
+
+        def wait_for_turbo_frame(selector = 'turbo-frame', timeout = nil)
+          if has_selector?("#{selector}[busy]", visible: true, wait: 1.seconds)
+            has_no_selector?("#{selector}[busy]", wait: timeout.presence || 5.seconds)
           end
         end
 

data/lib/spree/backend/version.rb

@@ -1,6 +1,6 @@
 module Spree
   module Backend
-    VERSION = '4.4.0'.freeze
+    VERSION = '4.5.0'.freeze
 
     def self.version
       VERSION

data/lib/spree/backend.rb

@@ -7,6 +7,7 @@ require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'select2-rails'
 require 'flatpickr'
+require 'flag-icons-rails'
 require 'bootstrap'
 require 'glyphicons'
 require 'hotwire-rails'

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spree/dashboard",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "Spree Dashboard",
   "main": "app/assets/javascripts/spree-dashboard.js",
   "type": "module",
@@ -20,10 +20,11 @@
   "license": "MIT",
   "dependencies": {
     "@hotwired/stimulus": "^3.0.1",
-    "@hotwired/turbo": "^7.0.1",
-    "@rails/request.js": "^0.0.5",
+    "@hotwired/turbo-rails": "^7.1.3",
+    "@rails/request.js": "^0.0.6",
+    "@spree/dashboard": "^0.2.0",
     "bootstrap": "4.6.1",
-    "flatpickr": "^4.6.9",
+    "flatpickr": "4.6.9",
     "jquery": "3.5.1",
     "popper.js": "1.16.1",
     "sortablejs": "^1.14.0",

data/rollup.config.js

@@ -17,6 +17,7 @@ export default [
     output: {
       file: "app/assets/javascripts/spree-dashboard.js",
       format: "umd",
+      inlineDynamicImports: true,
       name: "SpreeDashboard"
     },
     plugins: [
@@ -30,7 +31,8 @@ export default [
     input: "app/javascript/spree/dashboard/index.js",
     output: {
       file: "app/assets/javascripts/spree-dashboard.esm.js",
-      format: "es"
+      format: "es",
+      inlineDynamicImports: true
     },
     plugins: [
       resolve(),

data/spree_backend.gemspec

@@ -25,20 +25,21 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree', ">= 4.4.0.rc1"
+  s.add_dependency 'spree', ">= 4.4.0"
 
   s.add_dependency 'babel-transpiler', '~> 0.7'
   s.add_dependency 'bootstrap',        '~> 4.0'
-  s.add_dependency 'glyphicons',       '~> 1.0'
-  s.add_dependency 'flatpickr',        '~> 4.6'
+  s.add_dependency 'flag-icons-rails', '~> 3.4'
+  s.add_dependency 'flatpickr', '~> 4.6'
+  s.add_dependency 'glyphicons', '~> 1.0'
   s.add_dependency 'hotwire-rails'
-  s.add_dependency 'inline_svg',       '~> 1.5'
+  s.add_dependency 'inline_svg', '~> 1.5'
+  s.add_dependency 'jquery-rails', '~> 4.3'
+  s.add_dependency 'jquery-ui-rails', '~> 6.0'
   s.add_dependency 'jsbundling-rails'
-  s.add_dependency 'jquery-rails',     '~> 4.3'
-  s.add_dependency 'jquery-ui-rails',  '~> 6.0'
   s.add_dependency 'responders'
   s.add_dependency 'sass-rails',       '>= 5'
-  s.add_dependency 'select2-rails',    '~> 4.0'
+  s.add_dependency 'select2-rails',    '~> 4.0.6'
   s.add_dependency 'sprockets',        '~> 4.0'
-  s.add_dependency 'tinymce-rails'
+  s.add_dependency 'tinymce-rails',    '~> 5.0'
 end

data/yarn.lock

@@ -43,10 +43,18 @@
   resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.0.1.tgz#141f15645acaa3b133b7c247cad58ae252ffae85"
   integrity sha512-oHsJhgY2cip+K2ED7vKUNd2P+BEswVhrCYcJ802DSsblJFv7mPFVk3cQKvm2vHgHeDVdnj7oOKrBbzp1u8D+KA==
 
-"@hotwired/turbo@^7.0.1":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.0.1.tgz#2a8c6ab2f24914d1d47f3a7a7779e2881e8c61a0"
-  integrity sha512-awqraytYXbHV2NT0WAOnDDDGJeHHnFtnztdXvRuIqgsStUtPKM8B9H7ISm77SwbHemEjxEOB8Ku4RfNbEEXsPQ==
+"@hotwired/turbo-rails@^7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.1.3.tgz#a4e04ecb800a06e7f9aa6e298170fa4580b74216"
+  integrity sha512-6qKgn75bMWKx0bJgmSfrdC73EJkGLoSWZPAssvcd3nE7ZpDZff6f67j5OQNjjpRgNB7OFruom6VWguGQGu1fQg==
+  dependencies:
+    "@hotwired/turbo" "^7.1.0"
+    "@rails/actioncable" "^7.0"
+
+"@hotwired/turbo@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.1.0.tgz#27e44e0e3dc5bd1d4bda0766d579cf5a14091cd7"
+  integrity sha512-Q8kGjqwPqER+CtpQudbH+3Zgs2X4zb6pBAlr6NsKTXadg45pAOvxI9i4QpuHbwSzR2+x87HUm+rot9F/Pe8rxA==
 
 "@humanwhocodes/config-array@^0.6.0":
   version "0.6.0"
@@ -62,10 +70,15 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@rails/request.js@^0.0.5":
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/@rails/request.js/-/request.js-0.0.5.tgz#5ea896085f1c82bacca0e32aa918c8cd003a3d30"
-  integrity sha512-EDw3d5oCSPFn/os7C41+61urT5J5n+bMXK2NTQVhJI8VCPAIVbvFGjZIQI0a9zJ9KuaWKHM6IjXTRakKemlzoA==
+"@rails/actioncable@^7.0":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.3.tgz#71f08e958883af64f6a20489318b5e95d2c6dc5b"
+  integrity sha512-Iefl21FZD+ck1di6xSHMYzSzRiNJTHV4NrAzCfDfqc/wPz4xncrP8f2/fJ+2jzwKIaDn76UVMsALh7R5OzsF8Q==
+
+"@rails/request.js@^0.0.6":
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/@rails/request.js/-/request.js-0.0.6.tgz#5f0347a9f363e50ec45118c7134080490cda81d8"
+  integrity sha512-dfFWaQXitYJ4kxrgGJNhDNXX54/v10YgoJqBMVe6lhqs6a4N9WD7goZJEvwin82TtK8MqUNhwfyisgKwM6dMdg==
 
 "@rollup/plugin-commonjs@^19.0.1":
   version "19.0.2"
@@ -101,6 +114,20 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
+"@spree/dashboard@^0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@spree/dashboard/-/dashboard-0.2.0.tgz#0250842c8085bc7943a18d89abbdf5692e0d67a2"
+  integrity sha512-LyKEKMIaU3+GAdgux2TZZ0Ol3p7+kW+v3SAJtfQsyhkPjiSY+WaIawo5fU6UXWai/WLLfrvmXuZKFS9VXR6ZaQ==
+  dependencies:
+    "@hotwired/stimulus" "^3.0.1"
+    "@rails/request.js" "^0.0.6"
+    bootstrap "4.6.1"
+    flatpickr "^4.6.9"
+    jquery "3.5.1"
+    popper.js "1.16.1"
+    sortablejs "^1.14.0"
+    stimulus-sortable "^3.1.0"
+
 "@types/estree@*":
   version "0.0.50"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
@@ -453,11 +480,16 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
-flatpickr@^4.6.9:
+flatpickr@4.6.9:
   version "4.6.9"
   resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.9.tgz#9a13383e8a6814bda5d232eae3fcdccb97dc1499"
   integrity sha512-F0azNNi8foVWKSF+8X+ZJzz8r9sE1G4hl06RyceIaLvyltKvDl6vqk9Lm/6AUUCi5HWaIjiUbk7UpeE/fOXOpw==
 
+flatpickr@^4.6.9:
+  version "4.6.13"
+  resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz#8a029548187fd6e0d670908471e43abe9ad18d94"
+  integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw==
+
 flatted@^3.1.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2"