From d5de17372425adcddd4c2043b368f4f9c6f43bf6 Mon Sep 17 00:00:00 2001 From: BRIAN MUENZENMEYER Date: Thu, 12 Nov 2015 00:54:05 -0600 Subject: [PATCH 1/4] Updated package.json devDependencies for grunt and gulp configurations. --- package.gulp.json | 20 ++++++++++---------- package.json | 26 ++++++++++++++------------ 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/package.gulp.json b/package.gulp.json index 1ee3ab48b..ad7e69c77 100644 --- a/package.gulp.json +++ b/package.gulp.json @@ -3,20 +3,20 @@ "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", "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", diff --git a/package.json b/package.json index 75ab5d5e8..93d648ca8 100644 --- a/package.json +++ b/package.json @@ -3,37 +3,39 @@ "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", "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": { "test": "grunt travis --verbose" }, "engines": { - "node": ">=0.1" + "node": ">=0.1 <4.0" } } From 9b1d6a939bbfcea72dbff17344edd8a276c3f26d Mon Sep 17 00:00:00 2001 From: BRIAN MUENZENMEYER Date: Thu, 12 Nov 2015 00:55:43 -0600 Subject: [PATCH 2/4] Updated the changelog and readme to reflext node 4 and 5 support. --- CHANGELOG | 4 ++++ README.md | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 79c3cc66f..df3b02510 100644 --- 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 index 2272f8946..820ecf1e6 100644 --- 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: From 56c0efa19ee07ac16a1cf1964f5ff74fb1bb37ed Mon Sep 17 00:00:00 2001 From: BRIAN MUENZENMEYER Date: Thu, 12 Nov 2015 00:59:32 -0600 Subject: [PATCH 3/4] bumped the version --- builder/lineage_hunter.js | 2 +- builder/list_item_hunter.js | 2 +- builder/media_hunter.js | 2 +- builder/object_factory.js | 2 +- builder/parameter_hunter.js | 2 +- builder/pattern_assembler.js | 10 ++-------- builder/pattern_exporter.js | 2 +- builder/patternlab.js | 2 +- builder/patternlab_grunt.js | 2 +- builder/patternlab_gulp.js | 2 +- builder/pseudopattern_hunter.js | 2 +- builder/style_modifier_hunter.js | 2 +- package.gulp.json | 4 +++- package.json | 4 ++-- 14 files changed, 18 insertions(+), 22 deletions(-) diff --git a/builder/lineage_hunter.js b/builder/lineage_hunter.js index f908fe90f..4bd4acc9c 100644 --- 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 index decef1082..970e44f98 100644 --- 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 index 9eddbbac4..94ea61e09 100644 --- 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 index 2c91bc006..685f95196 100644 --- 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 index c19effb22..1d1962008 100644 --- 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 index 214e066fa..8fc134c9e 100644 --- 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 index 816a1d0ab..5ac4421d1 100644 --- 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 index 662b1105f..25b2232de 100644 --- 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 index 7cb6bb7d7..3e09643fd 100644 --- 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 index eceabee57..2b1db5d0c 100644 --- 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 index f085fe3f6..d47153cbe 100644 --- 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 index 38e0de440..139fc9b2f 100644 --- 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 index ad7e69c77..288f11faa 100644 --- a/package.gulp.json +++ b/package.gulp.json @@ -1,7 +1,7 @@ { "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.10.0", "del": "^2.0.2", @@ -23,12 +23,14 @@ "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 index 93d648ca8..c451cb4d4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "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": "^3.0.0", "diveSync": "^0.3.0", @@ -36,6 +36,6 @@ "test": "grunt travis --verbose" }, "engines": { - "node": ">=0.1 <4.0" + "node": ">=0.1" } } From 0afb234bd5e55a155c0230a11c2b05ca0e01c0cb Mon Sep 17 00:00:00 2001 From: BRIAN MUENZENMEYER Date: Thu, 12 Nov 2015 01:00:39 -0600 Subject: [PATCH 4/4] pushed the travis config with more node options. fixes #162 fixes #180 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 25b0a05cd..611cfd7d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: node_js node_js: + - stable + - 4.0 - 0.12 - 0.11