From 07affa27509e78f9b7447371ed143f9510f87dfd Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 8 Dec 2015 14:14:42 +0800 Subject: remove redundant spaces. --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 15c84d0..7f058f3 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,5 @@ "grunt": "~0.4.5", "node-sass": "~3.3.3" }, - "license": "MIT" } -- cgit v1.2.3 From de4efa5d194329095f90911101a67c5b5e13922f Mon Sep 17 00:00:00 2001 From: Bjoern Kimminich Date: Mon, 21 Dec 2015 23:17:53 +0100 Subject: updated to mustache 2.2.1 prevents XSS vulnerability (see https://github.com/janl/mustache.js/pull/388) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 15c84d0..f7035aa 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "dependencies": { "underscore": "~1.8.3", "express": "~4.13.3", - "mustache": "~2.1.3", + "mustache": "~2.2.1", "socket.io": "~1.3.7" }, "devDependencies": { -- cgit v1.2.3 From 4881281ea11f2ecdd927cc8c0c262ddff7354ca3 Mon Sep 17 00:00:00 2001 From: Victor Powell Date: Wed, 6 Jan 2016 13:01:58 -0800 Subject: Add the grunt-cli as a dependency instead of assuming global grunt. --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 7f058f3..fd8e36c 100644 --- a/package.json +++ b/package.json @@ -22,10 +22,11 @@ "node": "~4.1.1" }, "dependencies": { - "underscore": "~1.8.3", "express": "~4.13.3", + "grunt-cli": "^0.1.13", "mustache": "~2.1.3", - "socket.io": "~1.3.7" + "socket.io": "~1.3.7", + "underscore": "~1.8.3" }, "devDependencies": { "grunt-contrib-qunit": "~0.7.0", -- 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 'package.json') 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 9eb56f8146e9d4d57e579fcc1a40ae370b036e5b Mon Sep 17 00:00:00 2001 From: Benjamin Tan Date: Sun, 6 Mar 2016 16:52:02 +0800 Subject: Remove unused dependencies. --- package.json | 15 +++++++-------- plugin/notes-server/index.js | 3 +-- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 652bbed..043eac1 100644 --- a/package.json +++ b/package.json @@ -23,22 +23,21 @@ }, "dependencies": { "express": "~4.13.3", - "grunt-cli": "^0.1.13", + "grunt-cli": "~0.1.13", "mustache": "~2.2.1", - "socket.io": "~1.3.7", - "underscore": "~1.8.3" + "socket.io": "~1.3.7" }, "devDependencies": { - "grunt-contrib-qunit": "~0.7.0", - "grunt-contrib-jshint": "~0.11.3", + "grunt": "~0.4.5", + "grunt-autoprefixer": "~3.0.3", + "grunt-contrib-connect": "~0.11.2", "grunt-contrib-cssmin": "~0.14.0", + "grunt-contrib-jshint": "~0.11.3", + "grunt-contrib-qunit": "~0.7.0", "grunt-contrib-uglify": "~0.9.2", "grunt-contrib-watch": "~0.6.1", "grunt-sass": "~1.1.0-beta", - "grunt-contrib-connect": "~0.11.2", - "grunt-autoprefixer": "~3.0.3", "grunt-zip": "~0.17.1", - "grunt": "~0.4.5", "node-sass": "~3.3.3" }, "license": "MIT" diff --git a/plugin/notes-server/index.js b/plugin/notes-server/index.js index 683f064..fc66a26 100644 --- a/plugin/notes-server/index.js +++ b/plugin/notes-server/index.js @@ -2,7 +2,6 @@ var http = require('http'); var express = require('express'); var fs = require('fs'); var io = require('socket.io'); -var _ = require('underscore'); var Mustache = require('mustache'); var app = express(); @@ -64,5 +63,5 @@ var slidesLocation = 'http://localhost' + ( opts.port ? ( ':' + opts.port ) : '' console.log( brown + 'reveal.js - Speaker Notes' + reset ); console.log( '1. Open the slides at ' + green + slidesLocation + reset ); -console.log( '2. Click on the link your JS console to go to the notes page' ); +console.log( '2. Click on the link in your JS console to go to the notes page' ); console.log( '3. Advance through your slides and your notes will advance automatically' ); -- cgit v1.2.3 From 539e774d31f91676bcc3f75e28168921cd27d819 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Mon, 18 Apr 2016 15:29:51 +0200 Subject: 3.3.0 --- bower.json | 2 +- js/reveal.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/bower.json b/bower.json index 5561820..a42ca8d 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "reveal.js", - "version": "3.2.0", + "version": "3.3.0", "main": [ "js/reveal.js", "css/reveal.css" diff --git a/js/reveal.js b/js/reveal.js index dbb227b..10c609e 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -26,7 +26,7 @@ var Reveal; // The reveal.js version - var VERSION = '3.2.0'; + var VERSION = '3.3.0'; var SLIDES_SELECTOR = '.slides section', HORIZONTAL_SLIDES_SELECTOR = '.slides>section', diff --git a/package.json b/package.json index 043eac1..3135f35 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "reveal.js", - "version": "3.2.0", + "version": "3.3.0", "description": "The HTML Presentation Framework", "homepage": "http://lab.hakim.se/reveal-js", "subdomain": "revealjs", -- cgit v1.2.3 From 338a7b0ff9be7e26aa07252160fcf2135f125291 Mon Sep 17 00:00:00 2001 From: Quentin Bramas Date: Tue, 28 Jun 2016 14:31:37 +0200 Subject: add 'npm build' script that launch grunt --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 3135f35..2e3f4a0 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "main": "js/reveal.js", "scripts": { "test": "grunt test", - "start": "grunt serve" + "start": "grunt serve", + "build": "grunt" }, "author": { "name": "Hakim El Hattab", -- cgit v1.2.3 From 541bcf212314e368bffa815401497bb94d2acf0e Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 28 Jun 2016 15:48:09 +0200 Subject: update dependencies based on retire.js info #1473 --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index fdd2a68..7f6f334 100644 --- a/package.json +++ b/package.json @@ -22,10 +22,10 @@ "node": "~4.1.1" }, "dependencies": { - "express": "~4.13.3", - "grunt-cli": "~0.1.13", + "express": "~4.14.0", + "grunt-cli": "~1.2.0", "mustache": "~2.2.1", - "socket.io": "~1.3.7" + "socket.io": "^1.4.8" }, "devDependencies": { "grunt": "~0.4.5", @@ -33,13 +33,13 @@ "grunt-contrib-connect": "~0.11.2", "grunt-contrib-cssmin": "~0.14.0", "grunt-contrib-jshint": "~0.11.3", - "grunt-contrib-qunit": "~0.7.0", + "grunt-contrib-qunit": "~1.2.0", "grunt-contrib-uglify": "~0.9.2", - "grunt-contrib-watch": "~0.6.1", - "grunt-sass": "~1.1.0-beta", + "grunt-contrib-watch": "~1.0.0", + "grunt-sass": "~1.2.0", "grunt-retire": "~0.3.10", "grunt-zip": "~0.17.1", - "node-sass": "~3.3.3" + "node-sass": "~3.7.0" }, "license": "MIT" } -- 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 'package.json') 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 a8586b3ab38495fb2ba03786e64fd4d2231192ad Mon Sep 17 00:00:00 2001 From: Henrik Feldt Date: Wed, 9 Nov 2016 11:11:34 +0100 Subject: Bump node engine in packages.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 3135f35..3d4c764 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "url": "git://github.com/hakimel/reveal.js.git" }, "engines": { - "node": "~4.1.1" + "node": "~6.9.1" }, "dependencies": { "express": "~4.13.3", -- cgit v1.2.3 From b4d46d2b7c8a37de4e5b866412fe92e8f16d37fe Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Thu, 1 Dec 2016 10:32:37 +0100 Subject: update dependencies to work with latest node #1743 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 3d4c764..b73906e 100644 --- a/package.json +++ b/package.json @@ -33,12 +33,12 @@ "grunt-contrib-connect": "~0.11.2", "grunt-contrib-cssmin": "~0.14.0", "grunt-contrib-jshint": "~0.11.3", - "grunt-contrib-qunit": "~0.7.0", + "grunt-contrib-qunit": "~1.2.0", "grunt-contrib-uglify": "~0.9.2", "grunt-contrib-watch": "~0.6.1", "grunt-sass": "~1.1.0-beta", "grunt-zip": "~0.17.1", - "node-sass": "~3.3.3" + "node-sass": "~3.13.0" }, "license": "MIT" } -- cgit v1.2.3 From 03ac4a2e8ebc3b166286214bfb3bd69eb0561e34 Mon Sep 17 00:00:00 2001 From: Benjamin Tan Date: Tue, 6 Dec 2016 18:12:41 +0800 Subject: Reduce required Node.js version to 4.0.0. The development workflow can be used with Node 4+, not just Node 6. We should avoid showing warnings and errors when users are installing this package via npm/yarn. Ref. #1729, #1743. Closes #1725. --- README.md | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/README.md b/README.md index 5abc569..b0257cc 100644 --- a/README.md +++ b/README.md @@ -929,7 +929,7 @@ Reveal.initialize({ Then: -1. Install [Node.js](http://nodejs.org/) (1.0.0 or later) +1. Install [Node.js](http://nodejs.org/) (4.0.0 or later) 2. Run ```npm install``` 3. Run ```node plugin/notes-server``` @@ -1115,7 +1115,7 @@ The core of reveal.js is very easy to install. You'll simply need to download a Some reveal.js features, like external Markdown and speaker notes, require that presentations run from a local web server. The following instructions will set up such a server as well as all of the development tasks needed to make edits to the reveal.js source code. -1. Install [Node.js](http://nodejs.org/) (1.0.0 or later) +1. Install [Node.js](http://nodejs.org/) (4.0.0 or later) 1. Clone the reveal.js repository ```sh diff --git a/package.json b/package.json index f0dcedf..7a9f185 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "url": "git://github.com/hakimel/reveal.js.git" }, "engines": { - "node": "~6.9.1" + "node": ">=4.0.0" }, "dependencies": { "express": "~4.14.0", -- cgit v1.2.3 From 22de402888cf29321e4e6ff30aad5565c958d1d0 Mon Sep 17 00:00:00 2001 From: Benjamin Tan Date: Thu, 8 Dec 2016 15:26:16 +0800 Subject: Shift `dependencies` to `devDependencies`. The `reveal.js` npm module is typically installed to access the CSS/JS assets for Reveal.js. For those that want to run the plugins, they would clone the whole repository. Hence, it doesn’t make sense to include those as `dependencies`, which will increase download times. Closes #1734. --- package.json | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 7a9f185..0aebece 100644 --- a/package.json +++ b/package.json @@ -21,15 +21,11 @@ "engines": { "node": ">=4.0.0" }, - "dependencies": { - "express": "~4.14.0", - "grunt-cli": "~1.2.0", - "mustache": "~2.2.1", - "socket.io": "^1.4.8" - }, "devDependencies": { + "express": "~4.14.0", "grunt": "~1.0.1", "grunt-autoprefixer": "~3.0.3", + "grunt-cli": "~1.2.0", "grunt-contrib-connect": "~0.11.2", "grunt-contrib-cssmin": "~0.14.0", "grunt-contrib-jshint": "~0.11.3", @@ -39,7 +35,9 @@ "grunt-sass": "~1.2.0", "grunt-retire": "~0.3.10", "grunt-zip": "~0.17.1", - "node-sass": "~3.13.0" + "mustache": "~2.2.1", + "node-sass": "~3.13.0", + "socket.io": "^1.4.8" }, "license": "MIT" } -- cgit v1.2.3 From fb8414f4cb092a9f675e783b29b651a03a7858f4 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 10 Jan 2017 13:47:24 +0100 Subject: 3.4.0 --- bower.json | 2 +- js/reveal.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/bower.json b/bower.json index a42ca8d..b3bc42d 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "reveal.js", - "version": "3.3.0", + "version": "3.4.0", "main": [ "js/reveal.js", "css/reveal.css" diff --git a/js/reveal.js b/js/reveal.js index 7a4bc9e..c1c4eca 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -26,7 +26,7 @@ var Reveal; // The reveal.js version - var VERSION = '3.3.0'; + var VERSION = '3.4.0'; var SLIDES_SELECTOR = '.slides section', HORIZONTAL_SLIDES_SELECTOR = '.slides>section', diff --git a/package.json b/package.json index 7a9f185..1899fd9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "reveal.js", - "version": "3.3.0", + "version": "3.4.0", "description": "The HTML Presentation Framework", "homepage": "http://lab.hakim.se/reveal-js", "subdomain": "revealjs", -- cgit v1.2.3 From 9f8e4d5742df486cce577f6e0dbae666aabc4eb1 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Wed, 25 Jan 2017 10:51:25 +0100 Subject: 3.4.1 --- bower.json | 2 +- js/reveal.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/bower.json b/bower.json index b3bc42d..c7c312d 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "reveal.js", - "version": "3.4.0", + "version": "3.4.1", "main": [ "js/reveal.js", "css/reveal.css" diff --git a/js/reveal.js b/js/reveal.js index 46ca50c..9251dc0 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -26,7 +26,7 @@ var Reveal; // The reveal.js version - var VERSION = '3.4.0'; + var VERSION = '3.4.1'; var SLIDES_SELECTOR = '.slides section', HORIZONTAL_SLIDES_SELECTOR = '.slides>section', diff --git a/package.json b/package.json index 1899fd9..1f866ea 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "reveal.js", - "version": "3.4.0", + "version": "3.4.1", "description": "The HTML Presentation Framework", "homepage": "http://lab.hakim.se/reveal-js", "subdomain": "revealjs", -- cgit v1.2.3 From 8e93a1ddf96f36d982a9949d7e4240ba91a123bd Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Wed, 26 Apr 2017 14:21:54 +0200 Subject: 3.5.0 --- bower.json | 2 +- js/reveal.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/bower.json b/bower.json index c7c312d..ff18de4 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "reveal.js", - "version": "3.4.1", + "version": "3.5.0", "main": [ "js/reveal.js", "css/reveal.css" diff --git a/js/reveal.js b/js/reveal.js index 1f288b9..e36cb72 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -26,7 +26,7 @@ var Reveal; // The reveal.js version - var VERSION = '3.4.1'; + var VERSION = '3.5.0'; var SLIDES_SELECTOR = '.slides section', HORIZONTAL_SLIDES_SELECTOR = '.slides>section', diff --git a/package.json b/package.json index 37ffde2..eaec2b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "reveal.js", - "version": "3.4.1", + "version": "3.5.0", "description": "The HTML Presentation Framework", "homepage": "http://lab.hakim.se/reveal-js", "subdomain": "revealjs", -- cgit v1.2.3