Skip to content

Commit 18ff75a

Browse files
committed
Merge branch 'feature/enable-as-dependency' of https://github.com/EvanLovely/patternlab-node into EvanLovely-feature/enable-as-dependency
2 parents 26d359f + e73b21d commit 18ff75a

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

builder/patternlab.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*/
1010

11-
var patternlab_engine = function () {
11+
var patternlab_engine = function (config) {
1212
'use strict';
1313

1414
var path = require('path'),
@@ -25,7 +25,7 @@ var patternlab_engine = function () {
2525
patternlab = {};
2626

2727
patternlab.package = fs.readJSONSync('./package.json');
28-
patternlab.config = fs.readJSONSync('./config.json');
28+
patternlab.config = config || fs.readJSONSync(path.resolve(__dirname, '../config.json'));
2929

3030
var paths = patternlab.config.paths;
3131

package.gulp.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,24 @@
22
"name": "patternlab-node",
33
"description": "Pattern Lab is a collection of tools to help you create atomic design systems. This is the node command line interface (CLI).",
44
"version": "1.0.1",
5-
"devDependencies": {
6-
"browser-sync": "^2.10.0",
5+
"main": "./builder/patternlab.js",
6+
"dependencies": {
77
"del": "^2.0.2",
88
"diveSync": "^0.3.0",
99
"fs-extra": "^0.26.2",
1010
"glob": "^6.0.1",
11+
"html-entities": "^1.2.0",
12+
"mustache": "^2.2.0"
13+
},
14+
"devDependencies": {
15+
"browser-sync": "^2.10.0",
1116
"gulp": "^3.9.0",
1217
"gulp-connect": "^2.2.0",
1318
"gulp-copy": "0.0.2",
1419
"gulp-header": "^1.7.1",
1520
"gulp-load": "^0.1.1",
1621
"gulp-nodeunit": "0.0.5",
17-
"gulp-strip-banner": "0.0.2",
18-
"html-entities": "^1.2.0",
19-
"mustache": "^2.2.0"
22+
"gulp-strip-banner": "0.0.2"
2023
},
2124
"keywords": [
2225
"Pattern Lab",

package.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,23 @@
22
"name": "patternlab-node",
33
"description": "Pattern Lab is a collection of tools to help you create atomic design systems. This is the node command line interface (CLI).",
44
"version": "1.0.1",
5-
"devDependencies": {
6-
"bs-html-injector": "^3.0.0",
5+
"main": "./builder/patternlab.js",
6+
"dependencies": {
77
"diveSync": "^0.3.0",
88
"fs-extra": "^0.26.2",
99
"glob": "^6.0.1",
10+
"html-entities": "^1.2.0",
11+
"matchdep": "^1.0.0",
12+
"mustache": "^2.2.0"
13+
},
14+
"devDependencies": {
15+
"bs-html-injector": "^3.0.0",
1016
"grunt": "~0.4.5",
1117
"grunt-browser-sync": "^2.2.0",
1218
"grunt-contrib-concat": "^0.5.1",
1319
"grunt-contrib-copy": "^0.8.2",
1420
"grunt-contrib-nodeunit": "^0.4.1",
15-
"grunt-contrib-watch": "^0.6.1",
16-
"html-entities": "^1.2.0",
17-
"matchdep": "^1.0.0",
18-
"mustache": "^2.2.0"
21+
"grunt-contrib-watch": "^0.6.1"
1922
},
2023
"keywords": [
2124
"Pattern Lab",

0 commit comments

Comments
 (0)