Merge branch 'master' into master-xmr-dependabot-config

mozilla · Oct 10, 2019 · 50e6126 · 50e6126
2 parents 1f5f418 + c2489d6
commit 50e6126
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 28 deletions.
diff --git a/index.js b/index.js
@@ -8,14 +8,20 @@ const path = require('path');
 const Hapi = require('@hapi/hapi');
 const vision = require('@hapi/vision');
 const inert = require('@hapi/inert');
-
 const handlebarsHelperSRI = require('handlebars-helper-sri');
+const handlebarsPartialFile = require('handlebars-partial-file');
+const generate = require('./lib/generate');
+const generateElement = require('./lib/generateElement');
+
 let handlebars = require('handlebars');
 
 handlebars = handlebarsHelperSRI.register(handlebars);
 
-const generate = require('./lib/generate');
-const generateElement = require('./lib/generateElement');
+const hbsPartialFile = handlebarsPartialFile({
+  referenceDir: path.join(__dirname, 'public')
+});
+
+hbsPartialFile.registerDirectory('badge', 'svg');
 
 // eslint-disable-next-line quotes
 const CSP_HEADER = "default-src 'none'; base-uri 'none'; form-action 'self'; frame-src 'self'; frame-ancestors 'self'; img-src 'self'; manifest-src 'self'; style-src 'self'";

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,8 +33,9 @@
     "@hapi/inert": "^5.2.2",
     "@hapi/vision": "^5.5.4",
     "cross-env": "^6.0.3",
-    "handlebars": "^4.4.2",
+    "handlebars": "^4.4.3",
     "handlebars-helper-sri": "0.0.0",
+    "handlebars-partial-file": "^1.0.0",
     "node-fetch": "^2.6.0",
     "sri-toolbox": "^0.2.0"
   },

diff --git a/public/badge/badge.css b/public/badge/badge.css
@@ -18,7 +18,7 @@
   overflow: hidden;
 }
 
-.sri-test *[data-sri-status] img {
+.sri-test *[data-sri-status] svg {
   display: block;
   margin-left: 16px;
 }

diff --git a/public/badge/fail.svg b/public/badge/fail.svg
diff --git a/public/badge/pass.svg b/public/badge/pass.svg
diff --git a/templates/index.html b/templates/index.html
@@ -79,11 +79,11 @@ <h2>Test your browser</h2>
 
       <div class="sri-test" id="sri-badge">
         <div data-sri-status="pass">
-          <img src="/badge/pass.svg" alt="Pass Badge" width="50" height="64">
+          {{> pass}}
           <p>Your browser supports SRI</p>
         </div>
         <div data-sri-status="fail">
-          <img src="/badge/fail.svg" alt="Fail Badge" width="50" height="64">
+          {{> fail}}
           <p>Your browser does not support SRI</p>
         </div>
       </div>