fix: better meta handling

jsbin · Dec 12, 2018 · 5a4726c · 5a4726c
1 parent 19976ee
commit 5a4726c
Show file tree

Hide file tree

Showing 5 changed files with 1,236 additions and 1,190 deletions.
diff --git a/__tests__/fixtures/stripped.html b/__tests__/fixtures/stripped.html
@@ -0,0 +1,2 @@
+<!doctype html>
+<p>Hello world</p>
diff --git a/__tests__/multi-run.test.js b/__tests__/multi-run.test.js
@@ -0,0 +1,34 @@
+/* eslint-env jest */
+const toFile = require('../lib');
+const fileToBin = require('file-to-bin');
+const fs = require('fs');
+const path = require('path');
+
+describe('stripped and repeatedly converted', function() {
+  var html = '';
+
+  beforeEach(function() {
+    html = fs.readFileSync(
+      path.join(__dirname, 'fixtures', 'stripped.html'),
+      'utf8'
+    );
+  });
+
+  it('should have fixtures', function() {
+    expect(html.length).toBeGreaterThan(0);
+  });
+
+  it('does nothing to plain html', function() {
+    const bin = fileToBin(html);
+    bin.url = 'abc-def-ghi';
+    // bin.meta = `<!-- source: https://jsbin.com/${bin.url}/edit -->
+    // <meta http-equiv="CACHE-CONTROL" content="NO-CACHE">`;
+    const file = toFile(bin);
+    const parsed = fileToBin(file);
+
+    expect(parsed.html).toEqual(bin.html);
+    expect(parsed.url).toEqual(bin.url);
+
+    expect(toFile(parsed)).toEqual(toFile(bin));
+  });
+});
diff --git a/lib/index.js b/lib/index.js
@@ -80,7 +80,9 @@ function binToFile(bin, options = {}) {
   const binId = [bin.url, bin.revision].filter(Boolean).join('/');
   let meta =
     bin.meta ||
-    (bin.url ? `<!-- source: https://jsbin.com/${binId}/edit -->\n` : '');
+    (bin.url
+      ? `<meta name="source" content="https://jsbin.com/${binId}/edit">`
+      : '');
 
   // insert protocol if missing
   html = html.replace(/(src|href)=('|")\/\//g, '$1=$2' + proto + '//');
@@ -133,6 +135,7 @@ function binToFile(bin, options = {}) {
 
   // try to insert above the head
   if (meta) {
+    meta = `<!-- jsbin -->\n${meta.trim()}\n<!-- /jsbin -->\n`;
     const afterHTML = afterLine(file, '<html', meta);
     if (afterHTML) {
       file = afterHTML;
@@ -161,7 +164,7 @@ function binToFile(bin, options = {}) {
     } else {
       // is there head tag?
       const hasModule = javascript.includes('import ');
-      javascript = `<!--boot js-->\n<script id="jsbin-javascript" ${
+      javascript = `<script id="jsbin-javascript" ${
         hasModule ? 'type="module" ' : ''
       }defer>\n${javascript}\n</script>`;
 
@@ -202,7 +205,7 @@ function binToFile(bin, options = {}) {
 
         return '';
       })
-      .join('\n');
+      .join('');
 
     const bodyTag = insert(file, '</body>', sourceScripts);
     if (bodyTag) {