From 0ee9af72451e3c778f46b71c6bbde94436f00b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <michael@minelli.me>
Date: Fri, 4 Aug 2023 21:35:07 +0200
Subject: [PATCH] Package => Migrate from hjson to json5
---
NodeApp/package-lock.json | 36 ++++++++++++++++--------------------
NodeApp/package.json | 5 ++---
NodeApp/src/shared | 2 +-
3 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/NodeApp/package-lock.json b/NodeApp/package-lock.json
index ce33542..7ae7645 100644
--- a/NodeApp/package-lock.json
+++ b/NodeApp/package-lock.json
@@ -14,9 +14,9 @@
"chalk": "^4.1.2",
"commander": "^10.0.1",
"dotenv": "^16.3.1",
- "hjson": "^3.2.2",
"http-status-codes": "^2.2.0",
"inquirer": "^8.2.5",
+ "json5": "^2.2.3",
"jsonwebtoken": "^8.5.1",
"ora": "^5.4.1",
"winston": "^3.10.0"
@@ -25,10 +25,9 @@
"dirmanager": "dist/app.js"
},
"devDependencies": {
- "@types/hjson": "^2.4.3",
"@types/inquirer": "^8.2.6",
"@types/jsonwebtoken": "^8.5.9",
- "@types/node": "^18.17.1",
+ "@types/node": "^18.17.2",
"pkg": "^5.8.1",
"ts-node": "^10.9.1",
"typescript": "^5.1.6"
@@ -245,12 +244,6 @@
"integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
"dev": true
},
- "node_modules/@types/hjson": {
- "version": "2.4.3",
- "resolved": "https://registry.npmjs.org/@types/hjson/-/hjson-2.4.3.tgz",
- "integrity": "sha512-EDixutNn3FQwa5HdET+Tx0h7TirP2knJa9TB21ySqr8XVqT/VsvvOwnanTLHUOOpNofcUhkRKhOk0Wh4YD9RSA==",
- "dev": true
- },
"node_modules/@types/inquirer": {
"version": "8.2.6",
"resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.6.tgz",
@@ -271,9 +264,9 @@
}
},
"node_modules/@types/node": {
- "version": "18.17.1",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.1.tgz",
- "integrity": "sha512-xlR1jahfizdplZYRU59JlUx9uzF1ARa8jbhM11ccpCJya8kvos5jwdm2ZAgxSCwOl0fq21svP18EVwPBXMQudw==",
+ "version": "18.17.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.2.tgz",
+ "integrity": "sha512-wBo3KqP/PBqje5TI9UTiuL3yWfP6sdPtjtygSOqcYZWT232dfDeDOnkDps5wqZBP9NgGgYrNejinl0faAuE+HQ==",
"dev": true
},
"node_modules/@types/through": {
@@ -1065,14 +1058,6 @@
"node": ">=8"
}
},
- "node_modules/hjson": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/hjson/-/hjson-3.2.2.tgz",
- "integrity": "sha512-MkUeB0cTIlppeSsndgESkfFD21T2nXPRaBStLtf3cAYA2bVEFdXlodZB0TukwZiobPD1Ksax5DK4RTZeaXCI3Q==",
- "bin": {
- "hjson": "bin/hjson"
- }
- },
"node_modules/http-status-codes": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/http-status-codes/-/http-status-codes-2.2.0.tgz",
@@ -1290,6 +1275,17 @@
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
},
+ "node_modules/json5": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+ "bin": {
+ "json5": "lib/cli.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
"node_modules/jsonfile": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
diff --git a/NodeApp/package.json b/NodeApp/package.json
index 979adf4..76de191 100644
--- a/NodeApp/package.json
+++ b/NodeApp/package.json
@@ -31,18 +31,17 @@
"chalk" : "^4.1.2",
"commander" : "^10.0.1",
"dotenv" : "^16.3.1",
- "hjson" : "^3.2.2",
"http-status-codes": "^2.2.0",
"inquirer" : "^8.2.5",
+ "json5" : "^2.2.3",
"jsonwebtoken" : "^8.5.1",
"ora" : "^5.4.1",
"winston" : "^3.10.0"
},
"devDependencies": {
- "@types/hjson" : "^2.4.3",
"@types/inquirer" : "^8.2.6",
"@types/jsonwebtoken": "^8.5.9",
- "@types/node" : "^18.17.1",
+ "@types/node" : "^18.17.2",
"pkg" : "^5.8.1",
"ts-node" : "^10.9.1",
"typescript" : "^5.1.6"
diff --git a/NodeApp/src/shared b/NodeApp/src/shared
index bdcfaff..c6e9f76 160000
--- a/NodeApp/src/shared
+++ b/NodeApp/src/shared
@@ -1 +1 @@
-Subproject commit bdcfaffc04421d131cc63636a7c2b84a20cfadc5
+Subproject commit c6e9f764ca4b12fa1e75b4a247fba5572597b1d7
--
GitLab