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

1 files changed, 2 insertions, 43 deletions

diff --git a/config/webpack.config.js b/config/webpack.config.js
index 1796aa8..f21d38f 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -1,55 +1,14 @@
-const fs = require("fs");
 const path = require("path");
 const CopyPlugin = require("copy-webpack-plugin");
 
 process.env.ROOT_DIR = path.resolve(__dirname, "..");
 process.env.SOURCE_DIR = path.resolve(process.env.ROOT_DIR, "src");
-process.env.STATIC_DIR = path.resolve(process.env.ROOT_DIR, "static");
 
-const InjectScriptPlugin = require("./webpack/plugins/inject-script-webpack-plugin");
 const CreateManifestPlugin = require("./webpack/plugins/create-manifest-webpack-plugin");
+const generateScriptBuildConfig = require("./webpack/utils/generate-script-build-config");
 
 const manifest = require(path.resolve(process.env.SOURCE_DIR, "manifest.json"));
 
-const generateScriptBuildConfig = (script, scriptType) => {
-	const scriptName = script.substring(0, script.length - 3);
-	let entry = path.resolve(process.env.SOURCE_DIR, `scripts/${scriptName}.ts`);
-	if (!fs.existsSync(entry)) {
-		entry = path.resolve(process.env.SOURCE_DIR, `scripts/${scriptName}/index.ts`);
-		if (!fs.existsSync(entry)) {
-			entry = path.resolve(process.env.SOURCE_DIR, `scripts/${scriptName}.js`);
-		}
-	}
-
-	return {
-		entry,
-		mode: "production",
-		output: {
-			filename: `${scriptName}.js`
-		},
-		resolve: {
-			extensions: ["", ".ts", ".js"],
-			alias: {
-				"@": process.env.SOURCE_DIR
-			}
-		},
-		module: {
-			rules: [
-				{
-					test: /\.tsx?$/,
-					loader: "ts-loader",
-					options: {
-						configFile: "config/tsconfig.json"
-					}
-				}
-			]
-		},
-		plugins: scriptType.startsWith("injected")
-			? [new InjectScriptPlugin({ onload: scriptType === "injected_and_loaded" })]
-			: undefined
-	};
-};
-
 let scripts = [];
 
 for (const scriptType in manifest) {
@@ -61,7 +20,7 @@ for (const scriptType in manifest) {
 scripts[scripts.length - 1].plugins = (scripts[scripts.length - 1].plugins || []).concat([
 	new CopyPlugin({
 		patterns: [{
-			from: process.env.STATIC_DIR,
+			from: path.resolve(process.env.ROOT_DIR, "static"),
 			to: "./"
 		}]
 	}),