Merge branch 'dev' into feature/fix-directory-naming

sghoweri · web-flow · commit 936be651e21e · 2019-09-17T18:11:50.000-04:00
diff --git a/packages/development-edition-engine-handlebars/package.json b/packages/development-edition-engine-handlebars/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@pattern-lab/development-edition-engine-handlebars",
   "private": true,
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "The tree of components we use to test, develop and validate the Handlebars engine",
   "scripts": {
     "pl:build": "patternlab build --config ./patternlab-config.json",
@@ -32,6 +32,6 @@
     "@pattern-lab/engine-handlebars": "^2.0.1",
     "@pattern-lab/engine-mustache": "^2.0.1-alpha.0",
     "@pattern-lab/starterkit-mustache-demo": "^5.0.0",
-    "@pattern-lab/uikit-workshop": "^1.0.3"
+    "@pattern-lab/uikit-workshop": "^1.0.4"
   }
 }
diff --git a/packages/development-edition-engine-react/package.json b/packages/development-edition-engine-react/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@pattern-lab/engine-react-testing-tree",
   "description": "The tree of components we use to test, develop and validate the React engine",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "private": true,
   "main": "gulpfile.js",
   "dependencies": {
     "@pattern-lab/core": "^3.0.3",
     "@pattern-lab/engine-mustache": "^2.0.1-alpha.0",
     "@pattern-lab/engine-react": "^0.2.1-beta.1",
-    "@pattern-lab/uikit-workshop": "^1.0.3",
+    "@pattern-lab/uikit-workshop": "^1.0.4",
     "gulp": "3.9.1",
     "minimist": "^1.2.0",
     "react": "16.2.0"
diff --git a/packages/edition-node-gulp/package.json b/packages/edition-node-gulp/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@pattern-lab/edition-node-gulp",
   "description": "The gulp wrapper around patternlab-node core, providing tasks to interact with the core library and move supporting frontend assets.",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "main": "gulpfile.js",
   "dependencies": {
     "@pattern-lab/cli": "^1.0.1",
     "@pattern-lab/core": "^3.0.3",
     "@pattern-lab/engine-mustache": "^2.0.1-alpha.0",
-    "@pattern-lab/uikit-workshop": "^1.0.3",
+    "@pattern-lab/uikit-workshop": "^1.0.4",
     "gulp": "3.9.1",
     "minimist": "1.2.0"
   },
diff --git a/packages/edition-node/package.json b/packages/edition-node/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@pattern-lab/edition-node",
   "description": "A pure wrapper around patternlab-node core, the default pattern engine, and supporting frontend assets.",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "main": "patternlab-config.json",
   "dependencies": {
     "@pattern-lab/cli": "^1.0.1",
     "@pattern-lab/core": "^3.0.3",
     "@pattern-lab/engine-handlebars": "^2.0.1",
-    "@pattern-lab/uikit-workshop": "^1.0.3"
+    "@pattern-lab/uikit-workshop": "^1.0.4"
   },
   "keywords": [
     "Pattern Lab",
diff --git a/packages/edition-twig/package.json b/packages/edition-twig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pattern-lab/edition-twig",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "Pattern Lab node with Twig PHP Engine",
   "author": {
     "name": "Evan Lovely",
@@ -25,7 +25,7 @@
     "@pattern-lab/cli": "^1.0.1",
     "@pattern-lab/core": "^3.0.3",
     "@pattern-lab/engine-twig-php": "^3.0.3",
-    "@pattern-lab/uikit-workshop": "^1.0.3"
+    "@pattern-lab/uikit-workshop": "^1.0.4"
   },
   "engines": {
     "node": ">=6.0"
diff --git a/packages/edition-twig/patternlab-config.json b/packages/edition-twig/patternlab-config.json
@@ -8,6 +8,41 @@
           "paths": [
             "./node_modules/@pattern-lab/uikit-workshop/views-twig"
           ]
+        },
+        {
+          "id": "atoms",
+          "recursive": true,
+          "paths": [
+            "./source/_patterns/00-atoms"
+          ]
+        },
+        {
+          "id": "molecules",
+          "recursive": true,
+          "paths": [
+            "./source/_patterns/01-molecules"
+          ]
+        },
+        {
+          "id": "organisms",
+          "recursive": true,
+          "paths": [
+            "./source/_patterns/02-organisms"
+          ]
+        },
+        {
+          "id": "templates",
+          "recursive": true,
+          "paths": [
+            "./source/_patterns/03-templates"
+          ]
+        },
+        {
+          "id": "pages",
+          "recursive": true,
+          "paths": [
+            "./source/_patterns/04-pages"
+          ]
         }
       ],
       "alterTwigEnv": [
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-0634ccab5a0ead34e762.js b/packages/uikit-workshop/dist/styleguide/js/pl-modal-viewer-chunk-0634ccab5a0ead34e762.js
diff --git a/packages/uikit-workshop/dist/styleguide/js/pl-modal-viewer-chunk-9bbdeb5a6429fb975bf6.js b/packages/uikit-workshop/dist/styleguide/js/pl-modal-viewer-chunk-9bbdeb5a6429fb975bf6.js
diff --git a/packages/uikit-workshop/package.json b/packages/uikit-workshop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pattern-lab/uikit-workshop",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Front-end assets and templates for the default Pattern Lab workshop view",
   "main": "gulpfile.js",
   "scripts": {
diff --git a/packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.js b/packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.js
@@ -572,16 +572,23 @@ class Nav extends BaseComponent {
           );
         })}
 
-        {/* <li class="pl-c-nav__item">
-          <a
-            href="styleguide/html/styleguide.html"
-            class="pl-c-nav__link pl-c-nav__link--pattern"
-            data-patternpartial="all"
-            tabindex="0"
-          >
-            All
-          </a>
-        </li> */}
+        {/* display the All link if window.ishControlsHide is undefined (for some reason) OR window.ishControls.ishControlsHide doesn't have `views-all` and/or `all` set to true */}
+        {(window.ishControls === undefined ||
+          window.ishControls.ishControlsHide === undefined ||
+          (window.ishControls.ishControlsHide['views-all'] !== true &&
+            window.ishControls.ishControlsHide.all !== true)) && (
+          <li class="pl-c-nav__item">
+            <a
+              onClick={e => this.handleClick(e, 'all')}
+              href="styleguide/html/styleguide.html"
+              class="pl-c-nav__link pl-c-nav__link--pattern"
+              data-patternpartial="all"
+              tabindex="0"
+            >
+              All
+            </a>
+          </li>
+        )}
       </ol>
     );
   }
diff --git a/packages/uikit-workshop/src/scripts/components/pl-viewport/pl-viewport.js b/packages/uikit-workshop/src/scripts/components/pl-viewport/pl-viewport.js
@@ -53,12 +53,15 @@ class IFrame extends BaseComponent {
 
   // update the currently active nav + add / update the page's query string
   handlePageLoad(e) {
-    var queryString = window.location.search;
+    const queryString = window.location.search;
     const urlParams = new URLSearchParams(queryString);
-    let patternParam = urlParams.get('p');
+    const patternParam = urlParams.get('p');
 
-    if (e.detail.pattern) {
-      document.title = 'Pattern Lab - ' + e.detail.pattern;
+    const currentPattern =
+      e.detail.pattern || window.config.defaultPattern || 'all';
+
+    if (currentPattern) {
+      document.title = 'Pattern Lab - ' + currentPattern;
 
       const addressReplacement =
         window.location.protocol === 'file:'
@@ -68,21 +71,21 @@ class IFrame extends BaseComponent {
             window.location.host +
             window.location.pathname.replace('index.html', '') +
             '?p=' +
-            e.detail.pattern;
+            currentPattern;
 
       // first time hitting a PL page -- no query string on the current page
       if (patternParam === null) {
         window.history.replaceState(
           {
-            currentPattern: e.detail.pattern,
+            currentPattern: currentPattern,
           },
           null,
           addressReplacement
         );
       } else {
         window.history.replaceState(
           {
-            currentPattern: e.detail.pattern,
+            currentPattern: currentPattern,
           },
           null,
           addressReplacement
@@ -348,7 +351,10 @@ class IFrame extends BaseComponent {
       if (window.patternData) {
         patternParam = window.patternData.patternPartial;
       } else {
-        patternParam = 'all'; // @todo: this should also be able to be dynamically set via PL config file
+        patternParam =
+          window.config && window.config.defaultPattern
+            ? window.config.defaultPattern
+            : 'all';
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@pattern-lab/development-edition-engine-handlebars",`
`3`	`3`	`"private": true,`
`4`		`- "version": "0.1.2",`
	`4`	`+ "version": "0.1.3",`
`5`	`5`	`"description": "The tree of components we use to test, develop and validate the Handlebars engine",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"pl:build": "patternlab build --config ./patternlab-config.json",`
`@@ -32,6 +32,6 @@`
`32`	`32`	`"@pattern-lab/engine-handlebars": "^2.0.1",`
`33`	`33`	`"@pattern-lab/engine-mustache": "^2.0.1-alpha.0",`
`34`	`34`	`"@pattern-lab/starterkit-mustache-demo": "^5.0.0",`
`35`		`- "@pattern-lab/uikit-workshop": "^1.0.3"`
	`35`	`+ "@pattern-lab/uikit-workshop": "^1.0.4"`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@pattern-lab/uikit-workshop",`
`3`		`- "version": "1.0.3",`
	`3`	`+ "version": "1.0.4",`
`4`	`4`	`"description": "Front-end assets and templates for the default Pattern Lab workshop view",`
`5`	`5`	`"main": "gulpfile.js",`
`6`	`6`	`"scripts": {`