From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Thu, 11 Feb 2021 10:05:29 +0000 (+0100)
Subject: Merge branch 'master' of github.com:LucasBrazi06/ev-simulator into rollup
X-Git-Tag: v1.0.1-0~104^2~6^2~6
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=128f985401bd87bf53f68cbe1bfec8d64bbaa6d9;p=e-mobility-charging-stations-simulator.git

Merge branch 'master' of github.com:LucasBrazi06/ev-simulator into rollup
---

128f985401bd87bf53f68cbe1bfec8d64bbaa6d9
diff --cc package-lock.json
index b43b69a1,f9f9dc5a..3ea6a902
--- a/package-lock.json
+++ b/package-lock.json
@@@ -13457,17 -11019,11 +13457,17 @@@
        }
      },
      "typescript": {
-       "version": "4.1.4",
-       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.4.tgz",
-       "integrity": "sha512-+Uru0t8qIRgjuCpiSPpfGuhHecMllk5Zsazj5LZvVsEStEjmIRRBZe+jHjGQvsgS7M1wONy2PQXd67EMyV6acg==",
+       "version": "4.1.5",
+       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz",
+       "integrity": "sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==",
        "dev": true
      },
 +    "ua-parser-js": {
 +      "version": "0.7.23",
 +      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.23.tgz",
 +      "integrity": "sha512-m4hvMLxgGHXG3O3fQVAyyAQpZzDOvwnhOTjYz5Xmr7r/+LpkNy3vJXdVRWgd1TkAb7NGROZuSy96CrlNVjA7KA==",
 +      "dev": true
 +    },
      "umd": {
        "version": "3.0.3",
        "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz",
diff --cc package.json
index 5d9f16aa,5812d74a..21bb9987
--- a/package.json
+++ b/package.json
@@@ -75,9 -75,7 +75,9 @@@
      "mbt": "^1.1.0",
      "npm-check": "^5.9.2",
      "rimraf": "^3.0.2",
 +    "rollup": "^2.38.5",
 +    "rollup-plugin-delete": "^2.0.0",
      "ts-node-dev": "^1.1.1",
-     "typescript": "^4.1.4"
+     "typescript": "^4.1.5"
    }
  }