From e1d7c96eb998ffca900bf046f043c978fffb774f Mon Sep 17 00:00:00 2001 From: Abdulbasid Guled Date: Tue, 15 Feb 2022 16:36:57 -0500 Subject: [PATCH] Default latest commit url to master branch in development (#2856) --- pnpm-lock.yaml | 154 +++++++++++++++++++++++-------- src/api/status/package.json | 6 +- src/api/status/src/server.js | 14 +++ src/backend/web/routes/health.js | 2 +- 4 files changed, 134 insertions(+), 42 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b2b2310d68..bf0680084d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -317,6 +317,7 @@ importers: env-cmd: 10.1.0 express: 4.17.2 express-handlebars: 6.0.2 + get-repo-package-json: 2.0.0 nodemon: 2.0.15 npm-run-all: 4.1.5 perfect-scrollbar: 1.5.1 @@ -335,7 +336,11 @@ importers: bootstrap: 5.1.3_@popperjs+core@2.10.2 express: 4.17.2 express-handlebars: 6.0.2 + get-repo-package-json: 2.0.0 + npm-run-all: 4.1.5 perfect-scrollbar: 1.5.1 + sass: 1.45.2 + vite: 2.7.13_sass@1.45.2 xterm: 4.15.0 xterm-addon-fit: 0.5.0_xterm@4.15.0 xterm-addon-web-links: 0.4.0_xterm@4.15.0 @@ -343,9 +348,6 @@ importers: devDependencies: env-cmd: 10.1.0 nodemon: 2.0.15 - npm-run-all: 4.1.5 - sass: 1.45.2 - vite: 2.7.13_sass@1.45.2 src/api/users: specifiers: @@ -7267,6 +7269,11 @@ packages: /caniuse-lite/1.0.30001301: resolution: {integrity: sha512-csfD/GpHMqgEL3V3uIgosvh+SVIQvCh43SNu9HRbP1lnxkKm1kjDG4f32PP571JplkLjfS+mg2p1gxR7MYrrIA==} + /capture-stack-trace/1.0.1: + resolution: {integrity: sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==} + engines: {node: '>=0.10.0'} + dev: false + /cardinal/2.1.1: resolution: {integrity: sha1-fMEFXYItISlU0HsIXeolHMe8VQU=} hasBin: true @@ -7922,6 +7929,13 @@ packages: readable-stream: 3.6.0 dev: true + /create-error-class/3.0.2: + resolution: {integrity: sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=} + engines: {node: '>=0.10.0'} + dependencies: + capture-stack-trace: 1.0.1 + dev: false + /cron-parser/2.18.0: resolution: {integrity: sha512-s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg==} engines: {node: '>=0.8'} @@ -7960,7 +7974,6 @@ packages: semver: 5.7.1 shebang-command: 1.2.0 which: 1.3.1 - dev: true /cross-spawn/7.0.3: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} @@ -8994,7 +9007,7 @@ packages: cpu: [arm64] os: [android] requiresBuild: true - dev: true + dev: false optional: true /esbuild-darwin-64/0.13.15: @@ -9002,7 +9015,7 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true - dev: true + dev: false optional: true /esbuild-darwin-arm64/0.13.15: @@ -9010,7 +9023,7 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true - dev: true + dev: false optional: true /esbuild-freebsd-64/0.13.15: @@ -9018,7 +9031,7 @@ packages: cpu: [x64] os: [freebsd] requiresBuild: true - dev: true + dev: false optional: true /esbuild-freebsd-arm64/0.13.15: @@ -9026,7 +9039,7 @@ packages: cpu: [arm64] os: [freebsd] requiresBuild: true - dev: true + dev: false optional: true /esbuild-linux-32/0.13.15: @@ -9034,7 +9047,7 @@ packages: cpu: [ia32] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /esbuild-linux-64/0.13.15: @@ -9042,7 +9055,7 @@ packages: cpu: [x64] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /esbuild-linux-arm/0.13.15: @@ -9050,7 +9063,7 @@ packages: cpu: [arm] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /esbuild-linux-arm64/0.13.15: @@ -9058,7 +9071,7 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /esbuild-linux-mips64le/0.13.15: @@ -9066,7 +9079,7 @@ packages: cpu: [mips64el] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /esbuild-linux-ppc64le/0.13.15: @@ -9074,7 +9087,7 @@ packages: cpu: [ppc64] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /esbuild-netbsd-64/0.13.15: @@ -9082,7 +9095,7 @@ packages: cpu: [x64] os: [netbsd] requiresBuild: true - dev: true + dev: false optional: true /esbuild-openbsd-64/0.13.15: @@ -9090,7 +9103,7 @@ packages: cpu: [x64] os: [openbsd] requiresBuild: true - dev: true + dev: false optional: true /esbuild-sunos-64/0.13.15: @@ -9098,7 +9111,7 @@ packages: cpu: [x64] os: [sunos] requiresBuild: true - dev: true + dev: false optional: true /esbuild-windows-32/0.13.15: @@ -9106,7 +9119,7 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true - dev: true + dev: false optional: true /esbuild-windows-64/0.13.15: @@ -9114,7 +9127,7 @@ packages: cpu: [x64] os: [win32] requiresBuild: true - dev: true + dev: false optional: true /esbuild-windows-arm64/0.13.15: @@ -9122,7 +9135,7 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true - dev: true + dev: false optional: true /esbuild/0.13.15: @@ -9147,7 +9160,7 @@ packages: esbuild-windows-32: 0.13.15 esbuild-windows-64: 0.13.15 esbuild-windows-arm64: 0.13.15 - dev: true + dev: false /escalade/3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} @@ -10633,6 +10646,18 @@ packages: engines: {node: '>=8'} dev: false + /get-repo-package-json/2.0.0: + resolution: {integrity: sha512-LGadoJS49Wbm6R1nLL2BFwnQAVowiS6Akufajt94R/uaMq85PSX/tckvS+qH5C5Pas3ddEfXEq/vvD5dQIysag==} + dependencies: + github-url-to-object: 2.2.6 + got: 6.7.1 + dev: false + + /get-stream/3.0.0: + resolution: {integrity: sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=} + engines: {node: '>=4'} + dev: false + /get-stream/4.1.0: resolution: {integrity: sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==} engines: {node: '>=6'} @@ -10691,6 +10716,12 @@ packages: resolution: {integrity: sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==} dev: false + /github-url-to-object/2.2.6: + resolution: {integrity: sha1-ypJQFlFJdI7uswv8xgAMb+DSQvc=} + dependencies: + is-url: 1.2.4 + dev: false + /glob-parent/5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} @@ -10926,6 +10957,23 @@ packages: responselike: 2.0.0 dev: false + /got/6.7.1: + resolution: {integrity: sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=} + engines: {node: '>=4'} + dependencies: + create-error-class: 3.0.2 + duplexer3: 0.1.4 + get-stream: 3.0.0 + is-redirect: 1.0.0 + is-retry-allowed: 1.2.0 + is-stream: 1.1.0 + lowercase-keys: 1.0.1 + safe-buffer: 5.2.1 + timed-out: 4.0.1 + unzip-response: 2.0.1 + url-parse-lax: 1.0.0 + dev: false + /got/9.6.0: resolution: {integrity: sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==} engines: {node: '>=8.6'} @@ -11507,7 +11555,7 @@ packages: /immutable/4.0.0: resolution: {integrity: sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==} - dev: true + dev: false /import-fresh/3.3.0: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} @@ -11971,6 +12019,11 @@ packages: resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==} dev: true + /is-redirect/1.0.0: + resolution: {integrity: sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=} + engines: {node: '>=0.10.0'} + dev: false + /is-regex/1.1.4: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} @@ -11983,6 +12036,11 @@ packages: engines: {node: '>=0.10.0'} dev: false + /is-retry-allowed/1.2.0: + resolution: {integrity: sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==} + engines: {node: '>=0.10.0'} + dev: false + /is-root/2.1.0: resolution: {integrity: sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==} engines: {node: '>=6'} @@ -11994,6 +12052,11 @@ packages: /is-stream-ended/0.1.4: resolution: {integrity: sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==} + /is-stream/1.1.0: + resolution: {integrity: sha1-EtSj3U5o4Lec6428hBc66A2RykQ=} + engines: {node: '>=0.10.0'} + dev: false + /is-stream/2.0.1: resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} engines: {node: '>=8'} @@ -12015,7 +12078,6 @@ packages: /is-url/1.2.4: resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==} - dev: true /is-weakref/1.0.2: resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==} @@ -13180,7 +13242,6 @@ packages: parse-json: 4.0.0 pify: 3.0.0 strip-bom: 3.0.0 - dev: true /load-source-map/2.0.0: resolution: {integrity: sha512-QNZzJ2wMrTmCdeobMuMNEXHN1QGk8HG6louEkzD/zwQ7EU2RarrzlhQ4GnUYEFzLhK+Jq7IGyF/qy+XYBSO7AQ==} @@ -13660,7 +13721,6 @@ packages: /memorystream/0.3.1: resolution: {integrity: sha1-htcJCzDORV1j+64S3aUaR93K+bI=} engines: {node: '>= 0.10.0'} - dev: true /meow/10.1.2: resolution: {integrity: sha512-zbuAlN+V/sXlbGchNS9WTWjUzeamwMt/BApKCJi7B0QyZstZaMx0n4Unll/fg0njGtMdC9UP5SAscvOCLYdM+Q==} @@ -14017,6 +14077,7 @@ packages: resolution: {integrity: sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true + dev: false /napi-build-utils/1.0.2: resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==} @@ -14138,7 +14199,6 @@ packages: /nice-try/1.0.5: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} - dev: true /no-case/3.0.4: resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==} @@ -14312,7 +14372,6 @@ packages: read-pkg: 3.0.0 shell-quote: 1.7.3 string.prototype.padend: 3.1.3 - dev: true /npm-run-path/4.0.1: resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} @@ -14811,7 +14870,6 @@ packages: dependencies: error-ex: 1.3.2 json-parse-better-errors: 1.0.2 - dev: true /parse-json/5.2.0: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} @@ -14911,7 +14969,6 @@ packages: /path-key/2.0.1: resolution: {integrity: sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=} engines: {node: '>=4'} - dev: true /path-key/3.1.1: resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} @@ -14937,7 +14994,6 @@ packages: engines: {node: '>=4'} dependencies: pify: 3.0.0 - dev: true /path-type/4.0.0: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} @@ -14970,7 +15026,6 @@ packages: resolution: {integrity: sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==} engines: {node: '>=0.10'} hasBin: true - dev: true /pidusage/2.0.21: resolution: {integrity: sha512-cv3xAQos+pugVX+BfXpHsbyz/dLzX+lr44zNMsYiGxUw+kV5sgQCIcLd1z+0vq+KyC7dJ+/ts2PsfgWfSC3WXA==} @@ -14987,7 +15042,6 @@ packages: /pify/3.0.0: resolution: {integrity: sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=} engines: {node: '>=4'} - dev: true /pify/4.0.1: resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} @@ -15711,6 +15765,7 @@ packages: nanoid: 3.2.0 picocolors: 1.0.0 source-map-js: 1.0.2 + dev: false /prebuild-install/7.0.0: resolution: {integrity: sha512-IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA==} @@ -15741,6 +15796,11 @@ packages: engines: {node: '>= 0.8.0'} dev: true + /prepend-http/1.0.4: + resolution: {integrity: sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=} + engines: {node: '>=0.10.0'} + dev: false + /prepend-http/2.0.0: resolution: {integrity: sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=} engines: {node: '>=4'} @@ -16443,7 +16503,6 @@ packages: load-json-file: 4.0.0 normalize-package-data: 2.5.0 path-type: 3.0.0 - dev: true /read-pkg/5.2.0: resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==} @@ -16964,6 +17023,7 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.2 + dev: false /router/1.3.6: resolution: {integrity: sha512-gsjhou+LFApzkIP8VDrouG6Z4pqkeF11n3o5orlwPPvPTl0x7c+dbF71itKOhDoFHygmc3N3uqm55Uq/gIDUwg==} @@ -17088,7 +17148,7 @@ packages: chokidar: 3.5.3 immutable: 4.0.0 source-map-js: 1.0.2 - dev: true + dev: false /sax/1.2.4: resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==} @@ -17360,7 +17420,6 @@ packages: engines: {node: '>=0.10.0'} dependencies: shebang-regex: 1.0.0 - dev: true /shebang-command/2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} @@ -17371,7 +17430,6 @@ packages: /shebang-regex/1.0.0: resolution: {integrity: sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=} engines: {node: '>=0.10.0'} - dev: true /shebang-regex/3.0.0: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} @@ -17535,6 +17593,7 @@ packages: /source-map-js/1.0.2: resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} engines: {node: '>=0.10.0'} + dev: false /source-map-support/0.5.19: resolution: {integrity: sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==} @@ -17842,7 +17901,6 @@ packages: call-bind: 1.0.2 define-properties: 1.1.3 es-abstract: 1.19.1 - dev: true /string.prototype.trimend/1.0.4: resolution: {integrity: sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==} @@ -17919,7 +17977,6 @@ packages: /strip-bom/3.0.0: resolution: {integrity: sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=} engines: {node: '>=4'} - dev: true /strip-bom/4.0.0: resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==} @@ -18407,6 +18464,11 @@ packages: resolution: {integrity: sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==} dev: false + /timed-out/4.0.1: + resolution: {integrity: sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=} + engines: {node: '>=0.10.0'} + dev: false + /timers-ext/0.1.7: resolution: {integrity: sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==} dependencies: @@ -19051,6 +19113,11 @@ packages: resolution: {integrity: sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=} engines: {node: '>= 0.8'} + /unzip-response/2.0.1: + resolution: {integrity: sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=} + engines: {node: '>=4'} + dev: false + /unzipper/0.10.11: resolution: {integrity: sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==} dependencies: @@ -19151,6 +19218,13 @@ packages: webpack: 5.68.0 dev: false + /url-parse-lax/1.0.0: + resolution: {integrity: sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=} + engines: {node: '>=0.10.0'} + dependencies: + prepend-http: 1.0.4 + dev: false + /url-parse-lax/3.0.0: resolution: {integrity: sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=} engines: {node: '>=4'} @@ -19333,7 +19407,7 @@ packages: sass: 1.45.2 optionalDependencies: fsevents: 2.3.2 - dev: true + dev: false /vizion/2.2.1: resolution: {integrity: sha512-sfAcO2yeSU0CSPFI/DmZp3FsFE9T+8913nv1xWBOyzODv13fwkn6Vl7HqxGpkr9F608M+8SuFId3s+BlZqfXww==} diff --git a/src/api/status/package.json b/src/api/status/package.json index 14f3f383f0..b4098e9a93 100644 --- a/src/api/status/package.json +++ b/src/api/status/package.json @@ -30,7 +30,11 @@ "xterm": "4.15.0", "xterm-addon-fit": "0.5.0", "xterm-addon-web-links": "0.4.0", - "xterm-addon-webgl": "0.11.3" + "xterm-addon-webgl": "0.11.3", + "get-repo-package-json": "2.0.0", + "npm-run-all": "4.1.5", + "sass": "1.45.2", + "vite": "2.7.13" }, "engines": { "node": ">=12.0.0" diff --git a/src/api/status/src/server.js b/src/api/status/src/server.js index 9890ec841d..71401af309 100644 --- a/src/api/status/src/server.js +++ b/src/api/status/src/server.js @@ -3,6 +3,7 @@ const { static: serveStatic } = require('express'); const path = require('path'); const { engine } = require('express-handlebars'); const fs = require('fs/promises'); +const getPackage = require('get-repo-package-json'); const { check } = require('./services'); const getGitHubData = require('./js/github-stats'); const getFeedCount = require('./js/feed-stats'); @@ -48,6 +49,19 @@ const satelliteOptions = { }, }, }, + healthCheck: async (req, res) => { + const sha = process.env.GIT_COMMIT || 'master'; + const gitHubUrl = `https://github.com/Seneca-CDOT/telescope/commit/${sha}`; + const { version } = await getPackage('https://github.com/Seneca-CDOT/telescope/blob/master/'); + + res.set('Cache-Control', 'public, max-age=300'); + + return { + version, + sha, + gitHubUrl, + }; + }, }; const service = new Satellite(satelliteOptions); diff --git a/src/backend/web/routes/health.js b/src/backend/web/routes/health.js index c09871ec24..6db60ecfde 100644 --- a/src/backend/web/routes/health.js +++ b/src/backend/web/routes/health.js @@ -4,7 +4,7 @@ const healthcheck = require('express-healthcheck'); // We want the current version from package.json const { version } = require('../../../../package.json'); // As well as the current git sha -const sha = process.env.GIT_COMMIT || 'undefined'; +const sha = process.env.GIT_COMMIT || 'master'; // And a github URL to this commit const gitHubUrl = `https://github.com/Seneca-CDOT/telescope/commit/${sha}`;