From e5963592b248cf8831356fd0a6798c791aef1dcc Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Wed, 7 Aug 2019 15:58:09 -0400 Subject: [PATCH 1/3] Fix MIME-type issues with Lunr search Close #82 --- CHANGELOG.md | 5 +++++ _includes/search/lunr-search-scripts.html | 2 +- assets/javascripts/{search-data.json => lunr/lunr.store.js} | 0 3 files changed, 6 insertions(+), 1 deletion(-) rename assets/javascripts/{search-data.json => lunr/lunr.store.js} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfd2a7e..2c1cca7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased] + +### Fixed +- Fix MIME-type issues with Lunr search by renaming `search-data.json` to `lunr/lunr.store.js`. [#82](https://github.com/mmistakes/jekyll-theme-basically-basic/issues/82) + ## [1.4.2] - 2019-07-18 ### Added diff --git a/_includes/search/lunr-search-scripts.html b/_includes/search/lunr-search-scripts.html index 7314f9b..b011004 100644 --- a/_includes/search/lunr-search-scripts.html +++ b/_includes/search/lunr-search-scripts.html @@ -37,7 +37,7 @@ {%- endcase -%} - + {%- unless lang == "en" -%} diff --git a/assets/javascripts/search-data.json b/assets/javascripts/lunr/lunr.store.js similarity index 100% rename from assets/javascripts/search-data.json rename to assets/javascripts/lunr/lunr.store.js From b0411a4825a2c9290cc36bb65ea63bb426abd8d6 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 20 Aug 2019 11:22:06 -0400 Subject: [PATCH 2/3] Relax Jekyll dependency to allow for version 4.0 --- jekyll-theme-basically-basic.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll-theme-basically-basic.gemspec b/jekyll-theme-basically-basic.gemspec index bc07805..7c400ad 100644 --- a/jekyll-theme-basically-basic.gemspec +++ b/jekyll-theme-basically-basic.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |spec| f.match(%r{^(assets|_(includes|layouts|sass)/|(LICENSE|README|CHANGELOG)((\.(txt|md|markdown)|$)))}i) end - spec.add_runtime_dependency "jekyll", "~> 3.7" + spec.add_runtime_dependency "jekyll", ">= 3.6", "< 5.0" spec.add_runtime_dependency "jekyll-feed", "~> 0.10" spec.add_runtime_dependency "jekyll-paginate", "~> 1.1" spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.5" From 86d4f8c08c9dd559d38a99c8fc180dc289335acb Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 20 Aug 2019 11:23:00 -0400 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c1cca7..314f05a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +### Changed +- Relax Jekyll dependency to allow for version 4.0. ### Fixed - Fix MIME-type issues with Lunr search by renaming `search-data.json` to `lunr/lunr.store.js`. [#82](https://github.com/mmistakes/jekyll-theme-basically-basic/issues/82)