Browse Source

fix: version checks

Ryan Chandler 4 years ago
parent
commit
826df33118
9 changed files with 13 additions and 3 deletions
  1. 0 0
      dist/spruce.js
  2. 0 0
      dist/spruce.js.map
  3. 0 0
      dist/spruce.module.js
  4. 0 0
      dist/spruce.module.js.map
  5. 0 0
      dist/spruce.umd.js
  6. 0 0
      dist/spruce.umd.js.map
  7. 1 1
      examples/index.html
  8. 11 1
      src/utils.js
  9. 1 1
      yarn.lock

File diff suppressed because it is too large
+ 0 - 0
dist/spruce.js


File diff suppressed because it is too large
+ 0 - 0
dist/spruce.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/spruce.module.js


File diff suppressed because it is too large
+ 0 - 0
dist/spruce.module.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/spruce.umd.js


File diff suppressed because it is too large
+ 0 - 0
dist/spruce.umd.js.map


+ 1 - 1
examples/index.html

@@ -1,7 +1,7 @@
 <html>
     <head>
         <script src="../dist/spruce.umd.js"></script>
-        <script src="https://cdn.jsdelivr.net/gh/alpinejs/alpine@v2.6.x/dist/alpine.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/gh/alpinejs/alpine@v2.x.x/dist/alpine.min.js"></script>
     </head>
     <body>
         <div x-data>

+ 11 - 1
src/utils.js

@@ -1,3 +1,5 @@
+import compareVersions from 'compare-versions'
+
 export const domReady = () => {
     return new Promise(resolve => {
         if (document.readyState == "loading") {
@@ -32,5 +34,13 @@ export const isTesting = () => {
 }
 
 export const checkForAlpine = () => {
-    return isTesting() || (! window.Alpine || ! compareVersions.compare(window.Alpine.version, '2.7.0', '>='))
+    if (isTesting()) {
+        return true
+    }
+
+    if (! window.Alpine) {
+        return false
+    }
+
+    return compareVersions.compare(window.Alpine.version, '2.7.0', '>=')
 }

+ 1 - 1
yarn.lock

@@ -2145,7 +2145,7 @@ common-tags@^1.8.0:
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
   integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
 
-compare-versions@^3.6.0:
+compare-versions@3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
   integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==

Some files were not shown because too many files changed in this diff