fix: better meta handling

remy · remy · commit 0aaf6c66e001 · 2018-12-12T11:41:41.000Z
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__/fixtures/stripped.json b/__tests__/fixtures/stripped.json
@@ -0,0 +1,9 @@
+{
+  "settings": { "processors": {} },
+  "url": "???",
+  "source": {},
+  "revision": 1,
+  "javascript": "",
+  "css": "",
+  "html": "<!doctype html>\n<p>Hello world</p>\n"
+}
diff --git a/__tests__/index.js b/__tests__/index.js
@@ -68,7 +68,7 @@ const stripComments = s => s.replace(/<!--([\s\S]+)-->/g, '');
   });
 });
 
-test.only('zabihiheha', async () => {
+test('zabihiheha', async () => {
   const fixture = require('./fixtures/zabihiheha.json');
   const html = await read(__dirname + '/fixtures/zabihiheha.html', 'utf8');
   const res = lib(html);
diff --git a/__tests__/multi-copy.js b/__tests__/multi-copy.js
@@ -0,0 +1,13 @@
+const lib = require('../');
+const binToFile = require('bin-to-file');
+const fs = require('fs');
+const { promisify } = require('util');
+const read = promisify(fs.readFile);
+
+test.only('stripped down', async () => {
+  const fixture = require(`./fixtures/stripped.json`);
+  const html = await read(__dirname + '/fixtures/stripped.html', 'utf8');
+  const res = lib(html);
+
+  expect(res).toMatchObject(fixture);
+});
diff --git a/lib/index.js b/lib/index.js
@@ -1,6 +1,7 @@
 const reJS = /(?:<!--boot js-->\n)?<script id="jsbin-javascript".*>\s([\s\S]+?)<\/script>\n?/;
 const reCSS = /<style id="jsbin-css">\s([\s\S]+?)<\/style>\n?/;
 const reProcessors = /<script id="jsbin-source-([a-z]+)?" type="text\/source-([a-z]+)">([\s\S]+?)<\/script>\n?/g;
+const reMeta = /<!-- jsbin -->.*<!-- \/jsbin -->\n/gms;
 
 function fileToBin(html) {
   let javascript = '';
@@ -19,9 +20,12 @@ function fileToBin(html) {
   // try to find bin url
   const [url, revision] = (html.match(/jsbin\.com\/(.+)\/edit/) || [
     ,
-    '???/?',
+    '???/1',
   ])[1].split('/');
 
+  // start by stripping any out JS Bin specific metadata
+  html = html.replace(reMeta, '');
+
   // check for processors
   const settings = {
     processors: {},
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<!doctype html>`
	`2`	`+<p>Hello world</p>`