diff --git a/Accounts/Dockerfile.dev b/Accounts/Dockerfile.dev index 74652a7965..42a4eea763 100644 --- a/Accounts/Dockerfile.dev +++ b/Accounts/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/AdminDashboard/Dockerfile.dev b/AdminDashboard/Dockerfile.dev index fa955ee1d8..744a39aeec 100644 --- a/AdminDashboard/Dockerfile.dev +++ b/AdminDashboard/Dockerfile.dev @@ -17,6 +17,7 @@ RUN apk update && apk add --no-cache --virtual .gyp python3 make g++ #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/Alert/Dockerfile.dev b/Alert/Dockerfile.dev index ad1ba8e730..546caea6e1 100644 --- a/Alert/Dockerfile.dev +++ b/Alert/Dockerfile.dev @@ -15,6 +15,7 @@ RUN apk update && apk add --no-cache --virtual .gyp python3 make g++ #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/ApiDocs/Dockerfile.dev b/ApiDocs/Dockerfile.dev index 924b5a37de..3a2689e051 100644 --- a/ApiDocs/Dockerfile.dev +++ b/ApiDocs/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/ApplicationScanner/Dockerfile.dev b/ApplicationScanner/Dockerfile.dev index 529592885c..4ba5f5be96 100644 --- a/ApplicationScanner/Dockerfile.dev +++ b/ApplicationScanner/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/CommonServer/package-lock.json b/CommonServer/package-lock.json index a690863c43..e90e9a3beb 100644 --- a/CommonServer/package-lock.json +++ b/CommonServer/package-lock.json @@ -19,6 +19,7 @@ "express": "^4.17.3", "gridfs-stream": "^1.1.1", "handlebars": "^4.7.7", + "json2csv": "^5.0.7", "jsonwebtoken": "^8.5.1", "node-device-detector": "^2.0.0", "nodemailer": "^6.7.3", @@ -69,6 +70,7 @@ "moment": "^2.29.2", "nanoid": "^3.3.2", "nanoid-dictionary": "^4.3.0", + "reflect-metadata": "^0.1.13", "slugify": "^1.6.5", "typeorm": "^0.3.6", "uuid": "^8.3.2" @@ -2145,6 +2147,14 @@ "node": ">= 0.8" } }, + "node_modules/commander": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", + "engines": { + "node": ">= 6" + } + }, "node_modules/Common": { "resolved": "../Common", "link": true @@ -4108,6 +4118,23 @@ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", "dev": true }, + "node_modules/json2csv": { + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/json2csv/-/json2csv-5.0.7.tgz", + "integrity": "sha512-YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA==", + "dependencies": { + "commander": "^6.1.0", + "jsonparse": "^1.3.1", + "lodash.get": "^4.4.2" + }, + "bin": { + "json2csv": "bin/json2csv.js" + }, + "engines": { + "node": ">= 10", + "npm": ">= 6.13.0" + } + }, "node_modules/json5": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", @@ -4120,6 +4147,14 @@ "node": ">=6" } }, + "node_modules/jsonparse": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", + "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=", + "engines": [ + "node >= 0.2.0" + ] + }, "node_modules/jsonwebtoken": { "version": "8.5.1", "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", @@ -4219,6 +4254,11 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "node_modules/lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=" + }, "node_modules/lodash.includes": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", @@ -8118,6 +8158,11 @@ "delayed-stream": "~1.0.0" } }, + "commander": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==" + }, "Common": { "version": "file:../Common", "requires": { @@ -8131,6 +8176,7 @@ "moment": "^2.29.2", "nanoid": "^3.3.2", "nanoid-dictionary": "^4.3.0", + "reflect-metadata": "^0.1.13", "slugify": "^1.6.5", "ts-jest": "^27.1.4", "typeorm": "^0.3.6", @@ -9639,12 +9685,27 @@ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", "dev": true }, + "json2csv": { + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/json2csv/-/json2csv-5.0.7.tgz", + "integrity": "sha512-YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA==", + "requires": { + "commander": "^6.1.0", + "jsonparse": "^1.3.1", + "lodash.get": "^4.4.2" + } + }, "json5": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", "dev": true }, + "jsonparse": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", + "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=" + }, "jsonwebtoken": { "version": "8.5.1", "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", @@ -9728,6 +9789,11 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=" + }, "lodash.includes": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", diff --git a/CommonServer/package.json b/CommonServer/package.json index 24ca6ea0f9..2d34ad3b5a 100644 --- a/CommonServer/package.json +++ b/CommonServer/package.json @@ -21,6 +21,7 @@ "express": "^4.17.3", "gridfs-stream": "^1.1.1", "handlebars": "^4.7.7", + "json2csv": "^5.0.7", "jsonwebtoken": "^8.5.1", "node-device-detector": "^2.0.0", "nodemailer": "^6.7.3", diff --git a/ContainerScanner/Dockerfile.dev b/ContainerScanner/Dockerfile.dev index 36b7321ab4..a94c103723 100644 --- a/ContainerScanner/Dockerfile.dev +++ b/ContainerScanner/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/Dashboard/Dockerfile.dev b/Dashboard/Dockerfile.dev index 1e80e7cf7d..ccdc965aea 100644 --- a/Dashboard/Dockerfile.dev +++ b/Dashboard/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/DashboardAPI/Dockerfile.dev b/DashboardAPI/Dockerfile.dev index 27dddd3fb9..700a6790cc 100644 --- a/DashboardAPI/Dockerfile.dev +++ b/DashboardAPI/Dockerfile.dev @@ -15,6 +15,7 @@ RUN apk update && apk add --no-cache --virtual .gyp python3 make g++ #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/DashboardAPI/package.json b/DashboardAPI/package.json index 07cfe14b2f..0270330349 100644 --- a/DashboardAPI/package.json +++ b/DashboardAPI/package.json @@ -74,7 +74,7 @@ "scripts": { "start": "ts-node Index.ts", "compile": "tsc", - "dev": "ts-node-dev --inspect=0.0.0.0 Index.ts --ignore greenlock.d/* -- --staging", + "dev": "nodemon --exec 'node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts'", "test": "nyc --reporter=lcov --reporter=text mocha --exit test/index.ts", "enterprise-test": "IS_TESTING=true nyc --reporter=lcov --reporter=text mocha --exit test/enterprise.js", "audit": "npm audit --audit-level=low", diff --git a/DataIngestor/Dockerfile.dev b/DataIngestor/Dockerfile.dev index d72d6e1127..a52a168865 100644 --- a/DataIngestor/Dockerfile.dev +++ b/DataIngestor/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/HelmChart/Dockerfile.dev b/HelmChart/Dockerfile.dev index fa65c576fa..dbc49f9d67 100644 --- a/HelmChart/Dockerfile.dev +++ b/HelmChart/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/Home/Dockerfile.dev b/Home/Dockerfile.dev index 3c79be248b..f51bde2665 100644 --- a/Home/Dockerfile.dev +++ b/Home/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/HttpTestServer/Dockerfile.dev b/HttpTestServer/Dockerfile.dev index 465fd5eb32..6cb75a004e 100644 --- a/HttpTestServer/Dockerfile.dev +++ b/HttpTestServer/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/Identity/Dockerfile.dev b/Identity/Dockerfile.dev index 015baef044..4a14a28a6f 100644 --- a/Identity/Dockerfile.dev +++ b/Identity/Dockerfile.dev @@ -15,6 +15,7 @@ RUN apk update && apk add --no-cache --virtual .gyp python3 make g++ #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src @@ -39,7 +40,7 @@ WORKDIR /usr/src/app/ COPY ./Identity/package*.json /usr/src/app/ RUN npm install RUN npm install -g ts-node -RUN npm install -g ts-node-dev + # Bundle app source COPY ./Identity /usr/src/app diff --git a/Integration/Dockerfile.dev b/Integration/Dockerfile.dev index 95ea354e6b..73fce42c95 100644 --- a/Integration/Dockerfile.dev +++ b/Integration/Dockerfile.dev @@ -15,6 +15,7 @@ RUN apk update && apk add --no-cache --virtual .gyp python3 make g++ #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/Licensing/Dockerfile.dev b/Licensing/Dockerfile.dev index 5397889e7f..c183f5fcf2 100644 --- a/Licensing/Dockerfile.dev +++ b/Licensing/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g # Install CommonServer RUN mkdir /usr/src/ diff --git a/LighthouseRunner/Dockerfile.dev b/LighthouseRunner/Dockerfile.dev index 9b8e167aa9..a02ebd38a3 100644 --- a/LighthouseRunner/Dockerfile.dev +++ b/LighthouseRunner/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/Mail/.env b/Mail/.env index e69de29bb2..b2aa90127b 100644 --- a/Mail/.env +++ b/Mail/.env @@ -0,0 +1 @@ +PORT=3190 \ No newline at end of file diff --git a/Mail/Dockerfile.dev b/Mail/Dockerfile.dev index 3f54503fc1..d481b228b9 100644 --- a/Mail/Dockerfile.dev +++ b/Mail/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src @@ -36,7 +37,6 @@ WORKDIR /usr/src/app COPY ./Mail/package*.json /usr/src/app/ RUN npm install RUN npm install -g ts-node -RUN npm install -g ts-node-dev # Bundle app source COPY ./Mail /usr/src/app diff --git a/Mail/package.json b/Mail/package.json index 2f39f43f3e..d103746381 100644 --- a/Mail/package.json +++ b/Mail/package.json @@ -6,7 +6,7 @@ "scripts": { "start": "ts-node Index.ts", "compile": "tsc", - "dev": "ts-node-dev --inspect=0.0.0.0 Index.ts", + "dev": "nodemon --exec 'node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts'", "test": "echo 'no tests'" }, "author": "", diff --git a/Probe/Dockerfile.dev b/Probe/Dockerfile.dev index 4fcb21a3f9..208e732ab9 100644 --- a/Probe/Dockerfile.dev +++ b/Probe/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/ProbeAPI/Dockerfile.dev b/ProbeAPI/Dockerfile.dev index 3d879071b0..fb218fb144 100644 --- a/ProbeAPI/Dockerfile.dev +++ b/ProbeAPI/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/Realtime/Dockerfile.dev b/Realtime/Dockerfile.dev index 4d798c6b13..b2e547a614 100644 --- a/Realtime/Dockerfile.dev +++ b/Realtime/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/ScriptRunner/Dockerfile.dev b/ScriptRunner/Dockerfile.dev index af0fac52a3..1a62eebc71 100644 --- a/ScriptRunner/Dockerfile.dev +++ b/ScriptRunner/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src diff --git a/StatusPage/Dockerfile.dev b/StatusPage/Dockerfile.dev index 0c50249e05..1ec07fb610 100644 --- a/StatusPage/Dockerfile.dev +++ b/StatusPage/Dockerfile.dev @@ -11,6 +11,7 @@ RUN apk update && apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] RUN npm install typescript -g +RUN npm install nodemon -g RUN mkdir /usr/src