From 7e27b79ee9ac1223d9a8a6c1e9bf923e9be14232 Mon Sep 17 00:00:00 2001 From: Francesco Gringl-Novy Date: Fri, 13 Dec 2024 13:33:10 +0100 Subject: [PATCH 1/6] chore: Ensure `.nuxt` folder is lint ignored & cleared (#14700) Noticed that biome fix was failing on some stuff in the `.nuxt` folder in E2E tests, so figured to add this as well (and while at it, also ensure it is cleaned). --- biome.json | 13 ++++++------- dev-packages/e2e-tests/package.json | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/biome.json b/biome.json index db56e24f80f0..010139fbaa82 100644 --- a/biome.json +++ b/biome.json @@ -35,17 +35,16 @@ } }, "ignore": [ - ".vscode/*", + ".vscode", "**/*.json", - ".next/**/*", - ".svelte-kit/**/*", "**/fixtures/*/*.json", "**/*.min.js", - ".next/**", - ".svelte-kit/**", - ".angular/**", + ".next", + ".nuxt", + ".svelte-kit", + ".angular", "angular.json", - "ember/instance-initializers/**", + "ember/instance-initializers", "ember/types.d.ts", "solidstart/*.d.ts", "solidstart/client/", diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json index 6452d7752eba..e1ff6f84550a 100644 --- a/dev-packages/e2e-tests/package.json +++ b/dev-packages/e2e-tests/package.json @@ -16,7 +16,7 @@ "clean": "rimraf tmp node_modules && yarn clean:test-applications && yarn clean:pnpm", "ci:build-matrix": "ts-node ./lib/getTestMatrix.ts", "ci:build-matrix-optional": "ts-node ./lib/getTestMatrix.ts --optional=true", - "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.sveltekit,pnpm-lock.yaml,.last-run.json,test-results}", + "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,pnpm-lock.yaml,.last-run.json,test-results}", "clean:pnpm": "pnpm store prune" }, "devDependencies": { From 450684bc2bfcd5ac759c6b9deda9aae76be6cfd0 Mon Sep 17 00:00:00 2001 From: Andrei <168741329+andreiborza@users.noreply.github.com> Date: Fri, 13 Dec 2024 13:49:48 +0100 Subject: [PATCH 2/6] chore(craft): Remove aws v8 layer from .craft.yml (#14702) The v9 branch should not push to the v8 layer. --- .craft.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.craft.yml b/.craft.yml index 44d245311312..d9be4d4b3fa4 100644 --- a/.craft.yml +++ b/.craft.yml @@ -142,23 +142,6 @@ targets: id: '@sentry-internal/eslint-config-sdk' includeNames: /^sentry-internal-eslint-config-sdk-\d.*\.tgz$/ - # TODO(v9): Remove this target - # NOTE: We publish the v8 layer under its own name so people on v8 can still get patches - # whenever we release a new v8 version—otherwise we would overwrite the current major lambda layer. - - name: aws-lambda-layer - includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha|rc)\.\d+)?\.zip$/ - layerName: SentryNodeServerlessSDKv8 - compatibleRuntimes: - - name: node - versions: - - nodejs10.x - - nodejs12.x - - nodejs14.x - - nodejs16.x - - nodejs18.x - - nodejs20.x - license: MIT - # AWS Lambda Layer target - name: aws-lambda-layer includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha|rc)\.\d+)?\.zip$/ From 85f87e408d28763935e93584f87cca6d8fb0aa80 Mon Sep 17 00:00:00 2001 From: Maxime Pauvert Date: Fri, 13 Dec 2024 14:10:24 +0100 Subject: [PATCH 3/6] docs(nuxt): update readme troubleshoot section (#14309) https://github.com/nitrojs/nitro/issues/2703 fixed --------- Co-authored-by: Sigrid Huemer <32902192+s1gr1d@users.noreply.github.com> --- packages/nuxt/README.md | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/packages/nuxt/README.md b/packages/nuxt/README.md index 429fd7487ddc..1513d8a5f6d9 100644 --- a/packages/nuxt/README.md +++ b/packages/nuxt/README.md @@ -130,35 +130,6 @@ export default defineNuxtConfig({ }); ``` -## Troubleshooting +## Troubleshoot -When adding `sentry.server.config.ts`, you might get an error like this: -"`Failed to register ESM hook import-in-the-middle/hook.mjs`". You can add an override (npm/pnpm) or a resolution (yarn) -for `@vercel/nft` to fix this. This will add the `hook.mjs` file to your build output -([Nitro issue here](https://github.com/unjs/nitro/issues/2703)). - -For `npm`: - -```json -"overrides": { - "@vercel/nft": "^0.27.4" -} -``` - -for `yarn`: - -```json -"resolutions": { - "@vercel/nft": "^0.27.4" -} -``` - -or for `pnpm`: - -```json -"pnpm": { - "overrides": { - "@vercel/nft": "^0.27.4" - } -} -``` +If you encounter any issues with error tracking or integrations, refer to the official [Sentry Nuxt SDK documentation](https://docs.sentry.io/platforms/javascript/guides/nuxt/). If the documentation does not provide the necessary information, consider opening an issue on GitHub. From b891abcfb086acbbbd98ceaac1eb8c30b3773f6f Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Fri, 13 Dec 2024 15:22:46 +0100 Subject: [PATCH 4/6] chore(publish): Temporarily stop publishing lambda layer for v9 peview versions (#14707) temporarily disables publishing a lambda layer while `develop` is the branch where we cut v9 pre releases from. We shouldn't publish prerelease layer versions since we can't mark these layers as pre-release. They'd appear simply as stable new layer versions (with incremented ARN number) --- .craft.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.craft.yml b/.craft.yml index d9be4d4b3fa4..5bac7310fe15 100644 --- a/.craft.yml +++ b/.craft.yml @@ -143,19 +143,20 @@ targets: includeNames: /^sentry-internal-eslint-config-sdk-\d.*\.tgz$/ # AWS Lambda Layer target - - name: aws-lambda-layer - includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha|rc)\.\d+)?\.zip$/ - layerName: SentryNodeServerlessSDK - compatibleRuntimes: - - name: node - versions: - - nodejs10.x - - nodejs12.x - - nodejs14.x - - nodejs16.x - - nodejs18.x - - nodejs20.x - license: MIT + # TODO(v9): Once stable, re-add this target to publish the AWS Lambda layer + # - name: aws-lambda-layer + # includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha|rc)\.\d+)?\.zip$/ + # layerName: SentryNodeServerlessSDK + # compatibleRuntimes: + # - name: node + # versions: + # - nodejs10.x + # - nodejs12.x + # - nodejs14.x + # - nodejs16.x + # - nodejs18.x + # - nodejs20.x + # license: MIT # CDN Bundle Target - name: gcs From 6e7765a3b9fbe35ae79a579e8a851414bdddb201 Mon Sep 17 00:00:00 2001 From: Daniel Griesser Date: Fri, 13 Dec 2024 15:52:04 +0100 Subject: [PATCH 5/6] chore: Add external contributor to CHANGELOG.md (#14694) --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd6332f4c125..05d2f9630507 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott +Work in this release was contributed by @antonis. Thank you for your contribution! + ## 8.45.0 - feat(core): Add `handled` option to `captureConsoleIntegration` ([#14664](https://github.com/getsentry/sentry-javascript/pull/14664)) From f5aef6606eaf210a7d5c7b714791c829764a6e7a Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Fri, 13 Dec 2024 09:56:23 -0500 Subject: [PATCH 6/6] fix: Normalise ANR debug image file paths if appRoot was supplied --- packages/node/src/integrations/anr/worker.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/node/src/integrations/anr/worker.ts b/packages/node/src/integrations/anr/worker.ts index 354cea514618..b5f45fc6fcb3 100644 --- a/packages/node/src/integrations/anr/worker.ts +++ b/packages/node/src/integrations/anr/worker.ts @@ -104,11 +104,13 @@ function applyDebugMeta(event: Event): void { if (filenameToDebugId.size > 0) { const images: DebugImage[] = []; - for (const [filename, debugId] of filenameToDebugId.entries()) { + for (const [filename, debug_id] of filenameToDebugId.entries()) { + const code_file = options.appRootPath ? normalizeUrlToBase(filename, options.appRootPath) : filename; + images.push({ type: 'sourcemap', - code_file: filename, - debug_id: debugId, + code_file, + debug_id, }); } event.debug_meta = { images };