Added captha removal and autocomplete to GRN search.

3 files changed, 15 insertions, 18 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 fd5a0a2..aa076b8 100644
--- a/config/webpack/plugins/create-injected-shared-modules-webpack-plugin.js
+++ b/config/webpack/plugins/create-injected-shared-modules-webpack-plugin.js
@@ -2,7 +2,7 @@ const path = require("path");
 const fs = require("fs");
 const { sources } = require("webpack");
 
-const { getFileNameHash } = webpackRequire("utils/filename-hash");
+const { getFileName } = webpackRequire("utils/build-file");
 
 class CreateInjectedSharedModulesPlugin {
 	constructor({ injectedSharedModulesImportedCount, sortedSharedModules }) {
@@ -20,15 +20,15 @@ class CreateInjectedSharedModulesPlugin {
 				assets => {
 					const injectedSharedScripts = this.sortedSharedModules
 						.filter(sharedModule => this.injectedSharedModulesImportedCount[sharedModule] > 0)
-						.map(sharedModule => `shared/${getFileNameHash(sharedModule, "shared")}.js`);
+						.map(sharedModule => `shared/${getFileName(sharedModule, "shared")}.js`);
 
 					if (injectedSharedScripts.length > 0) {
-						const scriptInjectorModuleName = getFileNameHash("script-injector", "shared", true);
+						const scriptInjectorModuleName = getFileName("script-injector", "shared", true);
 						const injectionCode = injectedSharedScripts
 							.map(injectedScript => `$${scriptInjectorModuleName}.injectScriptHead("shared/${path.basename(injectedScript)}");`)
 							.join("");
 						compilation.emitAsset(
-							`shared/${getFileNameHash("injected-shared-modules", "shared")}.js`,
+							`shared/${getFileName("injected-shared-modules", "shared")}.js`,
 							new sources.RawSource(injectionCode)
 						);
 					}
diff --git a/config/webpack/plugins/create-manifest-webpack-plugin/index.js b/config/webpack/plugins/create-manifest-webpack-plugin/index.js
index b14cd13..92c3096 100644
--- a/config/webpack/plugins/create-manifest-webpack-plugin/index.js
+++ b/config/webpack/plugins/create-manifest-webpack-plugin/index.js
@@ -2,7 +2,7 @@ const { sources } = require("webpack");
 const path = require("path");
 
 const { getScriptRuntimeFromType } = webpackRequire("utils/script-runtime");
-const { getFileNameHash } = webpackRequire("utils/filename-hash");
+const { getFileName } = webpackRequire("utils/build-file");
 const scripts = webpackRequire("utils/scripts");
 const manifest = webpackRequire("plugins/create-manifest-webpack-plugin/manifest-template.json");
 
@@ -37,9 +37,9 @@ class CreateManifestPlugin {
 								arrangedScripts[scriptPath][scriptRuntime] = [];
 							}
 
-							arrangedScripts[scriptPath][scriptRuntime].push(`scripts/${getFileNameHash(scriptType, scriptPath)}.js`);
+							arrangedScripts[scriptPath][scriptRuntime].push(`scripts/${getFileName(scriptType, scriptPath)}.js`);
 							if (scriptType.startsWith("injected")) {
-								resources.push(`scripts/injected/${getFileNameHash(scriptType, scriptPath)}.js`);
+								resources.push(`scripts/injected/${getFileName(scriptType, scriptPath)}.js`);
 							}
 						}
 					}
@@ -48,8 +48,9 @@ class CreateManifestPlugin {
 						matches: [`*://banglarbhumi.gov.in/BanglarBhumi/*`],
 						js: this.sortedSharedModules
 							.filter(sharedModule => this.sharedModulesImportedCount[sharedModule] > 0)
-							.map(sharedModule => `shared/${getFileNameHash(sharedModule, "shared")}.js`)
-							.concat(arrangedScripts["*"]["document_start"]),
+							.map(sharedModule => `shared/${getFileName(sharedModule, "shared")}.js`)
+							.concat(arrangedScripts["*"]["document_start"])
+							.filter(x => x != null),
 						run_at: "document_start"
 					});
 
@@ -78,14 +79,14 @@ class CreateManifestPlugin {
 
 					const injectedSharedModules = this.sortedSharedModules
 						.filter(sharedModule => this.injectedSharedModulesImportedCount[sharedModule] > 0)
-						.map(sharedModule => `shared/${getFileNameHash(sharedModule, "shared")}.js`);
+						.map(sharedModule => `shared/${getFileName(sharedModule, "shared")}.js`);
 
 					if (injectedSharedModules.length > 0) {
 						resources = resources.concat(injectedSharedModules);
-						manifest.content_scripts[0].js.unshift(`shared/${getFileNameHash("injected-shared-modules", "shared")}.js`);
+						manifest.content_scripts[0].js.unshift(`shared/${getFileName("injected-shared-modules", "shared")}.js`);
 					}
 
-					manifest.content_scripts[0].js.unshift(`shared/${getFileNameHash("script-injector", "shared")}.js`);
+					manifest.content_scripts[0].js.unshift(`shared/${getFileName("script-injector", "shared")}.js`);
 
 					if (resources.length > 0) {
 						manifest.web_accessible_resources = [
diff --git a/config/webpack/plugins/inject-script-webpack-plugin.js b/config/webpack/plugins/inject-script-webpack-plugin.js
index 665d24e..25b1dc6 100644
--- a/config/webpack/plugins/inject-script-webpack-plugin.js
+++ b/config/webpack/plugins/inject-script-webpack-plugin.js
@@ -1,14 +1,10 @@
 const { sources } = require("webpack");
 const path = require("path");
 
-const { getFileNameHash } = webpackRequire("utils/filename-hash");
+const { getFileName } = webpackRequire("utils/build-file");
 const { getInjectedCode } = webpackRequire("utils/injected-code");
 
 class InjectScriptPlugin {
-	constructor(insertedBefore = false) {
-		this.insertedBefore = insertedBefore;
-	}
-
 	apply(compiler) {
 		compiler.hooks.compilation.tap("InjectScriptPlugin", compilation => {
 			compilation.hooks.processAssets.tapPromise(
@@ -21,7 +17,7 @@ class InjectScriptPlugin {
 					for (const assetName in assets) {
 						if (/\.js$/.test(assetName)) {
 							const injectedCodeResponse = getInjectedCode(compilation.getAsset(assetName).source.source())
-							const scriptInjectorModuleName = getFileNameHash("script-injector", "shared", true);
+							const scriptInjectorModuleName = getFileName("script-injector", "shared", true);
 							compilation.updateAsset(
 								assetName,
 								new sources.RawSource(injectedCodeResponse[0])