jekyll-bookshop 2.0.0.pre.beta.11 → 2.0.0.pre.beta.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e178beb2c975cc7e422cbd25243422b136fe73dcbac195db898e5be37152808
-  data.tar.gz: a4b2da0b751cbe198753b385d987c6e5839fb5dfa1146655f0c0ee11a8c01805
+  metadata.gz: e7ddb637c8043313c044d62c61e5814781c2ad78ab3e3ecf22853ab99174302e
+  data.tar.gz: 7b6ff50f7bff3f611e8067cf16b1e532f42bb8ad459d6f4fdcc04d0f9e864510
 SHA512:
-  metadata.gz: 237ed4ee72e72a89d29b5a64e2e35d6546e3a49207bbed2561d849ab2e89d018b0b4f6906c285c57fc3dbfced4af25f748a9048ca374619b42bc41da2ed09b50
-  data.tar.gz: de823f2d5f08d5e61cc53d8fec1ed31b08f969fb05c481a46935e67d312706cafa0a14d02a6f84216142c7adf8872e0e7c2f15816a0459b3d5998f6c0eb80a0d
+  metadata.gz: 179d6eca3638875aadcde57384c71ac0e5aab751b1d0a3e9b7bb4f6b3cf17b56c6b505fbfdb852234a2ce8f2bd02bf78dc115d6c590e7c4f199a515a706c685d
+  data.tar.gz: a726ade295d7db4e5908b127eadf1cb7655c80c8df1a17bc36b6b1c5305b3d3290371b45e21db64bf89bf5264a2cf9062e0fa7813294940f16c107a353e8fcbf

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.11"
+  VERSION = "2.0.0.pre.beta.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta.11
+  version: 2.0.0.pre.beta.15
 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