From 0eeaa9cb8432522350e5a8b92dd051534269c1a2 Mon Sep 17 00:00:00 2001
From: Jonas Pfalzgraf <jolun.swtor@gmail.com>
Date: Tue, 23 Aug 2022 18:08:10 +0200
Subject: [PATCH] polishing

---
 src/index.ts              | 15 +++++++++++
 tools/userScriptHeader.ts | 52 +++++++++++++++++++--------------------
 tsconfig.json             |  2 +-
 webpack.config.js         |  2 +-
 4 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index e69de29..23e4bf9 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -0,0 +1,15 @@
+/**
+ * App
+ */
+class App {
+
+    constructor() {
+        this.main();
+    }
+    
+    private main() {
+        console.log('Hello World!');
+    }
+}
+
+new App();
\ No newline at end of file
diff --git a/tools/userScriptHeader.ts b/tools/userScriptHeader.ts
index fb748cf..f822e6a 100644
--- a/tools/userScriptHeader.ts
+++ b/tools/userScriptHeader.ts
@@ -41,10 +41,9 @@ function generateMultibleEntrys(type: string, array: string[]): string {
   debugger;
   if (array) {
     array.forEach((item: string) => {
-      result += `// ${type}     ${item} `;
+      result += `// ${type}     ${item}`;
       if (array.length > 1) {
         result += "\n";
-        result += "                    ";
       }
     });
   }
@@ -64,13 +63,13 @@ function removeEmptyLinesFromString(string: string): string {
  * Generates user script header
  */
 async function generateUserScriptHeader() {
-  const includes = generateMultibleEntrys("@include", config.includes);
   const excludes = generateMultibleEntrys("@exclude", config.excludes);
   const requires = generateMultibleEntrys("@require", config.requires);
   const resources = generateMultibleEntrys("@resource", config.resources);
   const connecters = generateMultibleEntrys("@connect", config.connecters);
   const grants = generateMultibleEntrys("@grant", config.grants);
   const matches = generateMultibleEntrys("@match", config.matches);
+  const includes = generateMultibleEntrys("@match", config.includes);
   const antifeatures = generateMultibleEntrys(
     "@antifeature",
     config.antifeatures
@@ -104,32 +103,31 @@ async function generateUserScriptHeader() {
   }
 
   let header = `// ==UserScript==
-                    // @name         ${pkg.name}
-                    // @namespace    ${pkg.homepage}
-                    // @version      ${pkg.version}
-                    // @description  ${pkg.description}
-                    // @author       ${pkg.author}
-                    // @homepage     ${pkg.homepage}
-                    // @icon64       ${base64url}
-                    // @run-at       ${config.runAt}
-  	                ${updateUrl}
-                    ${downloadUrl}
-                    ${supportUrl}
-                    ${includes}
-                    ${excludes}
-                    ${requires}
-                    ${resources}
-                    ${connecters}
-                    ${grants}
-                    ${matches}
-                    ${antifeatures}
-                    ${noframes}
-                    ${matchAllFrames}
-                    // ==/UserScript==
+// @name         ${pkg.name}
+// @namespace    ${pkg.homepage}
+// @version      ${pkg.version}
+// @description  ${pkg.description}
+// @author       ${pkg.author}
+// @homepage     ${pkg.homepage}
+// @icon64       ${base64url}
+// @run-at       ${config.runAt}
+${updateUrl}
+${downloadUrl}
+${supportUrl}
+${excludes}
+${requires}
+${resources}
+${connecters}
+${grants}
+${matches}
+${antifeatures}
+${noframes}
+${matchAllFrames}
+// ==/UserScript==
 `;
   header = removeEmptyLinesFromString(header);
-  console.log(header);
-  // appendHeader(header);
+  header += "\n";
+  appendHeader(header);
 }
 
 generateUserScriptHeader();
diff --git a/tsconfig.json b/tsconfig.json
index a1cf3cb..aeb727d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,7 +3,7 @@
     "outDir": "./dist/",
     "noImplicitAny": true,
     "module": "ESNext",
-    "target": "ESNext",
+    "target": "ES6",
     "allowJs": false,
     "moduleResolution": "node",
     "sourceMap": true
diff --git a/webpack.config.js b/webpack.config.js
index 9a5a2a1..e9aac7a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -4,7 +4,7 @@ const pkg = require('./package.json');
 module.exports = {
     entry: './src/index.ts',
     devtool: 'inline-source-map',
-    mode: 'development',
+    mode: 'production',
     module: {
         rules: [
             {