From 719481e84ead17b8b55f5c673b11841f7b00950d Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 8 Feb 2021 16:21:30 -0700
Subject: [PATCH] refactor: add getPackageJson fn in constants

---
 package.json          |  5 +++--
 src/node/constants.ts | 17 ++++++++++++-----
 yarn.lock             |  5 +++++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 51479b90..5409ba4a 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
   },
   "main": "out/node/entry.js",
   "devDependencies": {
+    "@schemastore/package": "^0.0.6",
     "@types/body-parser": "^1.19.0",
     "@types/cookie-parser": "^1.4.2",
     "@types/express": "^4.17.8",
@@ -62,8 +63,8 @@
     "stylelint": "^13.0.0",
     "stylelint-config-recommended": "^3.0.0",
     "ts-node": "^9.0.0",
-    "wtfnode": "^0.8.4",
-    "typescript": "^4.1.3"
+    "typescript": "^4.1.3",
+    "wtfnode": "^0.8.4"
   },
   "resolutions": {
     "@types/node": "^12.12.7",
diff --git a/src/node/constants.ts b/src/node/constants.ts
index d6ba953e..c39beb05 100644
--- a/src/node/constants.ts
+++ b/src/node/constants.ts
@@ -1,13 +1,20 @@
 import { logger } from "@coder/logger"
+import { JSONSchemaForNPMPackageJsonFiles } from "@schemastore/package"
 import * as path from "path"
 
-let pkg: { version?: string; commit?: string } = {}
-try {
-  pkg = require("../../package.json")
-} catch (error) {
-  logger.warn(error.message)
+export function getPackageJson(relativePath: string): JSONSchemaForNPMPackageJsonFiles {
+  let pkg = {}
+  try {
+    pkg = require(relativePath)
+  } catch (error) {
+    logger.warn(error.message)
+  }
+
+  return pkg
 }
 
+const pkg = getPackageJson("../../package.json")
+
 export const version = pkg.version || "development"
 export const commit = pkg.commit || "development"
 export const rootPath = path.resolve(__dirname, "../..")
diff --git a/yarn.lock b/yarn.lock
index cb51b991..93173db8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -980,6 +980,11 @@
     "@parcel/utils" "^1.11.0"
     physical-cpu-count "^2.0.0"
 
+"@schemastore/package@^0.0.6":
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/@schemastore/package/-/package-0.0.6.tgz#9a76713da1c7551293b7e72e4f387f802bfd5d81"
+  integrity sha512-uNloNHoyHttSSdeuEkkSC+mdxJXMKlcUPOMb//qhQbIQijXg8x54VmAw3jm6GJZQ5DBtIqGBd66zEQCDCChQVA==
+
 "@stylelint/postcss-css-in-js@^0.37.2":
   version "0.37.2"
   resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz#7e5a84ad181f4234a2480803422a47b8749af3d2"