jekyll-bookshop 2.0.0.pre.beta.10 → 2.0.0.pre.beta.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa7ab939ab5d6e4a3605cd5ea3ce609928874b7bc608bb8ba65105ea91c64d01
-  data.tar.gz: 24108b66b51e30fe1f61659df6bd32750d57c1e3cfbc66af0d5088d25ec6eb15
+  metadata.gz: c67c7fc80faba9aa09db2799914be94703dd183a80f38633d3f3e5126daadfe5
+  data.tar.gz: 163f483d2af7eb8cbdee6750f4ffd6576c348a1a398b4f5c4f3f65a325874f91
 SHA512:
-  metadata.gz: f2f07baad90111ae1b08a04f0a5fd8df6d558f11205f9a4f2fc0cb9fff971262cd443e731adaa614e336940ef754e37ed5550b6f1aea2f61d508c7d922129a22
-  data.tar.gz: d36ad44716d84e9723386beefba6f54fadb35fb418fd5446e3e6d103d8e99ba2c8d8355029751d8cb2755ee227ae7d5396347a7f9ce2f4ad9f506b04b0c66600
+  metadata.gz: a8ea960efe36612012f4036e12daaf566c1de8b7766844eefde82311e9ed579f82097dbacbb2e8d02ccd0372053e157beede3d534e6f52a747e4cf46a947a3bf
+  data.tar.gz: ad29a0f8990597b718ef019c59fe38ca5cde97167d6007902f4552659735139d080c835d986893dc18b2bde8901f0b04e7f558f526be764b9277db57342dd9ef

data/lib/jekyll-bookshop/tags/browser-tag.rb

@@ -7,9 +7,25 @@ module JekyllBookshop
       @host = markup.strip
     end
 
+    def self.transformHostString(host)
+      case
+        when host =~ %r!^:\d+$!
+          "http://localhost#{host}/bookshop.js"
+        when host =~ %r!^\d+$!
+          "http://localhost:#{host}/bookshop.js"
+        when host =~ %r!^localhost:\d+$!
+          "http://#{host}/bookshop.js"
+        when host =~ %r!^/!
+          host
+        else
+          "//#{host}"
+      end
+    end
+
     def render(context)
       return unless @host
-      return if Jekyll.env == "production"
+
+      host = BrowserTag.transformHostString(@host)
 
       site = context.registers[:site]
       page = context.registers[:page]
@@ -21,7 +37,7 @@ module JekyllBookshop
 
       "<div data-bookshop-browser></div>
 <script>window.bookshop_browser_site_data = null;</script>
-<script src=\"//#{@host}\"></script>
+<script src=\"#{host}\"></script>
 <script>
   window.BookshopBrowser = new window.BookshopBrowserClass({
     globals: [window.bookshop_browser_site_data]

data/lib/jekyll-bookshop/tags/style-tag.rb

@@ -18,7 +18,20 @@ module JekyllBookshop
         "@import \"#{file}\";"
       end
 
-      "@media all, bookshop {#{bookshop_scss_files.join("\n")}}"
+      bookshop_scss_files.sort! do |a, b| 
+        a_shared = a.match(%r!"shared\/!)
+        b_shared = b.match(%r!"shared\/!)
+        case
+        when a_shared && !b_shared
+          -1
+        when !a_shared && b_shared
+          1
+        else
+          a <=> b
+        end
+      end
+
+      "@media all, bookshop {#{bookshop_scss_files.join("")}}"
     end
   end
 end

data/lib/jekyll-bookshop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllBookshop
-  VERSION = "2.0.0.pre.beta.10"
+  VERSION = "2.0.0.pre.beta.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta.10
+  version: 2.0.0.pre.beta.14
 platform: ruby
 authors:
 - CloudCannon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll