From 5ae3d9fa77237d42adf1766eb7301fc3399b9416 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sun, 24 Mar 2024 14:38:05 +0200
Subject: [PATCH] Try NR ESM

---
 app/utils/newrelic.server.ts | 4 ++--
 package.json                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/utils/newrelic.server.ts b/app/utils/newrelic.server.ts
index ae7a10ad1..54ed3516d 100644
--- a/app/utils/newrelic.server.ts
+++ b/app/utils/newrelic.server.ts
@@ -1,7 +1,7 @@
 const isEnabled =
   process.env["NEW_RELIC_APP_NAME"] && process.env["NEW_RELIC_LICENSE_KEY"];
 
-const newrelic = isEnabled ? require("newrelic") : {};
+import newrelic from "newrelic";
 
 export const browserTimingHeader = () =>
   isEnabled
@@ -22,7 +22,7 @@ export const noticeError = (
   isEnabled &&
   newrelic.noticeError(error, {
     ...attributes,
-    "tags.commit": process.env["RENDER_GIT_COMMIT"],
+    "tags.commit": process.env["RENDER_GIT_COMMIT"]!,
   });
 
 export const setTransactionName = (name: string) =>
diff --git a/package.json b/package.json
index 6afb1c980..3a0e636fc 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "dev:prod": "cross-env DB_PATH=db-prod.sqlite3 npm run dev",
     "dev:ci": "cp .env.example .env && npm run migrate up && npm run dev",
     "start": "npm run migrate up && remix-serve ./build/server/index.js",
-    "start:nr": "npm run migrate up && NODE_OPTIONS='-r dotenv/config -r newrelic' remix-serve ./build/server/index.js",
+    "start:nr": "npm run migrate up && NODE_OPTIONS='--import newrelic/esm-loader.mjs -r newrelic' remix-serve ./build/server/index.js",
     "migrate": "ley",
     "migrate:reset": "node scripts/delete-db-files.mjs && npm run migrate up",
     "check-translation-jsons": "node --experimental-specifier-resolution=node --import @swc-node/register/esm-register -r tsconfig-paths/register scripts/check-translation-jsons.ts",