make linter happy

Author: leo60228

addon/[email protected]

@@ -1,6 +1,4 @@
-import _ from 'lodash';
-
-const makeIdent = () => _.times(20, () => _.random(35).toString(36)).join('');
+const makeIdent = () => Math.random().toString(36).substring(2, 10);
 
 export default function runOnPage(func) {
     return (...args) => new Promise((resolve, reject) => {
@@ -22,15 +20,15 @@ export default function runOnPage(func) {
         const serializedArgs = args.map(x => {
             if (x instanceof Element) {
                 if (x.id) {
-                    return { id: x.id };
+                    return `document.getElementById(${JSON.stringify(x.id)})`;
                 } else {
                     x.id = makeIdent();
-                    return { tempId: x.id };
+                    return `(() => { const elem = document.getElementById(${JSON.stringify(x.id)}); elem.id = ''; return elem; })()`;
                 }
             } else if (typeof x === 'function') {
-                return { func: x.toString() };
+                return `(() => ${x.toString()})()`;
             } else {
-                return { val: x };
+                return JSON.stringify(x);
             }
         });
 
@@ -41,21 +39,7 @@ export default function runOnPage(func) {
         const scriptContent = `
         (async () => {
             try {
-                const serializedArgs = ${JSON.stringify(serializedArgs)};
-                const args = serializedArgs.map(x => {
-                    if ('id' in x) {
-                        return document.getElementById(x.id);
-                    } else if ('tempId' in x) {
-                        const elem = document.getElementById(x.tempId);
-                        elem.id = '';
-                        return elem;
-                    } else if ('func' in x) {
-                        const generate = new Function('return ' + x.func);
-                        return generate();
-                    } else {
-                        return x.val;
-                    }
-                });
+                const args = [${serializedArgs.join(',')}];
                 const ret = await (${serialized})(...args);
                 window.postMessage({ ident: ${JSON.stringify(ident)}, ret });
             } catch (err) {
@@ -67,7 +51,7 @@ export default function runOnPage(func) {
         `;
 
         const script = document.createElement('script');
-        script.innerHTML = scriptContent;
+        script.text = scriptContent;
         document.documentElement.prepend(script);
     });
 }

lib/runOnPage.js

@@ -5,13 +5,14 @@
     "main": "index.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
-        "build:dev:js": "webpack",
-        "build:prod:js": "webpack --env production",
-        "build:unsigned:ext": "cd addon && web-ext build --overwrite-dest",
-        "build:signed:ext": "cd addon && web-ext sign",
-        "build:unsigned": "yarn run build:dev:js && yarn run build:unsigned:ext",
-        "build:signed": "yarn run build:prod:js && yarn run build:signed:ext",
-        "build": "yarn run build:unsigned",
+        "build:js:dev": "webpack",
+        "build:js:prod": "webpack --env production",
+        "build:ext:unsigned": "cd addon && web-ext build --overwrite-dest",
+        "build:ext:signed": "cd addon && web-ext sign",
+        "build:dev": "yarn run build:js:dev && yarn run build:ext:unsigned",
+        "build:prod:unsigned": "yarn run build:js:prod && yarn run build:ext:unsigned",
+        "build:prod:signed": "yarn run build:js:prod && yarn run build:ext:signed",
+        "build": "yarn run build:dev",
         "start:firefox": "webpack watch",
         "start:chromium": "webpack watch --env chromium",
         "start": "yarn run start:firefox"
@@ -25,8 +26,6 @@
         "webpack": "^5.23.0",
         "webpack-cli": "^4.5.0"
     },
-    "dependencies": {
-        "lodash": "^4.17.20"
-    },
+    "dependencies": {},
     "type": "module"
 }

package.json

@@ -26,7 +26,10 @@ const config = env => ({
             profileCreateIfMissing: true,
             keepProfileChanges: true
         })
-    ]
+    ],
+    node: {
+        global: false
+    }
 });
 
 export default config;