Merge branch 'dev' into feature/uikit-refactor-and-enhancements

# Conflicts:
#	packages/uikit-workshop/dist/styleguide/js/patternlab-pattern.js
#	packages/uikit-workshop/dist/styleguide/js/patternlab-viewer.js

Author: sghoweri

netlify.toml

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

package.json

@@ -29,7 +29,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/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@pattern-lab/cli",
   "description": "Command-line interface (CLI) for the @pattern-lab/core.",
-  "version": "1.0.3",
+  "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);
     })();
   }
 

packages/core/test/object_factory_tests.js

@@ -178,7 +178,7 @@ tap.test('test Pattern capitalizes patternDisplayName correctly', function(
   test.end();
 });
 
-tap.test('test Pattern get dir level no sepatated pattern directory', function(
+tap.test('test Pattern get dir level no separated pattern directory', function(
   test
 ) {
   var p = new Pattern('00-atoms/00-global/00-colors-alt.mustache', { d: 123 });
@@ -198,24 +198,36 @@ tap.test('test Pattern get dir level no sepatated pattern directory', function(
 });
 
 tap.test(
-  'test Pattern get dir level with sepatated pattern directory',
+  'test Pattern get dir level with separated pattern directory',
   function(test) {
     var p = new Pattern(
       '00-atoms/00-global/00-colors-alt/colors-alt.mustache',
       { d: 123 }
     );
     test.equals(p.getDirLevel(0, { hasDir: true, dirLevel: 3 }), '00-atoms');
     test.equals(p.getDirLevel(1, { hasDir: true, dirLevel: 3 }), '00-global');
-    test.equals(p.getDirLevel(3, { hasDir: true, dirLevel: 3 }), '');
+    test.equals(
+      p.getDirLevel(3, { hasDir: true, dirLevel: 3 }),
+      '00-colors-alt'
+    );
     var p = new Pattern('00-atoms/00-colors-alt/colors-alt.mustache', {
       d: 123,
     });
     test.equals(p.getDirLevel(0, { hasDir: true, dirLevel: 2 }), '00-atoms');
-    test.equals(p.getDirLevel(1, { hasDir: true, dirLevel: 2 }), '00-atoms');
+    test.equals(
+      p.getDirLevel(1, { hasDir: true, dirLevel: 2 }),
+      '00-colors-alt'
+    );
     test.equals(p.getDirLevel(3, { hasDir: true, dirLevel: 2 }), '');
     var p = new Pattern('00-colors-alt/colors-alt.mustache', { d: 123 });
-    test.equals(p.getDirLevel(0, { hasDir: true, dirLevel: 1 }), '');
-    test.equals(p.getDirLevel(1, { hasDir: true, dirLevel: 1 }), '');
+    test.equals(
+      p.getDirLevel(0, { hasDir: true, dirLevel: 1 }),
+      '00-colors-alt'
+    );
+    test.equals(
+      p.getDirLevel(1, { hasDir: true, dirLevel: 1 }),
+      '00-colors-alt'
+    );
     test.equals(p.getDirLevel(3, { hasDir: true, dirLevel: 1 }), '');
     test.end();
   }

packages/create/package.json

@@ -1,12 +1,12 @@
 {
   "name": "create-pattern-lab",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "",
   "bin": "index.js",
   "main": "index.js",
   "scripts": {},
   "dependencies": {
-    "@pattern-lab/cli": "^1.0.3"
+    "@pattern-lab/cli": "^1.0.4"
   },
   "author": "",
   "license": "MIT",

packages/development-edition-engine-handlebars/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pattern-lab/development-edition-engine-handlebars",
   "private": true,
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "The tree of components we use to test, develop and validate the Handlebars engine",
   "scripts": {
     "pl:build": "patternlab build --config ./patternlab-config.json",
@@ -27,12 +27,12 @@
     "node": ">=10.0"
   },
   "dependencies": {
-    "@pattern-lab/cli": "^1.0.3",
-    "@pattern-lab/core": "^3.0.4",
+    "@pattern-lab/cli": "^1.0.4",
+    "@pattern-lab/core": "^3.0.5",
     "@pattern-lab/engine-handlebars": "^2.0.2",
     "@pattern-lab/engine-mustache": "^2.0.1",
-    "@pattern-lab/plugin-tab": "^2.0.3",
+    "@pattern-lab/plugin-tab": "^2.0.4",
     "@pattern-lab/starterkit-mustache-demo": "^5.0.0",
-    "@pattern-lab/uikit-workshop": "^1.0.7"
+    "@pattern-lab/uikit-workshop": "^1.0.8"
   }
 }