From 449db3d92063b5fa8286708ee34dcd544934e23e Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 20 Sep 2015 21:30:21 +0200
Subject: [PATCH 1/3] bump to 0.5.6
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index afb7592..bb00598 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "sourcejs",
"description": "Living Style Guide Engine for Managing and Developing Front-end Components.",
"author": "SourceJS",
- "version": "0.5.6-dev",
+ "version": "0.5.6",
"license": "MIT",
"engines": {
"node": ">=0.10.0 <4.0"
From 206c23dd3740de4795bf7a2a90a9f26c5ce5953c Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 20 Sep 2015 21:31:43 +0200
Subject: [PATCH 2/3] add 0.5.6 to updates section
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index cf8dcdb..0970c74 100755
--- a/README.md
+++ b/README.md
@@ -52,6 +52,7 @@ If you notice some bugs, or need to help finding a better solution in your proce
[Materials for presentations](https://github.com/sourcejs/pres).
## Updates
+* 20.09.15 [0.5.6](https://github.com/sourcejs/Source/releases/tag/0.5.6) and [0.5.6-no-jsdom](https://github.com/sourcejs/Source/releases/tag/0.5.6-no-jsdom) with EJS helpers, NPM 3 support and navigation improvements
* 16.08.15 [0.5.5](https://github.com/sourcejs/Source/releases/tag/0.5.5) and [0.5.5-no-jsdom](https://github.com/sourcejs/Source/releases/tag/0.5.5-no-jsdom) patch release with `<markdown>` tag fix and set of functional tests
* 15.08.15 [0.5.4](https://github.com/sourcejs/Source/releases/tag/0.5.4) and [0.5.4-no-jsdom](https://github.com/sourcejs/Source/releases/tag/0.5.4-no-jsdom) with middleware loader, relative paths in navigation support and other improvements
* 28.05.15 [0.5.3](https://github.com/sourcejs/Source/releases/tag/0.5.3) context options support, source-as-npm package, CI integration, watcher stability improvements and other great features
From 0c98b500484a6854e3ca6d9ee38df5426eabd391 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 20 Sep 2015 21:54:08 +0200
Subject: [PATCH 3/3] #182: fix npm 2
---
Gruntfile.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Gruntfile.js b/Gruntfile.js
index 5148ea2..727399a 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,20 +1,25 @@
'use strict';
var path = require('path');
+var fs = require('fs');
var pathToApp = path.resolve('./');
-var parentFolderName = path.basename(path.resolve('..'));
global.pathToApp = pathToApp;
var loadOptions = require('./core/loadOptions');
+// NPM 3 compatibility fix
var getLoaderPackageName = function() {
var packageName;
+ var parentFolderName = path.basename(path.resolve('..'));
var isSubPackage = parentFolderName === 'node_modules';
- if (isSubPackage) {
+ var isLocalDepsAvailable = fs.existsSync('node_modules/grunt-autoprefixer') && fs.existsSync('node_modules/grunt-contrib-cssmin');
+
+ if (isSubPackage && !isLocalDepsAvailable) {
packageName = 'load-grunt-parent-tasks';
} else {
packageName = 'load-grunt-tasks';
}
+
return packageName;
};