Switch to import pattern to load instrumentation on Express tests

onurtemizkan · onurtemizkan · commit 0e2f73aabaad · 2024-05-29T13:35:22.000-04:00
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/instrument.mjs b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/instrument.mjs
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json
@@ -3,7 +3,7 @@
   "sideEffects": false,
   "scripts": {
     "build": "remix vite:build",
-    "dev": "NODE_OPTIONS='--import=./instrument.server.mjs' node ./server.mjs",
+    "dev": "node ./server.mjs",
     "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
     "start": "cross-env NODE_ENV=production node ./server.mjs",
     "typecheck": "tsc",
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/server.mjs b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/server.mjs
@@ -1,3 +1,5 @@
+import './instrument.mjs';
+
 import { createRequestHandler } from '@remix-run/express';
 import { installGlobals } from '@remix-run/node';
 import compression from 'compression';
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app-express/package.json
@@ -6,7 +6,7 @@
     "build": "remix vite:build",
     "dev": "node ./server.mjs",
     "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
-    "start": "cross-env NODE_ENV=production node --require='./instrument.cjs' ./server.mjs",
+    "start": "cross-env NODE_ENV=production node ./server.mjs",
     "typecheck": "tsc",
     "clean": "npx rimraf node_modules pnpm-lock.yaml",
     "test:build": "pnpm install && npx playwright install && pnpm build",
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express/server.mjs b/dev-packages/e2e-tests/test-applications/create-remix-app-express/server.mjs
@@ -1,3 +1,5 @@
+import './instrument.cjs';
+
 import { createRequestHandler } from '@remix-run/express';
 import { installGlobals } from '@remix-run/node';
 import compression from 'compression';

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import './instrument.mjs';`
	`2`	`+`
`1`	`3`	`import { createRequestHandler } from '@remix-run/express';`
`2`	`4`	`import { installGlobals } from '@remix-run/node';`
`3`	`5`	`import compression from 'compression';`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import './instrument.cjs';`
	`2`	`+`
`1`	`3`	`import { createRequestHandler } from '@remix-run/express';`
`2`	`4`	`import { installGlobals } from '@remix-run/node';`
`3`	`5`	`import compression from 'compression';`