Fixed some bugs... Updated some code...

1 files changed, 17 insertions, 11 deletions

diff --git a/config/webpack/plugins/inject-script-webpack-plugin.js b/config/webpack/plugins/inject-script-webpack-plugin.js
index 63bab27..ca75213 100644
--- a/config/webpack/plugins/inject-script-webpack-plugin.js
+++ b/config/webpack/plugins/inject-script-webpack-plugin.js
@@ -1,10 +1,9 @@
 const terser = require("terser");
 
-let count = 0;
-
 class InjectScriptPlugin {
-	constructor({ onload }) {
+	constructor({ onload, isFirst }) {
 		this.onload = !!onload;
+		this.isFirst = !!isFirst;
 	}
 
 	apply(compiler) {
@@ -20,30 +19,37 @@ class InjectScriptPlugin {
 						if (assetName.endsWith(".js")) {
 							const asset = assets[assetName];
 							let content = asset._source._children;
-							let x = 2;
+							let x = -1;
 							for (let i = 0; i < content.length; i++) {
 								if (typeof content[i] === "string" && content[i].indexOf("__webpack_exports__") >= 0) {
 									x = i;
 									break;
 								}
 							}
+							if (x == -1) {
+								throw Error("Failed to inject script.");
+							}
 							content[x] += `
 								const observer = new MutationObserver(mutations => {
 								const script = document.querySelector("head > script:nth-child(54)");
 								if (script) {
-							`
-							if (count > 0) {
-								content[x] += "script.innerHTML += `";
-							} else {
-								content[x] += "script.innerHTML = `";
+									script.innerHTML 
+							`;
+							if (!this.isFirst) {
+								content[x] += "+";
 							}
+							content[x] += "= `";
 							if (this.onload) {
 								content[x] += "document.addEventListener(\"DOMContentLoaded\", () => {";
 								content[content.length - 3] += "});";
 							}
-							content[content.length - 3] += "`;observer.disconnect();}});observer.observe(document, {childList: true, subtree: true});";
+							content[content.length - 3] += `\`;
+										observer.disconnect();
+									}
+								});
+								observer.observe(document, {childList: true, subtree: true});
+							`;
 							content[x + 1] = (await terser.minify(content[x + 1]._source._source._valueAsString.replaceAll("`", "\\`"))).code;
-							count++;
 						}
 					}
 				}