Merge pull request #1096 from pattern-lab/fix/plugin-and-clean-fixes

Fix/plugin and clean fixes
pattern-lab · Nov 13, 2019 · f1f1b8e · f1f1b8e
2 parents f41d8bf + 2d6136c
commit f1f1b8e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/packages/core/src/lib/buildPatterns.js b/packages/core/src/lib/buildPatterns.js
@@ -40,7 +40,7 @@ module.exports = async (deletePatternDir, patternlab, additionalData) => {
   //
   const graph = (patternlab.graph = loadPatternGraph(
     patternlab,
-    deletePatternDir
+    patternlab.config.cleanPublic
   ));
   const graphNeedsUpgrade = !PatternGraph.checkVersion(graph);
   if (graphNeedsUpgrade) {
@@ -55,7 +55,7 @@ module.exports = async (deletePatternDir, patternlab, additionalData) => {
 
   // Flags
   patternlab.incrementalBuildsEnabled = !(
-    deletePatternDir || graphNeedsUpgrade
+    patternlab.config.cleanPublic || graphNeedsUpgrade
   );
 
   //

diff --git a/packages/plugin-tab/dist/js/@pattern-lab-plugin-tab.js b/packages/plugin-tab/dist/js/@pattern-lab-plugin-tab.js
@@ -1,4 +1,5 @@
-const PluginTab = {
+// workaround to `PluginTab undefined` error in Safari
+window.PluginTab = {
   /**
    * The function defined as the onready callback within the plugin configuration.
    */

diff --git a/packages/plugin-tab/src/snippet.js b/packages/plugin-tab/src/snippet.js
@@ -1,14 +1,21 @@
-/* global Panels */
+function addPanels() {
+  window.patternlab.panels.add({
+    id: 'sg-panel-scss',
+    name: 'SCSS',
+    default: false,
+    templateID: 'pl-panel-template-code',
+    httpRequest: true,
+    httpRequestReplace: '.scss',
+    httpRequestCompleted: false,
+    prismHighlight: true,
+    language: 'scss',
+    keyCombo: 'ctrl+shift+z',
+  });
+}
 
-window.patternlab.panels.add({
-  id: 'sg-panel-<<type>>',
-  name: '<<typeUC>>',
-  default: false,
-  templateID: 'pl-panel-template-code',
-  httpRequest: true,
-  httpRequestReplace: '.<<type>>',
-  httpRequestCompleted: false,
-  prismHighlight: true,
-  language: '<<type>>',
-  keyCombo: 'ctrl+shift+z',
-});
+// workaround to try recovering from load order race conditions
+if (window.patternlab && window.patternlab.panels) {
+  addPanels();
+} else {
+  document.addEventListener('patternLab.pageLoad', addPanels);
+}
diff --git a/packages/uikit-workshop/src/sass/scss/04-components/_pattern.scss b/packages/uikit-workshop/src/sass/scss/04-components/_pattern.scss
@@ -81,6 +81,7 @@
   font-family: $pl-font;
   border-color: #ddd;
   border-width: 1px; // fix for different browser defaults 
+  border-style: solid; // fix for different browser defaults (ex. Safari)
   display: flex;
   align-items: center;