Merge pull request #92 from Pera-Swarm/dependancy-fix

Dependency fix

Author: NuwanJ

package-lock.json

@@ -9,19 +9,15 @@
    },
    "scripts": {
       "dev": "run-s dev:js webpack-server",
-      "build": "run-s prebuild build:dir build:js",
+      "build": "run-s build:dir build:js",
       "prebuild": "run-s clean lint",
       "clean": "rimraf build",
-      "format": "prettier --write \"**/*.+(js|jsx|json|yml|yaml|css|md)\"",
       "lint": "eslint src/js/",
-      "webpack-server": "webpack-dev-server --env.NODE_ENV=dev --progress --color --open --hot",
-      "webpack-watch": "webpack --env.NODE_ENV=dev --progress --color --watch --hot",
-      "dev:js": "webpack --env.NODE_ENV=dev",
+      "webpack-server": "webpack serve --env NODE_ENV=dev --progress --color --open --hot",
+      "webpack-watch": "webpack --env NODE_ENV=dev --progress --color --watch --hot",
+      "dev:js": "webpack --env NODE_ENV=dev",
       "build:dir": "copyfiles -a -u 2 src/public/assets/**/*.* build/",
-      "build:js": "webpack --env.NODE_ENV=prod --progress --color --verbose",
-      "test": "echo \"Error: no test specified\" && exit 1",
-      "predeploy": "npm run build",
-      "deploy": "gh-pages -d build"
+      "build:js": "webpack --env NODE_ENV=prod --progress --color"
    },
    "repository": {
       "type": "git",
@@ -35,42 +31,39 @@
    },
    "homepage": "https://pera-swarm.github.io/visualizer",
    "devDependencies": {
-      "@babel/core": "^7.10.4",
-      "@babel/preset-env": "^7.10.4",
-      "autoprefixer": "^9.8.4",
-      "babel-loader": "^8.1.0",
+      "@babel/core": "^7.13.10",
+      "@babel/preset-env": "^7.13.12",
+      "autoprefixer": "^10.2.5",
+      "babel-loader": "^8.2.2",
       "cname-webpack-plugin": "^3.0.0",
-      "copyfiles": "^2.3.0",
-      "css-loader": "^3.6.0",
-      "eslint": "^7.4.0",
-      "file-loader": "^6.1.1",
-      "gh-pages": "^3.1.0",
-      "html-webpack-plugin": "^4.3.0",
-      "mini-css-extract-plugin": "^0.9.0",
-      "node-sass": "^7.0.0",
+      "copyfiles": "^2.4.1",
+      "crypto": "^1.0.1",
+      "crypto-browserify": "^3.12.0",
+      "css-loader": "^5.2.0",
+      "eslint": "^7.22.0",
+      "html-webpack-plugin": "^5.3.1",
+      "mini-css-extract-plugin": "^1.3.9",
+      "node-sass": "^5.0.0",
       "npm-run-all": "^4.1.5",
-      "optimize-css-assets-webpack-plugin": "^5.0.3",
-      "postcss-loader": "^3.0.0",
+      "optimize-css-assets-webpack-plugin": "^5.0.4",
+      "postcss-loader": "^5.2.0",
       "rimraf": "^3.0.2",
-      "sass-loader": "^8.0.2",
-      "source-map-loader": "^1.0.1",
-      "style-loader": "^1.2.1",
-      "terser-webpack-plugin": "^3.0.6",
-      "webpack": "^4.43.0",
-      "webpack-cli": "^3.3.12",
-      "webpack-dev-server": "^3.11.0"
+      "sass-loader": "^11.0.1",
+      "style-loader": "^2.0.0",
+      "terser-webpack-plugin": "^5.1.1",
+      "webpack": "^5.28.0",
+      "webpack-cli": "^4.5.0",
+      "webpack-dev-server": "^4.0.0-beta.1"
    },
    "dependencies": {
-      "@tweenjs/tween.js": "^18.6.0",
-      "copy-webpack-plugin": "^6.2.1",
+      "@tweenjs/tween.js": "^18.6.4",
       "es6-promise": "^4.2.8",
       "jquery": "^3.5.1",
-      "jsonwebtoken": "^9.0.0",
       "mqtt": "^4.2.8",
       "paho-mqtt": "^1.1.0",
       "prettier": "^2.2.1",
-      "three": "^0.137.0",
-      "three-stl-loader": "^1.0.6",
-      "update": "^0.7.4"
+      "stream-browserify": "^3.0.0",
+      "three": "^0.126.1",
+      "three-stl-loader": "^1.0.6"
    }
 }

package.json

@@ -1,3 +1,5 @@
 module.exports = {
-    plugins: [require('autoprefixer')]
+  plugins: [
+    require('autoprefixer'),
+  ],
 };

postcss.config.js

@@ -1,5 +1,3 @@
-const jwt = require('jsonwebtoken');
-
 function getUrlVars() {
     var vars = {};
     var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function (m, key, value) {
@@ -106,14 +104,3 @@ function clearParams() {
     const path = window.location.origin + window.location.pathname;
     window.history.pushState({}, document.title, path);
 }
-
-function decodeKey() {
-    try {
-        const decoded = jwt.verify(token, 'swarm-visualizer-secret');
-        return decoded;
-    } catch (err) {
-        // err
-        console.log('Token Error');
-        return -1;
-    }
-}

src/js/app/helpers/urlHelper.js

@@ -4,7 +4,7 @@
         <meta charset="UTF-8" />
         <title>Visualizer | Pera-Swarm</title>
         <link rel="icon" href="./favicon.ico" />
-    <link href="js/../css/main.css" rel="stylesheet"></head>
+    <script defer src="/js/runtime.bundle.js"></script><script defer src="/js/vendors.bundle.js"></script><script defer src="/js/main.bundle.js"></script><link href="/js/../css/main.css" rel="stylesheet"></head>
 
     <body>
         <section id="appContainer" class="main">
@@ -13,5 +13,5 @@
         </section>
         <script src="js/stats.min.js"></script>
         <script src="js/dat.gui.min.js"></script>
-    <script src="js/app.js"></script><script src="js/vendors.app.js"></script><script src="js/main.app.js"></script></body>
+    </body>
 </html>