chore: merge dev into feature/monorep-updates

Author: bmuenzenmeyer

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+patreon: patternlab

README.md

@@ -61,6 +61,7 @@ Pattern Lab / Node wouldn't be what it is today without the support of the commu
 
 * **[Brad Frost](http://bradfrost.com/)**
 * [Marcos Peebles](https://twitter.com/marcospeebles)
+* [Maximilian Franzke](https://twitter.com/maedmaex)
 * [Susan Simkins](https://twitter.com/susanmsimkins)
 
 ## Contributing

netlify.toml

@@ -0,0 +1,2 @@
+[context.deploy-preview]
+  command = "npm run setup && npm run preview:hbs"

package.json

@@ -38,7 +38,8 @@
     "test": "lerna run test",
     "clean": "git clean -dfx",
     "publish": "npx lerna publish -m \"[skip travis] chore(release): publish %s\"",
-    "postpublish": "auto release"
+    "postpublish": "auto release",
+    "preview:hbs": "cd packages/development-edition-engine-handlebars && npx patternlab add --starterkits '@pattern-lab/starterkit-handlebars-vanilla' && npm run pl:build"
   },
   "nyc": {
     "exclude": [

packages/cli/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.0.3](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/[email protected]...@pattern-lab/[email protected]) (2019-10-14)
+
+**Note:** Version bump only for package @pattern-lab/cli
+
+
+
+
+
+
 # [1.0.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/[email protected]...@pattern-lab/[email protected]) (2019-08-23)
 
 

packages/cli/bin/inquiries/starterkit.js

@@ -20,28 +20,28 @@ const starterkitSetup = [
       {
         name: 'starterkit-twig-demo (Recommended)',
         value: '@pattern-lab/starterkit-twig-demo',
-      },         
+      },
       {
         name: 'starterkit-mustache-bootstrap',
         value: 'starterkit-mustache-bootstrap',
-      },    
+      },
       {
         name: 'starterkit-mustache-demo',
         value: '@pattern-lab/starterkit-mustache-demo',
-      },      
+      },
       {
         name: 'starterkit-mustache-foundation',
         value: 'starterkit-mustache-foundation',
-      },      
+      },
       {
         name: 'starterkit-mustache-materialdesign',
         value: 'starterkit-mustache-materialdesign',
-      },      
+      },
       {
         name: 'starterkit-mustache-base',
         value: '@pattern-lab/starterkit-mustache-base',
       },
-   
+
       new inquirer.Separator(),
       {
         name: 'Custom starterkit',

packages/cli/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@pattern-lab/cli",
   "description": "Command-line interface (CLI) for the @pattern-lab/core.",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "bin": {
     "patternlab": "bin/patternlab.js"
   },
   "author": {
     "name": "Raphael Okon"
   },
   "dependencies": {
-    "@pattern-lab/core": "^3.0.4",
+    "@pattern-lab/core": "^3.0.5",
     "@pattern-lab/live-server": "^1.3.4",
     "archiver": "2.1.1",
     "chalk": "2.4.1",

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pattern-lab/core",
   "description": "Create atomic design systems with Pattern Lab. This is the core API and orchestrator of the ecosystem.",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "main": "./src/index.js",
   "dependencies": {
     "@pattern-lab/engine-mustache": "^2.0.1",

packages/core/src/lib/object_factory.js

@@ -39,7 +39,7 @@ const Pattern = function(relPath, data, patternlab) {
 
   // this is the unique name, subDir + fileName (sans extension)
   this.name = '';
-  if (info.hasDir) {
+  if (info.hasDir && info.dirLevel > 2) {
     let variant = '';
 
     if (this.fileName.indexOf('~') !== -1) {
@@ -76,23 +76,24 @@ const Pattern = function(relPath, data, patternlab) {
     .trim(); //this is the display name for the ui. strip numeric + hyphen prefixes
 
   //00-atoms if needed
-  this.patternType = this.getDirLevel(0, info);
+  this.patternType = this.getDirLevel(0);
 
   // the top-level pattern group this pattern belongs to. 'atoms'
   this.patternGroup = this.patternType.replace(patternPrefixMatcher, '');
 
   //00-colors if needed
-  this.patternSubType = this.getDirLevel(1, info);
+  this.patternSubType = this.getDirLevel(1);
 
   // the sub-group this pattern belongs to.
   this.patternSubGroup = this.patternSubType.replace(patternPrefixMatcher, ''); // 'global'
 
   // the joined pattern group and subgroup directory
-  this.flatPatternPath = info.hasDir
-    ? this.subdir
-        .replace(/[/\\]/g, '-')
-        .replace(new RegExp('-' + info.dir + '$'), '')
-    : this.subdir.replace(/[\/\\]/g, '-'); // '00-atoms-00-global'
+  this.flatPatternPath =
+    info.hasDir && info.dirLevel > 2
+      ? this.subdir
+          .replace(/[/\\]/g, '-')
+          .replace(new RegExp('-' + info.dir + '$'), '')
+      : this.subdir.replace(/[\/\\]/g, '-'); // '00-atoms-00-global'
 
   // calculated path from the root of the public directory to the generated
   // (rendered!) html file for this pattern, to be shown in the iframe
@@ -214,11 +215,8 @@ Pattern.prototype = {
     return this.engine.findPartial(partialString);
   },
 
-  getDirLevel: function(level, info) {
+  getDirLevel: function(level) {
     const items = this.subdir.split(path.sep);
-    if (info.hasDir) {
-      items.pop();
-    }
 
     if (items[level]) {
       return items[level];

packages/core/src/lib/plugin_manager.js

@@ -2,7 +2,6 @@
 
 const plugin_manager = function() {
   const path = require('path');
-  const findModules = require('./findModules');
   const logger = require('./log');
 
   const pluginMatcher = /^plugin-(.*)$/;
@@ -38,25 +37,25 @@ const plugin_manager = function() {
    * @param {object} patternlab
    */
   function initializePlugins(patternlab) {
-    const nodeModulesPath = path.join(process.cwd(), 'node_modules');
-    const foundPlugins = findModules(nodeModulesPath, isPlugin);
+    const foundPlugins = Object.keys(patternlab.config.plugins || {});
     foundPlugins.forEach(plugin => {
-      logger.info(`Found plugin: plugin-${plugin.name}`);
+      logger.info(`Found plugin: ${plugin}`);
       logger.info(`Attempting to load and initialize plugin.`);
-      const pluginModule = loadPlugin(plugin.modulePath);
+      const pluginModule = loadPlugin(
+        path.join(process.cwd(), 'node_modules', plugin)
+      );
       pluginModule(patternlab);
     });
   }
 
-  async function raiseEvent(patternlab, eventName, ...args) {
+  async function raiseEvent(patternlab, eventName, args) {
     patternlab.events.emit(eventName, args);
-
     await (async function() {
       const hookHandlers = (patternlab.hooks[eventName] || []).map(h =>
         h(args)
       );
 
-      const results = await Promise.all(hookHandlers);
+      await Promise.all(hookHandlers);
     })();
   }