fix(shared): proper ts rootDir

packages/cli/docker/docker-compose.yaml

@@ -42,7 +42,7 @@ services:
         depends_on:
             - nango-db
         volumes:
-            - "${NANGO_INTEGRATIONS_LOCATION:-./}:/usr/nango-server/src/packages/shared/dist/lib/nango-integrations"
+            - '${NANGO_INTEGRATIONS_LOCATION:-./}:/usr/nango-server/src/packages/shared/dist/nango-integrations'
         networks:
             - nango
 
@@ -64,7 +64,7 @@ services:
             - nango-db
             - temporal
         volumes:
-            - "${NANGO_INTEGRATIONS_LOCATION:-./}:/usr/nango-jobs/src/packages/shared/dist/lib/nango-integrations"
+            - '${NANGO_INTEGRATIONS_LOCATION:-./}:/usr/nango-jobs/src/packages/shared/dist/nango-integrations'
         networks:
             - nango
 

packages/cli/package.json

@@ -19,7 +19,7 @@
     "scripts": {
         "build": "tsc && npm run copyfiles",
         "copyfiles": "copyfiles -u 1 lib/templates/* dist",
-        "postbuild": "cp `node -p \"require.resolve('@nangohq/shared/dist/lib/sdk/sync.d.ts')\"` './dist/nango-sync.d.ts'",
+        "postbuild": "cp `node -p \"require.resolve('@nangohq/shared/dist/sdk/sync.d.ts')\"` './dist/nango-sync.d.ts'",
         "prepublishOnly": "npm install && npm run build"
     },
     "dependencies": {

packages/shared/lib/db/knexfile.cjs

@@ -1,4 +1,6 @@
 // Knex CLI for migration needs this Knexfile but doesn't play well with ESM modules.
 // That's why the content of the Knex config is moved to ./config.ts to be imported by the app in ESM-fashion, and the Knexfile is only used for the Knex CLI in CommonJS-fashion.
-const { config } = require('../../dist/lib/db/config');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { config } = require('../../dist/db/config.js');
+
 module.exports = config;

packages/shared/lib/utils/analytics.ts

@@ -1,9 +1,7 @@
 import { PostHog } from 'posthog-node';
-import { getBaseUrl, localhostUrl, dirname, UserType, isCloud, isStaging } from '../utils/utils.js';
+import { getBaseUrl, localhostUrl, UserType, isCloud, isStaging, packageJsonFile } from '../utils/utils.js';
 import ip from 'ip';
 import errorManager, { ErrorSourceEnum } from './error.manager.js';
-import { readFileSync } from 'fs';
-import path from 'path';
 import accountService from '../services/account.service.js';
 import environmentService from '../services/environment.service.js';
 import userService from '../services/user.service.js';
@@ -52,7 +50,7 @@ class Analytics {
             if (process.env['TELEMETRY']?.toLowerCase() !== 'false' && !isStaging()) {
                 this.client = new PostHog('phc_4S2pWFTyPYT1i7zwC8YYQqABvGgSAzNHubUkdEFvcTl');
                 this.client.enable();
-                this.packageVersion = JSON.parse(readFileSync(path.resolve(dirname(), '../../../package.json'), 'utf8')).version;
+                this.packageVersion = packageJsonFile().version;
             }
         } catch (e) {
             errorManager.report(e, {

packages/shared/lib/utils/error.manager.ts

@@ -1,14 +1,12 @@
 import * as uuid from 'uuid';
 import type { EventHint } from '@sentry/node';
 import sentry from '@sentry/node';
-import { readFileSync } from 'fs';
-import path from 'path';
 import type { Tracer } from 'dd-trace';
 import type { ErrorEvent } from '@sentry/types';
 import logger from '../logger/console.js';
 import { NangoError } from './error.js';
 import type { Response, Request } from 'express';
-import { isCloud, getEnvironmentId, getAccountIdAndEnvironmentIdFromSession, dirname, isApiAuthenticated, isUserAuthenticated } from './utils.js';
+import { isCloud, getEnvironmentId, getAccountIdAndEnvironmentIdFromSession, isApiAuthenticated, isUserAuthenticated, packageJsonFile } from './utils.js';
 import environmentService from '../services/environment.service.js';
 import accountService from '../services/account.service.js';
 import userService from '../services/user.service.js';
@@ -33,7 +31,7 @@ class ErrorManager {
     constructor() {
         try {
             if (isCloud() && process.env['SENTRY_DNS']) {
-                const packageVersion = JSON.parse(readFileSync(path.resolve(dirname(), '../../../package.json'), 'utf8')).version;
+                const packageVersion = packageJsonFile().version;
                 sentry.init({
                     dsn: process.env['SENTRY_DNS'],
                     beforeSend(event: ErrorEvent, _: EventHint) {

packages/shared/lib/utils/utils.ts

@@ -163,8 +163,8 @@ export function isValidHttpUrl(str: string) {
     }
 }
 
-export function dirname() {
-    return path.dirname(fileURLToPath(import.meta.url));
+export function dirname(thisFile?: string) {
+    return path.dirname(fileURLToPath(thisFile || import.meta.url));
 }
 
 export function parseTokenExpirationDate(expirationDate: any): Date {
@@ -423,9 +423,15 @@ export function getConnectionConfig(queryParams: any): Record<string, string> {
     return Object.fromEntries(arr) as Record<string, string>;
 }
 
+let packageJsonCache: PackageJson | undefined;
 export function packageJsonFile(): PackageJson {
-    const localPath = process.env['SERVER_RUN_MODE'] === 'DOCKERIZED' ? 'packages/shared/package.json' : '../shared/package.json';
-    return JSON.parse(readFileSync(resolve(process.cwd(), localPath)).toString('utf-8'));
+    if (packageJsonCache) {
+        return packageJsonCache;
+    }
+
+    const localPath = '../../package.json';
+    packageJsonCache = JSON.parse(readFileSync(resolve(dirname(), localPath)).toString('utf-8')) as PackageJson;
+    return packageJsonCache;
 }
 
 export function safeStringify(obj: any): string {

packages/shared/package.json

@@ -3,8 +3,8 @@
     "version": "0.39.5",
     "description": "Nango's shared components.",
     "type": "module",
-    "main": "dist/lib/index.js",
-    "typings": "dist/lib/index.d.ts",
+    "main": "dist/index.js",
+    "typings": "dist/index.d.ts",
     "scripts": {
         "build": "rimraf dist && tsc",
         "prepublishOnly": "npm install && npm run build"

packages/shared/tsconfig.json

@@ -1,7 +1,7 @@
 {
     "extends": "../../tsconfig.json",
     "compilerOptions": {
-        "rootDir": ".",
+        "rootDir": "lib",
         "outDir": "dist"
     },
     "references": [