From 51a5e2bf3ae81d02b4916a1afa38b8d323023e82 Mon Sep 17 00:00:00 2001
From: Stephen Coogan <coogie@users.noreply.github.com>
Date: Mon, 11 Nov 2019 05:29:14 +0000
Subject: [PATCH] fix: allow docs to build on Win platform (#10580)

* fix: allow docs to build on Win platform

* fix: remove unecessary Sass causing Win fails
---
 Gemfile                           | 14 +++++++++++--
 Gemfile.lock                      | 34 +++++++++++++++++++++----------
 sass/oscailte/_oscailte.scss      |  4 +---
 sass/oscailte/custom/_README.scss |  6 ------
 4 files changed, 36 insertions(+), 22 deletions(-)
 delete mode 100644 sass/oscailte/custom/_README.scss

diff --git a/Gemfile b/Gemfile
index bbf536f7cd2..91344cefdb0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-ruby "> 2.5.0"
+ruby '> 2.5.0'
 
 group :development do
   gem 'rake', '13.0.0'
@@ -20,3 +20,13 @@ end
 
 gem 'sinatra', '2.0.7'
 gem 'nokogiri', '1.10.5'
+
+# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
+# and associated library
+install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
+  gem 'tzinfo', '~> 1.2'
+  gem 'tzinfo-data'
+end
+
+# Performance-booster for watching directories on Windows
+gem "wdm", "~> 0.1.0" if Gem.win_platform?
diff --git a/Gemfile.lock b/Gemfile.lock
index b2f48bd2a57..22b5698c20a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,10 +24,12 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
+    eventmachine (1.2.7-x64-mingw32)
     ffi (1.11.1)
+    ffi (1.11.1-x64-mingw32)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     jekyll (4.0.0)
       addressable (~> 2.4)
@@ -50,7 +52,7 @@ GEM
     jekyll-paginate (1.1.0)
     jekyll-redirect-from (0.15.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sass-converter (2.0.0)
+    jekyll-sass-converter (2.0.1)
       sassc (> 2.0.1, < 3.0)
     jekyll-sitemap (1.3.1)
       jekyll (>= 3.7, < 5.0)
@@ -62,16 +64,17 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    listen (3.2.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
     mini_portile2 (2.4.0)
-    multi_json (1.13.1)
+    multi_json (1.14.1)
     mustermann (1.0.3)
     nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.5-x64-mingw32)
+      mini_portile2 (~> 2.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.1)
@@ -82,15 +85,16 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    rouge (3.9.0)
+    rouge (3.12.0)
     ruby-enum (0.7.2)
       i18n
-    ruby_dep (1.5.0)
     safe_yaml (1.0.5)
     sass (3.4.25)
     sass-globbing (1.1.5)
       sass (>= 3.1)
-    sassc (2.2.0)
+    sassc (2.2.1)
+      ffi (~> 1.9)
+    sassc (2.2.1-x64-mingw32)
       ffi (~> 1.9)
     sinatra (2.0.7)
       mustermann (~> 1.0)
@@ -100,11 +104,17 @@ GEM
     stringex (2.8.5)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    tilt (2.0.9)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2019.3)
+      tzinfo (>= 1.0.0)
     unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
   compass (= 1.0.3)
@@ -119,6 +129,8 @@ DEPENDENCIES
   sass-globbing (= 1.1.5)
   sinatra (= 2.0.7)
   stringex (= 2.8.5)
+  tzinfo (~> 1.2)
+  tzinfo-data
 
 RUBY VERSION
    ruby 2.6.2p47
diff --git a/sass/oscailte/_oscailte.scss b/sass/oscailte/_oscailte.scss
index 972226c6fad..29a22ffcda7 100644
--- a/sass/oscailte/_oscailte.scss
+++ b/sass/oscailte/_oscailte.scss
@@ -23,6 +23,4 @@
 @import "homepage/hero_unit";
 
 @import "helpers/classes";
-@import "helpers/grid-fix";
-
-@import "custom/**/*"
+@import "helpers/grid-fix";
\ No newline at end of file
diff --git a/sass/oscailte/custom/_README.scss b/sass/oscailte/custom/_README.scss
deleted file mode 100644
index 8f1caadd6c0..00000000000
--- a/sass/oscailte/custom/_README.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-// You can freely create SCSS files within this Custom directory
-// and they will be imported into the end of the theme's output CSS.
-// The directory is loaded to increase abstraction and reduce the amount of 
-// changes to be made to the Oscailte theme itself.
-
-// THESE FILES AREA LOADED ALPHABETICALLY
\ No newline at end of file