Comparing version 3.0.0-beta.19 to 3.0.0-beta.20
@@ -177,9 +177,9 @@ 'use strict'; | ||
]; | ||
let relsolvedPath = builder; | ||
let resolvedPath = builder; | ||
try { | ||
relsolvedPath = path.dirname(resolve.sync(builder, {paths: pathsToResolve})); | ||
resolvedPath = path.dirname(resolve.sync(builder, {paths: pathsToResolve})); | ||
} catch (e) { | ||
// console.log(`Your builder path "${builder}" is maybe wrong.`); | ||
} | ||
return relsolvedPath; | ||
return resolvedPath; | ||
} | ||
@@ -186,0 +186,0 @@ |
@@ -7,2 +7,8 @@ # Change Log | ||
## [3.0.0-beta.20] - 2018-05-07 | ||
### Fixed | ||
- path to KSS builder | ||
- By [@ryuran](https://github.com/ryuran) | ||
- Update dependencies | ||
## [3.0.0-beta.19] - 2018-04-23 | ||
@@ -9,0 +15,0 @@ ### Added |
@@ -133,17 +133,5 @@ 'use strict'; | ||
return checkBuilderPath.then(() => { | ||
return KssBuilderBase.loadBuilder(options.builder); | ||
return KssBuilderBase.loadBuilder(KssBuilderBase.builderResolve(options.builder)); | ||
}).catch(error => { | ||
let catchLoadFailure; | ||
// If the builder specified was "builder/twig" and there was no existing | ||
// path relative to the working directory, we should try again while using | ||
// the path to kss-node's Twig builder. | ||
// istanbul ignore if | ||
if (supportedBuilders.indexOf(options.builder) > -1) { | ||
options.builder = path.resolve(__dirname, '..', options.builder); | ||
catchLoadFailure = KssBuilderBase.loadBuilder(options.builder); | ||
} else { | ||
catchLoadFailure = Promise.reject(error); | ||
} | ||
return catchLoadFailure.catch(error => { | ||
return Promise.reject(error).catch(error => { | ||
reportError(error); | ||
@@ -150,0 +138,0 @@ throw error; |
@@ -66,3 +66,3 @@ 'use strict'; | ||
// Confirm this is a compatible builder. | ||
return KssBuilderBase.loadBuilder(options.builder || require('../builder/handlebars')).catch(error => { | ||
return KssBuilderBase.loadBuilder(options.builder ? KssBuilderBase.builderResolve(options.builder) : require('../builder/handlebars')).catch(error => { | ||
let catchLoadFailure; | ||
@@ -69,0 +69,0 @@ const supportedBuilders = [ |
{ | ||
"name": "kss", | ||
"version": "3.0.0-beta.19", | ||
"version": "3.0.0-beta.20", | ||
"description": "The Node.js port of KSS: A methodology for documenting CSS and building style guides", | ||
@@ -34,3 +34,3 @@ "homepage": "http://kss-node.github.io/kss-node", | ||
"bluebird": "^3.3.3", | ||
"fs-extra": "^5.0.0", | ||
"fs-extra": "^6.0.0", | ||
"glob": "^7.0.3", | ||
@@ -37,0 +37,0 @@ "handlebars": "^4.0.0", |
@@ -1,2 +0,2 @@ | ||
[![Build Status](https://secure.travis-ci.org/kss-node/kss-node.png?branch=master)](http://travis-ci.org/kss-node/kss-node/builds) [![Coverage Status](https://coveralls.io/repos/kss-node/kss-node/badge.svg?branch=master&service=github)](https://coveralls.io/github/kss-node/kss-node?branch=master) [![Dependency Status](https://david-dm.org/kss-node/kss-node.svg)](https://david-dm.org/kss-node/kss-node) | ||
[![Build Status](https://secure.travis-ci.org/kss-node/kss-node.png?branch=master)](http://travis-ci.org/kss-node/kss-node/builds) [![Coverage Status](https://coveralls.io/repos/kss-node/kss-node/badge.svg?branch=master&service=github)](https://coveralls.io/github/kss-node/kss-node?branch=master) [![Dependency Status](https://david-dm.org/kss-node/kss-node.svg)](https://david-dm.org/kss-node/kss-node) [![Greenkeeper badge](https://badges.greenkeeper.io/kss-node/kss-node.svg)](https://greenkeeper.io/) | ||
@@ -7,4 +7,2 @@ **Note:** This README is for the `master` branch of this project. To see the README for the latest stable release see [https://www.npmjs.com/package/kss](https://www.npmjs.com/package/kss). | ||
[![Greenkeeper badge](https://badges.greenkeeper.io/kss-node/kss-node.svg)](https://greenkeeper.io/) | ||
This is a Node.js implementation of [KSS](https://github.com/kneath/kss), "a documentation syntax for CSS" that's intended to have syntax readable by humans *and* machines. Hence, the kss-node software can be used to create a "living style guide". | ||
@@ -11,0 +9,0 @@ |
777508
9219
157
+ Addedfs-extra@6.0.1(transitive)
- Removedfs-extra@5.0.0(transitive)
Updatedfs-extra@^6.0.0