Merge branch 'master' into release

electric-eloquence · May 21, 2021 · c5e2467 · c5e2467
2 parents c3dc2cc + c552a78
commit c5e2467
Show file tree

Hide file tree

Showing 96 changed files with 4,856 additions and 4,870 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,2 @@
 /scripts/ui/data.js
+/test/fixtures/ui-data.js
diff --git a/.npmignore b/.npmignore
@@ -1,6 +1,5 @@
 *.log
 .*
 !.gitkeep
-/fepper-core
 /patterns
 /test
diff --git a/fepper-core/mustache-browser.css b/fepper-core/mustache-browser.css
diff --git a/package.json b/package.json
@@ -44,7 +44,6 @@
     "feplet": "^1.2.3",
     "he": "1.2.0",
     "jquery": "^3.5.1",
-    "js-beautify": "1.13.0",
     "mousetrap": "1.6.5",
     "prismjs": "1.23.0",
     "redux": "^4.0.5",
@@ -60,25 +59,26 @@
     "@babel/preset-env": "^7.11.5",
     "@babel/register": "^7.11.5",
     "@babel/runtime": "^7.11.2",
-    "@wdio/cli": "6.4.7",
-    "@wdio/local-runner": "6.4.7",
-    "@wdio/mocha-framework": "6.4.7",
-    "@wdio/spec-reporter": "6.4.7",
-    "@wdio/sync": "6.4.7",
+    "@wdio/cli": "7.2.0",
+    "@wdio/local-runner": "7.2.0",
+    "@wdio/mocha-framework": "7.2.0",
+    "@wdio/spec-reporter": "7.2.0",
+    "@wdio/sync": "7.2.0",
     "babel-eslint": "^10.1.0",
     "chai": "4.x",
     "chai-webdriverio": "^1.0.0",
     "cheerio": "^1.0.0-rc.3",
-    "chromedriver": "^87.0.5",
+    "chromedriver": "^89.0.0",
     "coveralls": "3.x",
     "eslint": "7.x",
+    "fepper": "*",
     "husky": "4.x",
     "mkdirp": "^1.0.3",
     "mocha": "8.x",
     "nyc": "15.x",
     "rollup": "^2.21.0",
     "sinon": "9.x",
-    "wdio-chromedriver-service": "6.0.4",
-    "webdriverio": "6.4.7"
+    "wdio-chromedriver-service": "7.0.0",
+    "webdriverio": "7.2.0"
   }
 }
diff --git a/patterns/00-elements-anchor/00-elements-anchor.html b/patterns/00-elements-anchor/00-elements-anchor.html
diff --git a/patterns/00-elements-anchor/00-elements-anchor.markup-only.html b/patterns/00-elements-anchor/00-elements-anchor.markup-only.html
diff --git a/patterns/00-elements-anchor/00-elements-anchor.mustache b/patterns/00-elements-anchor/00-elements-anchor.mustache
diff --git a/patterns/00-elements-paragraph/00-elements-paragraph.html b/patterns/00-elements-paragraph/00-elements-paragraph.html
@@ -4,7 +4,7 @@
   <title>Fepper</title>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width">
-  <meta name="generator" content="Fepper Front End Prototyper (http://fepper.io)">
+  <meta name="generator" content="Fepper Front End Prototyper (https://fepper.io)">
 
   <!-- Disable cache -->
   <meta http-equiv="cache-control" content="max-age=0">
@@ -14,29 +14,35 @@
   <meta http-equiv="pragma" content="no-cache">
 
   <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
-<link rel="stylesheet" href="../../test/fixtures/styles/pattern.css">
+<link rel="stylesheet" href="../../node_modules/fepper-ui/styles/pattern.css">
 <script src="../../node_modules/mousetrap/mousetrap.min.js"></script>
-<script src="../../test/fixtures/annotations/annotations.js"></script>
+<script src="../../annotations/annotations.js"></script>
 <!-- End Pattern Lab -->
 
 
+  <link rel="stylesheet" href="../../_styles/bld/style.css">
+  <script src="../../_scripts/src/variables.styl" type="text/javascript"></script>
 </head>
 <body class="">
-<p>Fepper Base</p>
-
+<p>Fepper Base</p>  
 <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
 <script type="text/json" id="sg-pattern-data-footer" class="sg-pattern-data">
-  {"lineage":[],"lineageExists":false,"lineageR":[{"lineagePattern":"compounds-block","lineagePath":"patterns/01-compounds-block/01-compounds-block.html","isHidden":false}],"lineageRExists":true,"patternDesc":"","patternExtension":".mustache","patternName":"Paragraph","patternPartial":"elements-paragraph","patternState":""}
+  {"lineage":[],"lineageExists":false,"lineageR":[{"lineagePattern":"compounds-block","lineagePath":"patterns/01-compounds-block/01-compounds-block.html","isHidden":false}],"lineageRExists":true,"patternDesc":"","patternExtension":".mustache","patternName":"Paragraph","patternPartial":"elements-paragraph","patternState":"","portReloader":35730,"portServer":3001}
 </script>
 
 <script>
-  document.querySelector('p').innerHTML = JSON.parse(document.querySelector('#sg-pattern-data-footer').innerHTML).patternPartial;
+  // LiveReload.
+  if (location.protocol !== 'file:') {
+    const reloader = document.createElement('script');
+
+    reloader.setAttribute('src', location.protocol + '//' + location.hostname + ':35730/livereload.js');
+    document.body.appendChild(reloader);
+  }
 </script>
 
-<script src="../../scripts/pattern/index.js" type="module"></script>
+<script src="../../node_modules/fepper-ui/scripts/pattern/index.js" type="module"></script>
 <!-- End Pattern Lab -->
 
 
-  <script src="../../test/fixtures/_scripts/src/variables.styl" type="text/javascript"></script>
 </body>
 </html>
diff --git a/patterns/00-elements-paragraph/00-elements-paragraph.markup-only.html b/patterns/00-elements-paragraph/00-elements-paragraph.markup-only.html
@@ -1 +1 @@
-<p>Fepper Base</p>
+<p>Fepper Base</p>  
diff --git a/patterns/00-elements/index.html b/patterns/00-elements/index.html
@@ -4,7 +4,7 @@
   <title>Fepper</title>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width">
-  <meta name="generator" content="Fepper Front End Prototyper (http://fepper.io)">
+  <meta name="generator" content="Fepper Front End Prototyper (https://fepper.io)">
 
   <!-- Disable cache -->
   <meta http-equiv="cache-control" content="max-age=0">
@@ -14,18 +14,20 @@
   <meta http-equiv="pragma" content="no-cache">
 
   <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
-<link rel="stylesheet" href="../../test/fixtures/styles/pattern.css">
+<link rel="stylesheet" href="../../node_modules/fepper-ui/styles/pattern.css">
 <script src="../../node_modules/mousetrap/mousetrap.min.js"></script>
-<script src="../../test/fixtures/annotations/annotations.js"></script>
+<script src="../../annotations/annotations.js"></script>
 <!-- End Pattern Lab -->
 
 
+  <link rel="stylesheet" href="../../_styles/bld/style.css">
+  <script src="../../_scripts/src/variables.styl" type="text/javascript"></script>
 </head>
 <body class="">
 <!-- View All -->
-<link rel="stylesheet" href="../../test/fixtures/styles/pattern-scaffolding.css">
+<link rel="stylesheet" href="../../_styles/pattern-scaffolding.css">
 <div class="sg-main" role="main">
-  
+
   <!-- Patterns -->
   <div id="sg-patterns">
 
@@ -39,42 +41,6 @@ <h2 class="sg-pattern-category-title sg-pattern-type">
         </h2>
       </div><!--end sg-pattern-category-->
 
-      <div id="elements-anchor" class="sg-pattern">
-        <div class="sg-pattern-head">
-          <h4 class="sg-pattern-title">
-            <a
-              href="../../patterns/00-elements-anchor/00-elements-anchor.html"
-              class="sg-pattern-link"
-              data-patternpartial="elements-anchor"
-              title="Link to Pattern"
-            >Anchor</a>
-          </h4>
-          <div class="sg-pattern-info-toggles">
-            <a
-              href="#"
-              id="sg-pattern-toggle-annotations-elements-anchor"
-              class="sg-pattern-info-toggle sg-pattern-toggle-annotations"
-              data-patternpartial="elements-anchor"
-              title="View Pattern Annotations"
-            >&#x1F4C4;</a>
-            <a
-              href="#"
-              id="sg-pattern-toggle-code-elements-anchor"
-              class="sg-pattern-info-toggle sg-pattern-toggle-code"
-              data-patternpartial="elements-anchor"
-              title="View Pattern Code"
-            >&#x276E;&#x276F;</a>
-          </div>
-        </div>
-        <div class="sg-pattern-example cf">
-          <a href="../04-pages-00-homepage/04-pages-00-homepage.html">Home</a>
-
-        </div>
-        <script type="text/json" id="sg-pattern-data-elements-anchor" class="sg-pattern-data">
-          {"lineage":[],"lineageExists":false,"lineageR":[{"lineagePattern":"compounds-block","lineagePath":"patterns/01-compounds-block/01-compounds-block.html","isHidden":false}],"lineageRExists":true,"patternDesc":"","patternExtension":".mustache","patternName":"Anchor","patternPartial":"elements-anchor","patternState":""}
-        </script>
-      </div><!--end .sg-pattern-->
-
       <div id="elements-paragraph" class="sg-pattern">
         <div class="sg-pattern-head">
           <h4 class="sg-pattern-title">
@@ -102,28 +68,63 @@ <h4 class="sg-pattern-title">
             >&#x276E;&#x276F;</a>
           </div>
         </div>
-        <div class="sg-pattern-example cf">
-          <p>Fepper Base</p>
-
-        </div>
+        <div class="sg-pattern-example"></div>
         <script type="text/json" id="sg-pattern-data-elements-paragraph" class="sg-pattern-data">
-          {"lineage":[],"lineageExists":false,"lineageR":[{"lineagePattern":"compounds-block","lineagePath":"patterns/01-compounds-block/01-compounds-block.html","isHidden":false}],"lineageRExists":true,"patternDesc":"","patternExtension":".mustache","patternName":"Paragraph","patternPartial":"elements-paragraph","patternState":""}
+          {"lineage":[],"lineageExists":false,"lineageR":[{"lineagePattern":"compounds-block","lineagePath":"patterns/01-compounds-block/01-compounds-block.html","isHidden":false}],"lineageRExists":true,"patternDesc":"","patternExtension":".mustache","patternName":"Paragraph","patternPartial":"elements-paragraph","patternState":"","portReloader":35730,"portServer":3001}
         </script>
       </div><!--end .sg-pattern-->
 
   </div> <!--end #sg-patterns-->
 
 </div><!--end .sg-main-->
 
+<script>
+  // Hydrate viewalls.
+  const patternEls = document.getElementsByClassName('sg-pattern');
+
+  for (const patternEl of patternEls) {
+    const exampleEl = patternEl.querySelector('.sg-pattern-example');
+    const linkEl = patternEl.querySelector('.sg-pattern-link');
+    const xhr = new XMLHttpRequest();
+
+    if (linkEl && linkEl.href) {
+      const regex = /\.\w+$/;
+      const matches = linkEl.href.match(regex);
+      const ext = matches && matches[0] ? matches[0] : matches;
+
+      if (ext) {
+        const link = linkEl.href.replace(regex, '.markup-only' + ext);
+
+        xhr.open('GET', link, true);
+        xhr.onload = () => {
+          if (xhr.responseText) {
+            exampleEl.innerHTML = xhr.responseText;
+          }
+        };
+        xhr.send();
+      }
+    }
+  }
+</script>
+
 <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
 <script type="text/json" id="sg-pattern-data-footer" class="sg-pattern-data">
   {"patternPartial":"viewall-elements"}
 </script>
 
-<script src="../../scripts/pattern/index.js" type="module"></script>
+<script>
+  // LiveReload.
+  if (location.protocol !== 'file:') {
+    const reloader = document.createElement('script');
+
+    reloader.setAttribute('src', location.protocol + '//' + location.hostname + ':35730/livereload.js');
+    document.body.appendChild(reloader);
+  }
+</script>
+
+<script src="../../node_modules/fepper-ui/scripts/pattern/index.js" type="module"></script>
 <!-- End Pattern Lab -->
 
 
-  <script src="../../test/fixtures/_scripts/src/variables.styl" type="text/javascript"></script>
 </body>
 </html>