Merge pull request #2 from arpitchakladar/dev/porting-to-firefox

Dev/implementing OCR for captcha autofill

5 files changed, 41 insertions, 30 deletions

diff --git a/config/webpack/plugins/create-injected-shared-modules-webpack-plugin.js b/config/webpack/plugins/create-injected-shared-modules-webpack-plugin.js
index aa076b8..695d4ef 100644
--- a/config/webpack/plugins/create-injected-shared-modules-webpack-plugin.js
+++ b/config/webpack/plugins/create-injected-shared-modules-webpack-plugin.js
@@ -1,8 +1,8 @@
-const path = require("path");
-const fs = require("fs");
-const { sources } = require("webpack");
+import path from "path";
+import fs from "fs";
+import webpack from "webpack";
 
-const { getFileName } = webpackRequire("utils/build-file");
+import { getFileName } from "../utils/build-file.js";
 
 class CreateInjectedSharedModulesPlugin {
 	constructor({ injectedSharedModulesImportedCount, sortedSharedModules }) {
@@ -29,7 +29,7 @@ class CreateInjectedSharedModulesPlugin {
 							.join("");
 						compilation.emitAsset(
 							`shared/${getFileName("injected-shared-modules", "shared")}.js`,
-							new sources.RawSource(injectionCode)
+							new webpack.sources.RawSource(injectionCode)
 						);
 					}
 				}
@@ -38,4 +38,4 @@ class CreateInjectedSharedModulesPlugin {
 	}
 }
 
-module.exports = CreateInjectedSharedModulesPlugin;
+export default CreateInjectedSharedModulesPlugin;
diff --git a/config/webpack/plugins/create-manifest-webpack-plugin/index.js b/config/webpack/plugins/create-manifest-webpack-plugin/index.js
index 8dc0ae4..6f1e2be 100644
--- a/config/webpack/plugins/create-manifest-webpack-plugin/index.js
+++ b/config/webpack/plugins/create-manifest-webpack-plugin/index.js
@@ -1,10 +1,15 @@
-const { sources } = require("webpack");
-const path = require("path");
-
-const { getScriptRuntimeFromType } = webpackRequire("utils/script-runtime");
-const { getFileName } = webpackRequire("utils/build-file");
-const scripts = webpackRequire("utils/scripts");
-const manifest = webpackRequire("plugins/create-manifest-webpack-plugin/manifest-template.json");
+import webpack from "webpack";
+import path from "path";
+import fs from "fs";
+
+import { getScriptRuntimeFromType } from "../../utils/script-runtime.js";
+import { getFileName } from "../../utils/build-file.js";
+import scripts from "../../utils/scripts.js";
+const manifest = JSON.parse(
+	fs.readFileSync(
+		path.resolve("config/webpack/plugins/create-manifest-webpack-plugin/manifest-template.json"),
+	),
+);
 
 class CreateManifestPlugin {
 	constructor({ sharedModulesImportedCount, injectedSharedModulesImportedCount, sortedSharedModules }) {
@@ -21,7 +26,7 @@ class CreateManifestPlugin {
 					stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
 				},
 				assets => {
-					manifest.version = require(path.resolve(ROOT_DIR, "package.json")).version;
+					manifest.version = JSON.parse(fs.readFileSync((path.resolve(ROOT_DIR, "package.json")))).version;
 					manifest.content_scripts = [];
 					let resources = [];
 
@@ -97,9 +102,11 @@ class CreateManifestPlugin {
 						];
 					}
 
+					manifest.background = { service_worker: "background.js" };
+
 					compilation.emitAsset(
 						"manifest.json",
-						new sources.RawSource(
+						new webpack.sources.RawSource(
 							JSON.stringify(
 								manifest,
 								undefined,
@@ -115,4 +122,5 @@ class CreateManifestPlugin {
 	}
 }
 
-module.exports = CreateManifestPlugin;
+export default CreateManifestPlugin;
+
diff --git a/config/webpack/plugins/create-manifest-webpack-plugin/manifest-template.json b/config/webpack/plugins/create-manifest-webpack-plugin/manifest-template.json
index d1d29f4..52496b6 100644
--- a/config/webpack/plugins/create-manifest-webpack-plugin/manifest-template.json
+++ b/config/webpack/plugins/create-manifest-webpack-plugin/manifest-template.json
@@ -1,7 +1,7 @@
 {
 	"manifest_version": 3,
 	"name": "Banglar Bhumi Utils",
-	"permissions": ["scripting", "declarativeNetRequest"],
+	"permissions": ["offscreen", "scripting", "declarativeNetRequest"],
 	"description": "A chrome extension to improve functionality of the banglarbhumi.gov.in website.",
 	"icons": {
 		"512": "icon512.png"
@@ -12,5 +12,8 @@
 			"enabled": true,
 			"path": "rules.json"
 		}]
+	},
+	"content_security_policy": {
+		"extension_pages": "script-src 'self' 'wasm-unsafe-eval'; object-src 'self';"
 	}
 }
diff --git a/config/webpack/plugins/create-rules-webpack-plugin.js b/config/webpack/plugins/create-rules-webpack-plugin.js
index 6e31196..5573ddf 100644
--- a/config/webpack/plugins/create-rules-webpack-plugin.js
+++ b/config/webpack/plugins/create-rules-webpack-plugin.js
@@ -1,6 +1,6 @@
-const path = require("path");
-const fs = require("fs");
-const { sources } = require("webpack");
+import path from "path";
+import fs from "fs";
+import webpack from "webpack";
 
 class CreateRulesPlugin {
 	apply(compiler) {
@@ -16,7 +16,7 @@ class CreateRulesPlugin {
 					let ruleId = 1;
 
 					for (const ruleFileName of ruleFileNames) {
-						const rule = require(path.resolve(SOURCE_DIR, "rules", ruleFileName));
+						const rule = JSON.parse(fs.readFileSync(path.resolve("src/rules", ruleFileName)));
 
 						if (rule instanceof Array) {
 							for (const currentRule of rule) {
@@ -31,7 +31,7 @@ class CreateRulesPlugin {
 
 					compilation.emitAsset(
 						"rules.json",
-						new sources.RawSource(
+						new webpack.sources.RawSource(
 							JSON.stringify(
 								rules,
 								undefined,
@@ -47,4 +47,4 @@ class CreateRulesPlugin {
 	}
 }
 
-module.exports = CreateRulesPlugin;
+export default CreateRulesPlugin;
diff --git a/config/webpack/plugins/inject-script-webpack-plugin.js b/config/webpack/plugins/inject-script-webpack-plugin.js
index 25b1dc6..2b60022 100644
--- a/config/webpack/plugins/inject-script-webpack-plugin.js
+++ b/config/webpack/plugins/inject-script-webpack-plugin.js
@@ -1,8 +1,8 @@
-const { sources } = require("webpack");
-const path = require("path");
+import webpack from "webpack";
+import path from "path";
 
-const { getFileName } = webpackRequire("utils/build-file");
-const { getInjectedCode } = webpackRequire("utils/injected-code");
+import { getFileName } from "../utils/build-file.js";
+import { getInjectedCode } from "../utils/injected-code.js";
 
 class InjectScriptPlugin {
 	apply(compiler) {
@@ -20,9 +20,9 @@ class InjectScriptPlugin {
 							const scriptInjectorModuleName = getFileName("script-injector", "shared", true);
 							compilation.updateAsset(
 								assetName,
-								new sources.RawSource(injectedCodeResponse[0])
+								new webpack.sources.RawSource(injectedCodeResponse[0])
 							);
-							assets["scripts/" + path.basename(assetName)] = new sources.RawSource(
+							assets["scripts/" + path.basename(assetName)] = new webpack.sources.RawSource(
 								`$${scriptInjectorModuleName}.injectScriptHead("scripts/injected/${path.basename(assetName)}", ${injectedCodeResponse[1]});`
 							);
 						}
@@ -33,4 +33,4 @@ class InjectScriptPlugin {
 	}
 }
 
-module.exports = InjectScriptPlugin;
+export default InjectScriptPlugin;