Skip to content

Commit 80c0ee6

Browse files
lforstlforst
authored
feat: Rename ESM loader hooks to import and loader (#11498)
1 parent ac803e9 commit 80c0ee6

File tree

13 files changed

+37
-37
lines changed

13 files changed

+37
-37
lines changed

‎dev-packages/e2e-tests/test-applications/esm-loader-node-express-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.0.0",
44
"private": true,
55
"scripts": {
6-
"start": "node --import=@sentry/node/register src/app.mjs",
6+
"start": "node --import=@sentry/node/import-hook src/app.mjs",
77
"clean": "npx rimraf node_modules,pnpm-lock.yaml",
88
"test:build": "pnpm install",
99
"test:assert": "playwright test"

‎dev-packages/rollup-utils/code/otelEsmRegisterLoaderTemplate.js renamed to ‎dev-packages/rollup-utils/code/otelEsmImportHookTemplate.js

File renamed without changes.

‎dev-packages/rollup-utils/code/otelEsmHooksLoaderTemplate.js renamed to ‎dev-packages/rollup-utils/code/otelEsmLoaderHookTemplate.js

File renamed without changes.

‎dev-packages/rollup-utils/code/sentryNodeEsmHooksLoaderTemplate.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dev-packages/rollup-utils/code/sentryNodeEsmRegisterLoaderTemplate.js renamed to ‎dev-packages/rollup-utils/code/sentryNodeEsmImportHookTemplate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
import { getFormat, getSource, load, resolve } from '@sentry/node/register';
1+
import { getFormat, getSource, load, resolve } from '@sentry/node/loader-hook';
22
export { getFormat, getSource, load, resolve };

‎dev-packages/rollup-utils/code/sentryNodeEsmLoaderHookTemplate.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import '@sentry/node/import-hook';

‎dev-packages/rollup-utils/npmHelpers.mjs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -151,23 +151,23 @@ export function makeOtelLoaders(outputFolder, hookVariant) {
151151
throw new Error('hookVariant is neither "otel" nor "sentry-node". Pick one.');
152152
}
153153

154-
const expectedRegisterLoaderLocation = `${outputFolder}/register.mjs`;
154+
const expectedRegisterLoaderLocation = `${outputFolder}/import-hook.mjs`;
155155
const foundRegisterLoaderExport = Object.keys(packageDotJSON.exports ?? {}).some(key => {
156156
return packageDotJSON?.exports?.[key]?.import?.default === expectedRegisterLoaderLocation;
157157
});
158158
if (!foundRegisterLoaderExport) {
159159
throw new Error(
160-
`You used the makeOtelLoaders() rollup utility without specifying the register loader inside \`exports[something].import.default\`. Please add "${expectedRegisterLoaderLocation}" as a value there (maybe check for typos - it needs to be "${expectedRegisterLoaderLocation}" exactly).`,
160+
`You used the makeOtelLoaders() rollup utility without specifying the import hook inside \`exports[something].import.default\`. Please add "${expectedRegisterLoaderLocation}" as a value there (maybe check for typos - it needs to be "${expectedRegisterLoaderLocation}" exactly).`,
161161
);
162162
}
163163

164-
const expectedHooksLoaderLocation = `${outputFolder}/hook.mjs`;
164+
const expectedHooksLoaderLocation = `${outputFolder}/loader-hook.mjs`;
165165
const foundHookLoaderExport = Object.keys(packageDotJSON.exports ?? {}).some(key => {
166166
return packageDotJSON?.exports?.[key]?.import?.default === expectedHooksLoaderLocation;
167167
});
168168
if (!foundHookLoaderExport) {
169169
throw new Error(
170-
`You used the makeOtelLoaders() rollup utility without specifying the hook loader inside \`exports[something].import.default\`. Please add "${expectedHooksLoaderLocation}" as a value there (maybe check for typos - it needs to be "${expectedHooksLoaderLocation}" exactly).`,
170+
`You used the makeOtelLoaders() rollup utility without specifying the loader hook inside \`exports[something].import.default\`. Please add "${expectedHooksLoaderLocation}" as a value there (maybe check for typos - it needs to be "${expectedHooksLoaderLocation}" exactly).`,
171171
);
172172
}
173173

@@ -190,25 +190,25 @@ export function makeOtelLoaders(outputFolder, hookVariant) {
190190
input: path.join(
191191
__dirname,
192192
'code',
193-
hookVariant === 'otel' ? 'otelEsmRegisterLoaderTemplate.js' : 'sentryNodeEsmRegisterLoaderTemplate.js',
193+
hookVariant === 'otel' ? 'otelEsmImportHookTemplate.js' : 'sentryNodeEsmImportHookTemplate.js',
194194
),
195-
external: ['@opentelemetry/instrumentation/hook.mjs', '@sentry/node/register'],
195+
external: /.*/,
196196
output: {
197197
format: 'esm',
198-
file: path.join(outputFolder, 'register.mjs'),
198+
file: path.join(outputFolder, 'import-hook.mjs'),
199199
},
200200
},
201201
// --loader hook
202202
{
203203
input: path.join(
204204
__dirname,
205205
'code',
206-
hookVariant === 'otel' ? 'otelEsmHooksLoaderTemplate.js' : 'sentryNodeEsmHooksLoaderTemplate.js',
206+
hookVariant === 'otel' ? 'otelEsmLoaderHookTemplate.js' : 'sentryNodeEsmLoaderHookTemplate.js',
207207
),
208-
external: ['@opentelemetry/instrumentation/hook.mjs', '@sentry/node/hook'],
208+
external: /.*/,
209209
output: {
210210
format: 'esm',
211-
file: path.join(outputFolder, 'hook.mjs'),
211+
file: path.join(outputFolder, 'loader-hook.mjs'),
212212
},
213213
},
214214
]);

‎packages/astro/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
"require": "./build/cjs/integration/middleware/index.js",
4343
"types": "./build/types/integration/middleware/index.types.d.ts"
4444
},
45-
"./register": {
45+
"./import": {
4646
"import": {
47-
"default": "./build/register.mjs"
47+
"default": "./build/import-hook.mjs"
4848
}
4949
},
50-
"./hook": {
50+
"./loader": {
5151
"import": {
52-
"default": "./build/hook.mjs"
52+
"default": "./build/loader-hook.mjs"
5353
}
5454
}
5555
},

‎packages/aws-serverless/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
"default": "./build/npm/cjs/index.js"
2626
}
2727
},
28-
"./register": {
28+
"./import": {
2929
"import": {
30-
"default": "./build/register.mjs"
30+
"default": "./build/import-hook.mjs"
3131
}
3232
},
33-
"./hook": {
33+
"./loader": {
3434
"import": {
35-
"default": "./build/hook.mjs"
35+
"default": "./build/loader-hook.mjs"
3636
}
3737
}
3838
},

‎packages/google-cloud-serverless/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
"default": "./build/cjs/index.js"
2727
}
2828
},
29-
"./register": {
29+
"./import": {
3030
"import": {
31-
"default": "./build/register.mjs"
31+
"default": "./build/import-hook.mjs"
3232
}
3333
},
34-
"./hook": {
34+
"./loader": {
3535
"import": {
36-
"default": "./build/hook.mjs"
36+
"default": "./build/loader-hook.mjs"
3737
}
3838
}
3939
},

‎packages/nextjs/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@
4343
"import": "./build/esm/index.server.js",
4444
"types": "./build/types/index.types.d.ts"
4545
},
46-
"./register": {
46+
"./import": {
4747
"import": {
48-
"default": "./build/register.mjs"
48+
"default": "./build/import-hook.mjs"
4949
}
5050
},
51-
"./hook": {
51+
"./loader": {
5252
"import": {
53-
"default": "./build/hook.mjs"
53+
"default": "./build/loader-hook.mjs"
5454
}
5555
}
5656
},

‎packages/node/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
"default": "./build/cjs/index.js"
3232
}
3333
},
34-
"./register": {
34+
"./import": {
3535
"import": {
36-
"default": "./build/register.mjs"
36+
"default": "./build/import-hook.mjs"
3737
}
3838
},
39-
"./hook": {
39+
"./loader": {
4040
"import": {
41-
"default": "./build/hook.mjs"
41+
"default": "./build/loader-hook.mjs"
4242
}
4343
}
4444
},

‎packages/remix/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
"node": "./build/cjs/index.server.js",
3535
"types": "./build/types/index.types.d.ts"
3636
},
37-
"./register": {
37+
"./import": {
3838
"import": {
39-
"default": "./build/register.mjs"
39+
"default": "./build/import-hook.mjs"
4040
}
4141
},
42-
"./hook": {
42+
"./loader": {
4343
"import": {
44-
"default": "./build/hook.mjs"
44+
"default": "./build/loader-hook.mjs"
4545
}
4646
}
4747
},

0 commit comments

Comments
 (0)