Merge remote-tracking branch 'refs/remotes/upstream/dev' into pattern-engines

Conflicts:
	builder/patternlab.js
	package.json

Author: geoffp

CHANGELOG

@@ -11,6 +11,10 @@ PL-node-v1.1.0
 - THX: Thanks @robinsonaaron for the issue and pull request!
 - FIX: Prefer exact pattern key match over fuzzy matches inside getpatternbykey()
 - THX: Thanks @EvanLovely for the suggestion
+- FIX: Fix issue where absolute paths in the config path object would not resolve
+- THX: Thanks to @geoffp and @EvanLovely for reporting, fixing and testing the issue in the dev branch.
+- FIX: Typo in gulp instructions in README.
+- THX: Thanks @simonknittel for the watchful eyes
 
 PL-node-v1.0.0
 - FIX: Resolve issue with not hiding underscored patterns.

README.md

@@ -44,7 +44,7 @@ To run patternlab-node using gulp, you need to swap out the default grunt config
 3. Run `npm install` from the command line
 4. Run `gulp` or `gulp serve` from the command line
 
-This creates all patterns, the styleguide, and the pattern lab site. It's strongly recommended to run `grunt serve` to see have BrowserSync spin up and serve the files to you.
+This creates all patterns, the styleguide, and the pattern lab site. It's strongly recommended to run `gulp serve` to have BrowserSync spin up and serve the files to you.
 
 ### There and Back Again, or Switching Between Grunt and Gulp
 

builder/patternlab.js

@@ -8,7 +8,7 @@
  *
  */
 
-var patternlab_engine = function () {
+var patternlab_engine = function (config) {
   'use strict';
 
   var path = require('path'),
@@ -24,7 +24,7 @@ var patternlab_engine = function () {
   patternlab = {};
 
   patternlab.package = fs.readJSONSync('./package.json');
-  patternlab.config = fs.readJSONSync('./config.json');
+  patternlab.config = config || fs.readJSONSync(path.resolve(__dirname, '../config.json'));
 
   var paths = patternlab.config.paths;
 
@@ -100,7 +100,7 @@ var patternlab_engine = function () {
           console.log(err);
           return;
         }
-        pattern_assembler.process_pattern_iterative(file.substring(2), patternlab);
+        pattern_assembler.process_pattern_iterative(path.resolve(file), patternlab);
     });
 
     //now that all the main patterns are known, look for any links that might be within data and expand them
@@ -125,7 +125,7 @@ var patternlab_engine = function () {
           console.log(err);
           return;
         }
-        pattern_assembler.process_pattern_recursive(file.substring(2), patternlab);
+        pattern_assembler.process_pattern_recursive(path.resolve(file), patternlab);
       });
 
 

package.gulp.json

@@ -2,21 +2,24 @@
   "name": "patternlab-node",
   "description": "Pattern Lab is a collection of tools to help you create atomic design systems. This is the node command line interface (CLI).",
   "version": "1.0.1",
-  "devDependencies": {
-    "browser-sync": "^2.10.0",
+  "main": "./builder/patternlab.js",
+  "dependencies": {
     "del": "^2.0.2",
     "diveSync": "^0.3.0",
     "fs-extra": "^0.26.2",
     "glob": "^6.0.1",
+    "html-entities": "^1.2.0",
+    "mustache": "^2.2.0"
+  },
+  "devDependencies": {
+    "browser-sync": "^2.10.0",
     "gulp": "^3.9.0",
     "gulp-connect": "^2.2.0",
     "gulp-copy": "0.0.2",
     "gulp-header": "^1.7.1",
     "gulp-load": "^0.1.1",
     "gulp-nodeunit": "0.0.5",
-    "gulp-strip-banner": "0.0.2",
-    "html-entities": "^1.2.0",
-    "mustache": "^2.2.0"
+    "gulp-strip-banner": "0.0.2"
   },
   "keywords": [
     "Pattern Lab",

package.json

@@ -2,21 +2,24 @@
   "name": "patternlab-node",
   "description": "Pattern Lab is a collection of tools to help you create atomic design systems. This is the node command line interface (CLI).",
   "version": "1.0.1",
-  "devDependencies": {
-    "bs-html-injector": "^3.0.0",
+  "main": "./builder/patternlab.js",
+  "dependencies": {
     "diveSync": "^0.3.0",
     "fs-extra": "^0.26.2",
     "glob": "^6.0.1",
+    "html-entities": "^1.2.0",
+    "matchdep": "^1.0.0",
+    "mustache": "^2.2.0",
+    "handlebars": "^4.0.5"
+  },
+  "devDependencies": {
+    "bs-html-injector": "^3.0.0",
     "grunt": "~0.4.5",
     "grunt-browser-sync": "^2.2.0",
     "grunt-contrib-concat": "^0.5.1",
     "grunt-contrib-copy": "^0.8.2",
     "grunt-contrib-nodeunit": "^0.4.1",
-    "grunt-contrib-watch": "^0.6.1",
-    "handlebars": "^4.0.5",
-    "html-entities": "^1.2.0",
-    "matchdep": "^1.0.0",
-    "mustache": "^2.2.0"
+    "grunt-contrib-watch": "^0.6.1"
   },
   "keywords": [
     "Pattern Lab",

test/pattern_assembler_tests.js

@@ -317,7 +317,7 @@
 						return;
 					}
 
-					pattern_assembler.process_pattern_iterative(file.substring(2), patternlab);
+					pattern_assembler.process_pattern_iterative(path.resolve(file), patternlab);
 				}
 			);
 
@@ -341,7 +341,7 @@
 						return;
 					}
 
-					pattern_assembler.process_pattern_recursive(file.substring(2), patternlab);
+					pattern_assembler.process_pattern_recursive(path.resolve(file), patternlab);
 				}
 			);
 
@@ -613,11 +613,12 @@
 			var patternlab = {};
 			//THIS IS BAD.
 			patternlab.config = fs.readJSONSync('./config.json');
-			patternlab.config.patterns = {source: patterns_dir};
-			patternlab.data = fs.readJSONSync('./source/_data/data.json');
-			patternlab.listitems = fs.readJSONSync('./source/_data/listitems.json');
-			patternlab.header = fs.readFileSync('./source/_patternlab-files/pattern-header-footer/header.html', 'utf8');
-			patternlab.footer = fs.readFileSync('./source/_patternlab-files/pattern-header-footer/footer.html', 'utf8');
+			patternlab.config.paths.source.patterns = patterns_dir;
+
+			patternlab.data = fs.readJSONSync(path.resolve(patternlab.config.paths.source.data, 'data.json'));
+			patternlab.listitems = fs.readJSONSync(path.resolve(patternlab.config.paths.source.data, 'listitems.json'));
+			patternlab.header = fs.readFileSync(path.resolve(patternlab.config.paths.source.patternlabFiles, 'pattern-header-footer/header.html'), 'utf8');
+			patternlab.footer = fs.readFileSync(path.resolve(patternlab.config.paths.source.patternlabFiles, 'pattern-header-footer/footer.html'), 'utf8');
 			patternlab.patterns = [];
 			patternlab.data.link = {};
 			patternlab.partials = {};
@@ -641,7 +642,7 @@
 						return;
 					}
 
-					pattern_assembler.process_pattern_iterative(file.substring(2), patternlab);
+					pattern_assembler.process_pattern_iterative(path.resolve(file), patternlab);
 				}
 			);