From cee64858dd0e0bb4aed195f04dc6d74b2980cdfa Mon Sep 17 00:00:00 2001
From: jzgdev
Date: Wed, 1 Jul 2015 22:51:01 -0700
Subject: Gruntfile.js: watch tasks restructured

---
 Gruntfile.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Gruntfile.js')

diff --git a/Gruntfile.js b/Gruntfile.js
index a851845..8be2929 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -112,9 +112,6 @@ module.exports = function(grunt) {
 		},
 
 		watch: {
-			options: {
-				livereload: true
-			},
 			js: {
 				files: [ 'Gruntfile.js', 'js/reveal.js' ],
 				tasks: 'js'
@@ -129,6 +126,9 @@ module.exports = function(grunt) {
 			},
 			html: {
 				files: [ 'index.html']
+			},
+			options: {
+				livereload: true
 			}
 		}
 
-- 
cgit v1.2.3


From 18b644cf8f1ae04b16f962655b99cb786f08ef2c Mon Sep 17 00:00:00 2001
From: Hakim El Hattab
Date: Mon, 4 Jan 2016 09:29:55 +0100
Subject: :copyright: :copyright: :copyright: :copyright: :copyright: closes
 #1469

---
 Gruntfile.js                | 2 +-
 LICENSE                     | 2 +-
 README.md                   | 2 +-
 css/reveal.css              | 2 +-
 css/reveal.scss             | 2 +-
 css/theme/black.css         | 2 +-
 css/theme/source/black.scss | 2 +-
 css/theme/source/white.scss | 2 +-
 css/theme/white.css         | 2 +-
 js/reveal.js                | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'Gruntfile.js')

diff --git a/Gruntfile.js b/Gruntfile.js
index f6c71e2..675adff 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,7 +13,7 @@ module.exports = function(grunt) {
 				' * http://lab.hakim.se/reveal-js\n' +
 				' * MIT licensed\n' +
 				' *\n' +
-				' * Copyright (C) 2015 Hakim El Hattab, http://hakim.se\n' +
+				' * Copyright (C) 2016 Hakim El Hattab, http://hakim.se\n' +
 				' */'
 		},
 
diff --git a/LICENSE b/LICENSE
index 0962307..faadd00 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2015 Hakim El Hattab, http://hakim.se
+Copyright (C) 2016 Hakim El Hattab, http://hakim.se
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 52dcd22..e7857cc 100644
--- a/README.md
+++ b/README.md
@@ -1016,4 +1016,4 @@ Some reveal.js features, like external Markdown and speaker notes, require that
 
 MIT licensed
 
-Copyright (C) 2015 Hakim El Hattab, http://hakim.se
+Copyright (C) 2016 Hakim El Hattab, http://hakim.se
diff --git a/css/reveal.css b/css/reveal.css
index 2f115e5..9739291 100644
--- a/css/reveal.css
+++ b/css/reveal.css
@@ -3,7 +3,7 @@
  * http://lab.hakim.se/reveal-js
  * MIT licensed
  *
- * Copyright (C) 2015 Hakim El Hattab, http://hakim.se
+ * Copyright (C) 2016 Hakim El Hattab, http://hakim.se
  */
 /*********************************************
  * RESET STYLES
diff --git a/css/reveal.scss b/css/reveal.scss
index d932269..eb600ac 100644
--- a/css/reveal.scss
+++ b/css/reveal.scss
@@ -3,7 +3,7 @@
  * http://lab.hakim.se/reveal-js
  * MIT licensed
  *
- * Copyright (C) 2015 Hakim El Hattab, http://hakim.se
+ * Copyright (C) 2016 Hakim El Hattab, http://hakim.se
  */
 
 
diff --git a/css/theme/black.css b/css/theme/black.css
index 54d44c3..deccc46 100644
--- a/css/theme/black.css
+++ b/css/theme/black.css
@@ -1,7 +1,7 @@
 /**
  * Black theme for reveal.js. This is the opposite of the 'white' theme.
  *
- * Copyright (C) 2015 Hakim El Hattab, http://hakim.se
+ * By Hakim El Hattab, http://hakim.se
  */
 @import url(../../lib/font/source-sans-pro/source-sans-pro.css);
 section.has-light-background, section.has-light-background h1, section.has-light-background h2, section.has-light-background h3, section.has-light-background h4, section.has-light-background h5, section.has-light-background h6 {
diff --git a/css/theme/source/black.scss b/css/theme/source/black.scss
index 73dfecb..5f7f601 100644
--- a/css/theme/source/black.scss
+++ b/css/theme/source/black.scss
@@ -1,7 +1,7 @@
 /**
  * Black theme for reveal.js. This is the opposite of the 'white' theme.
  *
- * Copyright (C) 2015 Hakim El Hattab, http://hakim.se
+ * By Hakim El Hattab, http://hakim.se
  */
 
 
diff --git a/css/theme/source/white.scss b/css/theme/source/white.scss
index 4c5b647..6758ce0 100644
--- a/css/theme/source/white.scss
+++ b/css/theme/source/white.scss
@@ -1,7 +1,7 @@
 /**
  * White theme for reveal.js. This is the opposite of the 'black' theme.
  *
- * Copyright (C) 2015 Hakim El Hattab, http://hakim.se
+ * By Hakim El Hattab, http://hakim.se
  */
 
 
diff --git a/css/theme/white.css b/css/theme/white.css
index a05cd85..14e1703 100644
--- a/css/theme/white.css
+++ b/css/theme/white.css
@@ -1,7 +1,7 @@
 /**
  * White theme for reveal.js. This is the opposite of the 'black' theme.
  *
- * Copyright (C) 2015 Hakim El Hattab, http://hakim.se
+ * By Hakim El Hattab, http://hakim.se
  */
 @import url(../../lib/font/source-sans-pro/source-sans-pro.css);
 section.has-dark-background, section.has-dark-background h1, section.has-dark-background h2, section.has-dark-background h3, section.has-dark-background h4, section.has-dark-background h5, section.has-dark-background h6 {
diff --git a/js/reveal.js b/js/reveal.js
index 164996d..2c92954 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -3,7 +3,7 @@
  * http://lab.hakim.se/reveal-js
  * MIT licensed
  *
- * Copyright (C) 2015 Hakim El Hattab, http://hakim.se
+ * Copyright (C) 2016 Hakim El Hattab, http://hakim.se
  */
 (function( root, factory ) {
 	if( typeof define === 'function' && define.amd ) {
-- 
cgit v1.2.3


From 7621e1085d6389b214f244ac3e3ddb78c381d1c8 Mon Sep 17 00:00:00 2001
From: Bjoern Kimminich
Date: Fri, 8 Jan 2016 10:46:28 +0100
Subject: added retire.js to build process -allows security vulnerability check
 in used npm-dependencies and own scripts -execute with ```grunt retire```

---
 Gruntfile.js | 10 +++++++++-
 package.json |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'Gruntfile.js')

diff --git a/Gruntfile.js b/Gruntfile.js
index f6c71e2..11bd42b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -134,7 +134,14 @@ module.exports = function(grunt) {
 			markdown: {
 				files: [ './*.md' ]
 			}
-		}
+		},
+
+		retire: {
+            js: ['js/reveal.js', 'lib/js/*.js', 'plugin/**/*.js'],
+            node: ['.'],
+            options: {
+            }
+        }
 
 	});
 
@@ -148,6 +155,7 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks( 'grunt-contrib-connect' );
 	grunt.loadNpmTasks( 'grunt-autoprefixer' );
 	grunt.loadNpmTasks( 'grunt-zip' );
+	grunt.loadNpmTasks('grunt-retire');
 
 	// Default task
 	grunt.registerTask( 'default', [ 'css', 'js' ] );
diff --git a/package.json b/package.json
index f7035aa..b75bb90 100644
--- a/package.json
+++ b/package.json
@@ -36,10 +36,11 @@
     "grunt-sass": "~1.1.0-beta",
     "grunt-contrib-connect": "~0.11.2",
     "grunt-autoprefixer": "~3.0.3",
+    "grunt-retire": "~0.3.10",
     "grunt-zip": "~0.17.1",
     "grunt": "~0.4.5",
     "node-sass": "~3.3.3"
   },
-  
+
   "license": "MIT"
 }
-- 
cgit v1.2.3


From 2dc546f5ba001a074296485ea17dd5d95c0c4d89 Mon Sep 17 00:00:00 2001
From: Ruben Oostinga
Date: Sat, 9 Apr 2016 12:33:46 +0200
Subject: Fix watching for markdown files

`./*.md` didn't work `*.md` does work---
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Gruntfile.js')

diff --git a/Gruntfile.js b/Gruntfile.js
index 675adff..b8919bd 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -132,7 +132,7 @@ module.exports = function(grunt) {
 				files: [ 'index.html']
 			},
 			markdown: {
-				files: [ './*.md' ]
+				files: [ '*.md' ]
 			}
 		}
 
-- 
cgit v1.2.3


From a6507afcb4cb4245d8ac23b5be247b1c780163ed Mon Sep 17 00:00:00 2001
From: Hakim El Hattab
Date: Sun, 10 Apr 2016 12:07:49 +0200
Subject: widen watch for html files, required for updates to demo.html

---
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Gruntfile.js')

diff --git a/Gruntfile.js b/Gruntfile.js
index 09e797f..87630d5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -126,7 +126,7 @@ module.exports = function(grunt) {
 				tasks: 'css-core'
 			},
 			html: {
-				files: [ 'index.html']
+				files: [ '*.html']
 			},
 			markdown: {
 				files: [ '*.md' ]
-- 
cgit v1.2.3


From 2cf00254a1a696111b0f4a48dda1cac399447193 Mon Sep 17 00:00:00 2001
From: CH
Date: Wed, 5 Oct 2016 11:45:37 +0200
Subject: renamed grunt 'base' option to 'root' (#1660)

* Allow slides to be served away from revealjs server location

The previous 'base' option conflicts with Grunt's 'base' option.
Changing it to 'root' avoids this. Further, updating to a newer Grunt
allows multiple parameters to be used. therefore `grunt serve --root="."
--root="pathtomyslides"` allows you to keep your slide content separate
from JS/CSS and such

* Live reload for relocated base

* Updated packages to match origin/dev

* Updated packages to match origin/dev

* Ensure root is an array
---
 Gruntfile.js | 14 +++++++++-----
 package.json |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'Gruntfile.js')

diff --git a/Gruntfile.js b/Gruntfile.js
index 7cea2a5..96a4f52 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,7 +1,9 @@
 /* global module:false */
 module.exports = function(grunt) {
 	var port = grunt.option('port') || 8000;
-	var base = grunt.option('base') || '.';
+	var root = grunt.option('root') || '.';
+
+	if (!Array.isArray(root)) root = [root];
 
 	// Project configuration
 	grunt.initConfig({
@@ -69,6 +71,7 @@ module.exports = function(grunt) {
 				curly: false,
 				eqeqeq: true,
 				immed: true,
+				esnext: true,
 				latedef: true,
 				newcap: true,
 				noarg: true,
@@ -93,11 +96,12 @@ module.exports = function(grunt) {
 			server: {
 				options: {
 					port: port,
-					base: base,
+					base: root,
 					livereload: true,
 					open: true
 				}
-			}
+			},
+
 		},
 
 		zip: {
@@ -126,10 +130,10 @@ module.exports = function(grunt) {
 				tasks: 'css-core'
 			},
 			html: {
-				files: [ '*.html']
+				files: root.map(path => path + '/*.html')
 			},
 			markdown: {
-				files: [ '*.md' ]
+				files: root.map(path => path + '/*.md')
 			},
 			options: {
 				livereload: true
diff --git a/package.json b/package.json
index 7f6f334..c96e4fd 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "socket.io": "^1.4.8"
   },
   "devDependencies": {
-    "grunt": "~0.4.5",
+    "grunt": "~1.0.1",
     "grunt-autoprefixer": "~3.0.3",
     "grunt-contrib-connect": "~0.11.2",
     "grunt-contrib-cssmin": "~0.14.0",
-- 
cgit v1.2.3


From b78cca5831e71e1165d70243e805af19e0d4df60 Mon Sep 17 00:00:00 2001
From: Oliver Davies
Date: Sun, 16 Oct 2016 09:53:19 +0100
Subject: Support sass extension for custom themes

---
 Gruntfile.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Gruntfile.js')

diff --git a/Gruntfile.js b/Gruntfile.js
index 87630d5..3bcefce 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -42,7 +42,7 @@ module.exports = function(grunt) {
 					{
 						expand: true,
 						cwd: 'css/theme/source',
-						src: ['*.scss'],
+						src: ['*.sass', '*.scss'],
 						dest: 'css/theme',
 						ext: '.css'
 					}
@@ -118,7 +118,12 @@ module.exports = function(grunt) {
 				tasks: 'js'
 			},
 			theme: {
-				files: [ 'css/theme/source/*.scss', 'css/theme/template/*.scss' ],
+				files: [
+					'css/theme/source/*.sass',
+					'css/theme/source/*.scss',
+					'css/theme/template/*.sass',
+					'css/theme/template/*.scss'
+				],
 				tasks: 'css-themes'
 			},
 			css: {
-- 
cgit v1.2.3


From e8164c13923b65c60cca122aeab6e61cb5377e80 Mon Sep 17 00:00:00 2001
From: Hakim El Hattab
Date: Fri, 20 Jan 2017 10:35:01 +0100
Subject: 2017

---
 Gruntfile.js    | 2 +-
 LICENSE         | 2 +-
 README.md       | 2 +-
 css/reveal.css  | 2 +-
 css/reveal.scss | 2 +-
 js/reveal.js    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'Gruntfile.js')

diff --git a/Gruntfile.js b/Gruntfile.js
index 96a4f52..059bb05 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -15,7 +15,7 @@ module.exports = function(grunt) {
 				' * http://lab.hakim.se/reveal-js\n' +
 				' * MIT licensed\n' +
 				' *\n' +
-				' * Copyright (C) 2016 Hakim El Hattab, http://hakim.se\n' +
+				' * Copyright (C) 2017 Hakim El Hattab, http://hakim.se\n' +
 				' */'
 		},
 
diff --git a/LICENSE b/LICENSE
index 924cd89..c3e6e5f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2016 Hakim El Hattab, http://hakim.se, and reveal.js contributors
+Copyright (C) 2017 Hakim El Hattab, http://hakim.se, and reveal.js contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 54b065b..22014c5 100644
--- a/README.md
+++ b/README.md
@@ -1168,4 +1168,4 @@ Some reveal.js features, like external Markdown and speaker notes, require that
 
 MIT licensed
 
-Copyright (C) 2016 Hakim El Hattab, http://hakim.se
+Copyright (C) 2017 Hakim El Hattab, http://hakim.se
diff --git a/css/reveal.css b/css/reveal.css
index 82d0767..296c8e9 100644
--- a/css/reveal.css
+++ b/css/reveal.css
@@ -3,7 +3,7 @@
  * http://lab.hakim.se/reveal-js
  * MIT licensed
  *
- * Copyright (C) 2016 Hakim El Hattab, http://hakim.se
+ * Copyright (C) 2017 Hakim El Hattab, http://hakim.se
  */
 /*********************************************
  * RESET STYLES
diff --git a/css/reveal.scss b/css/reveal.scss
index ce57358..ee3c440 100644
--- a/css/reveal.scss
+++ b/css/reveal.scss
@@ -3,7 +3,7 @@
  * http://lab.hakim.se/reveal-js
  * MIT licensed
  *
- * Copyright (C) 2016 Hakim El Hattab, http://hakim.se
+ * Copyright (C) 2017 Hakim El Hattab, http://hakim.se
  */
 
 
diff --git a/js/reveal.js b/js/reveal.js
index 3e4be56..7fad2b1 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -3,7 +3,7 @@
  * http://lab.hakim.se/reveal-js
  * MIT licensed
  *
- * Copyright (C) 2016 Hakim El Hattab, http://hakim.se
+ * Copyright (C) 2017 Hakim El Hattab, http://hakim.se
  */
 (function( root, factory ) {
 	if( typeof define === 'function' && define.amd ) {
-- 
cgit v1.2.3