Merge pull request #249 from pattern-lab/dev

Brian Muenzenmeyer · Brian Muenzenmeyer · commit e132d89608ea · 2016-02-15T08:24:11.000-06:00
Pattern Lab Node 1.1.1
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-node-v1.1.1
+- FIX: Fixed issue where alternate patterns are added to end of styleguide instead of inline with their parent pattern.
+
 PL-node-v1.1.0
 - FIX: Fixed issue where partials containing styleModifiers with integers were not found correctly under all circumstances
 - FIX: Fixed issue where excluded patterns were still rendered on the Pattern Lab site. Now they do not directly get rendered via the menu, view all links, or the styleguide, but are accessible for inclusion as pattern partials, and can be accessed via lineage.
diff --git a/builder/lineage_hunter.js b/builder/lineage_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v1.1.0 - 2016 
+ * patternlab-node - v1.1.1 - 2016 
  * 
  * 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 - v1.1.0 - 2016 
+ * patternlab-node - v1.1.1 - 2016 
  * 
  * 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 - v1.1.0 - 2016 
+ * patternlab-node - v1.1.1 - 2016 
  * 
  * 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 - v1.1.0 - 2016 
+ * patternlab-node - v1.1.1 - 2016 
  * 
  * 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 - v1.1.0 - 2016 
+ * patternlab-node - v1.1.1 - 2016 
  * 
  * 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 - v1.1.0 - 2016 
+ * patternlab-node - v1.1.1 - 2016 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/pattern_exporter.js b/builder/pattern_exporter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v1.1.0 - 2016 
+ * patternlab-node - v1.1.1 - 2016 
  * 
  * 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 - v1.1.0 - 2016 
+ * patternlab-node - v1.1.1 - 2016 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
@@ -162,6 +162,18 @@ var patternlab_engine = function (config) {
     patternlab.patternPaths = {};
     patternlab.viewAllPaths = {};
 
+    //sort all patterns explicitly.
+    patternlab.patterns = patternlab.patterns.sort(function(a,b){
+      if (a.name > b.name) {
+        return 1;
+      }
+      if (a.name < b.name) {
+        return -1;
+      }
+      // a must be equal to b
+      return 0;
+    });
+
     //find mediaQueries
     media_hunter.find_media_queries('./source/css', patternlab);
 
@@ -239,18 +251,6 @@ var patternlab_engine = function (config) {
     //build the patternlab website
     var patternlabSiteTemplate = fs.readFileSync(path.resolve(paths.source.patternlabFiles, 'index.mustache'), 'utf8');
 
-    //sort all patterns explicitly.
-    patternlab.patterns = patternlab.patterns.sort(function(a,b){
-      if (a.name > b.name) {
-        return 1;
-      }
-      if (a.name < b.name) {
-        return -1;
-      }
-      // a must be equal to b
-      return 0;
-    });
-
     //loop through all patterns.to build the navigation
     //todo: refactor this someday
     for(var i = 0; i < patternlab.patterns.length; i++){
diff --git a/builder/patternlab_grunt.js b/builder/patternlab_grunt.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v1.1.0 - 2016 
+ * patternlab-node - v1.1.1 - 2016 
  * 
  * 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 - v1.1.0 - 2016 
+ * patternlab-node - v1.1.1 - 2016 
  * 
  * 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 - v1.1.0 - 2016 
+ * patternlab-node - v1.1.1 - 2016 
  * 
  * 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 - v1.1.0 - 2016 
+ * patternlab-node - v1.1.1 - 2016 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/package.gulp.json b/package.gulp.json
@@ -1,13 +1,13 @@
 {
   "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.1.0",
+  "version": "1.1.1",
   "main": "./builder/patternlab.js",
   "dependencies": {
     "del": "^2.2.0",
     "diveSync": "^0.3.0",
     "fs-extra": "^0.26.5",
-    "glob": "^6.0.4",
+    "glob": "^7.0.0",
     "html-entities": "^1.2.0",
     "mustache": "^2.2.1"
   },
diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
   "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.1.0",
+  "version": "1.1.1",
   "main": "./builder/patternlab.js",
   "dependencies": {
     "diveSync": "^0.3.0",
     "fs-extra": "^0.26.2",
-    "glob": "^6.0.1",
+    "glob": "^7.0.0",
     "html-entities": "^1.2.0",
     "matchdep": "^1.0.0",
     "mustache": "^2.2.0"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * patternlab-node - v1.1.0 - 2016`
	`2`	`+ * patternlab-node - v1.1.1 - 2016`
`3`	`3`	`*`
`4`	`4`	`* Brian Muenzenmeyer, and the web community.`
`5`	`5`	`* Licensed under the MIT license.`