From 96e9061a100bdb60fa4e442f56ffee63f7349cc4 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Fri, 15 Mar 2024 14:49:49 +0000 Subject: [PATCH 1/5] feat(node-profiling): Output ESM and remove Sentry deps from output --- packages/profiling-node/package.json | 16 +++--- packages/profiling-node/rollup.npm.config.mjs | 20 +++---- packages/profiling-node/src/cpu_profiler.ts | 53 ++++++++++--------- 3 files changed, 49 insertions(+), 40 deletions(-) diff --git a/packages/profiling-node/package.json b/packages/profiling-node/package.json index e0025e41552f..a9847c48085b 100644 --- a/packages/profiling-node/package.json +++ b/packages/profiling-node/package.json @@ -6,14 +6,18 @@ "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/profiling-node", "author": "Sentry", "license": "MIT", - "main": "lib/index.js", + "main": "lib/cjs/index.js", "types": "lib/types/index.d.ts", "exports": { "./package.json": "./package.json", ".": { + "import": { + "types": "./lib/types/index.d.ts", + "default": "./lib/esm/index.js" + }, "require": { "types": "./lib/types/index.d.ts", - "default": "./lib/index.js" + "default": "./lib/cjs/index.js" } } }, @@ -73,14 +77,14 @@ "test": "cross-env SENTRY_PROFILER_BINARY_DIR=lib jest --config jest.config.js" }, "dependencies": { - "detect-libc": "^2.0.2", - "node-abi": "^3.52.0" - }, - "devDependencies": { "@sentry/core": "8.0.0-alpha.2", "@sentry/node-experimental": "8.0.0-alpha.2", "@sentry/types": "8.0.0-alpha.2", "@sentry/utils": "8.0.0-alpha.2", + "detect-libc": "^2.0.2", + "node-abi": "^3.52.0" + }, + "devDependencies": { "@types/node": "16.18.70", "@types/node-abi": "^3.0.0", "clang-format": "^1.8.0", diff --git a/packages/profiling-node/rollup.npm.config.mjs b/packages/profiling-node/rollup.npm.config.mjs index 057d5b8c60a6..1d74cc624f68 100644 --- a/packages/profiling-node/rollup.npm.config.mjs +++ b/packages/profiling-node/rollup.npm.config.mjs @@ -1,12 +1,12 @@ import commonjs from '@rollup/plugin-commonjs'; -import resolve from '@rollup/plugin-node-resolve'; -import typescript from '@rollup/plugin-typescript'; -import { makeBaseNPMConfig } from '@sentry-internal/rollup-utils'; +// import typescript from '@rollup/plugin-typescript'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; -export default makeBaseNPMConfig({ - packageSpecificConfig: { - input: 'src/index.ts', - output: { file: 'lib/index.js', format: 'cjs', dir: undefined, preserveModules: false }, - plugins: [resolve(), commonjs(), typescript({ tsconfig: './tsconfig.json' })], - }, -}); +export default makeNPMConfigVariants( + makeBaseNPMConfig({ + packageSpecificConfig: { + output: { dir: 'lib', preserveModules: false }, + plugins: [commonjs()], + }, + }), +); diff --git a/packages/profiling-node/src/cpu_profiler.ts b/packages/profiling-node/src/cpu_profiler.ts index 7bd23c4eca4b..c483197961e3 100644 --- a/packages/profiling-node/src/cpu_profiler.ts +++ b/packages/profiling-node/src/cpu_profiler.ts @@ -1,3 +1,4 @@ +import { createRequire } from 'node:module'; import { arch as _arch, platform as _platform } from 'os'; import { join, resolve } from 'path'; import { familySync } from 'detect-libc'; @@ -9,6 +10,10 @@ import { GLOBAL_OBJ, logger } from '@sentry/utils'; import { DEBUG_BUILD } from './debug-build'; import type { PrivateV8CpuProfilerBindings, V8CpuProfilerBindings } from './types'; +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore Rollup shims import.meta.url for CJS +const requireModule = createRequire(import.meta.url); + const stdlib = familySync(); const platform = process.env['BUILD_PLATFORM'] || _platform(); const arch = process.env['BUILD_ARCH'] || _arch(); @@ -25,13 +30,13 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings { // If a binary path is specified, use that. if (env['SENTRY_PROFILER_BINARY_PATH']) { const envPath = env['SENTRY_PROFILER_BINARY_PATH']; - return require(envPath); + return requireModule(envPath); } // If a user specifies a different binary dir, they are in control of the binaries being moved there if (env['SENTRY_PROFILER_BINARY_DIR']) { const binaryPath = join(resolve(env['SENTRY_PROFILER_BINARY_DIR']), `sentry_cpu_profiler-${identifier}`); - return require(`${binaryPath}.node`); + return requireModule(`${binaryPath}.node`); } // We need the fallthrough so that in the end, we can fallback to the require dynamice require. @@ -39,25 +44,25 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings { if (platform === 'darwin') { if (arch === 'x64') { if (abi === '93') { - return require('./sentry_cpu_profiler-darwin-x64-93.node'); + return requireModule('./sentry_cpu_profiler-darwin-x64-93.node'); } if (abi === '108') { - return require('./sentry_cpu_profiler-darwin-x64-108.node'); + return requireModule('./sentry_cpu_profiler-darwin-x64-108.node'); } if (abi === '115') { - return require('./sentry_cpu_profiler-darwin-x64-115.node'); + return requireModule('./sentry_cpu_profiler-darwin-x64-115.node'); } } if (arch === 'arm64') { if (abi === '93') { - return require('./sentry_cpu_profiler-darwin-arm64-93.node'); + return requireModule('./sentry_cpu_profiler-darwin-arm64-93.node'); } if (abi === '108') { - return require('./sentry_cpu_profiler-darwin-arm64-108.node'); + return requireModule('./sentry_cpu_profiler-darwin-arm64-108.node'); } if (abi === '115') { - return require('./sentry_cpu_profiler-darwin-arm64-115.node'); + return requireModule('./sentry_cpu_profiler-darwin-arm64-115.node'); } } } @@ -65,13 +70,13 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings { if (platform === 'win32') { if (arch === 'x64') { if (abi === '93') { - return require('./sentry_cpu_profiler-win32-x64-93.node'); + return requireModule('./sentry_cpu_profiler-win32-x64-93.node'); } if (abi === '108') { - return require('./sentry_cpu_profiler-win32-x64-108.node'); + return requireModule('./sentry_cpu_profiler-win32-x64-108.node'); } if (abi === '115') { - return require('./sentry_cpu_profiler-win32-x64-115.node'); + return requireModule('./sentry_cpu_profiler-win32-x64-115.node'); } } } @@ -80,53 +85,53 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings { if (arch === 'x64') { if (stdlib === 'musl') { if (abi === '93') { - return require('./sentry_cpu_profiler-linux-x64-musl-93.node'); + return requireModule('./sentry_cpu_profiler-linux-x64-musl-93.node'); } if (abi === '108') { - return require('./sentry_cpu_profiler-linux-x64-musl-108.node'); + return requireModule('./sentry_cpu_profiler-linux-x64-musl-108.node'); } if (abi === '115') { - return require('./sentry_cpu_profiler-linux-x64-musl-115.node'); + return requireModule('./sentry_cpu_profiler-linux-x64-musl-115.node'); } } if (stdlib === 'glibc') { if (abi === '93') { - return require('./sentry_cpu_profiler-linux-x64-glibc-93.node'); + return requireModule('./sentry_cpu_profiler-linux-x64-glibc-93.node'); } if (abi === '108') { - return require('./sentry_cpu_profiler-linux-x64-glibc-108.node'); + return requireModule('./sentry_cpu_profiler-linux-x64-glibc-108.node'); } if (abi === '115') { - return require('./sentry_cpu_profiler-linux-x64-glibc-115.node'); + return requireModule('./sentry_cpu_profiler-linux-x64-glibc-115.node'); } } } if (arch === 'arm64') { if (stdlib === 'musl') { if (abi === '93') { - return require('./sentry_cpu_profiler-linux-arm64-musl-93.node'); + return requireModule('./sentry_cpu_profiler-linux-arm64-musl-93.node'); } if (abi === '108') { - return require('./sentry_cpu_profiler-linux-arm64-musl-108.node'); + return requireModule('./sentry_cpu_profiler-linux-arm64-musl-108.node'); } if (abi === '115') { - return require('./sentry_cpu_profiler-linux-arm64-musl-115.node'); + return requireModule('./sentry_cpu_profiler-linux-arm64-musl-115.node'); } } if (stdlib === 'glibc') { if (abi === '93') { - return require('./sentry_cpu_profiler-linux-arm64-glibc-93.node'); + return requireModule('./sentry_cpu_profiler-linux-arm64-glibc-93.node'); } if (abi === '108') { - return require('./sentry_cpu_profiler-linux-arm64-glibc-108.node'); + return requireModule('./sentry_cpu_profiler-linux-arm64-glibc-108.node'); } if (abi === '115') { - return require('./sentry_cpu_profiler-linux-arm64-glibc-115.node'); + return requireModule('./sentry_cpu_profiler-linux-arm64-glibc-115.node'); } } } } - return require(`${built_from_source_path}.node`); + return requireModule(`${built_from_source_path}.node`); } const PrivateCpuProfilerBindings: PrivateV8CpuProfilerBindings = importCppBindingsModule(); From 49c6efeb0d5a6f8cd24f16aef0aa3d27910ec22d Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Fri, 15 Mar 2024 16:06:41 +0000 Subject: [PATCH 2/5] shim require instead --- package.json | 1 + packages/profiling-node/rollup.npm.config.mjs | 3 +- packages/profiling-node/src/cpu_profiler.ts | 53 +++++++++---------- yarn.lock | 7 +++ 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index dfd75a12e843..449947047aaf 100644 --- a/package.json +++ b/package.json @@ -88,6 +88,7 @@ "devDependencies": { "@biomejs/biome": "^1.4.0", "@rollup/plugin-commonjs": "^25.0.7", + "@rollup/plugin-esm-shim": "^0.1.5", "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-replace": "^5.0.5", diff --git a/packages/profiling-node/rollup.npm.config.mjs b/packages/profiling-node/rollup.npm.config.mjs index 1d74cc624f68..0625f19eef3e 100644 --- a/packages/profiling-node/rollup.npm.config.mjs +++ b/packages/profiling-node/rollup.npm.config.mjs @@ -1,4 +1,5 @@ import commonjs from '@rollup/plugin-commonjs'; +import esmshim from '@rollup/plugin-esm-shim'; // import typescript from '@rollup/plugin-typescript'; import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; @@ -6,7 +7,7 @@ export default makeNPMConfigVariants( makeBaseNPMConfig({ packageSpecificConfig: { output: { dir: 'lib', preserveModules: false }, - plugins: [commonjs()], + plugins: [commonjs(), esmshim()], }, }), ); diff --git a/packages/profiling-node/src/cpu_profiler.ts b/packages/profiling-node/src/cpu_profiler.ts index c483197961e3..7bd23c4eca4b 100644 --- a/packages/profiling-node/src/cpu_profiler.ts +++ b/packages/profiling-node/src/cpu_profiler.ts @@ -1,4 +1,3 @@ -import { createRequire } from 'node:module'; import { arch as _arch, platform as _platform } from 'os'; import { join, resolve } from 'path'; import { familySync } from 'detect-libc'; @@ -10,10 +9,6 @@ import { GLOBAL_OBJ, logger } from '@sentry/utils'; import { DEBUG_BUILD } from './debug-build'; import type { PrivateV8CpuProfilerBindings, V8CpuProfilerBindings } from './types'; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore Rollup shims import.meta.url for CJS -const requireModule = createRequire(import.meta.url); - const stdlib = familySync(); const platform = process.env['BUILD_PLATFORM'] || _platform(); const arch = process.env['BUILD_ARCH'] || _arch(); @@ -30,13 +25,13 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings { // If a binary path is specified, use that. if (env['SENTRY_PROFILER_BINARY_PATH']) { const envPath = env['SENTRY_PROFILER_BINARY_PATH']; - return requireModule(envPath); + return require(envPath); } // If a user specifies a different binary dir, they are in control of the binaries being moved there if (env['SENTRY_PROFILER_BINARY_DIR']) { const binaryPath = join(resolve(env['SENTRY_PROFILER_BINARY_DIR']), `sentry_cpu_profiler-${identifier}`); - return requireModule(`${binaryPath}.node`); + return require(`${binaryPath}.node`); } // We need the fallthrough so that in the end, we can fallback to the require dynamice require. @@ -44,25 +39,25 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings { if (platform === 'darwin') { if (arch === 'x64') { if (abi === '93') { - return requireModule('./sentry_cpu_profiler-darwin-x64-93.node'); + return require('./sentry_cpu_profiler-darwin-x64-93.node'); } if (abi === '108') { - return requireModule('./sentry_cpu_profiler-darwin-x64-108.node'); + return require('./sentry_cpu_profiler-darwin-x64-108.node'); } if (abi === '115') { - return requireModule('./sentry_cpu_profiler-darwin-x64-115.node'); + return require('./sentry_cpu_profiler-darwin-x64-115.node'); } } if (arch === 'arm64') { if (abi === '93') { - return requireModule('./sentry_cpu_profiler-darwin-arm64-93.node'); + return require('./sentry_cpu_profiler-darwin-arm64-93.node'); } if (abi === '108') { - return requireModule('./sentry_cpu_profiler-darwin-arm64-108.node'); + return require('./sentry_cpu_profiler-darwin-arm64-108.node'); } if (abi === '115') { - return requireModule('./sentry_cpu_profiler-darwin-arm64-115.node'); + return require('./sentry_cpu_profiler-darwin-arm64-115.node'); } } } @@ -70,13 +65,13 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings { if (platform === 'win32') { if (arch === 'x64') { if (abi === '93') { - return requireModule('./sentry_cpu_profiler-win32-x64-93.node'); + return require('./sentry_cpu_profiler-win32-x64-93.node'); } if (abi === '108') { - return requireModule('./sentry_cpu_profiler-win32-x64-108.node'); + return require('./sentry_cpu_profiler-win32-x64-108.node'); } if (abi === '115') { - return requireModule('./sentry_cpu_profiler-win32-x64-115.node'); + return require('./sentry_cpu_profiler-win32-x64-115.node'); } } } @@ -85,53 +80,53 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings { if (arch === 'x64') { if (stdlib === 'musl') { if (abi === '93') { - return requireModule('./sentry_cpu_profiler-linux-x64-musl-93.node'); + return require('./sentry_cpu_profiler-linux-x64-musl-93.node'); } if (abi === '108') { - return requireModule('./sentry_cpu_profiler-linux-x64-musl-108.node'); + return require('./sentry_cpu_profiler-linux-x64-musl-108.node'); } if (abi === '115') { - return requireModule('./sentry_cpu_profiler-linux-x64-musl-115.node'); + return require('./sentry_cpu_profiler-linux-x64-musl-115.node'); } } if (stdlib === 'glibc') { if (abi === '93') { - return requireModule('./sentry_cpu_profiler-linux-x64-glibc-93.node'); + return require('./sentry_cpu_profiler-linux-x64-glibc-93.node'); } if (abi === '108') { - return requireModule('./sentry_cpu_profiler-linux-x64-glibc-108.node'); + return require('./sentry_cpu_profiler-linux-x64-glibc-108.node'); } if (abi === '115') { - return requireModule('./sentry_cpu_profiler-linux-x64-glibc-115.node'); + return require('./sentry_cpu_profiler-linux-x64-glibc-115.node'); } } } if (arch === 'arm64') { if (stdlib === 'musl') { if (abi === '93') { - return requireModule('./sentry_cpu_profiler-linux-arm64-musl-93.node'); + return require('./sentry_cpu_profiler-linux-arm64-musl-93.node'); } if (abi === '108') { - return requireModule('./sentry_cpu_profiler-linux-arm64-musl-108.node'); + return require('./sentry_cpu_profiler-linux-arm64-musl-108.node'); } if (abi === '115') { - return requireModule('./sentry_cpu_profiler-linux-arm64-musl-115.node'); + return require('./sentry_cpu_profiler-linux-arm64-musl-115.node'); } } if (stdlib === 'glibc') { if (abi === '93') { - return requireModule('./sentry_cpu_profiler-linux-arm64-glibc-93.node'); + return require('./sentry_cpu_profiler-linux-arm64-glibc-93.node'); } if (abi === '108') { - return requireModule('./sentry_cpu_profiler-linux-arm64-glibc-108.node'); + return require('./sentry_cpu_profiler-linux-arm64-glibc-108.node'); } if (abi === '115') { - return requireModule('./sentry_cpu_profiler-linux-arm64-glibc-115.node'); + return require('./sentry_cpu_profiler-linux-arm64-glibc-115.node'); } } } } - return requireModule(`${built_from_source_path}.node`); + return require(`${built_from_source_path}.node`); } const PrivateCpuProfilerBindings: PrivateV8CpuProfilerBindings = importCppBindingsModule(); diff --git a/yarn.lock b/yarn.lock index 82514b069ead..f398f4bcb89f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5831,6 +5831,13 @@ is-reference "1.2.1" magic-string "^0.30.3" +"@rollup/plugin-esm-shim@^0.1.5": + version "0.1.5" + resolved "https://registry.yarnpkg.com/@rollup/plugin-esm-shim/-/plugin-esm-shim-0.1.5.tgz#74464e9a8a7e664557aae65592c8a3e317802220" + integrity sha512-xnIjDm/0EbqAw0/rR1UE7eAo9db0ftGPqT8RUCFtkFxtCuspbbmj+wutoyxm32jBytyO3SgkxSG17OR893fV7A== + dependencies: + magic-string "^0.30.3" + "@rollup/plugin-json@^4.0.0", "@rollup/plugin-json@^4.1.0": version "4.1.0" resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.1.0.tgz#54e09867ae6963c593844d8bd7a9c718294496f3" From 51762a8d892a8acb9fbe9a2dca17e1a034abfbfc Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Fri, 15 Mar 2024 16:23:17 +0000 Subject: [PATCH 3/5] Fix build --- packages/sveltekit/src/index.types.ts | 1 - packages/sveltekit/src/server/index.ts | 2 -- 2 files changed, 3 deletions(-) diff --git a/packages/sveltekit/src/index.types.ts b/packages/sveltekit/src/index.types.ts index 96f123ed0d1d..69ec5bb35597 100644 --- a/packages/sveltekit/src/index.types.ts +++ b/packages/sveltekit/src/index.types.ts @@ -46,7 +46,6 @@ export declare const getClient: typeof clientSdk.getClient; // eslint-disable-next-line deprecation/deprecation export declare const getCurrentHub: typeof clientSdk.getCurrentHub; // eslint-disable-next-line deprecation/deprecation -export declare const makeMain: typeof clientSdk.makeMain; export declare function close(timeout?: number | undefined): PromiseLike; export declare function flush(timeout?: number | undefined): PromiseLike; diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts index 5bd1be392657..0bb2f86e82f3 100644 --- a/packages/sveltekit/src/server/index.ts +++ b/packages/sveltekit/src/server/index.ts @@ -20,8 +20,6 @@ export { getIsolationScope, Hub, NodeClient, - // eslint-disable-next-line deprecation/deprecation - makeMain, setCurrentClient, Scope, SDK_VERSION, From 4f2715bd00c93673b59f033b8e8181fc20103925 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Fri, 15 Mar 2024 17:18:59 +0000 Subject: [PATCH 4/5] Fix paths --- packages/profiling-node/src/cpu_profiler.ts | 44 ++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/profiling-node/src/cpu_profiler.ts b/packages/profiling-node/src/cpu_profiler.ts index 7bd23c4eca4b..f2769fe5be45 100644 --- a/packages/profiling-node/src/cpu_profiler.ts +++ b/packages/profiling-node/src/cpu_profiler.ts @@ -15,7 +15,7 @@ const arch = process.env['BUILD_ARCH'] || _arch(); const abi = getAbi(versions.node, 'node'); const identifier = [platform, arch, stdlib, abi].filter(c => c !== undefined && c !== null).join('-'); -const built_from_source_path = resolve(__dirname, `./sentry_cpu_profiler-${identifier}`); +const built_from_source_path = resolve(__dirname, '..', `./sentry_cpu_profiler-${identifier}`); /** * Imports cpp bindings based on the current platform and architecture. @@ -39,25 +39,25 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings { if (platform === 'darwin') { if (arch === 'x64') { if (abi === '93') { - return require('./sentry_cpu_profiler-darwin-x64-93.node'); + return require('../sentry_cpu_profiler-darwin-x64-93.node'); } if (abi === '108') { - return require('./sentry_cpu_profiler-darwin-x64-108.node'); + return require('../sentry_cpu_profiler-darwin-x64-108.node'); } if (abi === '115') { - return require('./sentry_cpu_profiler-darwin-x64-115.node'); + return require('../sentry_cpu_profiler-darwin-x64-115.node'); } } if (arch === 'arm64') { if (abi === '93') { - return require('./sentry_cpu_profiler-darwin-arm64-93.node'); + return require('../sentry_cpu_profiler-darwin-arm64-93.node'); } if (abi === '108') { - return require('./sentry_cpu_profiler-darwin-arm64-108.node'); + return require('../sentry_cpu_profiler-darwin-arm64-108.node'); } if (abi === '115') { - return require('./sentry_cpu_profiler-darwin-arm64-115.node'); + return require('../sentry_cpu_profiler-darwin-arm64-115.node'); } } } @@ -65,13 +65,13 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings { if (platform === 'win32') { if (arch === 'x64') { if (abi === '93') { - return require('./sentry_cpu_profiler-win32-x64-93.node'); + return require('../sentry_cpu_profiler-win32-x64-93.node'); } if (abi === '108') { - return require('./sentry_cpu_profiler-win32-x64-108.node'); + return require('../sentry_cpu_profiler-win32-x64-108.node'); } if (abi === '115') { - return require('./sentry_cpu_profiler-win32-x64-115.node'); + return require('../sentry_cpu_profiler-win32-x64-115.node'); } } } @@ -80,48 +80,48 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings { if (arch === 'x64') { if (stdlib === 'musl') { if (abi === '93') { - return require('./sentry_cpu_profiler-linux-x64-musl-93.node'); + return require('../sentry_cpu_profiler-linux-x64-musl-93.node'); } if (abi === '108') { - return require('./sentry_cpu_profiler-linux-x64-musl-108.node'); + return require('../sentry_cpu_profiler-linux-x64-musl-108.node'); } if (abi === '115') { - return require('./sentry_cpu_profiler-linux-x64-musl-115.node'); + return require('../sentry_cpu_profiler-linux-x64-musl-115.node'); } } if (stdlib === 'glibc') { if (abi === '93') { - return require('./sentry_cpu_profiler-linux-x64-glibc-93.node'); + return require('../sentry_cpu_profiler-linux-x64-glibc-93.node'); } if (abi === '108') { - return require('./sentry_cpu_profiler-linux-x64-glibc-108.node'); + return require('../sentry_cpu_profiler-linux-x64-glibc-108.node'); } if (abi === '115') { - return require('./sentry_cpu_profiler-linux-x64-glibc-115.node'); + return require('../sentry_cpu_profiler-linux-x64-glibc-115.node'); } } } if (arch === 'arm64') { if (stdlib === 'musl') { if (abi === '93') { - return require('./sentry_cpu_profiler-linux-arm64-musl-93.node'); + return require('../sentry_cpu_profiler-linux-arm64-musl-93.node'); } if (abi === '108') { - return require('./sentry_cpu_profiler-linux-arm64-musl-108.node'); + return require('../sentry_cpu_profiler-linux-arm64-musl-108.node'); } if (abi === '115') { - return require('./sentry_cpu_profiler-linux-arm64-musl-115.node'); + return require('../sentry_cpu_profiler-linux-arm64-musl-115.node'); } } if (stdlib === 'glibc') { if (abi === '93') { - return require('./sentry_cpu_profiler-linux-arm64-glibc-93.node'); + return require('../sentry_cpu_profiler-linux-arm64-glibc-93.node'); } if (abi === '108') { - return require('./sentry_cpu_profiler-linux-arm64-glibc-108.node'); + return require('../sentry_cpu_profiler-linux-arm64-glibc-108.node'); } if (abi === '115') { - return require('./sentry_cpu_profiler-linux-arm64-glibc-115.node'); + return require('../sentry_cpu_profiler-linux-arm64-glibc-115.node'); } } } From 3df5b0161d1c2e925ba98edaa6befe579674c267 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Fri, 15 Mar 2024 17:27:15 +0000 Subject: [PATCH 5/5] remove comment --- packages/profiling-node/rollup.npm.config.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/profiling-node/rollup.npm.config.mjs b/packages/profiling-node/rollup.npm.config.mjs index 0625f19eef3e..1cc4f0936954 100644 --- a/packages/profiling-node/rollup.npm.config.mjs +++ b/packages/profiling-node/rollup.npm.config.mjs @@ -1,6 +1,5 @@ import commonjs from '@rollup/plugin-commonjs'; import esmshim from '@rollup/plugin-esm-shim'; -// import typescript from '@rollup/plugin-typescript'; import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; export default makeNPMConfigVariants(