Merge branch 'dev' into netlify

bmuenzenmeyer · web-flow · commit f286d150dcc9 · 2019-10-15T23:05:41.000-05:00
diff --git a/README.md b/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
diff --git a/packages/core/src/lib/plugin_manager.js b/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);
     })();
   }
 
diff --git a/packages/plugin-tab/index.js b/packages/plugin-tab/index.js
@@ -36,7 +36,8 @@ function writeConfigToOutput(patternlab, pluginConfig) {
   }
 }
 
-async function onPatternIterate(patternlab, pattern) {
+async function onPatternIterate(params) {
+  const [patternlab, pattern] = params;
   await tab_loader(patternlab, pattern);
 }
 
diff --git a/packages/uikit-workshop/dist/styleguide/js/patternlab-viewer.js b/packages/uikit-workshop/dist/styleguide/js/patternlab-viewer.js
diff --git a/packages/uikit-workshop/dist/styleguide/js/pl-modal-viewer-chunk-7506fe4aa4d15996d2ad.js b/packages/uikit-workshop/dist/styleguide/js/pl-modal-viewer-chunk-7506fe4aa4d15996d2ad.js
diff --git a/packages/uikit-workshop/src/scripts/components/panels-viewer.js b/packages/uikit-workshop/src/scripts/components/panels-viewer.js
@@ -106,19 +106,27 @@ export const panelsViewer = {
           const e = new XMLHttpRequest();
           // @todo: look deeper into how we can refactor this particular code block
           /* eslint-disable */
-          e.onload = (function(i, panels, patternData, iframeRequest) {
-            return function() {
+          e.onload = (function (i, panels, patternData, iframeRequest) {
+            return function () {
+
+              // since non-existant files (such as .scss from plugin-tab) still return a 200, we need to instead inspect the contents
+              // we look for responseText that starts with the doctype
+              let rText = this.responseText
+              if (rText.startsWith('<!DOCTYPE html>')) {
+                rText = ''
+              }
+
               // use pretty to format HTML
               if (panels[i].name === 'HTML') {
-                templateFormatted = pretty(this.responseText, { ocd: true });
+                templateFormatted = pretty(rText, { ocd: true });
               } else {
-                templateFormatted = this.responseText;
+                templateFormatted = rText;
               }
 
               const templateHighlighted = Prism.highlight(
                 templateFormatted,
                 Prism.languages[panels[i].name.toLowerCase()] ||
-                  Prism.languages['markup']
+                Prism.languages['markup']
                 // Prism.languages[panels[i].name.toLowerCase()],
               );
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ function writeConfigToOutput(patternlab, pluginConfig) {`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`-async function onPatternIterate(patternlab, pattern) {`
	`39`	`+async function onPatternIterate(params) {`
	`40`	`+ const [patternlab, pattern] = params;`
`40`	`41`	`await tab_loader(patternlab, pattern);`
`41`	`42`	`}`
`42`	`43`