diff --git a/.eslintignore b/.eslintignore
index 936cf5ec6..1ac2aac47 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -51,6 +51,8 @@ ReactNativeClient/pluginAssets/
 ReactNativeClient/lib/joplin-renderer/vendor/fountain.min.js
 ReactNativeClient/lib/joplin-renderer/assets/
 ReactNativeClient/lib/rnInjectedJs/
+Clipper/popup/config/webpack.config.js
+Clipper/popup/scripts/build.js
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 ElectronClient/gui/editors/PlainEditor.js
diff --git a/Clipper/package-lock.json b/Clipper/package-lock.json
index d53f6ffae..1f71766fc 100644
--- a/Clipper/package-lock.json
+++ b/Clipper/package-lock.json
@@ -1,45 +1,5 @@
 {
   "name": "joplin-webclipper",
   "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "fs-extra": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-      "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "dev": true
-    },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "readability-node": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/readability-node/-/readability-node-0.1.0.tgz",
-      "integrity": "sha1-DUBacMLCFZRKf0qbX3UGzQWpsao="
-    },
-    "universalify": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
-      "dev": true
-    }
-  }
+  "lockfileVersion": 1
 }
diff --git a/Clipper/popup/config/env.js b/Clipper/popup/config/env.js
new file mode 100644
index 000000000..9c76d46a3
--- /dev/null
+++ b/Clipper/popup/config/env.js
@@ -0,0 +1,93 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const paths = require('./paths');
+
+// Make sure that including paths.js after env.js will read .env variables.
+delete require.cache[require.resolve('./paths')];
+
+const NODE_ENV = process.env.NODE_ENV;
+if (!NODE_ENV) {
+	throw new Error(
+		'The NODE_ENV environment variable is required but was not specified.'
+	);
+}
+
+// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
+const dotenvFiles = [
+	`${paths.dotenv}.${NODE_ENV}.local`,
+	`${paths.dotenv}.${NODE_ENV}`,
+	// Don't include `.env.local` for `test` environment
+	// since normally you expect tests to produce the same
+	// results for everyone
+	NODE_ENV !== 'test' && `${paths.dotenv}.local`,
+	paths.dotenv,
+].filter(Boolean);
+
+// Load environment variables from .env* files. Suppress warnings using silent
+// if this file is missing. dotenv will never modify any environment variables
+// that have already been set.  Variable expansion is supported in .env files.
+// https://github.com/motdotla/dotenv
+// https://github.com/motdotla/dotenv-expand
+dotenvFiles.forEach(dotenvFile => {
+	if (fs.existsSync(dotenvFile)) {
+		require('dotenv-expand')(
+			require('dotenv').config({
+				path: dotenvFile,
+			})
+		);
+	}
+});
+
+// We support resolving modules according to `NODE_PATH`.
+// This lets you use absolute paths in imports inside large monorepos:
+// https://github.com/facebook/create-react-app/issues/253.
+// It works similar to `NODE_PATH` in Node itself:
+// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
+// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
+// Otherwise, we risk importing Node.js core modules into an app instead of Webpack shims.
+// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421
+// We also resolve them to make sure all tools using them work consistently.
+const appDirectory = fs.realpathSync(process.cwd());
+process.env.NODE_PATH = (process.env.NODE_PATH || '')
+	.split(path.delimiter)
+	.filter(folder => folder && !path.isAbsolute(folder))
+	.map(folder => path.resolve(appDirectory, folder))
+	.join(path.delimiter);
+
+// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be
+// injected into the application via DefinePlugin in Webpack configuration.
+const REACT_APP = /^REACT_APP_/i;
+
+function getClientEnvironment(publicUrl) {
+	const raw = Object.keys(process.env)
+		.filter(key => REACT_APP.test(key))
+		.reduce(
+			(env, key) => {
+				env[key] = process.env[key];
+				return env;
+			},
+			{
+				// Useful for determining whether we’re running in production mode.
+				// Most importantly, it switches React into the correct mode.
+				NODE_ENV: process.env.NODE_ENV || 'development',
+				// Useful for resolving the correct path to static assets in `public`.
+				// For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
+				// This should only be used as an escape hatch. Normally you would put
+				// images into the `src` and `import` them in code to get their paths.
+				PUBLIC_URL: publicUrl,
+			}
+		);
+	// Stringify all values so we can feed into Webpack DefinePlugin
+	const stringified = {
+		'process.env': Object.keys(raw).reduce((env, key) => {
+			env[key] = JSON.stringify(raw[key]);
+			return env;
+		}, {}),
+	};
+
+	return { raw, stringified };
+}
+
+module.exports = getClientEnvironment;
diff --git a/Clipper/popup/config/jest/cssTransform.js b/Clipper/popup/config/jest/cssTransform.js
new file mode 100644
index 000000000..9459da3e7
--- /dev/null
+++ b/Clipper/popup/config/jest/cssTransform.js
@@ -0,0 +1,14 @@
+'use strict';
+
+// This is a custom Jest transformer turning style imports into empty objects.
+// http://facebook.github.io/jest/docs/en/webpack.html
+
+module.exports = {
+	process() {
+		return 'module.exports = {};';
+	},
+	getCacheKey() {
+		// The output is always the same.
+		return 'cssTransform';
+	},
+};
diff --git a/Clipper/popup/config/jest/fileTransform.js b/Clipper/popup/config/jest/fileTransform.js
new file mode 100644
index 000000000..9884a1891
--- /dev/null
+++ b/Clipper/popup/config/jest/fileTransform.js
@@ -0,0 +1,40 @@
+'use strict';
+
+const path = require('path');
+const camelcase = require('camelcase');
+
+// This is a custom Jest transformer turning file imports into filenames.
+// http://facebook.github.io/jest/docs/en/webpack.html
+
+module.exports = {
+	process(src, filename) {
+		const assetFilename = JSON.stringify(path.basename(filename));
+
+		if (filename.match(/\.svg$/)) {
+			// Based on how SVGR generates a component name:
+			// https://github.com/smooth-code/svgr/blob/01b194cf967347d43d4cbe6b434404731b87cf27/packages/core/src/state.js#L6
+			const pascalCaseFilename = camelcase(path.parse(filename).name, {
+				pascalCase: true,
+			});
+			const componentName = `Svg${pascalCaseFilename}`;
+			return `const React = require('react');
+      module.exports = {
+        __esModule: true,
+        default: ${assetFilename},
+        ReactComponent: React.forwardRef(function ${componentName}(props, ref) {
+          return {
+            $$typeof: Symbol.for('react.element'),
+            type: 'svg',
+            ref: ref,
+            key: null,
+            props: Object.assign({}, props, {
+              children: ${assetFilename}
+            })
+          };
+        }),
+      };`;
+		}
+
+		return `module.exports = ${assetFilename};`;
+	},
+};
diff --git a/Clipper/popup/config/modules.js b/Clipper/popup/config/modules.js
new file mode 100644
index 000000000..1c5dec319
--- /dev/null
+++ b/Clipper/popup/config/modules.js
@@ -0,0 +1,141 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const paths = require('./paths');
+const chalk = require('react-dev-utils/chalk');
+const resolve = require('resolve');
+
+/**
+ * Get additional module paths based on the baseUrl of a compilerOptions object.
+ *
+ * @param {Object} options
+ */
+function getAdditionalModulePaths(options = {}) {
+	const baseUrl = options.baseUrl;
+
+	// We need to explicitly check for null and undefined (and not a falsy value) because
+	// TypeScript treats an empty string as `.`.
+	if (baseUrl == null) {
+		// If there's no baseUrl set we respect NODE_PATH
+		// Note that NODE_PATH is deprecated and will be removed
+		// in the next major release of create-react-app.
+
+		const nodePath = process.env.NODE_PATH || '';
+		return nodePath.split(path.delimiter).filter(Boolean);
+	}
+
+	const baseUrlResolved = path.resolve(paths.appPath, baseUrl);
+
+	// We don't need to do anything if `baseUrl` is set to `node_modules`. This is
+	// the default behavior.
+	if (path.relative(paths.appNodeModules, baseUrlResolved) === '') {
+		return null;
+	}
+
+	// Allow the user set the `baseUrl` to `appSrc`.
+	if (path.relative(paths.appSrc, baseUrlResolved) === '') {
+		return [paths.appSrc];
+	}
+
+	// If the path is equal to the root directory we ignore it here.
+	// We don't want to allow importing from the root directly as source files are
+	// not transpiled outside of `src`. We do allow importing them with the
+	// absolute path (e.g. `src/Components/Button.js`) but we set that up with
+	// an alias.
+	if (path.relative(paths.appPath, baseUrlResolved) === '') {
+		return null;
+	}
+
+	// Otherwise, throw an error.
+	throw new Error(
+		chalk.red.bold(
+			'Your project\'s `baseUrl` can only be set to `src` or `node_modules`.' +
+        ' Create React App does not support other values at this time.'
+		)
+	);
+}
+
+/**
+ * Get webpack aliases based on the baseUrl of a compilerOptions object.
+ *
+ * @param {*} options
+ */
+function getWebpackAliases(options = {}) {
+	const baseUrl = options.baseUrl;
+
+	if (!baseUrl) {
+		return {};
+	}
+
+	const baseUrlResolved = path.resolve(paths.appPath, baseUrl);
+
+	if (path.relative(paths.appPath, baseUrlResolved) === '') {
+		return {
+			src: paths.appSrc,
+		};
+	}
+}
+
+/**
+ * Get jest aliases based on the baseUrl of a compilerOptions object.
+ *
+ * @param {*} options
+ */
+function getJestAliases(options = {}) {
+	const baseUrl = options.baseUrl;
+
+	if (!baseUrl) {
+		return {};
+	}
+
+	const baseUrlResolved = path.resolve(paths.appPath, baseUrl);
+
+	if (path.relative(paths.appPath, baseUrlResolved) === '') {
+		return {
+			'^src/(.*)$': '<rootDir>/src/$1',
+		};
+	}
+}
+
+function getModules() {
+	// Check if TypeScript is setup
+	const hasTsConfig = fs.existsSync(paths.appTsConfig);
+	const hasJsConfig = fs.existsSync(paths.appJsConfig);
+
+	if (hasTsConfig && hasJsConfig) {
+		throw new Error(
+			'You have both a tsconfig.json and a jsconfig.json. If you are using TypeScript please remove your jsconfig.json file.'
+		);
+	}
+
+	let config;
+
+	// If there's a tsconfig.json we assume it's a
+	// TypeScript project and set up the config
+	// based on tsconfig.json
+	if (hasTsConfig) {
+		const ts = require(resolve.sync('typescript', {
+			basedir: paths.appNodeModules,
+		}));
+		config = ts.readConfigFile(paths.appTsConfig, ts.sys.readFile).config;
+		// Otherwise we'll check if there is jsconfig.json
+		// for non TS projects.
+	} else if (hasJsConfig) {
+		config = require(paths.appJsConfig);
+	}
+
+	config = config || {};
+	const options = config.compilerOptions || {};
+
+	const additionalModulePaths = getAdditionalModulePaths(options);
+
+	return {
+		additionalModulePaths: additionalModulePaths,
+		webpackAliases: getWebpackAliases(options),
+		jestAliases: getJestAliases(options),
+		hasTsConfig,
+	};
+}
+
+module.exports = getModules();
diff --git a/Clipper/popup/config/paths.js b/Clipper/popup/config/paths.js
new file mode 100644
index 000000000..808d27110
--- /dev/null
+++ b/Clipper/popup/config/paths.js
@@ -0,0 +1,90 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const url = require('url');
+
+// Make sure any symlinks in the project folder are resolved:
+// https://github.com/facebook/create-react-app/issues/637
+const appDirectory = fs.realpathSync(process.cwd());
+const resolveApp = relativePath => path.resolve(appDirectory, relativePath);
+
+const envPublicUrl = process.env.PUBLIC_URL;
+
+function ensureSlash(inputPath, needsSlash) {
+	const hasSlash = inputPath.endsWith('/');
+	if (hasSlash && !needsSlash) {
+		return inputPath.substr(0, inputPath.length - 1);
+	} else if (!hasSlash && needsSlash) {
+		return `${inputPath}/`;
+	} else {
+		return inputPath;
+	}
+}
+
+const getPublicUrl = appPackageJson =>
+	envPublicUrl || require(appPackageJson).homepage;
+
+// We use `PUBLIC_URL` environment variable or "homepage" field to infer
+// "public path" at which the app is served.
+// Webpack needs to know it to put the right <script> hrefs into HTML even in
+// single-page apps that may serve index.html for nested URLs like /todos/42.
+// We can't use a relative path in HTML because we don't want to load something
+// like /todos/42/static/js/bundle.7289d.js. We have to know the root.
+function getServedPath(appPackageJson) {
+	const publicUrl = getPublicUrl(appPackageJson);
+	const servedUrl =
+    envPublicUrl || (publicUrl ? url.parse(publicUrl).pathname : '/');
+	return ensureSlash(servedUrl, true);
+}
+
+const moduleFileExtensions = [
+	'web.mjs',
+	'mjs',
+	'web.js',
+	'js',
+	'web.ts',
+	'ts',
+	'web.tsx',
+	'tsx',
+	'json',
+	'web.jsx',
+	'jsx',
+];
+
+// Resolve file paths in the same order as webpack
+const resolveModule = (resolveFn, filePath) => {
+	const extension = moduleFileExtensions.find(extension =>
+		fs.existsSync(resolveFn(`${filePath}.${extension}`))
+	);
+
+	if (extension) {
+		return resolveFn(`${filePath}.${extension}`);
+	}
+
+	return resolveFn(`${filePath}.js`);
+};
+
+// config after eject: we're in ./config/
+module.exports = {
+	dotenv: resolveApp('.env'),
+	appPath: resolveApp('.'),
+	appBuild: resolveApp('build'),
+	appPublic: resolveApp('public'),
+	appHtml: resolveApp('public/index.html'),
+	appIndexJs: resolveModule(resolveApp, 'src/index'),
+	appPackageJson: resolveApp('package.json'),
+	appSrc: resolveApp('src'),
+	appTsConfig: resolveApp('tsconfig.json'),
+	appJsConfig: resolveApp('jsconfig.json'),
+	yarnLockFile: resolveApp('yarn.lock'),
+	testsSetup: resolveModule(resolveApp, 'src/setupTests'),
+	proxySetup: resolveApp('src/setupProxy.js'),
+	appNodeModules: resolveApp('node_modules'),
+	publicUrl: getPublicUrl(resolveApp('package.json')),
+	servedPath: getServedPath(resolveApp('package.json')),
+};
+
+
+
+module.exports.moduleFileExtensions = moduleFileExtensions;
diff --git a/Clipper/popup/config/pnpTs.js b/Clipper/popup/config/pnpTs.js
new file mode 100644
index 000000000..095794572
--- /dev/null
+++ b/Clipper/popup/config/pnpTs.js
@@ -0,0 +1,35 @@
+'use strict';
+
+const { resolveModuleName } = require('ts-pnp');
+
+exports.resolveModuleName = (
+	typescript,
+	moduleName,
+	containingFile,
+	compilerOptions,
+	resolutionHost
+) => {
+	return resolveModuleName(
+		moduleName,
+		containingFile,
+		compilerOptions,
+		resolutionHost,
+		typescript.resolveModuleName
+	);
+};
+
+exports.resolveTypeReferenceDirective = (
+	typescript,
+	moduleName,
+	containingFile,
+	compilerOptions,
+	resolutionHost
+) => {
+	return resolveModuleName(
+		moduleName,
+		containingFile,
+		compilerOptions,
+		resolutionHost,
+		typescript.resolveTypeReferenceDirective
+	);
+};
diff --git a/Clipper/popup/config/webpack.config.js b/Clipper/popup/config/webpack.config.js
new file mode 100644
index 000000000..2b241a85b
--- /dev/null
+++ b/Clipper/popup/config/webpack.config.js
@@ -0,0 +1,676 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const webpack = require('webpack');
+const resolve = require('resolve');
+const PnpWebpackPlugin = require('pnp-webpack-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
+const InlineChunkHtmlPlugin = require('react-dev-utils/InlineChunkHtmlPlugin');
+const TerserPlugin = require('terser-webpack-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+const safePostCssParser = require('postcss-safe-parser');
+const ManifestPlugin = require('webpack-manifest-plugin');
+const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
+const WorkboxWebpackPlugin = require('workbox-webpack-plugin');
+const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
+const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
+const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
+const paths = require('./paths');
+const modules = require('./modules');
+const getClientEnvironment = require('./env');
+const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
+const ForkTsCheckerWebpackPlugin = require('react-dev-utils/ForkTsCheckerWebpackPlugin');
+const typescriptFormatter = require('react-dev-utils/typescriptFormatter');
+
+const postcssNormalize = require('postcss-normalize');
+
+const appPackageJson = require(paths.appPackageJson);
+
+// Source maps are resource heavy and can cause out of memory issue for large source files.
+const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
+// Some apps do not need the benefits of saving a web request, so not inlining the chunk
+// makes for a smoother build process.
+const shouldInlineRuntimeChunk = process.env.INLINE_RUNTIME_CHUNK !== 'false';
+
+const imageInlineSizeLimit = parseInt(
+	process.env.IMAGE_INLINE_SIZE_LIMIT || '10000'
+);
+
+// Check if TypeScript is setup
+const useTypeScript = fs.existsSync(paths.appTsConfig);
+
+// style files regexes
+const cssRegex = /\.css$/;
+const cssModuleRegex = /\.module\.css$/;
+const sassRegex = /\.(scss|sass)$/;
+const sassModuleRegex = /\.module\.(scss|sass)$/;
+
+// This is the production and development configuration.
+// It is focused on developer experience, fast rebuilds, and a minimal bundle.
+module.exports = function(webpackEnv) {
+	const isEnvDevelopment = webpackEnv === 'development';
+	const isEnvProduction = webpackEnv === 'production';
+
+	// Variable used for enabling profiling in Production
+	// passed into alias object. Uses a flag if passed into the build command
+	const isEnvProductionProfile =
+    isEnvProduction && process.argv.includes('--profile');
+
+	// Webpack uses `publicPath` to determine where the app is being served from.
+	// It requires a trailing slash, or the file assets will get an incorrect path.
+	// In development, we always serve from the root. This makes config easier.
+	const publicPath = isEnvProduction
+		? paths.servedPath
+		: isEnvDevelopment && '/';
+	// Some apps do not use client-side routing with pushState.
+	// For these, "homepage" can be set to "." to enable relative asset paths.
+	const shouldUseRelativeAssetPaths = publicPath === './';
+
+	// `publicUrl` is just like `publicPath`, but we will provide it to our app
+	// as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
+	// Omit trailing slash as %PUBLIC_URL%/xyz looks better than %PUBLIC_URL%xyz.
+	const publicUrl = isEnvProduction
+		? publicPath.slice(0, -1)
+		: isEnvDevelopment && '';
+	// Get environment variables to inject into our app.
+	const env = getClientEnvironment(publicUrl);
+
+	// common function to get style loaders
+	const getStyleLoaders = (cssOptions, preProcessor) => {
+		const loaders = [
+			isEnvDevelopment && require.resolve('style-loader'),
+			isEnvProduction && {
+				loader: MiniCssExtractPlugin.loader,
+				options: shouldUseRelativeAssetPaths ? { publicPath: '../../' } : {},
+			},
+			{
+				loader: require.resolve('css-loader'),
+				options: cssOptions,
+			},
+			{
+				// Options for PostCSS as we reference these options twice
+				// Adds vendor prefixing based on your specified browser support in
+				// package.json
+				loader: require.resolve('postcss-loader'),
+				options: {
+					// Necessary for external CSS imports to work
+					// https://github.com/facebook/create-react-app/issues/2677
+					ident: 'postcss',
+					plugins: () => [
+						require('postcss-flexbugs-fixes'),
+						require('postcss-preset-env')({
+							autoprefixer: {
+								flexbox: 'no-2009',
+							},
+							stage: 3,
+						}),
+						// Adds PostCSS Normalize as the reset css with default options,
+						// so that it honors browserslist config in package.json
+						// which in turn let's users customize the target behavior as per their needs.
+						postcssNormalize(),
+					],
+					sourceMap: isEnvProduction && shouldUseSourceMap,
+				},
+			},
+		].filter(Boolean);
+		if (preProcessor) {
+			loaders.push(
+				{
+					loader: require.resolve('resolve-url-loader'),
+					options: {
+						sourceMap: isEnvProduction && shouldUseSourceMap,
+					},
+				},
+				{
+					loader: require.resolve(preProcessor),
+					options: {
+						sourceMap: true,
+					},
+				}
+			);
+		}
+		return loaders;
+	};
+
+	return {
+		mode: isEnvProduction ? 'production' : isEnvDevelopment && 'development',
+		// Stop compilation early in production
+		bail: isEnvProduction,
+		devtool: isEnvProduction
+			? shouldUseSourceMap
+				? 'source-map'
+				: false
+			: isEnvDevelopment && 'cheap-module-source-map',
+		// These are the "entry points" to our application.
+		// This means they will be the "root" imports that are included in JS bundle.
+		entry: [
+			// Include an alternative client for WebpackDevServer. A client's job is to
+			// connect to WebpackDevServer by a socket and get notified about changes.
+			// When you save a file, the client will either apply hot updates (in case
+			// of CSS changes), or refresh the page (in case of JS changes). When you
+			// make a syntax error, this client will display a syntax error overlay.
+			// Note: instead of the default WebpackDevServer client, we use a custom one
+			// to bring better experience for Create React App users. You can replace
+			// the line below with these two lines if you prefer the stock client:
+			// require.resolve('webpack-dev-server/client') + '?/',
+			// require.resolve('webpack/hot/dev-server'),
+			isEnvDevelopment &&
+        require.resolve('react-dev-utils/webpackHotDevClient'),
+			// Finally, this is your app's code:
+			paths.appIndexJs,
+			// We include the app code last so that if there is a runtime error during
+			// initialization, it doesn't blow up the WebpackDevServer client, and
+			// changing JS code would still trigger a refresh.
+		].filter(Boolean),
+		output: {
+			// The build folder.
+			path: isEnvProduction ? paths.appBuild : undefined,
+			// Add /* filename */ comments to generated require()s in the output.
+			pathinfo: isEnvDevelopment,
+			// There will be one main bundle, and one file per asynchronous chunk.
+			// In development, it does not produce real files.
+			filename: isEnvProduction
+				? 'static/js/[name].js'
+				: isEnvDevelopment && 'static/js/bundle.js',
+			// TODO: remove this when upgrading to webpack 5
+			futureEmitAssets: true,
+			// There are also additional JS chunk files if you use code splitting.
+			chunkFilename: isEnvProduction
+				? 'static/js/[name].chunk.js'
+				: isEnvDevelopment && 'static/js/[name].chunk.js',
+			// We inferred the "public path" (such as / or /my-project) from homepage.
+			// We use "/" in development.
+			publicPath: publicPath,
+			// Point sourcemap entries to original disk location (format as URL on Windows)
+			devtoolModuleFilenameTemplate: isEnvProduction
+				? info =>
+					path
+						.relative(paths.appSrc, info.absoluteResourcePath)
+						.replace(/\\/g, '/')
+				: isEnvDevelopment &&
+          (info => path.resolve(info.absoluteResourcePath).replace(/\\/g, '/')),
+			// Prevents conflicts when multiple Webpack runtimes (from different apps)
+			// are used on the same page.
+			jsonpFunction: `webpackJsonp${appPackageJson.name}`,
+			// this defaults to 'window', but by setting it to 'this' then
+			// module chunks which are built will work in web workers as well.
+			globalObject: 'this',
+		},
+		optimization: {
+			minimize: isEnvProduction,
+			minimizer: [
+				// This is only used in production mode
+				new TerserPlugin({
+					terserOptions: {
+						parse: {
+							// We want terser to parse ecma 8 code. However, we don't want it
+							// to apply any minification steps that turns valid ecma 5 code
+							// into invalid ecma 5 code. This is why the 'compress' and 'output'
+							// sections only apply transformations that are ecma 5 safe
+							// https://github.com/facebook/create-react-app/pull/4234
+							ecma: 8,
+						},
+						compress: {
+							ecma: 5,
+							warnings: false,
+							// Disabled because of an issue with Uglify breaking seemingly valid code:
+							// https://github.com/facebook/create-react-app/issues/2376
+							// Pending further investigation:
+							// https://github.com/mishoo/UglifyJS2/issues/2011
+							comparisons: false,
+							// Disabled because of an issue with Terser breaking valid code:
+							// https://github.com/facebook/create-react-app/issues/5250
+							// Pending further investigation:
+							// https://github.com/terser-js/terser/issues/120
+							inline: 2,
+						},
+						mangle: {
+							safari10: true,
+						},
+						// Added for profiling in devtools
+						keep_classnames: isEnvProductionProfile,
+						keep_fnames: isEnvProductionProfile,
+						output: {
+							ecma: 5,
+							comments: false,
+							// Turned on because emoji and regex is not minified properly using default
+							// https://github.com/facebook/create-react-app/issues/2488
+							ascii_only: true,
+						},
+					},
+					sourceMap: shouldUseSourceMap,
+				}),
+				// This is only used in production mode
+				new OptimizeCSSAssetsPlugin({
+					cssProcessorOptions: {
+						parser: safePostCssParser,
+						map: shouldUseSourceMap
+							? {
+								// `inline: false` forces the sourcemap to be output into a
+								// separate file
+								inline: false,
+								// `annotation: true` appends the sourceMappingURL to the end of
+								// the css file, helping the browser find the sourcemap
+								annotation: true,
+							}
+							: false,
+					},
+					cssProcessorPluginOptions: {
+						preset: ['default', { minifyFontValues: { removeQuotes: false } }],
+					},
+				}),
+			],
+			// Automatically split vendor and commons
+			// https://twitter.com/wSokra/status/969633336732905474
+			// https://medium.com/webpack/webpack-4-code-splitting-chunk-graph-and-the-splitchunks-optimization-be739a861366
+			splitChunks: {
+				chunks: 'all',
+				name: false,
+			},
+			// Keep the runtime chunk separated to enable long term caching
+			// https://twitter.com/wSokra/status/969679223278505985
+			// https://github.com/facebook/create-react-app/issues/5358
+			runtimeChunk: {
+				name: entrypoint => `runtime-${entrypoint.name}`,
+			},
+		},
+		resolve: {
+			// This allows you to set a fallback for where Webpack should look for modules.
+			// We placed these paths second because we want `node_modules` to "win"
+			// if there are any conflicts. This matches Node resolution mechanism.
+			// https://github.com/facebook/create-react-app/issues/253
+			modules: ['node_modules', paths.appNodeModules].concat(
+				modules.additionalModulePaths || []
+			),
+			// These are the reasonable defaults supported by the Node ecosystem.
+			// We also include JSX as a common component filename extension to support
+			// some tools, although we do not recommend using it, see:
+			// https://github.com/facebook/create-react-app/issues/290
+			// `web` extension prefixes have been added for better support
+			// for React Native Web.
+			extensions: paths.moduleFileExtensions
+				.map(ext => `.${ext}`)
+				.filter(ext => useTypeScript || !ext.includes('ts')),
+			alias: {
+				// Support React Native Web
+				// https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
+				'react-native': 'react-native-web',
+				// Allows for better profiling with ReactDevTools
+				...(isEnvProductionProfile && {
+					'react-dom$': 'react-dom/profiling',
+					'scheduler/tracing': 'scheduler/tracing-profiling',
+				}),
+				...(modules.webpackAliases || {}),
+			},
+			plugins: [
+				// Adds support for installing with Plug'n'Play, leading to faster installs and adding
+				// guards against forgotten dependencies and such.
+				PnpWebpackPlugin,
+				// Prevents users from importing files from outside of src/ (or node_modules/).
+				// This often causes confusion because we only process files within src/ with babel.
+				// To fix this, we prevent you from importing files out of src/ -- if you'd like to,
+				// please link the files into your node_modules/ and let module-resolution kick in.
+				// Make sure your source files are compiled, as they will not be processed in any way.
+				new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
+			],
+		},
+		resolveLoader: {
+			plugins: [
+				// Also related to Plug'n'Play, but this time it tells Webpack to load its loaders
+				// from the current package.
+				PnpWebpackPlugin.moduleLoader(module),
+			],
+		},
+		module: {
+			strictExportPresence: true,
+			rules: [
+				// Disable require.ensure as it's not a standard language feature.
+				{ parser: { requireEnsure: false } },
+
+				// First, run the linter.
+				// It's important to do this before Babel processes the JS.
+				// {
+				//   test: /\.(js|mjs|jsx|ts|tsx)$/,
+				//   enforce: 'pre',
+				//   use: [
+				//     {
+				//       options: {
+				//         cache: true,
+				//         formatter: require.resolve('react-dev-utils/eslintFormatter'),
+				//         eslintPath: require.resolve('eslint'),
+				//         resolvePluginsRelativeTo: __dirname,
+
+				//       },
+				//       loader: require.resolve('eslint-loader'),
+				//     },
+				//   ],
+				//   include: paths.appSrc,
+				// },
+				{
+					// "oneOf" will traverse all following loaders until one will
+					// match the requirements. When no loader matches it will fall
+					// back to the "file" loader at the end of the loader list.
+					oneOf: [
+						// "url" loader works like "file" loader except that it embeds assets
+						// smaller than specified limit in bytes as data URLs to avoid requests.
+						// A missing `test` is equivalent to a match.
+						{
+							test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
+							loader: require.resolve('url-loader'),
+							options: {
+								limit: imageInlineSizeLimit,
+								name: 'static/media/[name].[hash:8].[ext]',
+							},
+						},
+						// Process application JS with Babel.
+						// The preset includes JSX, Flow, TypeScript, and some ESnext features.
+						{
+							test: /\.(js|mjs|jsx|ts|tsx)$/,
+							include: paths.appSrc,
+							loader: require.resolve('babel-loader'),
+							options: {
+								customize: require.resolve(
+									'babel-preset-react-app/webpack-overrides'
+								),
+
+								plugins: [
+									[
+										require.resolve('babel-plugin-named-asset-import'),
+										{
+											loaderMap: {
+												svg: {
+													ReactComponent:
+                            '@svgr/webpack?-svgo,+titleProp,+ref![path]',
+												},
+											},
+										},
+									],
+								],
+								// This is a feature of `babel-loader` for webpack (not Babel itself).
+								// It enables caching results in ./node_modules/.cache/babel-loader/
+								// directory for faster rebuilds.
+								cacheDirectory: true,
+								// See #6846 for context on why cacheCompression is disabled
+								cacheCompression: false,
+								compact: isEnvProduction,
+							},
+						},
+						// Process any JS outside of the app with Babel.
+						// Unlike the application JS, we only compile the standard ES features.
+						{
+							test: /\.(js|mjs)$/,
+							exclude: /@babel(?:\/|\\{1,2})runtime/,
+							loader: require.resolve('babel-loader'),
+							options: {
+								babelrc: false,
+								configFile: false,
+								compact: false,
+								presets: [
+									[
+										require.resolve('babel-preset-react-app/dependencies'),
+										{ helpers: true },
+									],
+								],
+								cacheDirectory: true,
+								// See #6846 for context on why cacheCompression is disabled
+								cacheCompression: false,
+
+								// Babel sourcemaps are needed for debugging into node_modules
+								// code.  Without the options below, debuggers like VSCode
+								// show incorrect code and set breakpoints on the wrong lines.
+								sourceMaps: shouldUseSourceMap,
+								inputSourceMap: shouldUseSourceMap,
+							},
+						},
+						// "postcss" loader applies autoprefixer to our CSS.
+						// "css" loader resolves paths in CSS and adds assets as dependencies.
+						// "style" loader turns CSS into JS modules that inject <style> tags.
+						// In production, we use MiniCSSExtractPlugin to extract that CSS
+						// to a file, but in development "style" loader enables hot editing
+						// of CSS.
+						// By default we support CSS Modules with the extension .module.css
+						{
+							test: cssRegex,
+							exclude: cssModuleRegex,
+							use: getStyleLoaders({
+								importLoaders: 1,
+								sourceMap: isEnvProduction && shouldUseSourceMap,
+							}),
+							// Don't consider CSS imports dead code even if the
+							// containing package claims to have no side effects.
+							// Remove this when webpack adds a warning or an error for this.
+							// See https://github.com/webpack/webpack/issues/6571
+							sideEffects: true,
+						},
+						// Adds support for CSS Modules (https://github.com/css-modules/css-modules)
+						// using the extension .module.css
+						{
+							test: cssModuleRegex,
+							use: getStyleLoaders({
+								importLoaders: 1,
+								sourceMap: isEnvProduction && shouldUseSourceMap,
+								modules: {
+									getLocalIdent: getCSSModuleLocalIdent,
+								},
+							}),
+						},
+						// Opt-in support for SASS (using .scss or .sass extensions).
+						// By default we support SASS Modules with the
+						// extensions .module.scss or .module.sass
+						{
+							test: sassRegex,
+							exclude: sassModuleRegex,
+							use: getStyleLoaders(
+								{
+									importLoaders: 3,
+									sourceMap: isEnvProduction && shouldUseSourceMap,
+								},
+								'sass-loader'
+							),
+							// Don't consider CSS imports dead code even if the
+							// containing package claims to have no side effects.
+							// Remove this when webpack adds a warning or an error for this.
+							// See https://github.com/webpack/webpack/issues/6571
+							sideEffects: true,
+						},
+						// Adds support for CSS Modules, but using SASS
+						// using the extension .module.scss or .module.sass
+						{
+							test: sassModuleRegex,
+							use: getStyleLoaders(
+								{
+									importLoaders: 3,
+									sourceMap: isEnvProduction && shouldUseSourceMap,
+									modules: {
+										getLocalIdent: getCSSModuleLocalIdent,
+									},
+								},
+								'sass-loader'
+							),
+						},
+						// "file" loader makes sure those assets get served by WebpackDevServer.
+						// When you `import` an asset, you get its (virtual) filename.
+						// In production, they would get copied to the `build` folder.
+						// This loader doesn't use a "test" so it will catch all modules
+						// that fall through the other loaders.
+						{
+							loader: require.resolve('file-loader'),
+							// Exclude `js` files to keep "css" loader working as it injects
+							// its runtime that would otherwise be processed through "file" loader.
+							// Also exclude `html` and `json` extensions so they get processed
+							// by webpacks internal loaders.
+							exclude: [/\.(js|mjs|jsx|ts|tsx)$/, /\.html$/, /\.json$/],
+							options: {
+								name: 'static/media/[name].[hash:8].[ext]',
+							},
+						},
+						// ** STOP ** Are you adding a new loader?
+						// Make sure to add the new loader(s) before the "file" loader.
+					],
+				},
+			],
+		},
+		plugins: [
+			// Generates an `index.html` file with the <script> injected.
+			new HtmlWebpackPlugin(
+				Object.assign(
+					{},
+					{
+						inject: true,
+						template: paths.appHtml,
+					},
+					isEnvProduction
+						? {
+							minify: {
+								removeComments: true,
+								collapseWhitespace: true,
+								removeRedundantAttributes: true,
+								useShortDoctype: true,
+								removeEmptyAttributes: true,
+								removeStyleLinkTypeAttributes: true,
+								keepClosingSlash: true,
+								minifyJS: true,
+								minifyCSS: true,
+								minifyURLs: true,
+							},
+						}
+						: undefined
+				)
+			),
+			// Inlines the webpack runtime script. This script is too small to warrant
+			// a network request.
+			// https://github.com/facebook/create-react-app/issues/5358
+			isEnvProduction &&
+        shouldInlineRuntimeChunk &&
+        new InlineChunkHtmlPlugin(HtmlWebpackPlugin, [/runtime-.+[.]js/]),
+			// Makes some environment variables available in index.html.
+			// The public URL is available as %PUBLIC_URL% in index.html, e.g.:
+			// <link rel="icon" href="%PUBLIC_URL%/favicon.ico">
+			// In production, it will be an empty string unless you specify "homepage"
+			// in `package.json`, in which case it will be the pathname of that URL.
+			// In development, this will be an empty string.
+			new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
+			// This gives some necessary context to module not found errors, such as
+			// the requesting resource.
+			new ModuleNotFoundPlugin(paths.appPath),
+			// Makes some environment variables available to the JS code, for example:
+			// if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
+			// It is absolutely essential that NODE_ENV is set to production
+			// during a production build.
+			// Otherwise React will be compiled in the very slow development mode.
+			new webpack.DefinePlugin(env.stringified),
+			// This is necessary to emit hot updates (currently CSS only):
+			isEnvDevelopment && new webpack.HotModuleReplacementPlugin(),
+			// Watcher doesn't work well if you mistype casing in a path so we use
+			// a plugin that prints an error when you attempt to do this.
+			// See https://github.com/facebook/create-react-app/issues/240
+			isEnvDevelopment && new CaseSensitivePathsPlugin(),
+			// If you require a missing module and then `npm install` it, you still have
+			// to restart the development server for Webpack to discover it. This plugin
+			// makes the discovery automatic so you don't have to restart.
+			// See https://github.com/facebook/create-react-app/issues/186
+			isEnvDevelopment &&
+        new WatchMissingNodeModulesPlugin(paths.appNodeModules),
+			isEnvProduction &&
+        new MiniCssExtractPlugin({
+        	// Options similar to the same options in webpackOptions.output
+        	// both options are optional
+        	filename: 'static/css/[name].css',
+        	chunkFilename: 'static/css/[name].chunk.css',
+        }),
+			// Generate an asset manifest file with the following content:
+			// - "files" key: Mapping of all asset filenames to their corresponding
+			//   output file so that tools can pick it up without having to parse
+			//   `index.html`
+			// - "entrypoints" key: Array of files which are included in `index.html`,
+			//   can be used to reconstruct the HTML if necessary
+			new ManifestPlugin({
+				fileName: 'asset-manifest.json',
+				publicPath: publicPath,
+				generate: (seed, files, entrypoints) => {
+					const manifestFiles = files.reduce((manifest, file) => {
+						manifest[file.name] = file.path;
+						return manifest;
+					}, seed);
+					const entrypointFiles = entrypoints.main.filter(
+						fileName => !fileName.endsWith('.map')
+					);
+
+					return {
+						files: manifestFiles,
+						entrypoints: entrypointFiles,
+					};
+				},
+			}),
+			// Moment.js is an extremely popular library that bundles large locale files
+			// by default due to how Webpack interprets its code. This is a practical
+			// solution that requires the user to opt into importing specific locales.
+			// https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
+			// You can remove this if you don't use Moment.js:
+			new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+			// Generate a service worker script that will precache, and keep up to date,
+			// the HTML & assets that are part of the Webpack build.
+			// isEnvProduction &&
+   //      new WorkboxWebpackPlugin.GenerateSW({
+   //      	clientsClaim: true,
+   //      	exclude: [/\.map$/, /asset-manifest\.json$/],
+   //      	importWorkboxFrom: 'cdn',
+   //      	navigateFallback: `${publicUrl}/index.html`,
+   //      	navigateFallbackBlacklist: [
+   //      		// Exclude URLs starting with /_, as they're likely an API call
+   //      		new RegExp('^/_'),
+   //      		// Exclude any URLs whose last part seems to be a file extension
+   //      		// as they're likely a resource and not a SPA route.
+   //      		// URLs containing a "?" character won't be blacklisted as they're likely
+   //      		// a route with query params (e.g. auth callbacks).
+   //      		new RegExp('/[^/?]+\\.[^/]+$'),
+   //      	],
+   //      }),
+			// TypeScript type checking
+			useTypeScript &&
+        new ForkTsCheckerWebpackPlugin({
+        	typescript: resolve.sync('typescript', {
+        		basedir: paths.appNodeModules,
+        	}),
+        	async: isEnvDevelopment,
+        	useTypescriptIncrementalApi: true,
+        	checkSyntacticErrors: true,
+        	resolveModuleNameModule: process.versions.pnp
+        		? `${__dirname}/pnpTs.js`
+        		: undefined,
+        	resolveTypeReferenceDirectiveModule: process.versions.pnp
+        		? `${__dirname}/pnpTs.js`
+        		: undefined,
+        	tsconfig: paths.appTsConfig,
+        	reportFiles: [
+        		'**',
+        		'!**/__tests__/**',
+        		'!**/?(*.)(spec|test).*',
+        		'!**/src/setupProxy.*',
+        		'!**/src/setupTests.*',
+        	],
+        	silent: true,
+        	// The formatter is invoked directly in WebpackDevServerUtils during development
+        	formatter: isEnvProduction ? typescriptFormatter : undefined,
+        }),
+		].filter(Boolean),
+		// Some libraries import Node modules but don't use them in the browser.
+		// Tell Webpack to provide empty mocks for them so importing them works.
+		node: {
+			module: 'empty',
+			dgram: 'empty',
+			dns: 'mock',
+			fs: 'empty',
+			http2: 'empty',
+			net: 'empty',
+			tls: 'empty',
+			child_process: 'empty',
+		},
+		// Turn off performance processing because we utilize
+		// our own hints via the FileSizeReporter
+		performance: false,
+	};
+};
diff --git a/Clipper/popup/config/webpackDevServer.config.js b/Clipper/popup/config/webpackDevServer.config.js
new file mode 100644
index 000000000..8f078dd55
--- /dev/null
+++ b/Clipper/popup/config/webpackDevServer.config.js
@@ -0,0 +1,110 @@
+'use strict';
+
+const errorOverlayMiddleware = require('react-dev-utils/errorOverlayMiddleware');
+const evalSourceMapMiddleware = require('react-dev-utils/evalSourceMapMiddleware');
+const noopServiceWorkerMiddleware = require('react-dev-utils/noopServiceWorkerMiddleware');
+const ignoredFiles = require('react-dev-utils/ignoredFiles');
+const paths = require('./paths');
+const fs = require('fs');
+
+const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
+const host = process.env.HOST || '0.0.0.0';
+
+module.exports = function(proxy, allowedHost) {
+	return {
+		// WebpackDevServer 2.4.3 introduced a security fix that prevents remote
+		// websites from potentially accessing local content through DNS rebinding:
+		// https://github.com/webpack/webpack-dev-server/issues/887
+		// https://medium.com/webpack/webpack-dev-server-middleware-security-issues-1489d950874a
+		// However, it made several existing use cases such as development in cloud
+		// environment or subdomains in development significantly more complicated:
+		// https://github.com/facebook/create-react-app/issues/2271
+		// https://github.com/facebook/create-react-app/issues/2233
+		// While we're investigating better solutions, for now we will take a
+		// compromise. Since our WDS configuration only serves files in the `public`
+		// folder we won't consider accessing them a vulnerability. However, if you
+		// use the `proxy` feature, it gets more dangerous because it can expose
+		// remote code execution vulnerabilities in backends like Django and Rails.
+		// So we will disable the host check normally, but enable it if you have
+		// specified the `proxy` setting. Finally, we let you override it if you
+		// really know what you're doing with a special environment variable.
+		disableHostCheck:
+      !proxy || process.env.DANGEROUSLY_DISABLE_HOST_CHECK === 'true',
+		// Enable gzip compression of generated files.
+		compress: true,
+		// Silence WebpackDevServer's own logs since they're generally not useful.
+		// It will still show compile warnings and errors with this setting.
+		clientLogLevel: 'none',
+		// By default WebpackDevServer serves physical files from current directory
+		// in addition to all the virtual build products that it serves from memory.
+		// This is confusing because those files won’t automatically be available in
+		// production build folder unless we copy them. However, copying the whole
+		// project directory is dangerous because we may expose sensitive files.
+		// Instead, we establish a convention that only files in `public` directory
+		// get served. Our build script will copy `public` into the `build` folder.
+		// In `index.html`, you can get URL of `public` folder with %PUBLIC_URL%:
+		// <link rel="icon" href="%PUBLIC_URL%/favicon.ico">
+		// In JavaScript code, you can access it with `process.env.PUBLIC_URL`.
+		// Note that we only recommend to use `public` folder as an escape hatch
+		// for files like `favicon.ico`, `manifest.json`, and libraries that are
+		// for some reason broken when imported through Webpack. If you just want to
+		// use an image, put it in `src` and `import` it from JavaScript instead.
+		contentBase: paths.appPublic,
+		// By default files from `contentBase` will not trigger a page reload.
+		watchContentBase: true,
+		// Enable hot reloading server. It will provide /sockjs-node/ endpoint
+		// for the WebpackDevServer client so it can learn when the files were
+		// updated. The WebpackDevServer client is included as an entry point
+		// in the Webpack development configuration. Note that only changes
+		// to CSS are currently hot reloaded. JS changes will refresh the browser.
+		hot: true,
+		// Use 'ws' instead of 'sockjs-node' on server since we're using native
+		// websockets in `webpackHotDevClient`.
+		transportMode: 'ws',
+		// Prevent a WS client from getting injected as we're already including
+		// `webpackHotDevClient`.
+		injectClient: false,
+		// It is important to tell WebpackDevServer to use the same "root" path
+		// as we specified in the config. In development, we always serve from /.
+		publicPath: '/',
+		// WebpackDevServer is noisy by default so we emit custom message instead
+		// by listening to the compiler events with `compiler.hooks[...].tap` calls above.
+		quiet: true,
+		// Reportedly, this avoids CPU overload on some systems.
+		// https://github.com/facebook/create-react-app/issues/293
+		// src/node_modules is not ignored to support absolute imports
+		// https://github.com/facebook/create-react-app/issues/1065
+		watchOptions: {
+			ignored: ignoredFiles(paths.appSrc),
+		},
+		// Enable HTTPS if the HTTPS environment variable is set to 'true'
+		https: protocol === 'https',
+		host,
+		overlay: false,
+		historyApiFallback: {
+			// Paths with dots should still use the history fallback.
+			// See https://github.com/facebook/create-react-app/issues/387.
+			disableDotRule: true,
+		},
+		public: allowedHost,
+		proxy,
+		before(app, server) {
+			if (fs.existsSync(paths.proxySetup)) {
+				// This registers user provided middleware for proxy reasons
+				require(paths.proxySetup)(app);
+			}
+
+			// This lets us fetch source contents from webpack for the error overlay
+			app.use(evalSourceMapMiddleware(server));
+			// This lets us open files from the runtime error overlay.
+			app.use(errorOverlayMiddleware());
+
+			// This service worker file is effectively a 'no-op' that will reset any
+			// previous service worker registered for the same host:port combination.
+			// We do this in development to avoid hitting the production cache if
+			// it used the same host and port.
+			// https://github.com/facebook/create-react-app/issues/2272#issuecomment-302832432
+			app.use(noopServiceWorkerMiddleware());
+		},
+	};
+};
diff --git a/Clipper/popup/package-lock.json b/Clipper/popup/package-lock.json
index a190593e7..48512a653 100644
--- a/Clipper/popup/package-lock.json
+++ b/Clipper/popup/package-lock.json
@@ -20,6 +20,13 @@
         "browserslist": "^4.8.5",
         "invariant": "^2.2.4",
         "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "@babel/core": {
@@ -42,6 +49,13 @@
         "resolve": "^1.3.2",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "@babel/generator": {
@@ -101,6 +115,13 @@
         "invariant": "^2.2.4",
         "levenary": "^1.1.1",
         "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "@babel/helper-create-class-features-plugin": {
@@ -928,6 +949,13 @@
         "invariant": "^2.2.2",
         "levenary": "^1.1.1",
         "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "@babel/preset-react": {
@@ -1752,11 +1780,6 @@
         "negotiator": "0.6.2"
       }
     },
-    "acorn": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
-      "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ=="
-    },
     "acorn-globals": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
@@ -1773,11 +1796,6 @@
         }
       }
     },
-    "acorn-jsx": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz",
-      "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw=="
-    },
     "acorn-walk": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
@@ -1895,15 +1913,6 @@
         "sprintf-js": "~1.0.2"
       }
     },
-    "aria-query": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
-      "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
-      "requires": {
-        "ast-types-flow": "0.0.7",
-        "commander": "^2.11.0"
-      }
-    },
     "arity-n": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
@@ -1934,69 +1943,6 @@
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
       "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
     },
-    "array-includes": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
-        "is-string": "^1.0.5"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.4",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-          "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.1.5",
-            "is-regex": "^1.0.5",
-            "object-inspect": "^1.7.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.0",
-            "string.prototype.trimleft": "^2.1.1",
-            "string.prototype.trimright": "^2.1.1"
-          }
-        },
-        "es-to-primitive": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-          "requires": {
-            "is-callable": "^1.1.4",
-            "is-date-object": "^1.0.1",
-            "is-symbol": "^1.0.2"
-          }
-        },
-        "has-symbols": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
-        },
-        "is-callable": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
-        },
-        "is-regex": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
-          "requires": {
-            "has": "^1.0.3"
-          }
-        },
-        "object-keys": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-        }
-      }
-    },
     "array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -2015,68 +1961,6 @@
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
       "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
     },
-    "array.prototype.flat": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
-      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.4",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-          "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.1.5",
-            "is-regex": "^1.0.5",
-            "object-inspect": "^1.7.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.0",
-            "string.prototype.trimleft": "^2.1.1",
-            "string.prototype.trimright": "^2.1.1"
-          }
-        },
-        "es-to-primitive": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-          "requires": {
-            "is-callable": "^1.1.4",
-            "is-date-object": "^1.0.1",
-            "is-symbol": "^1.0.2"
-          }
-        },
-        "has-symbols": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
-        },
-        "is-callable": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
-        },
-        "is-regex": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
-          "requires": {
-            "has": "^1.0.3"
-          }
-        },
-        "object-keys": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-        }
-      }
-    },
     "arrify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
@@ -2123,11 +2007,6 @@
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
     },
-    "ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0="
-    },
     "astral-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
@@ -2185,11 +2064,6 @@
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
       "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="
     },
-    "axobject-query": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.1.2.tgz",
-      "integrity": "sha512-ICt34ZmrVt8UQnvPl6TVyDTkmhXmAyAT4Jh5ugfGUX4MOrZ+U/ZY6/sdylRw3qGNr9Ub5AJsaHeDMzNLehRdOQ=="
-    },
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -3324,11 +3198,6 @@
         "typedarray": "^0.0.6"
       }
     },
-    "confusing-browser-globals": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz",
-      "integrity": "sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw=="
-    },
     "connect-history-api-fallback": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
@@ -3344,11 +3213,6 @@
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
     },
-    "contains-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo="
-    },
     "content-disposition": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
@@ -3623,6 +3487,13 @@
         "semver": "^5.5.0",
         "shebang-command": "^1.2.0",
         "which": "^1.2.9"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "crypto-browserify": {
@@ -3908,11 +3779,6 @@
         "type": "^1.0.1"
       }
     },
-    "damerau-levenshtein": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz",
-      "integrity": "sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug=="
-    },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -4221,14 +4087,6 @@
         "buffer-indexof": "^1.0.0"
       }
     },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
     "dom-converter": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
@@ -4503,451 +4361,6 @@
         }
       }
     },
-    "eslint": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
-      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.10.0",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^1.4.3",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.1.2",
-        "esquery": "^1.0.1",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
-        "globals": "^12.1.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^7.0.0",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.14",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.3",
-        "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^6.1.2",
-        "strip-ansi": "^5.2.0",
-        "strip-json-comments": "^3.0.1",
-        "table": "^5.2.3",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "dependencies": {
-        "globals": {
-          "version": "12.3.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz",
-          "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==",
-          "requires": {
-            "type-fest": "^0.8.1"
-          }
-        },
-        "import-fresh": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-          "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
-          "requires": {
-            "parent-module": "^1.0.0",
-            "resolve-from": "^4.0.0"
-          }
-        },
-        "regexpp": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-          "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="
-        },
-        "resolve-from": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        }
-      }
-    },
-    "eslint-config-react-app": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-5.2.0.tgz",
-      "integrity": "sha512-WrHjoGpKr1kLLiWDD81tme9jMM0hk5cMxasLSdyno6DdPt+IfLOrDJBVo6jN7tn4y1nzhs43TmUaZWO6Sf0blw==",
-      "requires": {
-        "confusing-browser-globals": "^1.0.9"
-      }
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz",
-      "integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==",
-      "requires": {
-        "debug": "^2.6.9",
-        "resolve": "^1.13.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "resolve": {
-          "version": "1.15.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
-          "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
-          "requires": {
-            "path-parse": "^1.0.6"
-          }
-        }
-      }
-    },
-    "eslint-loader": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-3.0.3.tgz",
-      "integrity": "sha512-+YRqB95PnNvxNp1HEjQmvf9KNvCin5HXYYseOXVC2U0KEcw4IkQ2IQEBG46j7+gW39bMzeu0GsUhVbBY3Votpw==",
-      "requires": {
-        "fs-extra": "^8.1.0",
-        "loader-fs-cache": "^1.0.2",
-        "loader-utils": "^1.2.3",
-        "object-hash": "^2.0.1",
-        "schema-utils": "^2.6.1"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz",
-      "integrity": "sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q==",
-      "requires": {
-        "debug": "^2.6.9",
-        "pkg-dir": "^2.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
-        },
-        "pkg-dir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-          "requires": {
-            "find-up": "^2.1.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-flowtype": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.6.0.tgz",
-      "integrity": "sha512-W5hLjpFfZyZsXfo5anlu7HM970JBDqbEshAJUkeczP6BFCIfJXuiIBQXyberLRtOStT0OGPF8efeTbxlHk4LpQ==",
-      "requires": {
-        "lodash": "^4.17.15"
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.0.tgz",
-      "integrity": "sha512-NK42oA0mUc8Ngn4kONOPsPB1XhbUvNHqF+g307dPV28aknPoiNnKLFd9em4nkswwepdF5ouieqv5Th/63U7YJQ==",
-      "requires": {
-        "array-includes": "^3.0.3",
-        "array.prototype.flat": "^1.2.1",
-        "contains-path": "^0.1.0",
-        "debug": "^2.6.9",
-        "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.2",
-        "eslint-module-utils": "^2.4.1",
-        "has": "^1.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.0",
-        "read-pkg-up": "^2.0.0",
-        "resolve": "^1.12.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "doctrine": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-          "requires": {
-            "esutils": "^2.0.2",
-            "isarray": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-          "requires": {
-            "pify": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-        },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-          "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
-          }
-        },
-        "resolve": {
-          "version": "1.15.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
-          "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
-          "requires": {
-            "path-parse": "^1.0.6"
-          }
-        }
-      }
-    },
-    "eslint-plugin-jsx-a11y": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz",
-      "integrity": "sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg==",
-      "requires": {
-        "@babel/runtime": "^7.4.5",
-        "aria-query": "^3.0.0",
-        "array-includes": "^3.0.3",
-        "ast-types-flow": "^0.0.7",
-        "axobject-query": "^2.0.2",
-        "damerau-levenshtein": "^1.0.4",
-        "emoji-regex": "^7.0.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^2.2.1"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        }
-      }
-    },
-    "eslint-plugin-react": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.18.0.tgz",
-      "integrity": "sha512-p+PGoGeV4SaZRDsXqdj9OWcOrOpZn8gXoGPcIQTzo2IDMbAKhNDnME9myZWqO3Ic4R3YmwAZ1lDjWl2R2hMUVQ==",
-      "requires": {
-        "array-includes": "^3.1.1",
-        "doctrine": "^2.1.0",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^2.2.3",
-        "object.entries": "^1.1.1",
-        "object.fromentries": "^2.0.2",
-        "object.values": "^1.1.1",
-        "prop-types": "^15.7.2",
-        "resolve": "^1.14.2"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "loose-envify": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-          "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-          "requires": {
-            "js-tokens": "^3.0.0 || ^4.0.0"
-          }
-        },
-        "prop-types": {
-          "version": "15.7.2",
-          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-          "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-          "requires": {
-            "loose-envify": "^1.4.0",
-            "object-assign": "^4.1.1",
-            "react-is": "^16.8.1"
-          }
-        },
-        "resolve": {
-          "version": "1.15.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
-          "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
-          "requires": {
-            "path-parse": "^1.0.6"
-          }
-        }
-      }
-    },
-    "eslint-plugin-react-hooks": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.7.0.tgz",
-      "integrity": "sha512-iXTCFcOmlWvw4+TOE8CLWj6yX1GwzT0Y6cUfHHZqWnSk144VmVIRcVGtUAzrLES7C798lmvnt02C7rxaOX1HNA=="
-    },
     "eslint-scope": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
@@ -4970,29 +4383,11 @@
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
       "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="
     },
-    "espree": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz",
-      "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==",
-      "requires": {
-        "acorn": "^7.1.0",
-        "acorn-jsx": "^5.1.0",
-        "eslint-visitor-keys": "^1.1.0"
-      }
-    },
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
-    "esquery": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
-      "requires": {
-        "estraverse": "^4.0.0"
-      }
-    },
     "esrecurse": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
@@ -5422,14 +4817,6 @@
         "escape-string-regexp": "^1.0.5"
       }
     },
-    "file-entry-cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-      "requires": {
-        "flat-cache": "^2.0.1"
-      }
-    },
     "file-loader": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz",
@@ -5518,21 +4905,6 @@
         "locate-path": "^3.0.0"
       }
     },
-    "flat-cache": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-      "requires": {
-        "flatted": "^2.0.0",
-        "rimraf": "2.6.3",
-        "write": "1.0.3"
-      }
-    },
-    "flatted": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
-      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="
-    },
     "flatten": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
@@ -5643,14 +5015,20 @@
       }
     },
     "fs-extra": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-      "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
-      "dev": true,
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "requires": {
-        "graceful-fs": "^4.1.2",
+        "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
         "universalify": "^0.1.0"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
+        }
       }
     },
     "fs-minipass": {
@@ -6216,11 +5594,6 @@
       "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
       "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
     },
-    "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
-    },
     "immer": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz",
@@ -6567,11 +5940,6 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
     },
-    "is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="
-    },
     "is-svg": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
@@ -7829,11 +7197,6 @@
         "jsonify": "~0.0.0"
       }
     },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
-    },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -7876,15 +7239,6 @@
         "verror": "1.10.0"
       }
     },
-    "jsx-ast-utils": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz",
-      "integrity": "sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==",
-      "requires": {
-        "array-includes": "^3.0.3",
-        "object.assign": "^4.1.0"
-      }
-    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -7968,52 +7322,6 @@
         "strip-bom": "^3.0.0"
       }
     },
-    "loader-fs-cache": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz",
-      "integrity": "sha512-70IzT/0/L+M20jUlEqZhZyArTU6VKLRTYRDAYN26g4jfzpJqjipLL3/hgYpySqI9PwsVRHHFja0LfEmsx9X2Cw==",
-      "requires": {
-        "find-cache-dir": "^0.1.1",
-        "mkdirp": "0.5.1"
-      },
-      "dependencies": {
-        "find-cache-dir": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
-          "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
-          "requires": {
-            "commondir": "^1.0.1",
-            "mkdirp": "^0.5.1",
-            "pkg-dir": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "pkg-dir": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
-          "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-          "requires": {
-            "find-up": "^1.0.0"
-          }
-        }
-      }
-    },
     "loader-runner": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
@@ -8285,6 +7593,14 @@
             "resolve": "^1.10.0",
             "semver": "2 || 3 || 4 || 5",
             "validate-npm-package-license": "^3.0.1"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "5.7.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "dev": true
+            }
           }
         },
         "p-limit": {
@@ -8807,6 +8123,13 @@
         "semver": "^5.5.0",
         "shellwords": "^0.1.1",
         "which": "^1.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "node-releases": {
@@ -8833,6 +8156,13 @@
         "resolve": "^1.10.0",
         "semver": "2 || 3 || 4 || 5",
         "validate-npm-package-license": "^3.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "normalize-path": {
@@ -8920,11 +8250,6 @@
         }
       }
     },
-    "object-hash": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.0.2.tgz",
-      "integrity": "sha512-b+2AKjAf6uQlxxv8ChHdM+VT4eeX+ZSwv+pk2xIXZWbo+yxn4/En1iC+GHe/OFYa9on0AhFF2PvuAcFHoiiHaA=="
-    },
     "object-inspect": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
@@ -9028,70 +8353,6 @@
         }
       }
     },
-    "object.fromentries": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz",
-      "integrity": "sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.4",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-          "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.1.5",
-            "is-regex": "^1.0.5",
-            "object-inspect": "^1.7.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.0",
-            "string.prototype.trimleft": "^2.1.1",
-            "string.prototype.trimright": "^2.1.1"
-          }
-        },
-        "es-to-primitive": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-          "requires": {
-            "is-callable": "^1.1.4",
-            "is-date-object": "^1.0.1",
-            "is-symbol": "^1.0.2"
-          }
-        },
-        "has-symbols": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
-        },
-        "is-callable": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
-        },
-        "is-regex": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
-          "requires": {
-            "has": "^1.0.3"
-          }
-        },
-        "object-keys": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-        }
-      }
-    },
     "object.getownpropertydescriptors": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
@@ -10691,11 +9952,6 @@
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-    },
     "promise": {
       "version": "8.0.3",
       "resolved": "https://registry.npmjs.org/promise/-/promise-8.0.3.tgz",
@@ -11155,96 +10411,6 @@
         "prop-types": "^15.6.0"
       }
     },
-    "react-scripts": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.3.1.tgz",
-      "integrity": "sha512-DHvc+/QN0IsLvmnPQqd+H70ol+gdFD3p/SS2tX8M6z1ysjtRGvOwLWy72co1nphYGpq1NqV/Ti5dviU8SCAXpA==",
-      "requires": {
-        "@babel/core": "7.8.4",
-        "@svgr/webpack": "4.3.3",
-        "@typescript-eslint/eslint-plugin": "^2.10.0",
-        "@typescript-eslint/parser": "^2.10.0",
-        "babel-eslint": "10.0.3",
-        "babel-jest": "^24.9.0",
-        "babel-loader": "8.0.6",
-        "babel-plugin-named-asset-import": "^0.3.6",
-        "babel-preset-react-app": "^9.1.1",
-        "camelcase": "^5.3.1",
-        "case-sensitive-paths-webpack-plugin": "2.3.0",
-        "css-loader": "3.4.2",
-        "dotenv": "8.2.0",
-        "dotenv-expand": "5.1.0",
-        "eslint": "^6.6.0",
-        "eslint-config-react-app": "^5.2.0",
-        "eslint-loader": "3.0.3",
-        "eslint-plugin-flowtype": "4.6.0",
-        "eslint-plugin-import": "2.20.0",
-        "eslint-plugin-jsx-a11y": "6.2.3",
-        "eslint-plugin-react": "7.18.0",
-        "eslint-plugin-react-hooks": "^1.6.1",
-        "file-loader": "4.3.0",
-        "fs-extra": "^8.1.0",
-        "fsevents": "2.1.2",
-        "html-webpack-plugin": "4.0.0-beta.11",
-        "identity-obj-proxy": "3.0.0",
-        "jest": "24.9.0",
-        "jest-environment-jsdom-fourteen": "1.0.1",
-        "jest-resolve": "24.9.0",
-        "jest-watch-typeahead": "0.4.2",
-        "mini-css-extract-plugin": "0.9.0",
-        "optimize-css-assets-webpack-plugin": "5.0.3",
-        "pnp-webpack-plugin": "1.6.0",
-        "postcss-flexbugs-fixes": "4.1.0",
-        "postcss-loader": "3.0.0",
-        "postcss-normalize": "8.0.1",
-        "postcss-preset-env": "6.7.0",
-        "postcss-safe-parser": "4.0.1",
-        "react-app-polyfill": "^1.0.6",
-        "react-dev-utils": "^10.1.0",
-        "resolve": "1.15.0",
-        "resolve-url-loader": "3.1.1",
-        "sass-loader": "8.0.2",
-        "semver": "6.3.0",
-        "style-loader": "1.1.3",
-        "terser-webpack-plugin": "2.3.4",
-        "ts-pnp": "1.1.5",
-        "url-loader": "2.3.0",
-        "webpack": "4.41.5",
-        "webpack-dev-server": "3.10.1",
-        "webpack-manifest-plugin": "2.2.0",
-        "workbox-webpack-plugin": "4.3.1"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
-        },
-        "resolve": {
-          "version": "1.15.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
-          "integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
-          "requires": {
-            "path-parse": "^1.0.6"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        }
-      }
-    },
     "read-pkg": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
@@ -11589,9 +10755,9 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
     "resolve": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-      "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
+      "integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
       "requires": {
         "path-parse": "^1.0.6"
       }
@@ -11878,9 +11044,9 @@
       }
     },
     "semver": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
     "send": {
       "version": "0.17.1",
@@ -12114,23 +11280,6 @@
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
       "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="
     },
-    "slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        }
-      }
-    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -12632,11 +11781,6 @@
         "min-indent": "^1.0.0"
       }
     },
-    "strip-json-comments": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
-      "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="
-    },
     "style-loader": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.1.3.tgz",
@@ -12711,39 +11855,6 @@
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
-    "table": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
-      "requires": {
-        "ajv": "^6.10.2",
-        "lodash": "^4.17.14",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        }
-      }
-    },
     "tapable": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz",
@@ -13326,11 +12437,6 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
     },
-    "v8-compile-cache": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
-      "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="
-    },
     "validate-npm-package-license": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz",
@@ -15211,14 +14317,6 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
-    "write": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-      "requires": {
-        "mkdirp": "^0.5.1"
-      }
-    },
     "write-file-atomic": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz",
diff --git a/Clipper/popup/package.json b/Clipper/popup/package.json
index 963fee1ff..31fd09fa4 100644
--- a/Clipper/popup/package.json
+++ b/Clipper/popup/package.json
@@ -4,19 +4,61 @@
   "private": true,
   "homepage": ".",
   "dependencies": {
+    "@babel/core": "7.8.4",
+    "@svgr/webpack": "4.3.3",
+    "@typescript-eslint/eslint-plugin": "^2.10.0",
+    "@typescript-eslint/parser": "^2.10.0",
+    "babel-eslint": "10.0.3",
+    "babel-jest": "^24.9.0",
+    "babel-loader": "8.0.6",
+    "babel-plugin-named-asset-import": "^0.3.6",
+    "babel-preset-react-app": "^9.1.1",
+    "camelcase": "^5.3.1",
+    "case-sensitive-paths-webpack-plugin": "2.3.0",
+    "css-loader": "3.4.2",
+    "dotenv": "8.2.0",
+    "dotenv-expand": "5.1.0",
+    "file-loader": "4.3.0",
+    "fs-extra": "^8.1.0",
+    "html-webpack-plugin": "4.0.0-beta.11",
+    "identity-obj-proxy": "3.0.0",
+    "jest": "24.9.0",
+    "jest-environment-jsdom-fourteen": "1.0.1",
+    "jest-resolve": "24.9.0",
+    "jest-watch-typeahead": "0.4.2",
+    "mini-css-extract-plugin": "0.9.0",
+    "optimize-css-assets-webpack-plugin": "5.0.3",
+    "pnp-webpack-plugin": "1.6.0",
+    "postcss-flexbugs-fixes": "4.1.0",
+    "postcss-loader": "3.0.0",
+    "postcss-normalize": "8.0.1",
+    "postcss-preset-env": "6.7.0",
+    "postcss-safe-parser": "4.0.1",
     "react": "^16.12.0",
+    "react-app-polyfill": "^1.0.6",
+    "react-dev-utils": "^10.1.0",
     "react-dom": "^16.12.0",
     "react-redux": "^5.0.7",
-    "react-scripts": "3.3.1",
-    "redux": "^4.0.0"
+    "redux": "^4.0.0",
+    "resolve": "1.15.0",
+    "resolve-url-loader": "3.1.1",
+    "sass-loader": "8.0.2",
+    "semver": "6.3.0",
+    "style-loader": "1.1.3",
+    "terser-webpack-plugin": "2.3.4",
+    "ts-pnp": "1.1.5",
+    "url-loader": "2.3.0",
+    "webpack": "4.41.5",
+    "webpack-dev-server": "3.10.1",
+    "webpack-manifest-plugin": "2.2.0",
+    "workbox-webpack-plugin": "4.3.1"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "build": "SKIP_PREFLIGHT_CHECK=true react-scripts build",
-    "test": "react-scripts test --env=jsdom",
-    "eject": "react-scripts eject",
+    "start": "node scripts/start.js",
+    "build": "SKIP_PREFLIGHT_CHECK=true node scripts/build.js",
+    "test": "node scripts/test.js --env=jsdom",
     "watch": "cra-build-watch",
-    "postinstall": "node scripts/postinstall.js && npm run build"
+    "postinstall": "node postinstall.js && npm run build"
   },
   "devDependencies": {
     "cra-build-watch": "^3.2.0",
@@ -27,5 +69,58 @@
     "not dead",
     "not ie <= 11",
     "not op_mini all"
-  ]
+  ],
+  "jest": {
+    "roots": [
+      "<rootDir>/src"
+    ],
+    "collectCoverageFrom": [
+      "src/**/*.{js,jsx,ts,tsx}",
+      "!src/**/*.d.ts"
+    ],
+    "setupFiles": [
+      "react-app-polyfill/jsdom"
+    ],
+    "setupFilesAfterEnv": [],
+    "testMatch": [
+      "<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
+      "<rootDir>/src/**/*.{spec,test}.{js,jsx,ts,tsx}"
+    ],
+    "testEnvironment": "jest-environment-jsdom-fourteen",
+    "transform": {
+      "^.+\\.(js|jsx|ts|tsx)$": "<rootDir>/node_modules/babel-jest",
+      "^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
+      "^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
+    },
+    "transformIgnorePatterns": [
+      "[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$",
+      "^.+\\.module\\.(css|sass|scss)$"
+    ],
+    "modulePaths": [],
+    "moduleNameMapper": {
+      "^react-native$": "react-native-web",
+      "^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy"
+    },
+    "moduleFileExtensions": [
+      "web.js",
+      "js",
+      "web.ts",
+      "ts",
+      "web.tsx",
+      "tsx",
+      "json",
+      "web.jsx",
+      "jsx",
+      "node"
+    ],
+    "watchPlugins": [
+      "jest-watch-typeahead/filename",
+      "jest-watch-typeahead/testname"
+    ]
+  },
+  "babel": {
+    "presets": [
+      "react-app"
+    ]
+  }
 }
diff --git a/Clipper/popup/scripts/postinstall.js b/Clipper/popup/postinstall.js
similarity index 100%
rename from Clipper/popup/scripts/postinstall.js
rename to Clipper/popup/postinstall.js
diff --git a/Clipper/popup/scripts/build.js b/Clipper/popup/scripts/build.js
new file mode 100644
index 000000000..2bb475c64
--- /dev/null
+++ b/Clipper/popup/scripts/build.js
@@ -0,0 +1,211 @@
+'use strict';
+
+// Do this as the first thing so that any code reading it knows the right env.
+process.env.BABEL_ENV = 'production';
+process.env.NODE_ENV = 'production';
+
+// Makes the script crash on unhandled rejections instead of silently
+// ignoring them. In the future, promise rejections that are not handled will
+// terminate the Node.js process with a non-zero exit code.
+process.on('unhandledRejection', err => {
+	throw err;
+});
+
+// Ensure environment variables are read.
+require('../config/env');
+
+
+const path = require('path');
+const chalk = require('react-dev-utils/chalk');
+const fs = require('fs-extra');
+const webpack = require('webpack');
+const configFactory = require('../config/webpack.config');
+const paths = require('../config/paths');
+const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
+const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
+const printHostingInstructions = require('react-dev-utils/printHostingInstructions');
+const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
+const printBuildError = require('react-dev-utils/printBuildError');
+
+const measureFileSizesBeforeBuild =
+  FileSizeReporter.measureFileSizesBeforeBuild;
+const printFileSizesAfterBuild = FileSizeReporter.printFileSizesAfterBuild;
+const useYarn = fs.existsSync(paths.yarnLockFile);
+
+// These sizes are pretty large. We'll warn for bundles exceeding them.
+const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
+const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
+
+const isInteractive = process.stdout.isTTY;
+
+// Warn and crash if required files are missing
+if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
+	process.exit(1);
+}
+
+// Generate configuration
+const config = configFactory('production');
+
+// We require that you explicitly set browsers and do not fall back to
+// browserslist defaults.
+const { checkBrowsers } = require('react-dev-utils/browsersHelper');
+checkBrowsers(paths.appPath, isInteractive)
+	.then(() => {
+		// First, read the current file sizes in build directory.
+		// This lets us display how much they changed later.
+		return measureFileSizesBeforeBuild(paths.appBuild);
+	})
+	.then(previousFileSizes => {
+		// Remove all content but keep the directory so that
+		// if you're in it, you don't end up in Trash
+		fs.emptyDirSync(paths.appBuild);
+		// Merge with the public folder
+		copyPublicFolder();
+		// Start the webpack build
+		return build(previousFileSizes);
+	})
+	.then(
+		({ stats, previousFileSizes, warnings }) => {
+			if (warnings.length) {
+				console.log(chalk.yellow('Compiled with warnings.\n'));
+				console.log(warnings.join('\n\n'));
+				console.log(
+					`\nSearch for the ${
+						chalk.underline(chalk.yellow('keywords'))
+					} to learn more about each warning.`
+				);
+				console.log(
+					`To ignore, add ${
+						chalk.cyan('// eslint-disable-next-line')
+					} to the line before.\n`
+				);
+			} else {
+				console.log(chalk.green('Compiled successfully.\n'));
+			}
+
+			console.log('File sizes after gzip:\n');
+			printFileSizesAfterBuild(
+				stats,
+				previousFileSizes,
+				paths.appBuild,
+				WARN_AFTER_BUNDLE_GZIP_SIZE,
+				WARN_AFTER_CHUNK_GZIP_SIZE
+			);
+			console.log();
+
+			const appPackage = require(paths.appPackageJson);
+			const publicUrl = paths.publicUrl;
+			const publicPath = config.output.publicPath;
+			const buildFolder = path.relative(process.cwd(), paths.appBuild);
+			printHostingInstructions(
+				appPackage,
+				publicUrl,
+				publicPath,
+				buildFolder,
+				useYarn
+			);
+		},
+		err => {
+			const tscCompileOnError = process.env.TSC_COMPILE_ON_ERROR === 'true';
+			if (tscCompileOnError) {
+				console.log(
+					chalk.yellow(
+						'Compiled with the following type errors (you may want to check these before deploying your app):\n'
+					)
+				);
+				printBuildError(err);
+			} else {
+				console.log(chalk.red('Failed to compile.\n'));
+				printBuildError(err);
+				process.exit(1);
+			}
+		}
+	)
+	.catch(err => {
+		if (err && err.message) {
+			console.log(err.message);
+		}
+		process.exit(1);
+	});
+
+// Create the production build and print the deployment instructions.
+function build(previousFileSizes) {
+	// We used to support resolving modules according to `NODE_PATH`.
+	// This now has been deprecated in favor of jsconfig/tsconfig.json
+	// This lets you use absolute paths in imports inside large monorepos:
+	if (process.env.NODE_PATH) {
+		console.log(
+			chalk.yellow(
+				'Setting NODE_PATH to resolve modules absolutely has been deprecated in favor of setting baseUrl in jsconfig.json (or tsconfig.json if you are using TypeScript) and will be removed in a future major release of create-react-app.'
+			)
+		);
+		console.log();
+	}
+
+	console.log('Creating an optimized production build...');
+
+	const compiler = webpack(config);
+	return new Promise((resolve, reject) => {
+		compiler.run((err, stats) => {
+			let messages;
+			if (err) {
+				if (!err.message) {
+					return reject(err);
+				}
+
+				let errMessage = err.message;
+
+				// Add additional information for postcss errors
+				if (Object.prototype.hasOwnProperty.call(err, 'postcssNode')) {
+					errMessage +=
+            `\nCompileError: Begins at CSS selector ${
+            	err['postcssNode'].selector}`;
+				}
+
+				messages = formatWebpackMessages({
+					errors: [errMessage],
+					warnings: [],
+				});
+			} else {
+				messages = formatWebpackMessages(
+					stats.toJson({ all: false, warnings: true, errors: true })
+				);
+			}
+			if (messages.errors.length) {
+				// Only keep the first error. Others are often indicative
+				// of the same problem, but confuse the reader with noise.
+				if (messages.errors.length > 1) {
+					messages.errors.length = 1;
+				}
+				return reject(new Error(messages.errors.join('\n\n')));
+			}
+			if (
+				process.env.CI &&
+        (typeof process.env.CI !== 'string' ||
+          process.env.CI.toLowerCase() !== 'false') &&
+        messages.warnings.length
+			) {
+				console.log(
+					chalk.yellow(
+						'\nTreating warnings as errors because process.env.CI = true.\n' +
+              'Most CI servers set it automatically.\n'
+					)
+				);
+				return reject(new Error(messages.warnings.join('\n\n')));
+			}
+
+			return resolve({
+				stats,
+				previousFileSizes,
+				warnings: messages.warnings,
+			});
+		});
+	});
+}
+
+function copyPublicFolder() {
+	fs.copySync(paths.appPublic, paths.appBuild, {
+		dereference: true,
+		filter: file => file !== paths.appHtml,
+	});
+}
diff --git a/Clipper/popup/scripts/start.js b/Clipper/popup/scripts/start.js
new file mode 100644
index 000000000..4dda1a2f0
--- /dev/null
+++ b/Clipper/popup/scripts/start.js
@@ -0,0 +1,147 @@
+'use strict';
+
+// Do this as the first thing so that any code reading it knows the right env.
+process.env.BABEL_ENV = 'development';
+process.env.NODE_ENV = 'development';
+
+// Makes the script crash on unhandled rejections instead of silently
+// ignoring them. In the future, promise rejections that are not handled will
+// terminate the Node.js process with a non-zero exit code.
+process.on('unhandledRejection', err => {
+	throw err;
+});
+
+// Ensure environment variables are read.
+require('../config/env');
+
+
+const fs = require('fs');
+const chalk = require('react-dev-utils/chalk');
+const webpack = require('webpack');
+const WebpackDevServer = require('webpack-dev-server');
+const clearConsole = require('react-dev-utils/clearConsole');
+const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
+const {
+	choosePort,
+	createCompiler,
+	prepareProxy,
+	prepareUrls,
+} = require('react-dev-utils/WebpackDevServerUtils');
+const openBrowser = require('react-dev-utils/openBrowser');
+const paths = require('../config/paths');
+const configFactory = require('../config/webpack.config');
+const createDevServerConfig = require('../config/webpackDevServer.config');
+
+const useYarn = fs.existsSync(paths.yarnLockFile);
+const isInteractive = process.stdout.isTTY;
+
+// Warn and crash if required files are missing
+if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
+	process.exit(1);
+}
+
+// Tools like Cloud9 rely on this.
+const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3000;
+const HOST = process.env.HOST || '0.0.0.0';
+
+if (process.env.HOST) {
+	console.log(
+		chalk.cyan(
+			`Attempting to bind to HOST environment variable: ${chalk.yellow(
+				chalk.bold(process.env.HOST)
+			)}`
+		)
+	);
+	console.log(
+		'If this was unintentional, check that you haven\'t mistakenly set it in your shell.'
+	);
+	console.log(
+		`Learn more here: ${chalk.yellow('https://bit.ly/CRA-advanced-config')}`
+	);
+	console.log();
+}
+
+// We require that you explicitly set browsers and do not fall back to
+// browserslist defaults.
+const { checkBrowsers } = require('react-dev-utils/browsersHelper');
+checkBrowsers(paths.appPath, isInteractive)
+	.then(() => {
+		// We attempt to use the default port but if it is busy, we offer the user to
+		// run on a different port. `choosePort()` Promise resolves to the next free port.
+		return choosePort(HOST, DEFAULT_PORT);
+	})
+	.then(port => {
+		if (port == null) {
+			// We have not found a port.
+			return;
+		}
+		const config = configFactory('development');
+		const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
+		const appName = require(paths.appPackageJson).name;
+		const useTypeScript = fs.existsSync(paths.appTsConfig);
+		const tscCompileOnError = process.env.TSC_COMPILE_ON_ERROR === 'true';
+		const urls = prepareUrls(protocol, HOST, port);
+		const devSocket = {
+			warnings: warnings =>
+				devServer.sockWrite(devServer.sockets, 'warnings', warnings),
+			errors: errors =>
+				devServer.sockWrite(devServer.sockets, 'errors', errors),
+		};
+		// Create a webpack compiler that is configured with custom messages.
+		const compiler = createCompiler({
+			appName,
+			config,
+			devSocket,
+			urls,
+			useYarn,
+			useTypeScript,
+			tscCompileOnError,
+			webpack,
+		});
+		// Load proxy config
+		const proxySetting = require(paths.appPackageJson).proxy;
+		const proxyConfig = prepareProxy(proxySetting, paths.appPublic);
+		// Serve webpack assets generated by the compiler over a web server.
+		const serverConfig = createDevServerConfig(
+			proxyConfig,
+			urls.lanUrlForConfig
+		);
+		const devServer = new WebpackDevServer(compiler, serverConfig);
+		// Launch WebpackDevServer.
+		devServer.listen(port, HOST, err => {
+			if (err) {
+				return console.log(err);
+			}
+			if (isInteractive) {
+				clearConsole();
+			}
+
+			// We used to support resolving modules according to `NODE_PATH`.
+			// This now has been deprecated in favor of jsconfig/tsconfig.json
+			// This lets you use absolute paths in imports inside large monorepos:
+			if (process.env.NODE_PATH) {
+				console.log(
+					chalk.yellow(
+						'Setting NODE_PATH to resolve modules absolutely has been deprecated in favor of setting baseUrl in jsconfig.json (or tsconfig.json if you are using TypeScript) and will be removed in a future major release of create-react-app.'
+					)
+				);
+				console.log();
+			}
+
+			console.log(chalk.cyan('Starting the development server...\n'));
+			openBrowser(urls.localUrlForBrowser);
+		});
+
+		['SIGINT', 'SIGTERM'].forEach(function(sig) {
+			process.on(sig, function() {
+				devServer.close();
+				process.exit();
+			});
+		});
+	})
+	.catch(err => {
+		if (err && err.message) {
+			console.log(err.message);
+		}
+		process.exit(1);
+	});
diff --git a/Clipper/popup/scripts/test.js b/Clipper/popup/scripts/test.js
new file mode 100644
index 000000000..e753c25af
--- /dev/null
+++ b/Clipper/popup/scripts/test.js
@@ -0,0 +1,53 @@
+'use strict';
+
+// Do this as the first thing so that any code reading it knows the right env.
+process.env.BABEL_ENV = 'test';
+process.env.NODE_ENV = 'test';
+process.env.PUBLIC_URL = '';
+
+// Makes the script crash on unhandled rejections instead of silently
+// ignoring them. In the future, promise rejections that are not handled will
+// terminate the Node.js process with a non-zero exit code.
+process.on('unhandledRejection', err => {
+	throw err;
+});
+
+// Ensure environment variables are read.
+require('../config/env');
+
+
+const jest = require('jest');
+const execSync = require('child_process').execSync;
+let argv = process.argv.slice(2);
+
+function isInGitRepository() {
+	try {
+		execSync('git rev-parse --is-inside-work-tree', { stdio: 'ignore' });
+		return true;
+	} catch (e) {
+		return false;
+	}
+}
+
+function isInMercurialRepository() {
+	try {
+		execSync('hg --cwd . root', { stdio: 'ignore' });
+		return true;
+	} catch (e) {
+		return false;
+	}
+}
+
+// Watch unless on CI or explicitly running all tests
+if (
+	!process.env.CI &&
+  argv.indexOf('--watchAll') === -1 &&
+  argv.indexOf('--watchAll=false') === -1
+) {
+	// https://github.com/facebook/create-react-app/issues/5210
+	const hasSourceControl = isInGitRepository() || isInMercurialRepository();
+	argv.push(hasSourceControl ? '--watch' : '--watchAll');
+}
+
+
+jest.run(argv);
diff --git a/Tools/package-lock.json b/Tools/package-lock.json
index e8d13aaff..afc1261d8 100644
--- a/Tools/package-lock.json
+++ b/Tools/package-lock.json
@@ -458,6 +458,12 @@
         "uc.micro": "^1.0.5"
       }
     },
+    "md5-file": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-4.0.0.tgz",
+      "integrity": "sha512-UC0qFwyAjn4YdPpKaDNw6gNxRf7Mcx7jC1UGCY4boCzgvU2Aoc1mOGzTtrjjLKhM5ivsnhoKpQVxKPp+1j1qwg==",
+      "dev": true
+    },
     "mdurl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
diff --git a/Tools/package.json b/Tools/package.json
index 6cb555d56..2292d2e1f 100644
--- a/Tools/package.json
+++ b/Tools/package.json
@@ -22,5 +22,8 @@
     "string-padding": "^1.0.2",
     "uri-template": "^1.0.1",
     "yargs": "^12.0.5"
+  },
+  "devDependencies": {
+    "md5-file": "^4.0.0"
   }
 }
diff --git a/Tools/release-clipper.js b/Tools/release-clipper.js
index 6dee73980..678da9dbb 100644
--- a/Tools/release-clipper.js
+++ b/Tools/release-clipper.js
@@ -1,9 +1,10 @@
 const fs = require('fs-extra');
 const { execCommand } = require('./tool-utils.js');
+const md5File = require('md5-file/promise');
+const glob = require('glob');
 
 const clipperDir   = `${__dirname}/../Clipper`;
 const tmpSourceDirName = 'Clipper-source';
-const tmpSourceDir = `${__dirname}/../${tmpSourceDirName}`;
 
 async function copyDir(baseSourceDir, sourcePath, baseDestDir) {
 	await fs.mkdirp(`${baseDestDir}/${sourcePath}`);
@@ -31,6 +32,106 @@ async function updateManifestVersionNumber(manifestPath) {
 	return manifest.version;
 }
 
+async function createSourceZip() {
+	const tmpSourceDir = `${__dirname}/../${tmpSourceDirName}`;
+	const filename = 'joplin-webclipper-source.zip';
+	const filePath = `${clipperDir}/dist/${filename}`;
+	console.info('Creating source tarball for code validation...');
+	console.info(`Chdir: ${clipperDir}/..`);
+	process.chdir(`${clipperDir}/..`);
+	console.info(await execCommand(`rm -f "${filePath}"`));
+	console.info(await execCommand(`rsync -a --delete --exclude 'node_modules/' --exclude 'build/' --exclude 'dist/' "${clipperDir}/" "${tmpSourceDir}/"`));
+	console.info(await execCommand(`7z a -tzip ${filename} "${tmpSourceDirName}"`));
+	console.info(await execCommand(`mv ${filename} "${clipperDir}/dist/" && rm -rf "${tmpSourceDirName}"`));
+
+	return filePath;
+}
+
+async function compareFiles(path1, path2) {
+	return await md5File(path1) === await md5File(path2);
+}
+
+async function compareDir(dir1, dir2) {
+	console.info(`Comparing directories ${dir1} to ${dir2}`);
+
+	const globOptions = {
+		ignore: [
+			'**/node_modules/**',
+			'**/.git/**',
+		],
+	};
+
+	const filterFiles = (f) => {
+		const stat = fs.statSync(f);
+		return !stat.isDirectory();
+	};
+
+	const files1 = glob.sync(`${dir1}/**/*`, globOptions).filter(filterFiles).map(f => f.substr(dir1.length + 1));
+	const files2 = glob.sync(`${dir2}/**/*`, globOptions).filter(filterFiles).map(f => f.substr(dir2.length + 1));
+
+	const missingFiles1 = [];
+	const missingFiles2 = [];
+	const canBeMissing1 = [];
+	const canBeMissing2 = ['manifest.json'];
+	const differentFiles = [];
+	for (const f of files1) {
+		if (!files2.includes(f)) {
+			if (canBeMissing2.includes(f)) continue;
+			missingFiles2.push(f);
+			continue;
+		}
+
+		const sameFiles = await compareFiles(`${dir1}/${f}`, `${dir2}/${f}`);
+		if (!sameFiles) differentFiles.push(f);
+	}
+
+	for (const f of files2) {
+		if (!files1.includes(f)) {
+			if (canBeMissing1.includes(f)) continue;
+			missingFiles1.push(f);
+		}
+	}
+
+	if (missingFiles1.length) console.info(`Missing from ${dir1}:`, missingFiles1);
+	if (missingFiles2.length) console.info(`Missing from ${dir2}:`, missingFiles2);
+	if (differentFiles.length) console.info(`Different files: ${differentFiles}`);
+
+	if (!differentFiles.length && !missingFiles1.length && !missingFiles2.length) {
+		console.info('All files are equal');
+		return true;
+	}
+
+	return false;
+}
+
+async function checkSourceZip(sourceZip, compiledZip) {
+	const tmpDir = `${require('os').tmpdir()}/${Date.now()}`;
+
+	console.info(`Checking source ZIP in ${tmpDir}`);
+
+	const sourceDir = `${tmpDir}/source`;
+	const compiledDir = `${tmpDir}/compiled`;
+	await fs.mkdirp(sourceDir);
+	await fs.mkdirp(compiledDir);
+
+	process.chdir(sourceDir);
+	console.info(await execCommand(`cp "${sourceZip}" .`));
+	console.info(await execCommand(`unzip "${sourceZip}"`));
+	process.chdir(`${sourceDir}/Clipper-source/popup`);
+	console.info(await execCommand('npm install'));
+
+	process.chdir(compiledDir);
+	console.info(await execCommand(`cp "${compiledZip}" .`));
+	console.info(await execCommand(`unzip "${compiledZip}"`));
+
+	const areEqual = await compareDir(`${sourceDir}/Clipper-source/popup/build`, `${compiledDir}/popup/build`);
+
+	if (areEqual) {
+		await fs.remove(sourceDir);
+		await fs.remove(compiledDir);
+	}
+}
+
 async function main() {
 	console.info(await execCommand('git pull'));
 
@@ -41,53 +142,51 @@ async function main() {
 	// SKIP_PREFLIGHT_CHECK avoids the error "There might be a problem with the project dependency tree." due to eslint 5.12.0 being
 	// installed by CRA and 6.1.0 by us. It doesn't affect anything though, and the behaviour of the preflight
 	// check is buggy so we can ignore it.
+	console.info(await execCommand(`rm -rf ${clipperDir}/popup/build`));
 	console.info(await execCommand('npm run build'));
 
-	const dists = [
-		{
-			dir: `${clipperDir}/dist/chrome`,
-			name: 'chrome',
+	const dists = {
+		chrome: {
 			removeManifestKeys: (manifest) => {
 				manifest = Object.assign({}, manifest);
 				delete manifest.applications;
 				return manifest;
 			},
 		},
-		{
-			dir: `${clipperDir}/dist/firefox`,
-			name: 'firefox',
+		firefox: {
 			removeManifestKeys: (manifest) => {
 				manifest = Object.assign({}, manifest);
 				delete manifest.background.persistent;
 				return manifest;
 			},
 		},
-	];
+	};
 
-	for (let i = 0; i < dists.length; i++) {
-		const dist = dists[i];
-		await fs.remove(dist.dir);
-		await fs.mkdirp(dist.dir);
-		await copyToDist(dist.dir);
+	for (let distName in dists) {
+		const dist = dists[distName];
+		const distDir = `${clipperDir}/dist/${distName}`;
+		await fs.remove(distDir);
+		await fs.mkdirp(distDir);
+		await copyToDist(distDir);
 
-		const manifestText = await fs.readFile(`${dist.dir}/manifest.json`, 'utf-8');
+		const manifestText = await fs.readFile(`${distDir}/manifest.json`, 'utf-8');
 		let manifest = JSON.parse(manifestText);
 		manifest.name = 'Joplin Web Clipper';
 		if (dist.removeManifestKeys) manifest = dist.removeManifestKeys(manifest);
-		await fs.writeFile(`${dist.dir}/manifest.json`, JSON.stringify(manifest, null, 4));
+		await fs.writeFile(`${distDir}/manifest.json`, JSON.stringify(manifest, null, 4));
 
-		process.chdir(dist.dir);
-		console.info(await execCommand(`7z a -tzip ${dist.name}.zip *`));
-		console.info(await execCommand(`mv ${dist.name}.zip ..`));
+		process.chdir(distDir);
+		console.info(await execCommand(`rm -f "${distName}.zip"`));
+		console.info(await execCommand(`7z a -tzip ${distName}.zip *`));
+		console.info(await execCommand(`mv ${distName}.zip ..`));
+
+		dists[distName].outputPath = `${clipperDir}/dist/${distName}.zip`;
 	}
 
-	console.info('Creating source tarball for code validation...');
-	console.info(`Chdir: ${clipperDir}/..`);
-	process.chdir(`${clipperDir}/..`);
-	console.info(await execCommand(`rsync -a --delete --exclude 'node_modules/' --exclude 'build/' --exclude 'dist/' "${clipperDir}/" "${tmpSourceDir}/"`));
-	console.info(await execCommand(`7z a -tzip joplin-webclipper-source.zip "${tmpSourceDirName}"`));
-	console.info(await execCommand(`mv joplin-webclipper-source.zip "${clipperDir}/dist/" && rm -rf "${tmpSourceDirName}"`));
+	const sourceZip = await createSourceZip();
+	await checkSourceZip(sourceZip, dists.firefox.outputPath);
 
+	process.chdir(clipperDir);
 	console.info(await execCommand('git add -A'));
 	console.info(await execCommand(`git commit -m "Clipper release v${newVersion}"`));
 	console.info(await execCommand(`git tag clipper-${newVersion}`));