test: Bundling (#8)

Author: timfish

package.json

@@ -43,8 +43,8 @@
     "test": "node ./test/prepare.js && vitest run --testTimeout 60000"
   },
   "dependencies": {
-    "detect-libc": "^2.0.2",
-    "node-abi": "^3.61.0"
+    "detect-libc": "^2.0.3",
+    "node-abi": "^3.73.0"
   },
   "devDependencies": {
     "@sentry-internal/eslint-config-sdk": "^8.51.0",
@@ -55,7 +55,10 @@
     "eslint": "^7.0.0",
     "node-gyp": "^9.4.1",
     "typescript": "^5.7.3",
-    "vitest": "^3.0.4"
+    "vitest": "^3.0.4",
+    "webpack": "^5.97.1",
+    "node-loader": "^2.1.0",
+    "esbuild": "^0.24.2"
   },
   "sideEffects": false,
   "volta": {

src/index.ts

@@ -41,9 +41,6 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings {
   // This is for cases where precompiled binaries were not provided, but may have been compiled from source.
   if (platform === 'darwin') {
     if (arch === 'x64') {
-      if (abi === '93') {
-        return require('./sentry_cpu_profiler-darwin-x64-93.node');
-      }
       if (abi === '108') {
         return require('./sentry_cpu_profiler-darwin-x64-108.node');
       }
@@ -56,9 +53,6 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings {
     }
 
     if (arch === 'arm64') {
-      if (abi === '93') {
-        return require('./sentry_cpu_profiler-darwin-arm64-93.node');
-      }
       if (abi === '108') {
         return require('./sentry_cpu_profiler-darwin-arm64-108.node');
       }
@@ -73,9 +67,6 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings {
 
   if (platform === 'win32') {
     if (arch === 'x64') {
-      if (abi === '93') {
-        return require('./sentry_cpu_profiler-win32-x64-93.node');
-      }
       if (abi === '108') {
         return require('./sentry_cpu_profiler-win32-x64-108.node');
       }
@@ -91,9 +82,6 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings {
   if (platform === 'linux') {
     if (arch === 'x64') {
       if (stdlib === 'musl') {
-        if (abi === '93') {
-          return require('./sentry_cpu_profiler-linux-x64-musl-93.node');
-        }
         if (abi === '108') {
           return require('./sentry_cpu_profiler-linux-x64-musl-108.node');
         }
@@ -105,9 +93,6 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings {
         }
       }
       if (stdlib === 'glibc') {
-        if (abi === '93') {
-          return require('./sentry_cpu_profiler-linux-x64-glibc-93.node');
-        }
         if (abi === '108') {
           return require('./sentry_cpu_profiler-linux-x64-glibc-108.node');
         }
@@ -121,9 +106,6 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings {
     }
     if (arch === 'arm64') {
       if (stdlib === 'musl') {
-        if (abi === '93') {
-          return require('./sentry_cpu_profiler-linux-arm64-musl-93.node');
-        }
         if (abi === '108') {
           return require('./sentry_cpu_profiler-linux-arm64-musl-108.node');
         }
@@ -136,9 +118,6 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings {
       }
 
       if (stdlib === 'glibc') {
-        if (abi === '93') {
-          return require('./sentry_cpu_profiler-linux-arm64-glibc-93.node');
-        }
         if (abi === '108') {
           return require('./sentry_cpu_profiler-linux-arm64-glibc-108.node');
         }
@@ -190,7 +169,7 @@ class Bindings implements V8CpuProfilerBindings {
 
     return PrivateCpuProfilerBindings.stopProfiling(
       name,
-      format as unknown as any,
+      format as unknown as number,
       threadId,
       !!global._sentryDebugIds,
     );
@@ -199,4 +178,4 @@ class Bindings implements V8CpuProfilerBindings {
 
 export const CpuProfilerBindings = new Bindings();
 
-export * from './types';
+export * from './types';

test/bundle.mjs

@@ -0,0 +1,10 @@
+import { inspect } from 'node:util';
+
+import { CpuProfilerBindings, ProfileFormat } from '@sentry-internal/node-cpu-profiler';
+
+CpuProfilerBindings.startProfiling('test');
+
+setTimeout(() => {
+  const report = CpuProfilerBindings.stopProfiling('test', ProfileFormat.THREAD);
+  console.log(inspect(report, false, null, true));
+}, 5000);

test/bundler.test.ts

@@ -0,0 +1,64 @@
+import esbuild from 'esbuild';
+import * as path from 'path';
+import { describe, expect, test } from "vitest";
+import webpack from 'webpack';
+
+const entry = path.resolve(__dirname, 'bundle.mjs');
+
+describe('Bundler tests', () => {
+  test('webpack', ({ skip }) => {
+    if (!process.env.CI) {
+      skip("Modules will be missing unless we're running in CI");
+      return;
+    }
+
+    return new Promise<void>((resolve, reject) => {
+      webpack({
+        mode: 'production',
+        entry: entry,
+        target: 'node',
+        output: {
+          path: path.resolve(__dirname, 'dist', 'webpack'),
+          filename: 'index.js',
+        },
+        resolve: {
+          extensions: ['.js', '.node'],
+        },
+        module: {
+          rules: [
+            {
+              test: /\.node$/,
+              loader: 'node-loader',
+            },
+          ],
+        },
+      }).run((err, stats) => {
+        try {
+          expect(err).toBeNull();
+          expect(stats?.compilation.errors.length).toBe(0);
+          resolve();
+        } catch (e) {
+          console.error(stats?.compilation.errors);
+          reject(e);
+        }
+      });
+    });
+  });
+
+  test('esbuild', ({ skip }) => {
+    if (!process.env.CI) {
+      skip("Modules will be missing unless we're running in CI");
+      return;
+    }
+
+    esbuild.buildSync({
+      platform: 'node',
+      entryPoints: [entry],
+      outfile: './dist/esbuild/esm/index.mjs',
+      target: 'esnext',
+      format: 'esm',
+      bundle: true,
+      loader: { '.node': 'copy' },
+   });
+  });
+});