From 70fd0f02dd40b384344b2a696e674b9e31cdc591 Mon Sep 17 00:00:00 2001
From: Gerben <gerben@treora.com>
Date: Thu, 13 Jul 2017 23:20:39 +0200
Subject: [PATCH 1/4] Spin off src/util/when-all-settled.

https://www.npmjs.com/package/when-all-settled
---
 package.json                          |  3 ++-
 src/freeze-dry/common.js              |  2 +-
 src/freeze-dry/index.js               |  2 +-
 src/freeze-dry/inline-images.js       |  2 +-
 src/freeze-dry/inline-styles.js       |  2 +-
 src/page-analysis/background/index.js |  2 +-
 src/util/when-all-settled.js          | 32 ---------------------------
 yarn.lock                             |  6 +++++
 8 files changed, 13 insertions(+), 38 deletions(-)
 delete mode 100644 src/util/when-all-settled.js

diff --git a/package.json b/package.json
index 2ae261839..c5dc9c0b7 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,8 @@
     "semantic-ui-css": "git+https://github.com/Treora/semantic-ui-css.git#1d2237f",
     "semantic-ui-react": "^0.70.0",
     "tldjs": "^1.7.0",
-    "webextension-polyfill": "^0.1.1"
+    "webextension-polyfill": "^0.1.1",
+    "when-all-settled": "^0.1.1"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.1",
diff --git a/src/freeze-dry/common.js b/src/freeze-dry/common.js
index 803eeb165..f73cd3669 100644
--- a/src/freeze-dry/common.js
+++ b/src/freeze-dry/common.js
@@ -1,5 +1,5 @@
 import responseToDataUri from 'src/util/response-to-data-uri'
-import whenAllSettled from 'src/util/when-all-settled'
+import whenAllSettled from 'when-all-settled'
 
 
 export function removeNode(node) {
diff --git a/src/freeze-dry/index.js b/src/freeze-dry/index.js
index 9f40c62f1..79b648cec 100644
--- a/src/freeze-dry/index.js
+++ b/src/freeze-dry/index.js
@@ -1,4 +1,4 @@
-import whenAllSettled from 'src/util/when-all-settled'
+import whenAllSettled from 'when-all-settled'
 import inlineStyles from './inline-styles'
 import removeScripts from './remove-scripts'
 import removeNoscripts from './remove-noscripts'
diff --git a/src/freeze-dry/inline-images.js b/src/freeze-dry/inline-images.js
index 28ccd02d3..833c3c09c 100644
--- a/src/freeze-dry/inline-images.js
+++ b/src/freeze-dry/inline-images.js
@@ -1,4 +1,4 @@
-import whenAllSettled from 'src/util/when-all-settled'
+import whenAllSettled from 'when-all-settled'
 import { inlineUrlsInAttributes } from './common'
 
 
diff --git a/src/freeze-dry/inline-styles.js b/src/freeze-dry/inline-styles.js
index 7f7938e34..5d7e1e9bf 100644
--- a/src/freeze-dry/inline-styles.js
+++ b/src/freeze-dry/inline-styles.js
@@ -1,4 +1,4 @@
-import whenAllSettled from 'src/util/when-all-settled'
+import whenAllSettled from 'when-all-settled'
 import { urlToDataUri } from './common'
 
 
diff --git a/src/page-analysis/background/index.js b/src/page-analysis/background/index.js
index b1c87ef8d..bc55cfdf7 100644
--- a/src/page-analysis/background/index.js
+++ b/src/page-analysis/background/index.js
@@ -4,7 +4,7 @@ import { dataURLToBlob } from 'blob-util'
 
 import { whenPageDOMLoaded } from 'src/util/tab-events'
 import { remoteFunction } from 'src/util/webextensionRPC'
-import whenAllSettled from 'src/util/when-all-settled'
+import whenAllSettled from 'when-all-settled'
 import db from 'src/pouchdb'
 import updateDoc from 'src/util/pouchdb-update-doc'
 
diff --git a/src/util/when-all-settled.js b/src/util/when-all-settled.js
deleted file mode 100644
index b0547c9c7..000000000
--- a/src/util/when-all-settled.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Like Promise.all, but it does not mind if any of the promises reject.
-
-
-// By default, log rejections to the console when not in production mode.
-const debugEnabled = (
-    process && process.env && process.env.NODE_ENV !== 'production'
-)
-const defaultRejectionHandler = debugEnabled
-    ? error => { console.error(error) }
-    : () => {}
-
-// Creates a Promise that resolves when all promises passed to it have settled
-// (= either resolved or rejected). This is almost the same as Promise.all,
-// except it does not reject when some of the given promises reject.
-//
-// Arguments:
-// - promises: an array of Promises to wait for.
-// - options: {
-//      onRejection (optional):
-//          A rejection handler attached to each given promise.
-//          Note: if it throws an error, the returned promise rejects.
-//   }
-//
-// Returns: a Promise.
-export default function whenAllSettled(promises, {
-    onRejection = defaultRejectionHandler,
-} = {}) {
-    return Promise.all(
-        // Map each promise to a promise that never rejects.
-        promises.map(p => Promise.resolve(p).catch(onRejection))
-    )
-}
diff --git a/yarn.lock b/yarn.lock
index 166aa1ea5..8e71f57e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8325,6 +8325,12 @@ whatwg-url@^4.3.0:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
+when-all-settled@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/when-all-settled/-/when-all-settled-0.1.1.tgz#369bcfd142ed1f269174b8f0b6db1c87063c6113"
+  dependencies:
+    postinstall-build "^3.0.1"
+
 when@3.7.7:
   version "3.7.7"
   resolved "https://registry.yarnpkg.com/when/-/when-3.7.7.tgz#aba03fc3bb736d6c88b091d013d8a8e590d84718"

From a5ba6f1e846226ccf65aeec85ca05a4b0b0db222 Mon Sep 17 00:00:00 2001
From: Gerben <gerben@treora.com>
Date: Fri, 14 Jul 2017 00:39:54 +0200
Subject: [PATCH 2/4] Spin off src/util/response-to-data-uri.

https://www.npmjs.com/package/response-to-data-url
---
 package.json                                 |  1 +
 src/freeze-dry/common.js                     |  4 ++--
 src/freeze-dry/common.test.js                |  6 +++---
 src/page-analysis/background/get-fav-icon.js |  4 ++--
 src/util/response-to-data-uri.js             | 11 -----------
 yarn.lock                                    |  6 ++++++
 6 files changed, 14 insertions(+), 18 deletions(-)
 delete mode 100644 src/util/response-to-data-uri.js

diff --git a/package.json b/package.json
index c5dc9c0b7..d2fd1df5c 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "redux-observable": "^0.14.1",
     "redux-query-sync": "^0.1.4",
     "redux-thunk": "^2.2.0",
+    "response-to-data-url": "^0.1.0",
     "rxjs": "^5.4.1",
     "semantic-ui-css": "git+https://github.com/Treora/semantic-ui-css.git#1d2237f",
     "semantic-ui-react": "^0.70.0",
diff --git a/src/freeze-dry/common.js b/src/freeze-dry/common.js
index f73cd3669..2dd6c6298 100644
--- a/src/freeze-dry/common.js
+++ b/src/freeze-dry/common.js
@@ -1,4 +1,4 @@
-import responseToDataUri from 'src/util/response-to-data-uri'
+import responseToDataUrl from 'response-to-data-url'
 import whenAllSettled from 'when-all-settled'
 
 
@@ -9,7 +9,7 @@ export function removeNode(node) {
 export async function urlToDataUri(url) {
     try {
         const response = await fetch(url, {cache: 'force-cache'})
-        const dataUri = await responseToDataUri(response)
+        const dataUri = await responseToDataUrl(response)
         return dataUri
     } catch (err) {
         return 'about:invalid'
diff --git a/src/freeze-dry/common.test.js b/src/freeze-dry/common.test.js
index f0319857a..5af78530c 100644
--- a/src/freeze-dry/common.test.js
+++ b/src/freeze-dry/common.test.js
@@ -1,7 +1,7 @@
 /* eslint-env jest */
 
 import { inlineUrlsInAttributes, urlToDataUri, removeNode } from 'src/freeze-dry/common'
-import * as responseToDataUri from 'src/util/response-to-data-uri'
+import * as responseToDataUrl from 'response-to-data-url'
 import { dataURLToBlob } from 'blob-util'
 
 
@@ -26,7 +26,7 @@ describe('removeNode', () => {
 describe('urlToDataUri', () => {
     test('should return a dataUri given a URL', async () => {
         const someDataUri = 'data:text/html,<h1>bananas</h1>'
-        const spy = jest.spyOn(responseToDataUri, 'default').mockImplementation(async () => {
+        const spy = jest.spyOn(responseToDataUrl, 'default').mockImplementation(async () => {
             return someDataUri
         })
         const dataUri = await urlToDataUri('https://example.com/page')
@@ -35,7 +35,7 @@ describe('urlToDataUri', () => {
     })
 
     test('should return a "about:invalid" upon failure', async () => {
-        const spy = jest.spyOn(responseToDataUri, 'default').mockImplementation(async () => {
+        const spy = jest.spyOn(responseToDataUrl, 'default').mockImplementation(async () => {
             throw new Error('mock error')
         })
         const dataUri = await urlToDataUri('http://example.com')
diff --git a/src/page-analysis/background/get-fav-icon.js b/src/page-analysis/background/get-fav-icon.js
index 8fbeba1c5..ce2763fc5 100644
--- a/src/page-analysis/background/get-fav-icon.js
+++ b/src/page-analysis/background/get-fav-icon.js
@@ -1,4 +1,4 @@
-import responseToDataURI from 'src/util/response-to-data-uri'
+import responseToDataUrl from 'response-to-data-url'
 
 // Get a tab's fav-icon (website logo) as a data URI
 async function getFavIcon({tabId}) {
@@ -9,7 +9,7 @@ async function getFavIcon({tabId}) {
     }
 
     const response = await fetch(tab.favIconUrl)
-    const dataURI = await responseToDataURI(response)
+    const dataURI = await responseToDataUrl(response)
     return dataURI
 }
 
diff --git a/src/util/response-to-data-uri.js b/src/util/response-to-data-uri.js
deleted file mode 100644
index c332fb123..000000000
--- a/src/util/response-to-data-uri.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Turn a fetch() response into data URI (does this have to be so convoluted?)
-export default function responseToDataURI(response) {
-    return response.blob().then(
-        blob => new Promise((resolve, reject) => {
-            const reader = new FileReader()
-            reader.onload = () => resolve(reader.result)
-            reader.onerror = () => reject(reader.error)
-            reader.readAsDataURL(blob)
-        })
-    )
-}
diff --git a/yarn.lock b/yarn.lock
index 8e71f57e5..9e9506767 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7131,6 +7131,12 @@ resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2,
   dependencies:
     path-parse "^1.0.5"
 
+response-to-data-url@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/response-to-data-url/-/response-to-data-url-0.1.0.tgz#da1eb5724d114bd6568dda890acfbc3f905663ab"
+  dependencies:
+    postinstall-build "^3.0.1"
+
 restore-cursor@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"

From 95fcbd0924cab20253a128804ed64aadf0a6fc3f Mon Sep 17 00:00:00 2001
From: Gerben <gerben@treora.com>
Date: Fri, 14 Jul 2017 00:46:13 +0200
Subject: [PATCH 3/4] Consistently rename data URI -> data URL.

Neither identifier nor locator fits the meaning very well (is it both?),
but data URL is the term used commonly and originally (RFC 2397).
---
 src/activity-logger/index.js                  |  2 +-
 src/freeze-dry/common.js                      | 20 +++++------
 src/freeze-dry/common.test.js                 | 34 +++++++++----------
 src/freeze-dry/fix-links.test.js              |  6 ++--
 src/freeze-dry/inline-styles.js               | 12 +++----
 src/freeze-dry/inline-styles.test.js          | 20 +++++------
 src/freeze-dry/set-content-security-policy.js |  2 +-
 src/overview/components/ImgFromPouch.jsx      | 10 +++---
 src/page-analysis/background/get-fav-icon.js  |  6 ++--
 src/page-analysis/background/index.js         | 12 +++----
 .../background/make-screenshot.js             |  4 +--
 src/page-viewer/index.js                      |  4 +--
 src/popup/popup.js                            |  4 +--
 src/pouchdb.js                                |  8 ++---
 14 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/src/activity-logger/index.js b/src/activity-logger/index.js
index 2adddc3db..3222bb352 100644
--- a/src/activity-logger/index.js
+++ b/src/activity-logger/index.js
@@ -24,7 +24,7 @@ export function generateVisitDocId({timestamp, nonce} = {}) {
 
 // Tell whether a page can be stored.
 export function isLoggable({url}) {
-    // Only http(s) pages. Ignoring data uris, newtab, ...
+    // Only http(s) pages. Ignoring data URLs, newtab, ...
     const loggableUrlPattern = /^https?:\/\//
     return loggableUrlPattern.test(url)
 }
diff --git a/src/freeze-dry/common.js b/src/freeze-dry/common.js
index 2dd6c6298..41035fcad 100644
--- a/src/freeze-dry/common.js
+++ b/src/freeze-dry/common.js
@@ -6,18 +6,18 @@ export function removeNode(node) {
     node.parentNode.removeChild(node)
 }
 
-export async function urlToDataUri(url) {
+export async function urlToDataUrl(url) {
     try {
         const response = await fetch(url, {cache: 'force-cache'})
-        const dataUri = await responseToDataUrl(response)
-        return dataUri
+        const dataUrl = await responseToDataUrl(response)
+        return dataUrl
     } catch (err) {
         return 'about:invalid'
     }
 }
 
 // Find all URLs in the specified attribute(s) of the specified elements, fetch
-// their contents, and replace the URL with the content encoded as a data URI.
+// their contents, and replace the URL with the content encoded as a data URL.
 // The elements argument can be a query selector string if rootElement is given.
 export async function inlineUrlsInAttributes({
     elements,
@@ -44,17 +44,17 @@ export async function inlineUrlsInAttributes({
             const urls = attrToUrls(value, attribute)
 
             // Fetch (hopefully from cache) the resource for each URL.
-            const dataUriPs = urls.map(async url => {
+            const dataUrlPs = urls.map(async url => {
                 const absoluteUrl = new URL(url, docUrl)
-                const dataUri = await urlToDataUri(absoluteUrl)
-                return dataUri
+                const dataUrl = await urlToDataUrl(absoluteUrl)
+                return dataUrl
             })
-            const dataUris = await Promise.all(dataUriPs)
+            const dataUrls = await Promise.all(dataUrlPs)
 
-            // Replace the URLs in the attribute value with the data URIs.
+            // Replace the URLs in the attribute value with the data URLs.
             let newValue = value
             for (let i = 0; i < urls.length; i++) {
-                newValue = newValue.replace(urls[i], dataUris[i])
+                newValue = newValue.replace(urls[i], dataUrls[i])
             }
             if (newValue !== value) {
                 element.setAttribute(attribute, newValue)
diff --git a/src/freeze-dry/common.test.js b/src/freeze-dry/common.test.js
index 5af78530c..2b91720a1 100644
--- a/src/freeze-dry/common.test.js
+++ b/src/freeze-dry/common.test.js
@@ -1,11 +1,11 @@
 /* eslint-env jest */
 
-import { inlineUrlsInAttributes, urlToDataUri, removeNode } from 'src/freeze-dry/common'
+import { inlineUrlsInAttributes, urlToDataUrl, removeNode } from 'src/freeze-dry/common'
 import * as responseToDataUrl from 'response-to-data-url'
 import { dataURLToBlob } from 'blob-util'
 
 
-const imageDataUri = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=='
+const imageDataUrl = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=='
 
 beforeEach(() => {
     fetch.resetMocks()
@@ -23,14 +23,14 @@ describe('removeNode', () => {
     })
 })
 
-describe('urlToDataUri', () => {
-    test('should return a dataUri given a URL', async () => {
-        const someDataUri = 'data:text/html,<h1>bananas</h1>'
+describe('urlToDataUrl', () => {
+    test('should return a dataUrl given a URL', async () => {
+        const someDataUrl = 'data:text/html,<h1>bananas</h1>'
         const spy = jest.spyOn(responseToDataUrl, 'default').mockImplementation(async () => {
-            return someDataUri
+            return someDataUrl
         })
-        const dataUri = await urlToDataUri('https://example.com/page')
-        expect(dataUri).toBe(someDataUri)
+        const dataUrl = await urlToDataUrl('https://example.com/page')
+        expect(dataUrl).toBe(someDataUrl)
         spy.mockRestore()
     })
 
@@ -38,15 +38,15 @@ describe('urlToDataUri', () => {
         const spy = jest.spyOn(responseToDataUrl, 'default').mockImplementation(async () => {
             throw new Error('mock error')
         })
-        const dataUri = await urlToDataUri('http://example.com')
-        expect(dataUri).toBe('about:invalid')
+        const dataUrl = await urlToDataUrl('http://example.com')
+        expect(dataUrl).toBe('about:invalid')
         spy.mockRestore()
     })
 
     test('should return a "about:invalid" when fetching fails', async () => {
         fetch.mockRejectOnce()
-        const dataUri = await urlToDataUri('http://example.com')
-        expect(dataUri).toBe('about:invalid')
+        const dataUrl = await urlToDataUrl('http://example.com')
+        expect(dataUrl).toBe('about:invalid')
     })
 })
 
@@ -56,10 +56,10 @@ describe('inlineUrlsInAttributes', () => {
     let imageBlob
 
     beforeAll(async () => {
-        imageBlob = await dataURLToBlob(imageDataUri)
+        imageBlob = await dataURLToBlob(imageDataUrl)
     })
 
-    test('should change the URL in <img> tag to a dataUri', async () => {
+    test('should change the URL in <img> tag to a dataUrl', async () => {
         fetch.mockResponseOnce(imageBlob)
         const doc = parser.parseFromString(
             '<html><body><img src="public/image/background.png" alt="background" /></body></html>',
@@ -68,10 +68,10 @@ describe('inlineUrlsInAttributes', () => {
         const rootElement = doc.documentElement
         await inlineUrlsInAttributes({elements: 'img', attributes: 'src', rootElement, docUrl})
         expect(rootElement.querySelector('img').getAttribute('data-original-src')).toBe('public/image/background.png')
-        expect(rootElement.querySelector('img').getAttribute('src')).toBe(imageDataUri)
+        expect(rootElement.querySelector('img').getAttribute('src')).toBe(imageDataUrl)
     })
 
-    test('should change the URL in the <link> tag to a dataUri', async () => {
+    test('should change the URL in the <link> tag to a dataUrl', async () => {
         fetch.mockResponseOnce(imageBlob)
         const doc = parser.parseFromString(
             '<html><head><link rel="icon" href="public/image/favicon.ico"></head></html>',
@@ -80,7 +80,7 @@ describe('inlineUrlsInAttributes', () => {
         const rootElement = doc.documentElement
         await inlineUrlsInAttributes({elements: 'link', attributes: 'href', rootElement, docUrl})
         expect(rootElement.querySelector('link').getAttribute('data-original-href')).toBe('public/image/favicon.ico')
-        expect(rootElement.querySelector('link').getAttribute('href')).toBe(imageDataUri)
+        expect(rootElement.querySelector('link').getAttribute('href')).toBe(imageDataUrl)
     })
 
     test('should remove the attribute integrity from the tag', async () => {
diff --git a/src/freeze-dry/fix-links.test.js b/src/freeze-dry/fix-links.test.js
index 9111a0e08..cc9ac19d5 100644
--- a/src/freeze-dry/fix-links.test.js
+++ b/src/freeze-dry/fix-links.test.js
@@ -53,10 +53,10 @@ describe('fixLinks', () => {
     })
 
     test('should not alter data urls in href attribute', async () => {
-        const datauri = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=='
+        const dataUrl = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=='
         const rootElement = window.document.createElement('div')
-        rootElement.innerHTML = `<a href="${datauri}">Link</a>`
+        rootElement.innerHTML = `<a href="${dataUrl}">Link</a>`
         await fixLinks({rootElement, docUrl})
-        expect(rootElement.querySelector('*[href]').getAttribute('href')).toBe(datauri)
+        expect(rootElement.querySelector('*[href]').getAttribute('href')).toBe(dataUrl)
     })
 })
diff --git a/src/freeze-dry/inline-styles.js b/src/freeze-dry/inline-styles.js
index 5d7e1e9bf..a48bf6073 100644
--- a/src/freeze-dry/inline-styles.js
+++ b/src/freeze-dry/inline-styles.js
@@ -1,9 +1,9 @@
 import whenAllSettled from 'when-all-settled'
-import { urlToDataUri } from './common'
+import { urlToDataUrl } from './common'
 
 
 // Finds all url(...) occurrances in a string of CSS, then fetches and inlines
-// them as data URIs.
+// them as data URLs.
 // Returns the processed (and possibly much larger) string of CSS.
 async function inlineStylesheetContents({stylesheetText, stylesheetUrl}) {
     const cssFindUrlsPattern = /url\s*\(\s*('|")?\s*([^"')]+?)\s*\1\s*\)/ig
@@ -18,14 +18,14 @@ async function inlineStylesheetContents({stylesheetText, stylesheetUrl}) {
             ? new URL(match[2], stylesheetUrl)
             : undefined
     })
-    const dataUris = await Promise.all(urls.map(urlToDataUri))
-    dataUris.forEach((dataUri, i) => {
-        stylesheetText = stylesheetText.replace(cssUrls[i], `url(${dataUri})`)
+    const dataUrls = await Promise.all(urls.map(urlToDataUrl))
+    dataUrls.forEach((dataUrl, i) => {
+        stylesheetText = stylesheetText.replace(cssUrls[i], `url(${dataUrl})`)
     })
     return stylesheetText
 }
 
-// In every <link rel="stylesheet"> tag, inline the stylesheet as a data URI,
+// In every <link rel="stylesheet"> tag, inline the stylesheet as a data URL,
 // and inline every URL within that stylesheet.
 async function inlineLinkedStylesheets({rootElement, docUrl}) {
     const querySelector = 'link[rel*="stylesheet"][href]'
diff --git a/src/freeze-dry/inline-styles.test.js b/src/freeze-dry/inline-styles.test.js
index 6cc94c466..65e4b42ff 100644
--- a/src/freeze-dry/inline-styles.test.js
+++ b/src/freeze-dry/inline-styles.test.js
@@ -5,14 +5,14 @@ import * as common from 'src/freeze-dry/common'
 import { dataURLToBlob } from 'blob-util'
 
 
-const imageDataUri = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=='
+const imageDataUrl = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=='
 
 describe('inlineStyles', () => {
     const parser = new DOMParser()
     let imageBlob
 
     beforeAll(async () => {
-        imageBlob = await dataURLToBlob(imageDataUri)
+        imageBlob = await dataURLToBlob(imageDataUrl)
     })
 
     test('should return <style> tag with the fetched stylesheet', async () => {
@@ -34,14 +34,14 @@ describe('inlineStyles', () => {
         const docUrl = 'https://example.com'
         await inlineStyles({rootElement: doc.documentElement, docUrl})
         expect(doc.querySelector('style').innerHTML)
-            .toBe(`div{background-image: url(${imageDataUri});}`)
+            .toBe(`div{background-image: url(${imageDataUrl});}`)
     })
 
-    test('should convert the url in <style> to dataUris', async () => {
+    test('should convert the url in <style> to dataUrls', async () => {
         const styleSheet = 'div{background-image: url("public/image/background.jpeg");}'
         fetch.mockResponseOnce(new Blob([styleSheet]))
-        const styleSheetAsDataUri = `data:text/plain;charset=utf-8;base64,aHR0cHM6Ly9leGFtcGxlLmNvbS9wdWJsaWMvaW1hZ2UvYmFja2dyb3VuZC5qcGVn`
-        const spy = jest.spyOn(common, 'urlToDataUri').mockReturnValue(styleSheetAsDataUri)
+        const styleSheetAsDataUrl = `data:text/plain;charset=utf-8;base64,aHR0cHM6Ly9leGFtcGxlLmNvbS9wdWJsaWMvaW1hZ2UvYmFja2dyb3VuZC5qcGVn`
+        const spy = jest.spyOn(common, 'urlToDataUrl').mockReturnValue(styleSheetAsDataUrl)
         const doc = parser.parseFromString(
             `<html>
                 <head>
@@ -58,12 +58,12 @@ describe('inlineStyles', () => {
         await inlineStyles({rootElement: doc.documentElement, docUrl})
         expect(spy).toHaveBeenCalled()
         expect(doc.querySelector('style').innerHTML.trim())
-            .toBe(`div{background-image: url(${styleSheetAsDataUri});}`)
+            .toBe(`div{background-image: url(${styleSheetAsDataUrl});}`)
         spy.mockRestore()
     })
 
-    test('should convert the urls in a style attribute to data uris', async () => {
-        const spy = jest.spyOn(common, 'urlToDataUri').mockReturnValue(imageDataUri)
+    test('should convert the urls in a style attribute to data URLs', async () => {
+        const spy = jest.spyOn(common, 'urlToDataUrl').mockReturnValue(imageDataUrl)
         const doc = parser.parseFromString(
             '<html><div style="background-image: url(\'public/image/background.jpeg\');"></div></html>',
             'text/html'
@@ -72,7 +72,7 @@ describe('inlineStyles', () => {
         await inlineStyles({rootElement: doc.documentElement, docUrl})
         expect(spy).toHaveBeenCalled()
         expect(doc.querySelector('div').getAttribute('style'))
-            .toBe(`background-image: url(${imageDataUri});`)
+            .toBe(`background-image: url(${imageDataUrl});`)
         spy.mockRestore()
     })
 })
diff --git a/src/freeze-dry/set-content-security-policy.js b/src/freeze-dry/set-content-security-policy.js
index 0edea943e..3b15bb904 100644
--- a/src/freeze-dry/set-content-security-policy.js
+++ b/src/freeze-dry/set-content-security-policy.js
@@ -6,7 +6,7 @@ export default function setContentSecurityPolicy({doc, policyDirectives}) {
         doc.documentElement.insertAdjacentElement('afterbegin', head)
     }
 
-    // Disallow any sources, except data URIs where we use them.
+    // Disallow any sources, except data URLs where we use them.
     const csp = policyDirectives.join('; ')
 
     const metaEl = doc.createElement('meta')
diff --git a/src/overview/components/ImgFromPouch.jsx b/src/overview/components/ImgFromPouch.jsx
index 3183025d2..582c4658c 100644
--- a/src/overview/components/ImgFromPouch.jsx
+++ b/src/overview/components/ImgFromPouch.jsx
@@ -3,7 +3,7 @@ import omit from 'lodash/fp/omit'
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import { getAttachmentAsDataUri } from 'src/pouchdb'
+import { getAttachmentAsDataUrl } from 'src/pouchdb'
 
 
 const readHash = ({doc, attachmentId}) =>
@@ -13,7 +13,7 @@ export default class ImgFromPouch extends React.Component {
     constructor(props) {
         super(props)
         this.state = {
-            dataUri: undefined,
+            dataUrl: undefined,
         }
     }
 
@@ -35,9 +35,9 @@ export default class ImgFromPouch extends React.Component {
     }
 
     async updateFile({doc, attachmentId}) {
-        const dataUri = await getAttachmentAsDataUri({doc, attachmentId})
+        const dataUrl = await getAttachmentAsDataUrl({doc, attachmentId})
         if (this._isMounted) {
-            this.setState({dataUri})
+            this.setState({dataUrl})
         }
     }
 
@@ -46,7 +46,7 @@ export default class ImgFromPouch extends React.Component {
         return (
             <img
                 {...childProps}
-                src={this.state.dataUri}
+                src={this.state.dataUrl}
             />
         )
     }
diff --git a/src/page-analysis/background/get-fav-icon.js b/src/page-analysis/background/get-fav-icon.js
index ce2763fc5..cb3b3cc89 100644
--- a/src/page-analysis/background/get-fav-icon.js
+++ b/src/page-analysis/background/get-fav-icon.js
@@ -1,6 +1,6 @@
 import responseToDataUrl from 'response-to-data-url'
 
-// Get a tab's fav-icon (website logo) as a data URI
+// Get a tab's fav-icon (website logo) as a data URL
 async function getFavIcon({tabId}) {
     const tab = await browser.tabs.get(tabId)
 
@@ -9,8 +9,8 @@ async function getFavIcon({tabId}) {
     }
 
     const response = await fetch(tab.favIconUrl)
-    const dataURI = await responseToDataUrl(response)
-    return dataURI
+    const dataUrl = await responseToDataUrl(response)
+    return dataUrl
 }
 
 export default getFavIcon
diff --git a/src/page-analysis/background/index.js b/src/page-analysis/background/index.js
index bc55cfdf7..e90e6a40f 100644
--- a/src/page-analysis/background/index.js
+++ b/src/page-analysis/background/index.js
@@ -30,16 +30,16 @@ async function performPageAnalysis({pageId, tabId}) {
     }
 
     // Get and store the fav-icon
-    const storeFavIcon = getFavIcon({tabId}).then(async dataUri => {
-        if (dataUri === undefined) return
-        const blob = await dataURLToBlob(dataUri)
+    const storeFavIcon = getFavIcon({tabId}).then(async dataUrl => {
+        if (dataUrl === undefined) return
+        const blob = await dataURLToBlob(dataUrl)
         await setDocAttachment(db, pageId, 'favIcon')(blob)
     })
 
     // Capture a screenshot.
-    const storeScreenshot = makeScreenshot({tabId}).then(async dataUri => {
-        if (dataUri === undefined) return
-        const blob = await dataURLToBlob(dataUri)
+    const storeScreenshot = makeScreenshot({tabId}).then(async dataUrl => {
+        if (dataUrl === undefined) return
+        const blob = await dataURLToBlob(dataUrl)
         await setDocAttachment(db, pageId, 'screenshot')(blob)
     })
 
diff --git a/src/page-analysis/background/make-screenshot.js b/src/page-analysis/background/make-screenshot.js
index 6dcd62a08..22217d5b3 100644
--- a/src/page-analysis/background/make-screenshot.js
+++ b/src/page-analysis/background/make-screenshot.js
@@ -2,7 +2,7 @@ import delay from 'src/util/delay'
 import { whenTabActive } from 'src/util/tab-events'
 
 // Take a screenshot of the tabId, if it is active.
-// Returns a promise of the screenshot (a png image in a data URI).
+// Returns a promise of the screenshot (a png image in a data URL).
 // The promise rejects if the tab is not currently active!
 async function snapNow({tabId}) {
     const tab = await browser.tabs.get(tabId)
@@ -13,7 +13,7 @@ async function snapNow({tabId}) {
     return image
 }
 
-// Return the promise of an image (as data URI) of the visible area of the tab,
+// Return the promise of an image (as data URL) of the visible area of the tab,
 // but only as soon as it is active (due to a limitation of the browser API)
 export default async function makeScreenshotOfTabAsap({tabId}) {
     await whenTabActive({tabId})
diff --git a/src/page-viewer/index.js b/src/page-viewer/index.js
index 679359bbd..51c239bdb 100644
--- a/src/page-viewer/index.js
+++ b/src/page-viewer/index.js
@@ -6,8 +6,8 @@ export function hrefForLocalPage({page}) {
         return undefined
     }
     const pageId = page._id
-    const uri = `/page-viewer/localpage.html?page=${encodeURIComponent(pageId)}`
+    const url = `/page-viewer/localpage.html?page=${encodeURIComponent(pageId)}`
     const hash = (page.url && page.url.split('#')[1])
-    const href = (hash !== undefined) ? uri + '#' + hash : uri
+    const href = (hash !== undefined) ? url + '#' + hash : url
     return href
 }
diff --git a/src/popup/popup.js b/src/popup/popup.js
index 851268df7..24ce98232 100644
--- a/src/popup/popup.js
+++ b/src/popup/popup.js
@@ -1,4 +1,4 @@
-import { getAttachmentAsDataUri } from 'src/pouchdb'
+import { getAttachmentAsDataUrl } from 'src/pouchdb'
 import { remoteFunction } from 'src/util/webextensionRPC'
 import { hrefForLocalPage } from 'src/page-viewer'
 
@@ -22,7 +22,7 @@ async function storeThisPage() {
     } finally {
         screenshotDimmer.classList.remove('active')
     }
-    const imgData = await getAttachmentAsDataUri({doc: page, attachmentId: 'screenshot'})
+    const imgData = await getAttachmentAsDataUrl({doc: page, attachmentId: 'screenshot'})
     screenshotImg.src = imgData
     const href = hrefForLocalPage({page})
     if (href) {
diff --git a/src/pouchdb.js b/src/pouchdb.js
index 3bdbc40e2..42fe07a9b 100644
--- a/src/pouchdb.js
+++ b/src/pouchdb.js
@@ -40,10 +40,10 @@ export const normaliseFindResult = result => ({
 export const resultRowsById = result =>
     fromPairs(result.rows.map(row => [row.id, row]))
 
-// Get an attachment from a doc as a data URI string.
+// Get an attachment from a doc as a data URL string.
 // Pass either a docId or a doc itself, and the attachmentId.
 // Returns undefined if non-existent.
-export async function getAttachmentAsDataUri({doc, docId=doc._id, attachmentId}) {
+export async function getAttachmentAsDataUrl({doc, docId=doc._id, attachmentId}) {
     if (!docId
         || !attachmentId
         // If we got passed the doc itself, we can check whether the attachment exists.
@@ -58,6 +58,6 @@ export async function getAttachmentAsDataUri({doc, docId=doc._id, attachmentId})
         return undefined
     }
     const base64 = await blobToBase64String(blob)
-    const dataUri = `data:${blob.type};base64,${base64}`
-    return dataUri
+    const dataUrl = `data:${blob.type};base64,${base64}`
+    return dataUrl
 }

From dd41663540916e15acc8ce16cb483d7a9ee20129 Mon Sep 17 00:00:00 2001
From: Gerben <gerben@treora.com>
Date: Fri, 14 Jul 2017 01:41:27 +0200
Subject: [PATCH 4/4] Spin off src/freeze-dry.

https://www.npmjs.com/package/freeze-dry
---
 Codetour.md                                   |   6 -
 package.json                                  |   1 +
 src/freeze-dry/Readme.md                      |  26 -----
 src/freeze-dry/common.js                      |  72 ------------
 src/freeze-dry/common.test.js                 | 103 ------------------
 src/freeze-dry/fix-links.js                   |  18 ---
 src/freeze-dry/fix-links.test.js              |  62 -----------
 src/freeze-dry/index.js                       |  45 --------
 src/freeze-dry/index.test.js                  |  38 -------
 src/freeze-dry/inline-images.js               |  36 ------
 src/freeze-dry/inline-images.test.js          |  26 -----
 src/freeze-dry/inline-styles.js               | 100 -----------------
 src/freeze-dry/inline-styles.test.js          |  78 -------------
 src/freeze-dry/remove-noscripts.js            |   8 --
 src/freeze-dry/remove-noscripts.test.js       |  30 -----
 src/freeze-dry/remove-scripts.js              |  38 -------
 src/freeze-dry/remove-scripts.test.js         |  30 -----
 src/freeze-dry/set-content-security-policy.js |  16 ---
 .../set-content-security-policy.test.js       |  21 ----
 src/page-analysis/content_script/index.js     |   2 +-
 yarn.lock                                     |   8 ++
 21 files changed, 10 insertions(+), 754 deletions(-)
 delete mode 100644 src/freeze-dry/Readme.md
 delete mode 100644 src/freeze-dry/common.js
 delete mode 100644 src/freeze-dry/common.test.js
 delete mode 100644 src/freeze-dry/fix-links.js
 delete mode 100644 src/freeze-dry/fix-links.test.js
 delete mode 100644 src/freeze-dry/index.js
 delete mode 100644 src/freeze-dry/index.test.js
 delete mode 100644 src/freeze-dry/inline-images.js
 delete mode 100644 src/freeze-dry/inline-images.test.js
 delete mode 100644 src/freeze-dry/inline-styles.js
 delete mode 100644 src/freeze-dry/inline-styles.test.js
 delete mode 100644 src/freeze-dry/remove-noscripts.js
 delete mode 100644 src/freeze-dry/remove-noscripts.test.js
 delete mode 100644 src/freeze-dry/remove-scripts.js
 delete mode 100644 src/freeze-dry/remove-scripts.test.js
 delete mode 100644 src/freeze-dry/set-content-security-policy.js
 delete mode 100644 src/freeze-dry/set-content-security-policy.test.js

diff --git a/Codetour.md b/Codetour.md
index 0f6485c99..c55818646 100644
--- a/Codetour.md
+++ b/Codetour.md
@@ -42,12 +42,6 @@ For logging visits in the database. A visit object points to a page object, whic
 page itself. Project focus has shifted from logging every visit to manually storing pages, so this
 code may be refactored soon.
 
-### [`src/freeze-dry`](src/freeze-dry): snapshotting a webpage
-
-Provides the freezeDry function that creates a single static html file (returned
-as a string) with the rendered page. It takes the DOM, removes scripts, and
-inlines images and stylesheets. Should be moved into its own repo soon.
-
 ### [`src/page-analysis`](src/page-analysis/): (web)page analysis
 
 This extracts and stores information about the page in a given tab, such as:
diff --git a/package.json b/package.json
index d2fd1df5c..5510d7177 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "core-js": "^2.4.1",
     "diff-match-patch": "^1.0.0",
     "docuri": "^4.2.2",
+    "freeze-dry": "^0.1.0",
     "history": "^4.6.3",
     "lodash": "^4.17.4",
     "moment": "^2.18.1",
diff --git a/src/freeze-dry/Readme.md b/src/freeze-dry/Readme.md
deleted file mode 100644
index ea46bf98d..000000000
--- a/src/freeze-dry/Readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Freeze-dry: web page conservation
-
-Freeze-dry stores a web page as it is shown in the browser. It takes the DOM, and returns it as an
-HTML string, after having and inlined external resources such as images (as `data:` URLs) and
-stylesheets. It removes any scripts and prevents connectivity, so the resulting HTML document is a
-static, self-contained snapshot of the page.
-
-
-## Usage
-
-```
-const html = await freezeDry()
-
-// Instead of taking window.document, you can pass a Document object, and possibly its URL.
-const htmlString = await freezeDry(document, url)
-```
-
-
-## Why no scripts?
-
-It would be great to keep the interactive features of a page, so that for example a zoomable plot or
-drop-down menu would still function. We can however not store the current state of the scripts, and
-if we simply execute them again in the snapshotted page, in a different environment, they might
-mess up completely. Not running scripts gives a predictable result.
-
-Note that simple interactivity defined in CSS stylesheets will still work.
diff --git a/src/freeze-dry/common.js b/src/freeze-dry/common.js
deleted file mode 100644
index 41035fcad..000000000
--- a/src/freeze-dry/common.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import responseToDataUrl from 'response-to-data-url'
-import whenAllSettled from 'when-all-settled'
-
-
-export function removeNode(node) {
-    node.parentNode.removeChild(node)
-}
-
-export async function urlToDataUrl(url) {
-    try {
-        const response = await fetch(url, {cache: 'force-cache'})
-        const dataUrl = await responseToDataUrl(response)
-        return dataUrl
-    } catch (err) {
-        return 'about:invalid'
-    }
-}
-
-// Find all URLs in the specified attribute(s) of the specified elements, fetch
-// their contents, and replace the URL with the content encoded as a data URL.
-// The elements argument can be a query selector string if rootElement is given.
-export async function inlineUrlsInAttributes({
-    elements,
-    attributes,
-    // Default case: the value is a single URL (e.g. for href, src, ...)
-    attrToUrls = (value, attribute) => [value],
-    fixIntegrity = false,
-    rootElement,
-    docUrl,
-}) {
-    attributes = Array.isArray(attributes) ? attributes : [attributes]
-    if (typeof elements === 'string') {
-        elements = rootElement.querySelectorAll(elements)
-    }
-    // For each element...
-    const jobsForElements = Array.from(elements).map(async element => {
-        // ...for each listed attribute...
-        const jobsForAttributes = attributes.map(async attribute => {
-            // ...read the URL or URLs to be replaced.
-            const value = element.getAttribute(attribute)
-            if (!value) return
-
-            // Read the URL or URLs from the attribute value
-            const urls = attrToUrls(value, attribute)
-
-            // Fetch (hopefully from cache) the resource for each URL.
-            const dataUrlPs = urls.map(async url => {
-                const absoluteUrl = new URL(url, docUrl)
-                const dataUrl = await urlToDataUrl(absoluteUrl)
-                return dataUrl
-            })
-            const dataUrls = await Promise.all(dataUrlPs)
-
-            // Replace the URLs in the attribute value with the data URLs.
-            let newValue = value
-            for (let i = 0; i < urls.length; i++) {
-                newValue = newValue.replace(urls[i], dataUrls[i])
-            }
-            if (newValue !== value) {
-                element.setAttribute(attribute, newValue)
-                // Add the original attribute value (the original URL)
-                element.setAttribute(`data-original-${attribute}`, value)
-            }
-            if (fixIntegrity) {
-                // Don't bother recomputing the hash, just remove the check.
-                element.removeAttribute('integrity')
-            }
-        })
-        await whenAllSettled(jobsForAttributes)
-    })
-    await whenAllSettled(jobsForElements)
-}
diff --git a/src/freeze-dry/common.test.js b/src/freeze-dry/common.test.js
deleted file mode 100644
index 2b91720a1..000000000
--- a/src/freeze-dry/common.test.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/* eslint-env jest */
-
-import { inlineUrlsInAttributes, urlToDataUrl, removeNode } from 'src/freeze-dry/common'
-import * as responseToDataUrl from 'response-to-data-url'
-import { dataURLToBlob } from 'blob-util'
-
-
-const imageDataUrl = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=='
-
-beforeEach(() => {
-    fetch.resetMocks()
-})
-
-describe('removeNode', () => {
-    test('should remove the node', () => {
-        const parser = new DOMParser()
-        const doc = parser.parseFromString(
-            '<html><head></head><body></body></html>',
-            'text/html'
-        )
-        removeNode(doc.querySelector('head'))
-        expect(doc.querySelector('head')).toBeNull()
-    })
-})
-
-describe('urlToDataUrl', () => {
-    test('should return a dataUrl given a URL', async () => {
-        const someDataUrl = 'data:text/html,<h1>bananas</h1>'
-        const spy = jest.spyOn(responseToDataUrl, 'default').mockImplementation(async () => {
-            return someDataUrl
-        })
-        const dataUrl = await urlToDataUrl('https://example.com/page')
-        expect(dataUrl).toBe(someDataUrl)
-        spy.mockRestore()
-    })
-
-    test('should return a "about:invalid" upon failure', async () => {
-        const spy = jest.spyOn(responseToDataUrl, 'default').mockImplementation(async () => {
-            throw new Error('mock error')
-        })
-        const dataUrl = await urlToDataUrl('http://example.com')
-        expect(dataUrl).toBe('about:invalid')
-        spy.mockRestore()
-    })
-
-    test('should return a "about:invalid" when fetching fails', async () => {
-        fetch.mockRejectOnce()
-        const dataUrl = await urlToDataUrl('http://example.com')
-        expect(dataUrl).toBe('about:invalid')
-    })
-})
-
-describe('inlineUrlsInAttributes', () => {
-    const docUrl = 'https://example.com/page'
-    const parser = new DOMParser()
-    let imageBlob
-
-    beforeAll(async () => {
-        imageBlob = await dataURLToBlob(imageDataUrl)
-    })
-
-    test('should change the URL in <img> tag to a dataUrl', async () => {
-        fetch.mockResponseOnce(imageBlob)
-        const doc = parser.parseFromString(
-            '<html><body><img src="public/image/background.png" alt="background" /></body></html>',
-            'text/html'
-        )
-        const rootElement = doc.documentElement
-        await inlineUrlsInAttributes({elements: 'img', attributes: 'src', rootElement, docUrl})
-        expect(rootElement.querySelector('img').getAttribute('data-original-src')).toBe('public/image/background.png')
-        expect(rootElement.querySelector('img').getAttribute('src')).toBe(imageDataUrl)
-    })
-
-    test('should change the URL in the <link> tag to a dataUrl', async () => {
-        fetch.mockResponseOnce(imageBlob)
-        const doc = parser.parseFromString(
-            '<html><head><link rel="icon" href="public/image/favicon.ico"></head></html>',
-            'text/html'
-        )
-        const rootElement = doc.documentElement
-        await inlineUrlsInAttributes({elements: 'link', attributes: 'href', rootElement, docUrl})
-        expect(rootElement.querySelector('link').getAttribute('data-original-href')).toBe('public/image/favicon.ico')
-        expect(rootElement.querySelector('link').getAttribute('href')).toBe(imageDataUrl)
-    })
-
-    test('should remove the attribute integrity from the tag', async () => {
-        const doc = parser.parseFromString(
-            `<html>
-                <head>
-                    <link
-                        href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css"
-                        rel="stylesheet"
-                        integrity="sha256-MfvZlkHCEqatNoGiOXveE8FIwMzZg4W85qfrfIFBfYc="
-                    >
-                </head>
-            </html>`,
-            'text/html'
-        )
-        const rootElement = doc.documentElement
-        await inlineUrlsInAttributes({elements: 'link', attributes: 'href', fixIntegrity: true, rootElement, docUrl})
-        expect(rootElement.querySelector('link').getAttribute('integrity')).toBeNull()
-    })
-})
diff --git a/src/freeze-dry/fix-links.js b/src/freeze-dry/fix-links.js
deleted file mode 100644
index 6253d5061..000000000
--- a/src/freeze-dry/fix-links.js
+++ /dev/null
@@ -1,18 +0,0 @@
-export default async function fixLinks({rootElement, docUrl}) {
-    const head = rootElement.querySelector('head')
-    if (head) {
-        const base = head.ownerDocument.createElement('base')
-        base.href = docUrl
-        head.insertAdjacentElement('afterbegin', base)
-    } else {
-        const links = Array.from(rootElement.querySelectorAll('*[href]'))
-        links.forEach(link => {
-            const href = link.getAttribute('href')
-            const absoluteUrl = new URL(href, docUrl)
-            if (href !== absoluteUrl) {
-                link.setAttribute('href', absoluteUrl)
-            }
-        })
-        // TODO rewrite other attributes than href (see http://stackoverflow.com/a/2725168)
-    }
-}
diff --git a/src/freeze-dry/fix-links.test.js b/src/freeze-dry/fix-links.test.js
deleted file mode 100644
index cc9ac19d5..000000000
--- a/src/freeze-dry/fix-links.test.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/* eslint-env jest */
-
-import fixLinks from 'src/freeze-dry/fix-links'
-
-
-describe('fixLinks', () => {
-    const docUrl = 'https://example.com/page'
-
-    test('should insert the <base> element into <head>', async () => {
-        const doc = window.document.implementation.createHTMLDocument()
-        const rootElement = doc.documentElement
-        doc.querySelector('head').insertAdjacentElement = jest.fn()
-        const docUrl = 'about:blank'
-        await fixLinks({rootElement, docUrl})
-        const base = document.createElement('base')
-        base.href = docUrl
-        // XXX insertAdjacentElement is not yet implemented in jsdom. This test is a placeholder
-        // until a better solution arises.
-        expect(rootElement.querySelector('head').insertAdjacentElement)
-            .toBeCalledWith('afterbegin', base)
-    })
-
-    test('should do nothing for absolute URLs', async () => {
-        const rootElement = window.document.createElement('div')
-        rootElement.innerHTML = '<a href="https://example.com/#home">Link</a>'
-        await fixLinks({rootElement, docUrl})
-        expect(rootElement.querySelector('*[href]').getAttribute('href'))
-            .toBe('https://example.com/#home')
-    })
-
-    test('should make relative URLs absolute', async () => {
-        const rootElement = window.document.createElement('div')
-        rootElement.innerHTML = '<a href="otherpage#home">Link</a>'
-        await fixLinks({rootElement, docUrl})
-        expect(rootElement.querySelector('*[href]').getAttribute('href'))
-            .toBe('https://example.com/otherpage#home')
-    })
-
-    test('should not alter inline javascript in href attribute', async () => {
-        const rootElement = window.document.createElement('div')
-        rootElement.innerHTML = `<a href="javascript:alert('Hello');">Link</a>`
-        await fixLinks({rootElement, docUrl})
-        expect(rootElement.querySelector('*[href]').getAttribute('href'))
-            .toBe(`javascript:alert('Hello');`)
-    })
-
-    test('should not alter mailto: URIs in href attribute', async () => {
-        const rootElement = window.document.createElement('div')
-        rootElement.innerHTML = `<a href="mailto:someone@example.com">Link</a>`
-        await fixLinks({rootElement, docUrl})
-        expect(rootElement.querySelector('*[href]').getAttribute('href'))
-            .toBe(`mailto:someone@example.com`)
-    })
-
-    test('should not alter data urls in href attribute', async () => {
-        const dataUrl = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=='
-        const rootElement = window.document.createElement('div')
-        rootElement.innerHTML = `<a href="${dataUrl}">Link</a>`
-        await fixLinks({rootElement, docUrl})
-        expect(rootElement.querySelector('*[href]').getAttribute('href')).toBe(dataUrl)
-    })
-})
diff --git a/src/freeze-dry/index.js b/src/freeze-dry/index.js
deleted file mode 100644
index 79b648cec..000000000
--- a/src/freeze-dry/index.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import whenAllSettled from 'when-all-settled'
-import inlineStyles from './inline-styles'
-import removeScripts from './remove-scripts'
-import removeNoscripts from './remove-noscripts'
-import inlineImages from './inline-images'
-import setContentSecurityPolicy from './set-content-security-policy'
-import fixLinks from './fix-links'
-
-
-export default async function freezeDry (
-    document = window.document,
-    docUrl = document.URL,
-) {
-    // Clone the document's root element into a new (invisible) doc.
-    let doc = document.implementation.createHTMLDocument()
-    const rootElement = doc.importNode(
-        document.documentElement,
-        true /* deep copy */
-    )
-    doc.replaceChild(rootElement, doc.documentElement)
-
-    const jobs = [
-        // Removing scripts should be superfluous when setting the CSP; but it helps to protect
-        // pre-CSP viewers, it saves space, and reduces error messages in the console.
-        removeScripts({rootElement}),
-        inlineStyles({rootElement, docUrl}),
-        inlineImages({rootElement, docUrl}),
-        fixLinks({rootElement, docUrl}),
-        setContentSecurityPolicy({
-            doc,
-            policyDirectives: [
-                "default-src 'none'", // Block any connectivity from media we did not deal with.
-                "img-src data:", // Allow inlined images.
-                "style-src data: 'unsafe-inline'", // Allow inlined styles.
-                "font-src data:", // Allow inlined fonts.
-            ],
-        }),
-        removeNoscripts({rootElement}), // Because our CSP might cause <noscript> content to show.
-    ]
-    await whenAllSettled(jobs)
-
-    // Read the resulting DOM as a string
-    const html = rootElement.outerHTML
-    return html
-}
diff --git a/src/freeze-dry/index.test.js b/src/freeze-dry/index.test.js
deleted file mode 100644
index 9f6bfe6b9..000000000
--- a/src/freeze-dry/index.test.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/* eslint-env jest */
-/* eslint import/namespace: "off" */
-
-import freezeDry from 'src/freeze-dry/index'
-import * as inlineStyles from 'src/freeze-dry/inline-styles'
-import * as removeScripts from 'src/freeze-dry/remove-scripts'
-import * as inlineImages from 'src/freeze-dry/inline-images'
-import * as setContentSecurityPolicy from 'src/freeze-dry/set-content-security-policy'
-import * as fixLinks from 'src/freeze-dry/fix-links'
-import * as removeNoscripts from './remove-noscripts'
-
-
-beforeAll(() => {
-    inlineStyles.default = jest.fn()
-    removeScripts.default = jest.fn()
-    inlineImages.default = jest.fn()
-    fixLinks.default = jest.fn()
-    setContentSecurityPolicy.default = jest.fn()
-    removeNoscripts.default = jest.fn()
-})
-
-describe('freezeDry', () => {
-    test('should run all the jobs', async () => {
-        await freezeDry()
-        expect(inlineStyles.default).toHaveBeenCalled()
-        expect(removeScripts.default).toHaveBeenCalled()
-        expect(inlineImages.default).toHaveBeenCalled()
-        expect(fixLinks.default).toHaveBeenCalled()
-        expect(setContentSecurityPolicy.default).toHaveBeenCalled()
-        expect(removeNoscripts.default).toHaveBeenCalled()
-    })
-
-    test('should return the HTML document as a string', async () => {
-        // XXX We depend on the default empty document provided by jest.
-        const html = await freezeDry()
-        expect(html).toBe('<html><head></head><body></body></html>')
-    })
-})
diff --git a/src/freeze-dry/inline-images.js b/src/freeze-dry/inline-images.js
deleted file mode 100644
index 833c3c09c..000000000
--- a/src/freeze-dry/inline-images.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import whenAllSettled from 'when-all-settled'
-import { inlineUrlsInAttributes } from './common'
-
-
-export function getUrlsFromSrcset(srcsetValue) {
-    // srcset example: srcset="http://image 2x, http://other-image 1.5x"
-    const URLs = srcsetValue.split(',').map(srcsetItem =>
-        srcsetItem.trim().split(/\s+/)[0]
-    )
-    return URLs
-}
-
-const attributesToInline = [
-    {
-        elements: 'img',
-        attributes: 'src',
-        fixIntegrity: true,
-    },
-    {
-        elements: 'img',
-        attributes: 'srcset',
-        attrToUrls: getUrlsFromSrcset,
-    },
-    {
-        elements: 'link[rel*=icon]',
-        attributes: 'href',
-        fixIntegrity: true,
-    },
-]
-
-export default async function inlineImages({rootElement, docUrl}) {
-    const jobs = attributesToInline.map(options =>
-        inlineUrlsInAttributes({...options, rootElement, docUrl})
-    )
-    await whenAllSettled(jobs)
-}
diff --git a/src/freeze-dry/inline-images.test.js b/src/freeze-dry/inline-images.test.js
deleted file mode 100644
index a5c83e916..000000000
--- a/src/freeze-dry/inline-images.test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/* eslint-env jest */
-/* eslint import/namespace: "off" */
-
-import inlineImages, { getUrlsFromSrcset } from 'src/freeze-dry/inline-images'
-import * as common from 'src/freeze-dry/common'
-
-
-describe('getUrlsFromSrcset', () => {
-    test('should return URLs for srcset', () => {
-        const srcset = 'https://example.com/background1.jpg 0.5x, https://example.com/background2.jpg 1x, background3.jpg 2x'
-        const urls = getUrlsFromSrcset(srcset)
-        expect(urls[0]).toBe('https://example.com/background1.jpg')
-        expect(urls[1]).toBe('https://example.com/background2.jpg')
-        expect(urls[2]).toBe('background3.jpg')
-    })
-})
-
-describe('inlineImages', () => {
-    test('should call inlineUrlsInAttributes', async () => {
-        common.inlineUrlsInAttributes = jest.fn()
-        const doc = window.document.implementation.createHTMLDocument()
-        const rootElement = doc.documentElement
-        await inlineImages({rootElement, docUrl: 'about:blank'})
-        expect(common.inlineUrlsInAttributes).toHaveBeenCalledTimes(3)
-    })
-})
diff --git a/src/freeze-dry/inline-styles.js b/src/freeze-dry/inline-styles.js
deleted file mode 100644
index a48bf6073..000000000
--- a/src/freeze-dry/inline-styles.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import whenAllSettled from 'when-all-settled'
-import { urlToDataUrl } from './common'
-
-
-// Finds all url(...) occurrances in a string of CSS, then fetches and inlines
-// them as data URLs.
-// Returns the processed (and possibly much larger) string of CSS.
-async function inlineStylesheetContents({stylesheetText, stylesheetUrl}) {
-    const cssFindUrlsPattern = /url\s*\(\s*('|")?\s*([^"')]+?)\s*\1\s*\)/ig
-    const cssExtractUrlPattern = /url\s*\(\s*('|")?\s*([^"')]+?)\s*\1\s*\)/i
-    const cssUrls = stylesheetText.match(cssFindUrlsPattern)
-    if (!cssUrls) {
-        return stylesheetText
-    }
-    const urls = cssUrls.map(urlString => {
-        const match = urlString.match(cssExtractUrlPattern)
-        return match
-            ? new URL(match[2], stylesheetUrl)
-            : undefined
-    })
-    const dataUrls = await Promise.all(urls.map(urlToDataUrl))
-    dataUrls.forEach((dataUrl, i) => {
-        stylesheetText = stylesheetText.replace(cssUrls[i], `url(${dataUrl})`)
-    })
-    return stylesheetText
-}
-
-// In every <link rel="stylesheet"> tag, inline the stylesheet as a data URL,
-// and inline every URL within that stylesheet.
-async function inlineLinkedStylesheets({rootElement, docUrl}) {
-    const querySelector = 'link[rel*="stylesheet"][href]'
-    const linkElements = Array.from(rootElement.querySelectorAll(querySelector))
-    const jobs = linkElements.map(async linkEl => {
-        const stylesheetUrl = new URL(linkEl.getAttribute('href'), docUrl)
-        let stylesheetText
-        try {
-            // Fetch the stylesheet itself.
-            const response = await fetch(stylesheetUrl, {cache: 'force-cache'})
-            stylesheetText = await response.text()
-            // Fetch and replace URLs inside the stylesheet.
-            stylesheetText = await inlineStylesheetContents({
-                stylesheetText,
-                stylesheetUrl,
-            })
-        } catch (err) {
-            stylesheetText = '/* Oops! Freeze-dry failed to save this stylesheet. */'
-        }
-        const styleEl = rootElement.ownerDocument.createElement('style')
-        styleEl.innerHTML = stylesheetText
-
-        // Type is practically always text/css, the default, but copy it anyway.
-        const type = linkEl.getAttribute('type')
-        if (type) {
-            styleEl.setAttribute('type', type)
-        }
-
-        // Replace the <link /> element with the inlined <style>...</style>.
-        linkEl.parentNode.replaceChild(styleEl, linkEl)
-    })
-    await whenAllSettled(jobs)
-}
-
-// In every <style>...</style> block, inline any URLs it contains.
-async function inlineStyleTagContents({rootElement, docUrl}) {
-    const querySelector = 'style[type="text/css"],style:not([type])'
-    const styleElements = Array.from(rootElement.querySelectorAll(querySelector))
-    const jobs = styleElements.map(async styleEl => {
-        let stylesheetText = styleEl.innerHTML
-        stylesheetText = await inlineStylesheetContents({
-            stylesheetText,
-            stylesheetUrl: docUrl,
-        })
-        styleEl.innerHTML = stylesheetText
-    })
-    await whenAllSettled(jobs)
-}
-
-// In every <sometag style="..."> inline style, inline any URLs it contains.
-async function inlineInlineStyleContents({rootElement, docUrl}) {
-    const querySelector = '*[style]'
-    const elements = Array.from(rootElement.querySelectorAll(querySelector))
-    const jobs = elements.map(async element => {
-        let inlineStyleText = element.getAttribute('style')
-        inlineStyleText = await inlineStylesheetContents({
-            stylesheetText: inlineStyleText,
-            stylesheetUrl: docUrl,
-        })
-        element.setAttribute('style', inlineStyleText)
-    })
-    await whenAllSettled(jobs)
-}
-
-export default async function inlineStyles({rootElement, docUrl}) {
-    const jobs = [
-        inlineLinkedStylesheets({rootElement, docUrl}),
-        inlineStyleTagContents({rootElement, docUrl}),
-        inlineInlineStyleContents({rootElement, docUrl}),
-    ]
-    await whenAllSettled(jobs)
-}
diff --git a/src/freeze-dry/inline-styles.test.js b/src/freeze-dry/inline-styles.test.js
deleted file mode 100644
index 65e4b42ff..000000000
--- a/src/freeze-dry/inline-styles.test.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/* eslint-env jest */
-
-import inlineStyles from 'src/freeze-dry/inline-styles'
-import * as common from 'src/freeze-dry/common'
-import { dataURLToBlob } from 'blob-util'
-
-
-const imageDataUrl = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=='
-
-describe('inlineStyles', () => {
-    const parser = new DOMParser()
-    let imageBlob
-
-    beforeAll(async () => {
-        imageBlob = await dataURLToBlob(imageDataUrl)
-    })
-
-    test('should return <style> tag with the fetched stylesheet', async () => {
-        const styleSheet = 'div{background-image: url("public/image/background.jpeg");}'
-        fetch.mockResponseOnce(new Blob([styleSheet]))
-        fetch.mockResponseOnce(imageBlob)
-        const doc = parser.parseFromString(
-            `<html>
-                <head>
-                    <link
-                        rel="stylesheet"
-                        type="text/css"
-                        href="https://example.com/theme.css"
-                    >
-                </head>
-            </html>`,
-            'text/html'
-        )
-        const docUrl = 'https://example.com'
-        await inlineStyles({rootElement: doc.documentElement, docUrl})
-        expect(doc.querySelector('style').innerHTML)
-            .toBe(`div{background-image: url(${imageDataUrl});}`)
-    })
-
-    test('should convert the url in <style> to dataUrls', async () => {
-        const styleSheet = 'div{background-image: url("public/image/background.jpeg");}'
-        fetch.mockResponseOnce(new Blob([styleSheet]))
-        const styleSheetAsDataUrl = `data:text/plain;charset=utf-8;base64,aHR0cHM6Ly9leGFtcGxlLmNvbS9wdWJsaWMvaW1hZ2UvYmFja2dyb3VuZC5qcGVn`
-        const spy = jest.spyOn(common, 'urlToDataUrl').mockReturnValue(styleSheetAsDataUrl)
-        const doc = parser.parseFromString(
-            `<html>
-                <head>
-                    <style type="text/css">
-                        div{background-image: url("public/image/background.jpeg");}
-                    </style>
-                </head>
-                <div>
-                </div>
-            </html>`,
-            'text/html'
-        )
-        const docUrl = 'https://example.com'
-        await inlineStyles({rootElement: doc.documentElement, docUrl})
-        expect(spy).toHaveBeenCalled()
-        expect(doc.querySelector('style').innerHTML.trim())
-            .toBe(`div{background-image: url(${styleSheetAsDataUrl});}`)
-        spy.mockRestore()
-    })
-
-    test('should convert the urls in a style attribute to data URLs', async () => {
-        const spy = jest.spyOn(common, 'urlToDataUrl').mockReturnValue(imageDataUrl)
-        const doc = parser.parseFromString(
-            '<html><div style="background-image: url(\'public/image/background.jpeg\');"></div></html>',
-            'text/html'
-        )
-        const docUrl = 'https://example.com'
-        await inlineStyles({rootElement: doc.documentElement, docUrl})
-        expect(spy).toHaveBeenCalled()
-        expect(doc.querySelector('div').getAttribute('style'))
-            .toBe(`background-image: url(${imageDataUrl});`)
-        spy.mockRestore()
-    })
-})
diff --git a/src/freeze-dry/remove-noscripts.js b/src/freeze-dry/remove-noscripts.js
deleted file mode 100644
index f641d7fbf..000000000
--- a/src/freeze-dry/remove-noscripts.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { removeNode } from './common.js'
-
-
-// Removes all <noscript> elements in rootElement.
-export default function removeNoscripts({rootElement}) {
-    const scripts = Array.from(rootElement.querySelectorAll('noscript'))
-    scripts.forEach(removeNode)
-}
diff --git a/src/freeze-dry/remove-noscripts.test.js b/src/freeze-dry/remove-noscripts.test.js
deleted file mode 100644
index db165348d..000000000
--- a/src/freeze-dry/remove-noscripts.test.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* eslint-env jest */
-
-import removeNoscripts from 'src/freeze-dry/remove-noscripts'
-import * as common from 'src/freeze-dry/common'
-
-
-describe('removeNoscripts', () => {
-    test('should call removeNode for every <noscript> tag', () => {
-        const spy = jest.spyOn(common, 'removeNode')
-        const parser = new DOMParser()
-        const doc = parser.parseFromString(
-            '<html><head><noscript>No script was loaded</noscript><noscript>Your browser does not support JavaScript</noscript></head></html>',
-            'text/html'
-        )
-        const rootElement = doc.documentElement
-        removeNoscripts({rootElement})
-        expect(spy).toHaveBeenCalledTimes(2)
-    })
-
-    test('should remove all the <noscript> tags from the node', () => {
-        const parser = new DOMParser()
-        const doc = parser.parseFromString(
-            '<html><head><noscript>No script was loaded</noscript><noscript>Your browser does not support JavaScript</noscript></head></html>',
-            'text/html'
-        )
-        const rootElement = doc.documentElement
-        removeNoscripts({rootElement})
-        expect(rootElement.querySelector('noscript')).toBeNull()
-    })
-})
diff --git a/src/freeze-dry/remove-scripts.js b/src/freeze-dry/remove-scripts.js
deleted file mode 100644
index 629fc078a..000000000
--- a/src/freeze-dry/remove-scripts.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { removeNode } from './common.js'
-
-
-// Removes all <script> elements in rootElement.
-export function removeScriptElements({rootElement}) {
-    const scripts = Array.from(rootElement.querySelectorAll('script'))
-    scripts.forEach(removeNode)
-}
-
-// Removes event handlers (onclick, onload, etcetera) from rootElement and all elements it contains.
-export function removeEventHandlers({rootElement}) {
-    const elements = Array.from(rootElement.querySelectorAll('*'))
-    elements.forEach(element => {
-        // A crude approach: any attribute starting with 'on' is removed.
-        Array.from(element.attributes)
-            .filter(attribute => attribute.name.startsWith('on'))
-            .forEach(attribute => {
-                element.removeAttribute(attribute.name)
-            })
-    })
-}
-
-// Disables all links with a 'javascript:' href.
-export function removeJavascriptHrefs({rootElement}) {
-    const elements = Array.from(rootElement.querySelectorAll('*[href^="javascript:"]'))
-    elements.forEach(element => {
-        // We should keep some href value there to not change the link's appearance, but it should
-        // not be resolvable. So just keep the 'javascript:' there, for lack of better idea.
-        element.setAttribute('href', 'javascript:')
-    })
-}
-
-// Tries to remove all kinds of scripts contained in the given rootElement.
-export default async function removeScripts({rootElement}) {
-    removeScriptElements({rootElement})
-    removeEventHandlers({rootElement})
-    removeJavascriptHrefs({rootElement})
-}
diff --git a/src/freeze-dry/remove-scripts.test.js b/src/freeze-dry/remove-scripts.test.js
deleted file mode 100644
index 5640fc564..000000000
--- a/src/freeze-dry/remove-scripts.test.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* eslint-env jest */
-
-import removeScripts from 'src/freeze-dry/remove-scripts'
-
-
-describe('removeScripts', () => {
-    test('should remove script tags from the document', async () => {
-        const parser = new DOMParser()
-        const doc = parser.parseFromString(
-            '<html><head><script></script></head></html>',
-            'text/html'
-        )
-        const rootElement = doc.documentElement
-        const docUrl = 'about:blank'
-        await removeScripts({rootElement, docUrl})
-        expect(rootElement.getElementsByTagName('script').length).toBe(0)
-    })
-
-    test('should remove "on" handlers', async () => {
-        const parser = new DOMParser()
-        const doc = parser.parseFromString(
-            '<html><div onmouseover="handler()" onClick="handler()"></div></html>',
-            'text/html'
-        )
-        const rootElement = doc.documentElement
-        const docUrl = 'about:blank'
-        await removeScripts({rootElement, docUrl})
-        expect(rootElement.querySelector('div').attributes.length).toBe(0)
-    })
-})
diff --git a/src/freeze-dry/set-content-security-policy.js b/src/freeze-dry/set-content-security-policy.js
deleted file mode 100644
index 3b15bb904..000000000
--- a/src/freeze-dry/set-content-security-policy.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Puts the given CSP directives into a <meta> tag of the given document.
-export default function setContentSecurityPolicy({doc, policyDirectives}) {
-    // Ensure a head element exists.
-    if (!doc.head) {
-        const head = doc.createElement('head')
-        doc.documentElement.insertAdjacentElement('afterbegin', head)
-    }
-
-    // Disallow any sources, except data URLs where we use them.
-    const csp = policyDirectives.join('; ')
-
-    const metaEl = doc.createElement('meta')
-    metaEl.setAttribute('http-equiv', 'Content-Security-Policy')
-    metaEl.setAttribute('content', csp)
-    doc.head.insertAdjacentElement('afterbegin', metaEl)
-}
diff --git a/src/freeze-dry/set-content-security-policy.test.js b/src/freeze-dry/set-content-security-policy.test.js
deleted file mode 100644
index bf1d1deb1..000000000
--- a/src/freeze-dry/set-content-security-policy.test.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* eslint-env jest */
-
-import setContentSecurityPolicy from 'src/freeze-dry/set-content-security-policy'
-
-
-describe('setContentSecurityPolicy', () => {
-    test('should insert <meta> element at beginning of <head>', () => {
-        const policyDirectives = [
-            "default-src 'none'",
-            "img-src data:",
-            "style-src data: 'unsafe-inline'",
-            "font-src data:",
-        ]
-        const doc = window.document.implementation.createHTMLDocument()
-        // XXX insertAdjacentElement is not yet implemented in jsdom. This test is a placeholder
-        // until a better solution arises.
-        doc.querySelector('head').insertAdjacentElement = jest.fn()
-        setContentSecurityPolicy({doc, policyDirectives})
-        expect(doc.querySelector('head').insertAdjacentElement).toHaveBeenCalled()
-    })
-})
diff --git a/src/page-analysis/content_script/index.js b/src/page-analysis/content_script/index.js
index 9f9febfb5..c71f531f4 100644
--- a/src/page-analysis/content_script/index.js
+++ b/src/page-analysis/content_script/index.js
@@ -1,7 +1,7 @@
 import { makeRemotelyCallable } from 'src/util/webextensionRPC'
 
 import extractPageContent from './extract-page-content'
-import freezeDry from 'src/freeze-dry'
+import freezeDry from 'freeze-dry'
 
 
 makeRemotelyCallable({
diff --git a/yarn.lock b/yarn.lock
index 9e9506767..e05dd073c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3060,6 +3060,14 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
+freeze-dry@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/freeze-dry/-/freeze-dry-0.1.0.tgz#a055b91f8e94ce1dce99f1a904f37fa9b3f94354"
+  dependencies:
+    postinstall-build "^3.0.1"
+    response-to-data-url "^0.1.0"
+    when-all-settled "^0.1.1"
+
 fs-exists-sync@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"