Merge pull request #561 from Aktanusa/npm

Add NPM

.eslintignore

@@ -0,0 +1,2 @@
+CookieMonster.js
+CookieMonster.user.js

.github/workflows/CheckMainFile.yml

@@ -1,4 +1,4 @@
-name: Check build of CookieMonster
+name: Check build of CookieMonster.js
 on: pull_request
 jobs:
   build:
@@ -7,10 +7,11 @@ jobs:
     - uses: actions/checkout@v2
     - name: Check if CookieMonster.js is built correctly 
       run: |
-        cat ./src/Header.js ./src/Cache.js ./src/Config.js ./src/Data.js ./src/Disp.js ./src/Main.js ./src/Sim.js ./src/Footer.js > CookieMonsterTest.js
+        npm install
+        npx terser ./src/Header.js ./src/Cache.js ./src/Config.js ./src/Data.js ./src/Disp.js ./src/Main.js ./src/Sim.js ./src/Footer.js -o CookieMonsterTest.js
         if cmp CookieMonster.js CookieMonsterTest.js; then
             echo '### SUCCESS: CookieMonster is correctly built! ###'
         else
-            echo '### WARNING: CookieMonster.js does not seem to be correct. Have you compiled the source files into the final file using either of the combine files? ###'
+            echo '### WARNING: CookieMonster.js does not seem to be correct. Make sure to run "npm run build" after saving all your changes! ###'
             exit 1
         fi

.github/workflows/ESLint.yml

@@ -6,4 +6,4 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Run ESLint
-      run: npx eslint CookieMonster.js
+      run: npx eslint src

.gitignore

@@ -0,0 +1 @@
+node_modules

Combine.bat

@@ -1,2 +0,0 @@
-@ECHO OFF
-COPY /B /Y .\src\Header.js + .\src\Cache.js + .\src\Config.js + .\src\Data.js + .\src\Disp.js + .\src\Main.js + .\src\Sim.js + .\src\Footer.js CookieMonster.js

Combine.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-cat ./src/Header.js ./src/Cache.js ./src/Config.js ./src/Data.js ./src/Disp.js ./src/Main.js ./src/Sim.js ./src/Footer.js > CookieMonster.js

README.md

@@ -63,6 +63,12 @@ If the bug is still here, you can submit an issue for it. Please do so by using
 
 All suggestions are welcome, even the smallest ones.
 
+## Contributing
+
+To contribute you can fork and clone the repository and run `npm install`.
+
+Please also remember to run `npm run build` after saving all your changes to build the final `CookieMonster.js` file. 
+
 ## Contributors
 
 * **[Raving_Kumquat](https://cookieclicker.wikia.com/wiki/User:Raving_Kumquat)**: Original author

package.json

@@ -0,0 +1,44 @@
+{
+  "name": "cookie-monster",
+  "version": "2.031.4",
+  "description": "Cookie Monster is an add-on that you can load into Cookie Clicker which offers a wide range of tools and statistics to enhance the game. It is not a cheat interface – although it does offer helpers for golden cookies and such, everything can be toggled off at will to only leave how much information you want. This is a helper and everything is an option.",
+  "main": "CookieMonster.js",
+  "keywords": [
+    "Cookie Clicker",
+    "javascript",
+    "mod",
+    "Dashnet",
+    "Orteil"
+  ],
+  "scripts": {
+    "build": "npx eslint src && terser ./src/Header.js ./src/Cache.js ./src/Config.js ./src/Data.js ./src/Disp.js ./src/Main.js ./src/Sim.js ./src/Footer.js -o CookieMonster.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Aktanusa/CookieMonster.git"
+  },
+  "license": "MIT",
+  "author": {
+    "name": "Aktanusa",
+    "email": "13665637+DanielNoord@users.noreply.github.com"
+  },
+  "contributors": [
+    {
+      "name": "Daniël van Noord",
+      "email": "13665637+DanielNoord@users.noreply.github.com"
+    },
+    {
+      "name": "Aran Leite",
+      "email": "hyoretsu@gmail.com",
+      "url": "https://www.linkedin.com/in/aranleite"
+    }
+  ],
+  "bugs": {
+    "url": "https://github.com/Aktanusa/CookieMonster/issues"
+  },
+  "homepage": "https://github.com/Aktanusa/CookieMonster#readme",
+  "devDependencies": {
+    "eslint": "^7.19.0",
+    "terser": "^5.6.0-beta"
+  }
+}

src/Header.js

@@ -1,32 +1,18 @@
+/* eslint-disable no-redeclare */
+/* eslint-disable no-unused-vars */
 /**********
  * Header *
  **********/
 
-var RunCookieMonsterHeader = function() {
-    CM = {};
-
-    CM.Backup = {};
-
-    CM.Cache = {};
-
-    CM.Config = {};
-
-    CM.ConfigData = {};
-
-    CM.Data = {};
-
-    CM.Disp = {};
-
-    CM.Footer = {};
-
-    CM.Main = {};
-
-    CM.Options = {};
-
-    CM.Sim = {};
+const CM = {
+    Backup: {},
+    Cache: {},
+    Config: {},
+    ConfigData: {},
+    Data: {},
+    Disp: {},
+    Footer: {},
+    Main: {},
+    Options: {},
+    Sim: {},
 };
-
-if (typeof CM == "undefined") {
-    RunCookieMonsterHeader();
-}
-