Skip to content

Commit 3912333

Browse files
author
Brian Muenzenmeyer
committed
Merge pull request pattern-lab#181 from pattern-lab/dev
Dev push for v0.15.0
2 parents beb6d7e + 0afb234 commit 3912333

17 files changed

+47
-45
lines changed

‎.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
language: node_js
22

33
node_js:
4+
- stable
5+
- 4.0
46
- 0.12
57
- 0.11
68

‎CHANGELOG

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
22

3+
PL-node-v0.15.0
4+
- CHG: Updated package.json devDependencies for Node 4.X and 5.X support.
5+
- CHG: Updated package.gulp.json devDependencies for Node 4.X and 5.X support.
6+
37
PL-node-v0.14.0
48
- ADD: Support for style modifiers
59
- ADD: Support for styleGuideExcludes

‎README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ This repository contains the vanilla builder logic, grunt and gulp configuration
1010

1111
* Download the [latest release of patternlab-node](https://github.com/pattern-lab/patternlab-node/releases/latest) from Github
1212
* Via npm, run `npm install patternlab-node` (Note this will auto install the grunt version currently. see below)
13-
* **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.
13+
* **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).
1414

1515
### Choose Your Adventure! Now Vanilla, Grunt & Gulp
1616

1717
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.
1818

19-
**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.
20-
2119
### Getting Started - Grunt
2220

2321
To run patternlab-node using grunt, do the following in the directory you downloaded and extracted the zipped release:

‎builder/lineage_hunter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* patternlab-node - v0.14.0 - 2015
2+
* patternlab-node - v0.15.0 - 2015
33
*
44
* Brian Muenzenmeyer, and the web community.
55
* Licensed under the MIT license.

‎builder/list_item_hunter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* patternlab-node - v0.14.0 - 2015
2+
* patternlab-node - v0.15.0 - 2015
33
*
44
* Brian Muenzenmeyer, and the web community.
55
* Licensed under the MIT license.

‎builder/media_hunter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* patternlab-node - v0.14.0 - 2015
2+
* patternlab-node - v0.15.0 - 2015
33
*
44
* Brian Muenzenmeyer, and the web community.
55
* Licensed under the MIT license.

‎builder/object_factory.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* patternlab-node - v0.14.0 - 2015
2+
* patternlab-node - v0.15.0 - 2015
33
*
44
* Brian Muenzenmeyer, and the web community.
55
* Licensed under the MIT license.

‎builder/parameter_hunter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* patternlab-node - v0.14.0 - 2015
2+
* patternlab-node - v0.15.0 - 2015
33
*
44
* Brian Muenzenmeyer, and the web community.
55
* Licensed under the MIT license.

‎builder/pattern_assembler.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* patternlab-node - v0.14.0 - 2015
2+
* patternlab-node - v0.15.0 - 2015
33
*
44
* Brian Muenzenmeyer, and the web community.
55
* Licensed under the MIT license.
@@ -262,13 +262,7 @@
262262
throw 'Could not find pattern with key ' + key;
263263
}
264264

265-
/**
266-
* Recursively merge properties of two objects.
267-
*
268-
* @param {Object} obj1 If obj1 has properties obj2 doesn't, add to obj2.
269-
* @param {Object} obj2 This object's properties have priority over obj1.
270-
* @returns {Object} obj2
271-
*/
265+
272266
function mergeData(obj1, obj2){
273267
if(typeof obj2 === 'undefined'){
274268
obj2 = {};

‎builder/pattern_exporter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* patternlab-node - v0.14.0 - 2015
2+
* patternlab-node - v0.15.0 - 2015
33
*
44
* Brian Muenzenmeyer, and the web community.
55
* Licensed under the MIT license.

‎builder/patternlab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* patternlab-node - v0.14.0 - 2015
2+
* patternlab-node - v0.15.0 - 2015
33
*
44
* Brian Muenzenmeyer, and the web community.
55
* Licensed under the MIT license.

‎builder/patternlab_grunt.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* patternlab-node - v0.14.0 - 2015
2+
* patternlab-node - v0.15.0 - 2015
33
*
44
* Brian Muenzenmeyer, and the web community.
55
* Licensed under the MIT license.

‎builder/patternlab_gulp.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* patternlab-node - v0.14.0 - 2015
2+
* patternlab-node - v0.15.0 - 2015
33
*
44
* Brian Muenzenmeyer, and the web community.
55
* Licensed under the MIT license.

‎builder/pseudopattern_hunter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* patternlab-node - v0.14.0 - 2015
2+
* patternlab-node - v0.15.0 - 2015
33
*
44
* Brian Muenzenmeyer, and the web community.
55
* Licensed under the MIT license.

‎builder/style_modifier_hunter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* patternlab-node - v0.14.0 - 2015
2+
* patternlab-node - v0.15.0 - 2015
33
*
44
* Brian Muenzenmeyer, and the web community.
55
* Licensed under the MIT license.

‎package.gulp.json

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
11
{
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).",
4-
"version": "0.14.0",
4+
"version": "0.15.0",
55
"devDependencies": {
6-
"browser-sync": "^2.8.2",
7-
"del": "^1.2.1",
8-
"diveSync": "^0.2.1",
9-
"fs-extra": "^0.14.0",
10-
"glob": "^4.3.5",
11-
"gulp": "^3.8.8",
12-
"gulp-connect": "^2.0.6",
6+
"browser-sync": "^2.10.0",
7+
"del": "^2.0.2",
8+
"diveSync": "^0.3.0",
9+
"fs-extra": "^0.26.2",
10+
"glob": "^6.0.1",
11+
"gulp": "^3.9.0",
12+
"gulp-connect": "^2.2.0",
1313
"gulp-copy": "0.0.2",
14-
"gulp-header": "^1.0.5",
14+
"gulp-header": "^1.7.1",
1515
"gulp-load": "^0.1.1",
1616
"gulp-nodeunit": "0.0.5",
1717
"gulp-strip-banner": "0.0.2",
18-
"html-entities": "^1.1.1",
19-
"mustache": "^1.0.0"
18+
"html-entities": "^1.2.0",
19+
"mustache": "^2.2.0"
2020
},
2121
"keywords": [
2222
"Pattern Lab",
2323
"Atomic Web Design",
2424
"Node",
2525
"Grunt",
26+
"Gulp",
2627
"Javascript"
2728
],
2829
"repository": {
2930
"type": "git",
3031
"url": "git://github.com/pattern-lab/patternlab-node.git"
3132
},
33+
"bugs": "https://github.com/pattern-lab/patternlab-node/issues",
3234
"author": "Brian Muenzenmeyer",
3335
"license": "MIT",
3436
"scripts": {

‎package.json

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
11
{
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).",
4-
"version": "0.14.0",
4+
"version": "0.15.0",
55
"devDependencies": {
6-
"bs-html-injector": "^2.0.4",
7-
"diveSync": "^0.2.1",
8-
"fs-extra": "^0.24.0",
9-
"glob": "^4.3.5",
10-
"grunt": "~0.4.0",
11-
"grunt-browser-sync": "^2.1.3",
12-
"grunt-contrib-concat": "^0.5.0",
13-
"grunt-contrib-copy": "^0.7.0",
6+
"bs-html-injector": "^3.0.0",
7+
"diveSync": "^0.3.0",
8+
"fs-extra": "^0.26.2",
9+
"glob": "^6.0.1",
10+
"grunt": "~0.4.5",
11+
"grunt-browser-sync": "^2.2.0",
12+
"grunt-contrib-concat": "^0.5.1",
13+
"grunt-contrib-copy": "^0.8.2",
1414
"grunt-contrib-nodeunit": "^0.4.1",
1515
"grunt-contrib-watch": "^0.6.1",
16-
"html-entities": "^1.1.1",
17-
"matchdep": "^0.3.0",
18-
"mustache": "^1.0.0"
16+
"html-entities": "^1.2.0",
17+
"matchdep": "^1.0.0",
18+
"mustache": "^2.2.0"
1919
},
2020
"keywords": [
2121
"Pattern Lab",
2222
"Atomic Web Design",
2323
"Node",
2424
"Grunt",
25+
"Gulp",
2526
"Javascript"
2627
],
2728
"repository": {
2829
"type": "git",
2930
"url": "git://github.com/pattern-lab/patternlab-node.git"
3031
},
32+
"bugs": "https://github.com/pattern-lab/patternlab-node/issues",
3133
"author": "Brian Muenzenmeyer",
3234
"license": "MIT",
3335
"scripts": {

0 commit comments

Comments
 (0)