From cdb960723184d25d76249b707a78f68089b00705 Mon Sep 17 00:00:00 2001 From: Paul Radzkov Date: Wed, 14 Jan 2015 16:54:10 +0300 Subject: [PATCH 1/2] Updated dependencies --- package.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 540ace0..bb1bdca 100644 --- a/package.json +++ b/package.json @@ -8,24 +8,24 @@ }, "dependencies": { "bower-npm-install": "~0.5.1", + "docpad": "~6.69.2", + "docpad-plugin-cleanurls": "~2.7.0", + "docpad-plugin-eco": "~2.1.0", + "docpad-plugin-ghpages": "~2.4.3", + "docpad-plugin-grunt": "~2.1.1", + "docpad-plugin-marked": "git://github.com/varya/docpad-plugin-marked.git#compiled", + "docpad-plugin-moment": "~2.0.2", + "docpad-plugin-rss": "~2.1.4", + "docpad-plugin-services": "~2.6.0", "enb": "~0.13.2", - "enb-xjst": "~1.1.1", - "enb-borschik": "~1.0.4", "enb-bemxjst": "~1.2.0", - "enb-modules": "~0.1.2", + "enb-borschik": "~1.0.4", "enb-diverse-js": ">=0.1.0", + "enb-modules": "~0.1.2", + "enb-xjst": "~1.1.1", "grunt": "~0.4.5", "grunt-contrib-copy": "~0.4.0", "grunt-shell": "~0.7.0", - "docpad": "~6.64.3", - "docpad-plugin-cleanurls": "~2.7.0", - "docpad-plugin-eco": "~2.0.3", - "docpad-plugin-grunt": "~2.1.1", - "docpad-plugin-ghpages": "~2.4.3", - "docpad-plugin-marked": "git://github.com/varya/docpad-plugin-marked.git#compiled", - "docpad-plugin-moment": "~2.0.2", - "docpad-plugin-rss": "~2.1.3", - "docpad-plugin-services": "~2.6.0", "moment": "~2.0.0" }, "main": "node_modules/docpad/bin/docpad-server", From dbbf36a2c895fe1ffd95bff5c51f2b9bc822ab61 Mon Sep 17 00:00:00 2001 From: Paul Radzkov Date: Wed, 14 Jan 2015 17:52:10 +0300 Subject: [PATCH 2/2] Fixed "npm install" and "grunt shell" process on Windows --- Gruntfile.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 43cc07f..4c8ea66 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -4,7 +4,7 @@ module.exports = function(grunt) { pkg: grunt.file.readJSON('package.json'), shell: { enb: { - command: './node_modules/enb/bin/enb make' + command: 'node ./node_modules/enb/bin/enb make' } }, copy: { diff --git a/package.json b/package.json index bb1bdca..3cee064 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ }, "main": "node_modules/docpad/bin/docpad-server", "scripts": { - "install": "./node_modules/bower-npm-install/bin/bower-npm-install", + "install": "node ./node_modules/bower-npm-install/bin/bower-npm-install", "start": "node_modules/docpad/bin/docpad-server" } }