Merge pull request #181 from pattern-lab/dev

Brian Muenzenmeyer · Brian Muenzenmeyer · commit 39123338a215 · 2015-11-12T01:10:14.000-06:00
Dev push for v0.15.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,8 @@
 language: node_js
 
 node_js:
+  - stable
+  - 4.0
   - 0.12
   - 0.11
 
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-node-v0.15.0
+- CHG: Updated package.json devDependencies for Node 4.X and 5.X support.
+- CHG: Updated package.gulp.json devDependencies for Node 4.X and 5.X support.
+
 PL-node-v0.14.0
 - ADD: Support for style modifiers
 - ADD: Support for styleGuideExcludes
diff --git a/README.md b/README.md
@@ -10,14 +10,12 @@ This repository contains the vanilla builder logic, grunt and gulp configuration
 
 * Download the [latest release of patternlab-node](https://github.com/pattern-lab/patternlab-node/releases/latest) from Github
 * Via npm, run `npm install patternlab-node` (Note this will auto install the grunt version currently. see below)
-* **NOTE** Node version 4.X is not officially supported yet, citing [a lot of Windows issues](https://github.com/nodejs/node-gyp/issues/629), including [mine](https://github.com/pattern-lab/patternlab-node/issues/162). Upgrade node at your own risk until otherwise stated.
+* **NOTE** Node version 4.X and 5.X have tentative support, citing [a lot of Windows issues](https://github.com/nodejs/node-gyp/issues/629), including [mine](https://github.com/pattern-lab/patternlab-node/issues/162). Upgrade node at your own risk until otherwise stated. I've tried to catalog some issues and troubleshooting steps on the [wiki](https://github.com/pattern-lab/patternlab-node/wiki/Windows-Issues).
 
 ### Choose Your Adventure! Now Vanilla, Grunt & Gulp
 
 This repository ships with two `package.json` files, a `Gruntfile.js`, and a `gulpfile.js`. The default is grunt currently. The core builder is not dependent on either.
 
-**HELP WANTED** Please help me test both of the configurations by [reporting](https://github.com/pattern-lab/patternlab-node/blob/dev/CONTRIBUTING.md) any issues encountered.
-
 ### Getting Started - Grunt
 
 To run patternlab-node using grunt, do the following in the directory you downloaded and extracted the zipped release:
diff --git a/builder/lineage_hunter.js b/builder/lineage_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/list_item_hunter.js b/builder/list_item_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/media_hunter.js b/builder/media_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/object_factory.js b/builder/object_factory.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/parameter_hunter.js b/builder/parameter_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/pattern_assembler.js b/builder/pattern_assembler.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
@@ -262,13 +262,7 @@
       throw 'Could not find pattern with key ' + key;
     }
 
-    /**
-     * Recursively merge properties of two objects.
-     *
-     * @param {Object} obj1 If obj1 has properties obj2 doesn't, add to obj2.
-     * @param {Object} obj2 This object's properties have priority over obj1.
-     * @returns {Object} obj2
-     */
+    
     function mergeData(obj1, obj2){
       if(typeof obj2 === 'undefined'){
         obj2 = {};
diff --git a/builder/pattern_exporter.js b/builder/pattern_exporter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/patternlab.js b/builder/patternlab.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/patternlab_grunt.js b/builder/patternlab_grunt.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/patternlab_gulp.js b/builder/patternlab_gulp.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/pseudopattern_hunter.js b/builder/pseudopattern_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/style_modifier_hunter.js b/builder/style_modifier_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/package.gulp.json b/package.gulp.json
@@ -1,34 +1,36 @@
 {
   "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": "0.14.0",
+  "version": "0.15.0",
   "devDependencies": {
-    "browser-sync": "^2.8.2",
-    "del": "^1.2.1",
-    "diveSync": "^0.2.1",
-    "fs-extra": "^0.14.0",
-    "glob": "^4.3.5",
-    "gulp": "^3.8.8",
-    "gulp-connect": "^2.0.6",
+    "browser-sync": "^2.10.0",
+    "del": "^2.0.2",
+    "diveSync": "^0.3.0",
+    "fs-extra": "^0.26.2",
+    "glob": "^6.0.1",
+    "gulp": "^3.9.0",
+    "gulp-connect": "^2.2.0",
     "gulp-copy": "0.0.2",
-    "gulp-header": "^1.0.5",
+    "gulp-header": "^1.7.1",
     "gulp-load": "^0.1.1",
     "gulp-nodeunit": "0.0.5",
     "gulp-strip-banner": "0.0.2",
-    "html-entities": "^1.1.1",
-    "mustache": "^1.0.0"
+    "html-entities": "^1.2.0",
+    "mustache": "^2.2.0"
   },
   "keywords": [
     "Pattern Lab",
     "Atomic Web Design",
     "Node",
     "Grunt",
+    "Gulp",
     "Javascript"
   ],
   "repository": {
     "type": "git",
     "url": "git://github.com/pattern-lab/patternlab-node.git"
   },
+  "bugs": "https://github.com/pattern-lab/patternlab-node/issues",
   "author": "Brian Muenzenmeyer",
   "license": "MIT",
   "scripts": {
diff --git a/package.json b/package.json
@@ -1,33 +1,35 @@
 {
   "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": "0.14.0",
+  "version": "0.15.0",
   "devDependencies": {
-    "bs-html-injector": "^2.0.4",
-    "diveSync": "^0.2.1",
-    "fs-extra": "^0.24.0",
-    "glob": "^4.3.5",
-    "grunt": "~0.4.0",
-    "grunt-browser-sync": "^2.1.3",
-    "grunt-contrib-concat": "^0.5.0",
-    "grunt-contrib-copy": "^0.7.0",
+    "bs-html-injector": "^3.0.0",
+    "diveSync": "^0.3.0",
+    "fs-extra": "^0.26.2",
+    "glob": "^6.0.1",
+    "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",
-    "html-entities": "^1.1.1",
-    "matchdep": "^0.3.0",
-    "mustache": "^1.0.0"
+    "html-entities": "^1.2.0",
+    "matchdep": "^1.0.0",
+    "mustache": "^2.2.0"
   },
   "keywords": [
     "Pattern Lab",
     "Atomic Web Design",
     "Node",
     "Grunt",
+    "Gulp",
     "Javascript"
   ],
   "repository": {
     "type": "git",
     "url": "git://github.com/pattern-lab/patternlab-node.git"
   },
+  "bugs": "https://github.com/pattern-lab/patternlab-node/issues",
   "author": "Brian Muenzenmeyer",
   "license": "MIT",
   "scripts": {

-Original file line number
+Diff line change
@@ @@ -1,6 +1,8 @@ @@
 language: node_js
 node_js:
 +  - stable
 +  - 4.0
   - 0.12
   - 0.11
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * patternlab-node - v0.14.0 - 2015`
	`2`	`+ * patternlab-node - v0.15.0 - 2015`
`3`	`3`	`*`
`4`	`4`	`* Brian Muenzenmeyer, and the web community.`
`5`	`5`	`* Licensed under the MIT license.`