refactor: remove unused files and polyfills

DimensionDev · Oct 10, 2019 · 1590dce · 1590dce
1 parent b38be2a
commit 1590dce
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 34 deletions.
diff --git a/config-overrides/index.js b/config-overrides/index.js
@@ -8,7 +8,7 @@ const src = file => path.join(__dirname, '../', file)
 /**
  * Polyfills that needs to be copied to dist
  */
-const polyfills = [
+let polyfills = [
     'node_modules/webextension-polyfill/dist/browser-polyfill.min.js',
     'node_modules/webextension-polyfill/dist/browser-polyfill.min.js.map',
     'src/polyfill/asmcrypto.js',
@@ -48,6 +48,10 @@ const target = (argv => ({
     WKWebview: (argv['wk-webview']),
 }))(require('yargs').argv)
 
+if (target.Firefox) {
+    polyfills = polyfills.filter(name => !name.includes('webextension-polyfill'))
+}
+
 /**
  * @param config {import("webpack").Configuration}
  * @param env {'development' | 'production'}
@@ -99,8 +103,12 @@ function override(config, env) {
      * @param {HtmlWebpackPlugin.Options} options
      */
     function newPage(options = {}) {
+        let templateContent = fs.readFileSync(path.join(__dirname, './template.html'), 'utf8')
+        if (target.Firefox) {
+            templateContent = templateContent.replace('<script src="/polyfill/browser-polyfill.min.js"></script>', '')
+        }
         return new HtmlWebpackPlugin({
-            templateContent: fs.readFileSync(path.join(__dirname, './template.html'), 'utf8'),
+            templateContent,
             inject: 'body',
             ...options,
         })

diff --git a/public/index.html b/public/index.html
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <script src="polyfill/browser-polyfill.min.js"></script>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-        <style>
-            body {
-                margin: 0;
-                background: #fafafa;
-            }
-            #root {
-                min-width: 100vw;
-                min-height: 100vh;
-            }
-        </style>
-        <title>Maskbook</title>
-    </head>
-    <body>
-        <div id="root"></div>
-    </body>
-</html>

diff --git a/public/popup.html b/public/popup.html