Merge commit 'c40d94b92aa706cf8bce048a249a34a428e6c35b' into feature/uikit-refactor-p7

# Conflicts:
#	packages/uikit-workshop/package.json

Author: sghoweri

packages/core/README.md

@@ -28,9 +28,9 @@ See [Usage](#usage) for more information.
 
 For users wanting a more pre-packaged experience several editions are available.
 
-* [Pattern Lab/Node: Vanilla Edition](https://github.com/pattern-lab/patternlab-node/packages/edition-node) contains info how to get started within a pure node environment.
+* [Pattern Lab/Node: Vanilla Edition](https://github.com/pattern-lab/patternlab-node/tree/dev/packages/edition-node) contains info how to get started within a pure node environment.
 
-* [Pattern Lab/Node: Gulp Edition](https://github.com/pattern-lab/patternlab-node/packages/edition-node-gulp) contains info how to get started within a Gulp task running environment.
+* [Pattern Lab/Node: Gulp Edition](https://github.com/pattern-lab/patternlab-node/tree/dev/packages/edition-node-gulp) contains info how to get started within a Gulp task running environment.
 
 
 ## Ecosystem
@@ -63,7 +63,7 @@ patternlab.serve({
 
 * Read more about the rest of [Public API](./docs), and already implemented for you within [Editions](#editions).
 
-* A full-featured [command line interface](https://github.com/pattern-lab/patternlab-node/packages/cli) is also available.
+* A full-featured [command line interface](https://github.com/pattern-lab/patternlab-node/tree/dev/packages/cli) is also available.
 
 ### Events
 

packages/core/src/lib/addPattern.js

@@ -41,12 +41,7 @@ module.exports = function(pattern, patternlab) {
       patternlab.partials[pattern.patternPartial] = pattern.patternDesc;
     }
 
-    //patterns sorted by name so the patterntype and patternsubtype is adhered to for menu building
-    patternlab.patterns.splice(
-      _.sortedIndexBy(patternlab.patterns, pattern, 'name'),
-      0,
-      pattern
-    );
+    patternlab.patterns.push(pattern);
     patternlab.graph.add(pattern);
   }
 };

packages/core/src/lib/patternlab.js

@@ -334,7 +334,12 @@ module.exports = class PatternLab {
         this.patterns.map(pattern => {
           return processIterative(pattern, self);
         })
-      );
+      ).then(() => {
+        // patterns sorted by name so the patterntype and patternsubtype is adhered to for menu building
+        this.patterns.sort((pattern1, pattern2) =>
+          pattern1.name.localeCompare(pattern2.name)
+        );
+      });
     });
   }
 

packages/core/src/lib/pseudopattern_hunter.js

@@ -12,6 +12,7 @@ const logger = require('./log');
 const readDocumentation = require('./readDocumentation');
 const lineage_hunter = new lh();
 const changes_hunter = new ch();
+const yaml = require('js-yaml');
 
 const pseudopattern_hunter = function() {};
 
@@ -22,9 +23,12 @@ pseudopattern_hunter.prototype.find_pseudopatterns = function(
   const paths = patternlab.config.paths;
 
   //look for a pseudo pattern by checking if there is a file containing same
-  //name, with ~ in it, ending in .json
+  //name, with ~ in it, ending in .json, .yml or .yaml
   const needle =
-    currentPattern.subdir + '/' + currentPattern.fileName + '~*.json';
+    currentPattern.subdir +
+    '/' +
+    currentPattern.fileName +
+    '~*.{json,yml,yaml}';
   const pseudoPatterns = glob.sync(needle, {
     cwd: paths.source.patterns,
     debug: false,
@@ -45,7 +49,9 @@ pseudopattern_hunter.prototype.find_pseudopatterns = function(
           paths.source.patterns,
           pseudoPatterns[i]
         );
-        variantFileData = fs.readJSONSync(variantFileFullPath);
+        variantFileData = yaml.safeLoad(
+          fs.readFileSync(variantFileFullPath, 'utf8')
+        );
       } catch (err) {
         logger.warning(
           `There was an error parsing pseudopattern JSON for ${
@@ -65,9 +71,13 @@ pseudopattern_hunter.prototype.find_pseudopatterns = function(
       const variantName = pseudoPatterns[i]
         .substring(pseudoPatterns[i].indexOf('~') + 1)
         .split('.')[0];
+      const variantExtension = pseudoPatterns[i]
+        .split('.')
+        .slice(-1)
+        .pop();
       const variantFilePath = path.join(
         currentPattern.subdir,
-        currentPattern.fileName + '~' + variantName + '.json'
+        currentPattern.fileName + '~' + variantName + '.' + variantExtension
       );
       const lm = fs.statSync(variantFileFullPath);
       const patternVariant = Pattern.create(

packages/engine-mustache/README.md

@@ -1,5 +1,5 @@
 ## The Mustache PatternEngine for Pattern Lab / Node
 
-This one should be included by default with [Pattern Lab Node Core](https://github.com/pattern-lab/patternlab-node/packages/core) and consumed by [Node Editions](https://github.com/pattern-lab?utf8=%E2%9C%93&query=edition-node).
+This one should be included by default with [Pattern Lab Node Core](https://github.com/pattern-lab/patternlab-node/tree/dev/packages/core) and consumed by [Node Editions](https://github.com/pattern-lab?utf8=%E2%9C%93&query=edition-node).
 
 If it's missing from your project for any reason, `npm install @pattern-lab/engine-mustache` should do the trick.

packages/uikit-workshop/package.json

@@ -28,9 +28,6 @@
   "license": "MIT",
   "repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop",
   "bugs": "https://github.com/pattern-lab/patternlab-node/issues",
-  "peerDependencies": {
-    "jshint": "^2.9.5"
-  },
   "devDependencies": {
     "@babel/core": "^7.0.0",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
@@ -50,7 +47,6 @@
     "css-loader": "^1.0.0",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "github:jantimon/html-webpack-plugin#webpack-4",
-    "jshint": "^2.9.6",
     "mini-css-extract-plugin": "^0.4.1",
     "no-emit-webpack-plugin": "^1.0.0",
     "node-sass": "^4.9.3",
@@ -90,7 +86,6 @@
     "iframe-resizer": "^3.6.2",
     "jquery": "^3.3.1",
     "js-cookie": "^2.2.0",
-    "jshint": "^2.9.5",
     "mousetrap": "^1.6.2",
     "preact": "^8.3.1",
     "preact-compat": "^3.18.4",