pattern-lab · sghoweri · Feb 9, 2019 · Sep 3, 2018 · Sep 9, 2018 · Sep 9, 2018
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -6,7 +6,7 @@ No pull request is too small. Check out any [help wanted 🆘](https://github.co
 
 ## Prerequisites
 
-To get started, you'll need Node 8 or higher. Managing Node with [nvm](https://github.com/creationix/nvm) is recommended. Once installed, you can target the version of Node we specify within the [`.nvmrc`](https://github.com/pattern-lab/patternlab-node/blob/master/.nvmrc) file.
+To get started, you'll need Node installed. Managing Node with [nvm](https://github.com/creationix/nvm) is recommended. Once installed, you can target the version of Node we specify within the [`.nvmrc`](https://github.com/pattern-lab/patternlab-node/blob/master/.nvmrc) file.
 
 ```sh
 nvm install <<version>>

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 <!-- before posting an issue, try chatting on https://gitter.im/pattern-lab/node -->
 
-<!-- before posting an issue, verify you are running at least Node 6 -->
+<!-- before posting an issue, verify you are running at least Node 8 -->
 
 I am using Pattern Lab Node `vX.X.X` on `Windows | Mac | Linux`, with Node `vX.X.X`, using a `Gulp | Grunt | Vanilla | Custom` Edition.
 

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-8.9.4
+10.0.0
diff --git a/.prettierignore b/.prettierignore
@@ -9,3 +9,6 @@ packages/core/scripts/api.handlebars
 packages/core/scripts/events.handlebars
 packages/core/test/files/annotations.js
 **/uikit-workshop/src/js/**/*
+*.json
+*.md
+*.scss
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ before_install:
 
 before_script:
   - npm install -g lerna@3.2.1
-  - npm run bootstrap
+  - npm run setup
   - lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
   - lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
   - lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -0,0 +1,17 @@
+# This is a comment.
+# Each line is a file pattern followed by one or more owners.
+
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence,
+# @global-owner1 and @global-owner2 will be requested for
+# review when someone opens a pull request.
+@pattern-lab/trusted-committers
+
+# CLI owner
+/packages/cli @raphaelokon
+
+# uikit-workshop owner
+/packages/uikit-workshop @sghoweri
+
+# engine-nunjucks owner
+/packages/engine-nunjucks @danwhite85
diff --git a/package.json b/package.json
@@ -5,8 +5,10 @@
   "private": true,
   "scripts": {
     "bootstrap": "lerna bootstrap",
+    "setup": "npm run bootstrap && npm run build:uikit",
+    "build:uikit": "lerna exec --scope @pattern-lab/uikit-workshop -- npm run build",
     "precommit": "pretty-quick --staged",
-    "prettier": "prettier --config .prettierrc --write ./**/*.js",
+    "prettier": "prettier --config .prettierrc --write ./**/*.js --ignore-path .prettierignore",
     "test": "lerna run test",
     "clean": "git clean -dfx"
   },

@@ -0,0 +1 @@
+10.0.0
@@ -1,7 +1,7 @@
 language: node_js
 node_js:
   - node
-  - 6
+  - 8
 before_script:
   - npm install edition-node
   - npm install starterkit-mustache-base

@@ -49,7 +49,7 @@
   "bugs": "https://github.com/pattern-lab/patternlab-node/issues",
   "license": "MIT",
   "engines": {
-    "node": ">=6.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/core/.nvmrc b/packages/core/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/core/README.md b/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
 

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -65,7 +65,7 @@
     "test": "tap test/*_tests.js --reporter spec --coverage"
   },
   "engines": {
-    "node": ">=6.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/core/src/lib/addPattern.js b/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);
   }
 };
diff --git a/packages/core/src/lib/compose.js b/packages/core/src/lib/compose.js
@@ -164,6 +164,7 @@ module.exports = function(pattern, patternlab) {
             logger.info(err);
           }
           allFooterData = _.merge(allFooterData, pattern.jsonFileData);
+          allFooterData.cacheBuster = patternlab.cacheBuster;
           allFooterData.patternLabFoot = footerPartial;
 
           return render(patternlab.userFoot, allFooterData).then(footerHTML => {

diff --git a/packages/core/src/lib/patternlab.js b/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)
+        );
+      });
     });
   }
 

diff --git a/packages/core/src/lib/pseudopattern_hunter.js b/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(

diff --git a/packages/development-edition-engine-handlebars/.nvmrc b/packages/development-edition-engine-handlebars/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/development-edition-engine-handlebars/package.json b/packages/development-edition-engine-handlebars/package.json
@@ -21,6 +21,9 @@
     "type": "git",
     "url": "git://github.com/pattern-lab/patternlab-node.git"
   },
+  "engines": {
+    "node": ">=10.0"
+  },
   "dependencies": {
     "@pattern-lab/cli": "^0.0.1-beta.0",
     "@pattern-lab/core": "^3.0.0-beta.0",

diff --git a/packages/development-edition-engine-react/.nvmrc b/packages/development-edition-engine-react/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/development-edition-engine-react/package.json b/packages/development-edition-engine-react/package.json
@@ -31,6 +31,6 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=6.0"
+    "node": ">=10.0"
   }
 }
diff --git a/packages/edition-node-gulp/.nvmrc b/packages/edition-node-gulp/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/edition-node-gulp/package.json b/packages/edition-node-gulp/package.json
@@ -27,7 +27,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=6.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/edition-node/.nvmrc b/packages/edition-node/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/edition-node/package.json b/packages/edition-node/package.json
@@ -27,7 +27,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=6.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/engine-handlebars/.nvmrc b/packages/engine-handlebars/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/engine-handlebars/package.json b/packages/engine-handlebars/package.json
@@ -22,7 +22,7 @@
   "license": "MIT",
   "scripts": {},
   "engines": {
-    "node": ">=4.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/engine-liquid/.nvmrc b/packages/engine-liquid/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/engine-liquid/package.json b/packages/engine-liquid/package.json
@@ -22,7 +22,7 @@
   "license": "MIT",
   "scripts": {},
   "engines": {
-    "node": ">=0.1"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/engine-mustache/.nvmrc b/packages/engine-mustache/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/engine-mustache/README.md b/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.
diff --git a/packages/engine-mustache/package.json b/packages/engine-mustache/package.json
@@ -22,7 +22,7 @@
   "license": "MIT",
   "scripts": {},
   "engines": {
-    "node": ">=0.1"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/engine-nunjucks/.nvmrc b/packages/engine-nunjucks/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/engine-nunjucks/package.json b/packages/engine-nunjucks/package.json
@@ -11,7 +11,7 @@
     "nunjucks": "3.1.3"
   },
   "engines": {
-    "node": ">=4.0"
+    "node": ">=10.0"
   },
   "keywords": [
     "Pattern Lab",

diff --git a/packages/engine-react/.nvmrc b/packages/engine-react/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/engine-react/package.json b/packages/engine-react/package.json
@@ -30,7 +30,7 @@
   "license": "MIT",
   "scripts": {},
   "engines": {
-    "node": ">=6"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/engine-twig/.nvmrc b/packages/engine-twig/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/engine-twig/package.json b/packages/engine-twig/package.json
@@ -22,7 +22,7 @@
   "license": "MIT",
   "scripts": {},
   "engines": {
-    "node": ">=4.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/engine-underscore/.nvmrc b/packages/engine-underscore/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/engine-underscore/package.json b/packages/engine-underscore/package.json
@@ -23,7 +23,7 @@
     "lint": "eslint **/*.js"
   },
   "engines": {
-    "node": ">=4.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/live-server/.nvmrc b/packages/live-server/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/live-server/package.json b/packages/live-server/package.json
@@ -43,7 +43,7 @@
   "repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/live-server",
   "bugs": "https://github.com/pattern-lab/patternlab-node/issues",
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/plugin-tab/.nvmrc b/packages/plugin-tab/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/plugin-tab/package.json b/packages/plugin-tab/package.json
@@ -8,6 +8,9 @@
     "glob": "7.0.0",
     "lodash": "4.17.5"
   },
+  "engines": {
+    "node": ">=10.0"
+  },
   "repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/plugin-tab",
   "bugs": "https://github.com/pattern-lab/patternlab-node/issues",
   "scripts": {

@@ -0,0 +1 @@
+10.0.0
@@ -0,0 +1,5 @@
+// .rc config file allowing users to customize folder locations, etc that are wired up to be configurable in the build process (via cosmic config) -- this example lives in the root of UIKit however can live in a higher-level parent as part of your project's config!
+
+module.exports = {
+  // buildDir: __dirname + '/www/pattern-lab',
+}