jekyll-bookshop 2.0.0.pre.alpha.0 → 2.0.0.pre.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dcfebd607dda67280a95931eadee542b2a0018df3f5562b3439ec3f3ab2c4c4
-  data.tar.gz: 3614e23aa9fdf1d9fa31157e0612157f55d30c716ed46b1c40fbe001f7c521fa
+  metadata.gz: e92ee512a6bc33f0b3bd8559a05d6b60302c0e11c22a14c6f89ec001121a05db
+  data.tar.gz: 1c05f39bea2e59713a16c54f03d8ebe63a9c37bbeb8546a0da41342a51011360
 SHA512:
-  metadata.gz: 2b7b413b32a1f126733a8f37a0860e4321b5933fb8844775aad40e7d840fbf8f2c4a85cb06169e972ae95c5e9ca039c6549587ac5c29f703bed7add368550752
-  data.tar.gz: '01970a6a13c8571afeec9a9075250a5fed66eaee7229226ef56431cddaad0d50b1953ec0e6a7683cdfb05d66d84bdd99276e6bc8b22fdd95daa4a05c2ec652c8'
+  metadata.gz: a8f34bf13c9ab929a66fb53f09d4f79efc8384b10fb27b466fb6c7fde6f38a418be50eb67c07029bf61c5c1d01cb41684996af8e52120af18d361c2eb5f5b4e2
+  data.tar.gz: 4bed403b8d80a9ec62ac56e69cf8e405f9da6a654b942813d3f2ba4d5c0b7bb16e3b937493b843f44dc7040947a23e34097d6556b861ee581c6d6c4039e3fe60

data/lib/jekyll-bookshop.rb

@@ -6,10 +6,7 @@ module JekyllBookshop
 
     # Look for includes in the built bookshop directory
     def tag_includes_dirs(context)
-      bookshop_locations = context['site']['bookshop_locations']&.collect do |location|
-        Pathname.new(location + "/components").cleanpath.to_s
-      end
-      bookshop_locations.freeze
+      context['site']['bookshop_component_locations'].freeze
     end
 
     # Support the bind syntax, spreading an object into params
@@ -76,9 +73,11 @@ module JekyllBookshop
       end
 
       output_css = if Jekyll.env == "production"
-        bookshop_scss_files.join("")
+        bookshop_scss_files.join("\n")
       else
-        "html:not([data-bookshop-hmr]) {#{bookshop_scss_files.join("")}}"
+"html:not([data-bookshop-hmr]) {
+#{bookshop_scss_files.join("\n")}
+}"
       end
 
       output_css
@@ -89,16 +88,28 @@ module JekyllBookshop
 
     # Add the paths to find bookshop's styles
     def self.open_bookshop(site)
-      bookshop_locations = site.config['bookshop_locations']&.collect do |location|
-        Pathname.new(location + "/").cleanpath.to_s
+      base_bookshop_locations = site.config['bookshop_locations']&.collect do |location|
+        Pathname.new("#{site.source}/#{location}/").cleanpath.to_s
+      end
+      base_bookshop_locations = base_bookshop_locations.select do |location|
+        Dir.exist?(location)
+      end
+      bookshop_component_locations = base_bookshop_locations&.collect do |location|
+        Pathname.new("#{location}/components/").cleanpath.to_s
       end
 
       site.config['watch_dirs'] ||= [] # Paired with CloudCannon/jekyll-watch
-      site.config['watch_dirs'].push(*bookshop_locations);
+      site.config['watch_dirs'].push(*base_bookshop_locations);
 
       site.config['sass'] ||= {}
       site.config['sass']['load_paths'] ||= []
-      site.config['sass']['load_paths'].push(*bookshop_locations)
+      site.config['sass']['load_paths'].push(*base_bookshop_locations)
+
+      site.config['bookshop_locations'] = []
+      site.config['bookshop_locations'].push(*base_bookshop_locations)
+
+      site.config['bookshop_component_locations'] ||= []
+      site.config['bookshop_component_locations'].push(*bookshop_component_locations)
     end
   end
 

data/lib/jekyll-bookshop/version.rb

@@ -1,3 +1,3 @@
 module JekyllBookshop
-  VERSION = "2.0.0-alpha.0"
+  VERSION = "2.0.0.pre.alpha.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.0
+  version: 2.0.0.pre.alpha.5
 platform: ruby
 authors:
 - Liam Bigelow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll