From fea568133160a5a35cf512f0cf62667925aa30c2 Mon Sep 17 00:00:00 2001 From: Urook <95576653+Urook@users.noreply.github.com> Date: Mon, 11 Apr 2022 09:25:20 +0300 Subject: [PATCH] RK-12004 Update appVersion used if remote is empty (#305) * Bump hard-coded appVersion used in case remote is empty * Try importing The version directly from package json * Use require package json instead of import from json --- package.json | 2 +- src/api.ts | 4 ++-- tsconfig.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index be3a7929..938badbf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "explorook", - "version": "1.8.33", + "version": "1.8.34", "description": "Rookout's site addon to support local files and folders", "main": "dist/index.js", "scripts": { diff --git a/src/api.ts b/src/api.ts index dda63162..590d98bb 100644 --- a/src/api.ts +++ b/src/api.ts @@ -304,12 +304,12 @@ export const resolvers = { }, appVersion: async (parent: any): Promise => { if (process.env.development) { - return require("../package.json").version; + return require("../package.json")?.version; } else if (remote) { return remote.app.getVersion(); } else { // remote should exist. but sometimes it's undefined and breaks tests for some reason, so adding a temp fallback - return "1.8.16"; + return require("../package.json")?.version || "1.8.34"; } }, recentLogs: (parent: any): Log[] => { diff --git a/tsconfig.json b/tsconfig.json index a2b069cc..fdd8d2de 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -23,4 +23,4 @@ "include": [ "src/*" ] -} \ No newline at end of file +}