From 62812de0a92a32c5e2acfd9c4016222afda40611 Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Sun, 22 May 2022 12:38:15 +0100 Subject: [PATCH] fix dockerfiles --- Accounts/Dockerfile | 1 + AdminDashboard/Dockerfile | 1 + Alert/Dockerfile | 1 + ApiDocs/Dockerfile | 1 + ApplicationScanner/Dockerfile | 1 + ContainerScanner/Dockerfile | 1 + Dashboard/Dockerfile | 1 + DashboardAPI/Dockerfile | 1 + DataIngestor/Dockerfile | 1 + HelmChart/Dockerfile | 1 + Home/Dockerfile | 1 + HttpTestServer/Dockerfile | 1 + Identity/Dockerfile | 1 + Identity/Dockerfile.dev | 1 + Integration/Dockerfile | 1 + Licensing/Dockerfile | 1 + LighthouseRunner/Dockerfile | 1 + Mail/Dockerfile | 1 + Mail/Dockerfile.dev | 1 + Mail/package-lock.json | 725 +++++++++++++++++++++++++++++++++- Mail/package.json | 3 - Probe/Dockerfile | 1 + ProbeAPI/Dockerfile | 1 + Realtime/Dockerfile | 1 + ScriptRunner/Dockerfile | 1 + StatusPage/Dockerfile | 1 + docker-compose.ci.yml | 1 + docker-compose.dev.yml | 1 + docker-compose.yml | 1 + package.json | 1 + 30 files changed, 752 insertions(+), 4 deletions(-) diff --git a/Accounts/Dockerfile b/Accounts/Dockerfile index 4b7a2b08d2..a6fb7498fe 100755 --- a/Accounts/Dockerfile +++ b/Accounts/Dockerfile @@ -52,6 +52,7 @@ WORKDIR /usr/src/app COPY ./Accounts/package*.json /usr/src/app/ RUN npm install RUN npm install -g ts-node +RUN npm install -g ts-node-dev # Copy app source COPY ./Accounts /usr/src/app diff --git a/AdminDashboard/Dockerfile b/AdminDashboard/Dockerfile index 3e7e481da1..9f56447beb 100644 --- a/AdminDashboard/Dockerfile +++ b/AdminDashboard/Dockerfile @@ -57,6 +57,7 @@ WORKDIR /usr/src/app COPY ./AdminDashboard/package*.json /usr/src/app/ RUN npm install RUN npm install -g ts-node +RUN npm install -g ts-node-dev # Copy app source COPY ./AdminDashboard /usr/src/app diff --git a/Alert/Dockerfile b/Alert/Dockerfile index c8b4b88a0c..621472055d 100644 --- a/Alert/Dockerfile +++ b/Alert/Dockerfile @@ -48,6 +48,7 @@ RUN curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/master/contri COPY ./Alert/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 ./Alert /usr/src/app diff --git a/ApiDocs/Dockerfile b/ApiDocs/Dockerfile index 8768dffd42..55e5928cdf 100755 --- a/ApiDocs/Dockerfile +++ b/ApiDocs/Dockerfile @@ -36,6 +36,7 @@ WORKDIR /usr/src/app COPY ./ApiDocs/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 ./ApiDocs /usr/src/app diff --git a/ApplicationScanner/Dockerfile b/ApplicationScanner/Dockerfile index 3dfe435606..8fd5b2686d 100755 --- a/ApplicationScanner/Dockerfile +++ b/ApplicationScanner/Dockerfile @@ -42,6 +42,7 @@ WORKDIR /usr/src/app COPY ./ApplicationScanner/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 ./ApplicationScanner /usr/src/app diff --git a/ContainerScanner/Dockerfile b/ContainerScanner/Dockerfile index b7bcd5a90d..7706796c94 100755 --- a/ContainerScanner/Dockerfile +++ b/ContainerScanner/Dockerfile @@ -41,6 +41,7 @@ WORKDIR /usr/src/app COPY ./ContainerScanner/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 ./ContainerScanner /usr/src/app diff --git a/Dashboard/Dockerfile b/Dashboard/Dockerfile index 3fe1300045..e156c152dc 100755 --- a/Dashboard/Dockerfile +++ b/Dashboard/Dockerfile @@ -52,6 +52,7 @@ WORKDIR /usr/src/app COPY ./Dashboard/package*.json /usr/src/app/ RUN npm install RUN npm install -g ts-node +RUN npm install -g ts-node-dev # Copy app source COPY ./Dashboard /usr/src/app diff --git a/DashboardAPI/Dockerfile b/DashboardAPI/Dockerfile index a806a3256c..4e47767f60 100755 --- a/DashboardAPI/Dockerfile +++ b/DashboardAPI/Dockerfile @@ -48,6 +48,7 @@ RUN curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/master/contri COPY ./DashboardAPI/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 ./DashboardAPI /usr/src/app diff --git a/DataIngestor/Dockerfile b/DataIngestor/Dockerfile index f3ece14016..721f6d41a0 100755 --- a/DataIngestor/Dockerfile +++ b/DataIngestor/Dockerfile @@ -57,6 +57,7 @@ RUN mv ./kubectl /usr/local/bin/kubectl && \ COPY ./DataIngestor/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 ./DataIngestor /usr/src/app diff --git a/HelmChart/Dockerfile b/HelmChart/Dockerfile index 52624439f7..5ac4db7c64 100755 --- a/HelmChart/Dockerfile +++ b/HelmChart/Dockerfile @@ -34,6 +34,7 @@ WORKDIR /usr/src/app COPY ./HelmChart/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 ./HelmChart /usr/src/app diff --git a/Home/Dockerfile b/Home/Dockerfile index 09d2f70a8f..2edb168032 100755 --- a/Home/Dockerfile +++ b/Home/Dockerfile @@ -42,6 +42,7 @@ WORKDIR /usr/src/app COPY ./Home/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 ./Home /usr/src/app diff --git a/HttpTestServer/Dockerfile b/HttpTestServer/Dockerfile index 892701819e..d8481524f3 100755 --- a/HttpTestServer/Dockerfile +++ b/HttpTestServer/Dockerfile @@ -44,6 +44,7 @@ WORKDIR /usr/src/app COPY ./HttpTestServer/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 ./HttpTestServer /usr/src/app diff --git a/Identity/Dockerfile b/Identity/Dockerfile index 8fe80af808..9e2510632e 100644 --- a/Identity/Dockerfile +++ b/Identity/Dockerfile @@ -45,6 +45,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/Identity/Dockerfile.dev b/Identity/Dockerfile.dev index 50f5bba7dc..015baef044 100644 --- a/Identity/Dockerfile.dev +++ b/Identity/Dockerfile.dev @@ -39,6 +39,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 b/Integration/Dockerfile index 92eeb0194d..0d0636f192 100644 --- a/Integration/Dockerfile +++ b/Integration/Dockerfile @@ -48,6 +48,7 @@ RUN curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/master/contri COPY ./Integration/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 ./Integration /usr/src/app diff --git a/Licensing/Dockerfile b/Licensing/Dockerfile index 6df7a982fc..67cb8e7534 100644 --- a/Licensing/Dockerfile +++ b/Licensing/Dockerfile @@ -42,6 +42,7 @@ WORKDIR /usr/src/app COPY ./Licensing/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 ./Licensing /usr/src/app diff --git a/LighthouseRunner/Dockerfile b/LighthouseRunner/Dockerfile index 88fb0c76c4..2846a93ce3 100755 --- a/LighthouseRunner/Dockerfile +++ b/LighthouseRunner/Dockerfile @@ -45,6 +45,7 @@ WORKDIR /usr/src/app COPY ./LighthouseRunner/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 ./LighthouseRunner /usr/src/app diff --git a/Mail/Dockerfile b/Mail/Dockerfile index f05ba27aa1..0e786e5823 100755 --- a/Mail/Dockerfile +++ b/Mail/Dockerfile @@ -43,6 +43,7 @@ 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/Dockerfile.dev b/Mail/Dockerfile.dev index 84c94844ae..3f54503fc1 100644 --- a/Mail/Dockerfile.dev +++ b/Mail/Dockerfile.dev @@ -36,6 +36,7 @@ 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-lock.json b/Mail/package-lock.json index 7cbff0f6fc..c216b835b9 100644 --- a/Mail/package-lock.json +++ b/Mail/package-lock.json @@ -16,7 +16,8 @@ "CommonServer": "file:../CommonServer", "handlebars": "^4.7.7", "nodemailer": "^6.7.3", - "nodemailer-express-handlebars": "^5.0.0" + "nodemailer-express-handlebars": "^5.0.0", + "ts-node-dev": "^1.1.8" }, "devDependencies": {} }, @@ -31,6 +32,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" @@ -3847,6 +3849,7 @@ } }, "../CommonServer": { + "name": "common-server", "version": "1.0.0", "license": "MIT", "dependencies": { @@ -5314,10 +5317,45 @@ "@types/nodemailer": "*" } }, + "node_modules/@types/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-xevGOReSYGM7g/kUBZzPqCrR/KYAo+F0yiPc85WFTJa0MSLtyFTVTU6cJu/aV4mid7IffDIWqo69THF2o4JiEQ==" + }, + "node_modules/@types/strip-json-comments": { + "version": "0.0.30", + "resolved": "https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz", + "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==" + }, + "node_modules/anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==" + }, "node_modules/balanced-match": { "version": "1.0.2", "license": "MIT" }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "engines": { + "node": ">=8" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "license": "MIT", @@ -5326,6 +5364,48 @@ "concat-map": "0.0.1" } }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" + }, + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, "node_modules/Common": { "resolved": "../Common", "link": true @@ -5338,6 +5418,27 @@ "version": "0.0.1", "license": "MIT" }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==" + }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/dynamic-dedupe": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/dynamic-dedupe/-/dynamic-dedupe-0.3.0.tgz", + "integrity": "sha1-BuRMIj9eTpTXjvnbI6ZRXOL5YqE=", + "dependencies": { + "xtend": "^4.0.0" + } + }, "node_modules/express-handlebars": { "version": "6.0.4", "license": "BSD-3-Clause", @@ -5350,10 +5451,39 @@ "node": ">=v12.22.9" } }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "license": "MIT" }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, "node_modules/glob": { "version": "7.2.0", "license": "MIT", @@ -5372,6 +5502,17 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/graceful-fs": { "version": "4.2.10", "license": "MIT" @@ -5395,6 +5536,17 @@ "uglify-js": "^3.1.4" } }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, "node_modules/inflight": { "version": "1.0.6", "license": "MIT", @@ -5407,6 +5559,60 @@ "version": "2.0.4", "license": "MIT" }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-core-module": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==" + }, "node_modules/minimatch": { "version": "3.1.2", "license": "MIT", @@ -5421,6 +5627,17 @@ "version": "1.2.6", "license": "MIT" }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/neo-async": { "version": "2.6.2", "license": "MIT" @@ -5439,6 +5656,14 @@ "express-handlebars": "^6.0.0" } }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/once": { "version": "1.4.0", "license": "MIT", @@ -5453,6 +5678,60 @@ "node": ">=0.10.0" } }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", + "dependencies": { + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, "node_modules/source-map": { "version": "0.6.1", "license": "BSD-3-Clause", @@ -5460,6 +5739,143 @@ "node": ">=0.10.0" } }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tree-kill": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "bin": { + "tree-kill": "cli.js" + } + }, + "node_modules/ts-node": { + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz", + "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==", + "dependencies": { + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "source-map-support": "^0.5.17", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "typescript": ">=2.7" + } + }, + "node_modules/ts-node-dev": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/ts-node-dev/-/ts-node-dev-1.1.8.tgz", + "integrity": "sha512-Q/m3vEwzYwLZKmV6/0VlFxcZzVV/xcgOt+Tx/VjaaRHyiBcFlV0541yrT09QjzzCxlDZ34OzKjrFAynlmtflEg==", + "dependencies": { + "chokidar": "^3.5.1", + "dynamic-dedupe": "^0.3.0", + "minimist": "^1.2.5", + "mkdirp": "^1.0.4", + "resolve": "^1.0.0", + "rimraf": "^2.6.1", + "source-map-support": "^0.5.12", + "tree-kill": "^1.2.2", + "ts-node": "^9.0.0", + "tsconfig": "^7.0.0" + }, + "bin": { + "ts-node-dev": "lib/bin.js", + "tsnd": "lib/bin.js" + }, + "engines": { + "node": ">=0.8.0" + }, + "peerDependencies": { + "node-notifier": "*", + "typescript": "*" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/tsconfig": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz", + "integrity": "sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==", + "dependencies": { + "@types/strip-bom": "^3.0.0", + "@types/strip-json-comments": "0.0.30", + "strip-bom": "^3.0.0", + "strip-json-comments": "^2.0.0" + } + }, + "node_modules/typescript": { + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", + "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, "node_modules/uglify-js": { "version": "3.15.4", "license": "BSD-2-Clause", @@ -5478,6 +5894,22 @@ "node_modules/wrappy": { "version": "1.0.2", "license": "MIT" + }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "engines": { + "node": ">=0.4" + } + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "engines": { + "node": ">=6" + } } }, "dependencies": { @@ -5500,9 +5932,38 @@ "@types/nodemailer": "*" } }, + "@types/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-xevGOReSYGM7g/kUBZzPqCrR/KYAo+F0yiPc85WFTJa0MSLtyFTVTU6cJu/aV4mid7IffDIWqo69THF2o4JiEQ==" + }, + "@types/strip-json-comments": { + "version": "0.0.30", + "resolved": "https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz", + "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==" + }, + "anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==" + }, "balanced-match": { "version": "1.0.2" }, + "binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" + }, "brace-expansion": { "version": "1.1.11", "requires": { @@ -5510,6 +5971,34 @@ "concat-map": "0.0.1" } }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" + }, + "chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + } + }, "Common": { "version": "file:../Common", "requires": { @@ -5523,6 +6012,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", @@ -8306,6 +8796,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", @@ -11422,6 +11913,24 @@ "concat-map": { "version": "0.0.1" }, + "create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==" + }, + "diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==" + }, + "dynamic-dedupe": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/dynamic-dedupe/-/dynamic-dedupe-0.3.0.tgz", + "integrity": "sha1-BuRMIj9eTpTXjvnbI6ZRXOL5YqE=", + "requires": { + "xtend": "^4.0.0" + } + }, "express-handlebars": { "version": "6.0.4", "requires": { @@ -11430,9 +11939,28 @@ "handlebars": "^4.7.7" } }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, "fs.realpath": { "version": "1.0.0" }, + "fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "optional": true + }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, "glob": { "version": "7.2.0", "requires": { @@ -11444,6 +11972,14 @@ "path-is-absolute": "^1.0.0" } }, + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "requires": { + "is-glob": "^4.0.1" + } + }, "graceful-fs": { "version": "4.2.10" }, @@ -11457,6 +11993,14 @@ "wordwrap": "^1.0.0" } }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "requires": { + "function-bind": "^1.1.1" + } + }, "inflight": { "version": "1.0.6", "requires": { @@ -11467,6 +12011,45 @@ "inherits": { "version": "2.0.4" }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-core-module": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "requires": { + "has": "^1.0.3" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + }, + "is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==" + }, "minimatch": { "version": "3.1.2", "requires": { @@ -11476,6 +12059,11 @@ "minimist": { "version": "1.2.6" }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + }, "neo-async": { "version": "2.6.2" }, @@ -11488,6 +12076,11 @@ "express-handlebars": "^6.0.0" } }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + }, "once": { "version": "1.4.0", "requires": { @@ -11497,9 +12090,129 @@ "path-is-absolute": { "version": "1.0.1" }, + "path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + }, + "picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" + }, + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "requires": { + "picomatch": "^2.2.1" + } + }, + "resolve": { + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", + "requires": { + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + } + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "requires": { + "glob": "^7.1.3" + } + }, "source-map": { "version": "0.6.1" }, + "source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } + }, + "tree-kill": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==" + }, + "ts-node": { + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz", + "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==", + "requires": { + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "source-map-support": "^0.5.17", + "yn": "3.1.1" + } + }, + "ts-node-dev": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/ts-node-dev/-/ts-node-dev-1.1.8.tgz", + "integrity": "sha512-Q/m3vEwzYwLZKmV6/0VlFxcZzVV/xcgOt+Tx/VjaaRHyiBcFlV0541yrT09QjzzCxlDZ34OzKjrFAynlmtflEg==", + "requires": { + "chokidar": "^3.5.1", + "dynamic-dedupe": "^0.3.0", + "minimist": "^1.2.5", + "mkdirp": "^1.0.4", + "resolve": "^1.0.0", + "rimraf": "^2.6.1", + "source-map-support": "^0.5.12", + "tree-kill": "^1.2.2", + "ts-node": "^9.0.0", + "tsconfig": "^7.0.0" + } + }, + "tsconfig": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz", + "integrity": "sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==", + "requires": { + "@types/strip-bom": "^3.0.0", + "@types/strip-json-comments": "0.0.30", + "strip-bom": "^3.0.0", + "strip-json-comments": "^2.0.0" + } + }, + "typescript": { + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", + "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", + "peer": true + }, "uglify-js": { "version": "3.15.4", "optional": true @@ -11509,6 +12222,16 @@ }, "wrappy": { "version": "1.0.2" + }, + "xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" + }, + "yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==" } } } diff --git a/Mail/package.json b/Mail/package.json index 8a6467f656..101004a98d 100644 --- a/Mail/package.json +++ b/Mail/package.json @@ -20,8 +20,5 @@ "handlebars": "^4.7.7", "nodemailer": "^6.7.3", "nodemailer-express-handlebars": "^5.0.0" - }, - "devDependencies": { - } } diff --git a/Probe/Dockerfile b/Probe/Dockerfile index a8c93e6c60..c1d44585de 100755 --- a/Probe/Dockerfile +++ b/Probe/Dockerfile @@ -57,6 +57,7 @@ RUN mv ./kubectl /usr/local/bin/kubectl && \ COPY ./Probe/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 /probe /usr/src/app diff --git a/ProbeAPI/Dockerfile b/ProbeAPI/Dockerfile index fca8f47106..3e15564afa 100755 --- a/ProbeAPI/Dockerfile +++ b/ProbeAPI/Dockerfile @@ -41,6 +41,7 @@ WORKDIR /usr/src/app COPY ./ProbeAPI/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 ./ProbeAPI /usr/src/app diff --git a/Realtime/Dockerfile b/Realtime/Dockerfile index 3d6a9c3267..846cc95e8e 100755 --- a/Realtime/Dockerfile +++ b/Realtime/Dockerfile @@ -41,6 +41,7 @@ WORKDIR /usr/src/app COPY ./Realtime/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 ./Realtime /usr/src/app diff --git a/ScriptRunner/Dockerfile b/ScriptRunner/Dockerfile index 1d89d9f0c9..3da44a40b1 100644 --- a/ScriptRunner/Dockerfile +++ b/ScriptRunner/Dockerfile @@ -41,6 +41,7 @@ WORKDIR /usr/src/app COPY ./ScriptRunner/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 ./ScriptRunner /usr/src/app diff --git a/StatusPage/Dockerfile b/StatusPage/Dockerfile index 0e143bd857..a207bd7715 100755 --- a/StatusPage/Dockerfile +++ b/StatusPage/Dockerfile @@ -47,6 +47,7 @@ COPY ./StatusPage/package*.json /usr/src/app/ RUN npm install RUN npm install -g ts-node +RUN npm install -g ts-node-dev RUN npm install -g serve RUN npm install -g eslint diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 0bfb54f8ae..7178f99439 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -339,6 +339,7 @@ services: environment: *common-variables depends_on: - haraka + - postgres container-scanner: ports: diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index ff26b16315..66aacde8af 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -46,6 +46,7 @@ services: environment: *common-variables depends_on: - haraka + - postgres saml: image: kenchan0130/simplesamlphp diff --git a/docker-compose.yml b/docker-compose.yml index d2ef5616da..cfb9a4e58e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -280,6 +280,7 @@ services: environment: *common-variables depends_on: - haraka + - ppostgres application-scanner: ports: diff --git a/package.json b/package.json index af382de9b9..df8fce61b8 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "start-enterprise-ci": "export DOCKER_CLIENT_TIMEOUT=1000 && export COMPOSE_HTTP_TIMEOUT=1000 && docker-compose -f docker-compose.ci.yml up -d $npm_config_services", "stop-dev": "docker-compose -f docker-compose.dev.yml down --remove-orphans", "staging-test": "cd tests && npm run-script staging-test", + "prune": "docker system prune", "remove-all-containers": "docker stop $(docker ps -a -q) && docker rm $(docker ps -a -q) || echo 'No running containers'", "debug-staging-test": "cd tests && npm run-script debug-staging-test", "docker-enterprise-test": "npm install && npm run remove-all-containers && docker-compose build && docker-compose --env-file=./docker-compose-enterprise-ci.env up -d && cd tests && npm run-script enterprise-test",