review fixes

utils/build/docker/nodejs/express4-typescript/app.ts

@@ -31,13 +31,16 @@ app.get('/', (req: Request, res: Response) => {
 });
 
 app.get('/healthcheck', (req: Request, res: Response) => {
+  const { version } = require('dd-trace/package.json')
+  const { wafManager } = require('dd-trace/packages/dd-trace/src/appsec/waf')
+
   res.json({
     status: 'ok',
     library: {
       language: 'nodejs',
-      version: require('dd-trace/package.json').version,
-      libddwaf_version: require('dd-trace/node_modules/@datadog/native-appsec/package.json').libddwaf_version,
-      appsec_event_rules_version: require('dd-trace/packages/dd-trace/src/appsec/waf').wafManager?.rulesVersion
+      version,
+      libddwaf_version: wafManager?.ddwafVersion,
+      appsec_event_rules_version: wafManager?.rulesVersion
     }
   });
 })

utils/build/docker/nodejs/express4/app.js

@@ -39,13 +39,16 @@ app.get('/', (req, res) => {
 })
 
 app.get('/healthcheck', (req, res) => {
+  const { version } = require('dd-trace/package.json')
+  const { wafManager } = require('dd-trace/packages/dd-trace/src/appsec/waf')
+
   res.json({
     status: 'ok',
     library: {
       language: 'nodejs',
-      version: require('dd-trace/package.json').version,
-      libddwaf_version: require('dd-trace/node_modules/@datadog/native-appsec/package.json').libddwaf_version,
-      appsec_event_rules_version: require('dd-trace/packages/dd-trace/src/appsec/waf').wafManager?.rulesVersion
+      version,
+      libddwaf_version: wafManager?.ddwafVersion,
+      appsec_event_rules_version: wafManager?.rulesVersion
     }
   })
 })

utils/build/docker/nodejs/nextjs/next.config.js

@@ -1,6 +1,8 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-
+  // Disabled because standalone mode does not support using modules directly
+  // from node_modules which is necessary when using `npm link dd-trace`.
+  // output: 'standalone'
 }
 
 module.exports = nextConfig

utils/build/docker/nodejs/nextjs/src/app/healthcheck/route.js

@@ -4,15 +4,14 @@ import { NextResponse } from 'next/server'
 
 export async function GET (request) {
   const { version } = __non_webpack_require__('dd-trace/package.json')
-  const pkg = __non_webpack_require__('dd-trace/node_modules/@datadog/native-appsec/package.json')
   const { wafManager } = __non_webpack_require__('dd-trace/packages/dd-trace/src/appsec/waf')
 
   return NextResponse.json({
     status: 'ok',
     library: {
       language: 'nodejs',
       version,
-      libddwaf_version: pkg.libddwaf_version,
+      libddwaf_version: wafManager?.ddwafVersion,
       appsec_event_rules_version: wafManager?.rulesVersion
     }
   }, {