fix(nextjs): Respect directives in value injection loader #14083
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chargome
approved these changes
Oct 28, 2024
| const SKIP_COMMENT_AND_DIRECTIVE_REGEX = | ||
| // Note: CodeQL complains that this regex potentially has n^2 runtime. This likely won't affect realistic files. | ||
| // biome-ignore lint/nursery/useRegexLiterals: No user input | ||
| new RegExp('^(?:\\s*|/\\*(?:.|\\r|\\n)*?\\*/|//.*[\\n\\r])*(?:"[^"]*";|\'[^\']*\';)?'); |
alexandresoro
pushed a commit
to alexandresoro/ouca
that referenced
this pull request
Nov 3, 2024
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@sentry/node](https://github.com/getsentry/sentry-javascript/tree/master/packages/node) ([source](https://github.com/getsentry/sentry-javascript)) | dependencies | minor | [`8.35.0` -> `8.36.0`](https://renovatebot.com/diffs/npm/@sentry%2fnode/8.35.0/8.36.0) | | [@sentry/react](https://github.com/getsentry/sentry-javascript/tree/master/packages/react) ([source](https://github.com/getsentry/sentry-javascript)) | dependencies | minor | [`8.35.0` -> `8.36.0`](https://renovatebot.com/diffs/npm/@sentry%2freact/8.35.0/8.36.0) | --- ### Release Notes <details> <summary>getsentry/sentry-javascript (@​sentry/node)</summary> ### [`v8.36.0`](https://github.com/getsentry/sentry-javascript/blob/HEAD/CHANGELOG.md#8360) [Compare Source](getsentry/sentry-javascript@8.35.0...8.36.0) ##### Important Changes - **feat(nextjs/vercel-edge/cloudflare): Switch to OTEL for performance monitoring ([#​13889](getsentry/sentry-javascript#13889 With this release, the Sentry Next.js, and Cloudflare SDKs will now capture performance data based on OpenTelemetry. Some exceptions apply in cases where Next.js captures inaccurate data itself. NOTE: You may experience minor differences in transaction names in Sentry. Most importantly transactions for serverside pages router invocations will now be named `GET /[param]/my/route` instead of `/[param]/my/route`. This means that those transactions are now better aligned with the OpenTelemetry semantic conventions. ##### Other Changes - deps: Bump bundler plugins and CLI to 2.22.6 and 2.37.0 respectively ([#​14050](getsentry/sentry-javascript#14050)) - feat(deps): bump [@​opentelemetry/instrumentation-aws-sdk](https://github.com/opentelemetry/instrumentation-aws-sdk) from 0.44.0 to 0.45.0 ([#​14099](getsentry/sentry-javascript#14099)) - feat(deps): bump [@​opentelemetry/instrumentation-connect](https://github.com/opentelemetry/instrumentation-connect) from 0.39.0 to 0.40.0 ([#​14101](getsentry/sentry-javascript#14101)) - feat(deps): bump [@​opentelemetry/instrumentation-express](https://github.com/opentelemetry/instrumentation-express) from 0.43.0 to 0.44.0 ([#​14102](getsentry/sentry-javascript#14102)) - feat(deps): bump [@​opentelemetry/instrumentation-fs](https://github.com/opentelemetry/instrumentation-fs) from 0.15.0 to 0.16.0 ([#​14098](getsentry/sentry-javascript#14098)) - feat(deps): bump [@​opentelemetry/instrumentation-kafkajs](https://github.com/opentelemetry/instrumentation-kafkajs) from 0.3.0 to 0.4.0 ([#​14100](getsentry/sentry-javascript#14100)) - feat(nextjs): Add method and url to route handler request data ([#​14084](getsentry/sentry-javascript#14084)) - feat(node): Add breadcrumbs for `child_process` and `worker_thread` ([#​13896](getsentry/sentry-javascript#13896)) - fix(core): Ensure standalone spans are not sent if SDK is disabled ([#​14088](getsentry/sentry-javascript#14088)) - fix(nextjs): Await flush in api handlers ([#​14023](getsentry/sentry-javascript#14023)) - fix(nextjs): Don't leak webpack types into exports ([#​14116](getsentry/sentry-javascript#14116)) - fix(nextjs): Fix matching logic for file convention type for root level components ([#​14038](getsentry/sentry-javascript#14038)) - fix(nextjs): Respect directives in value injection loader ([#​14083](getsentry/sentry-javascript#14083)) - fix(nuxt): Only wrap `.mjs` entry files in rollup ([#​14060](getsentry/sentry-javascript#14060)) - fix(nuxt): Re-export all exported bindings ([#​14086](getsentry/sentry-javascript#14086)) - fix(nuxt): Server-side setup in readme ([#​14049](getsentry/sentry-javascript#14049)) - fix(profiling-node): Always warn when running on incompatible major version of Node.js ([#​14043](getsentry/sentry-javascript#14043)) - fix(replay): Fix `onError` callback ([#​14002](getsentry/sentry-javascript#14002)) - perf(otel): Only calculate current timestamp once ([#​14094](getsentry/sentry-javascript#14094)) - test(browser-integration): Add sentry DSN route handler by default ([#​14095](getsentry/sentry-javascript#14095)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4xMzguNiIsInVwZGF0ZWRJblZlciI6IjM4LjEzOC42IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=--> Reviewed-on: https://git.tristess.app/alexandresoro/ouca/pulls/289 Reviewed-by: Alexandre Soro <[email protected]> Co-authored-by: renovate <[email protected]> Co-committed-by: renovate <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is in preparation for turbopack (#8105).
In the future,
sentry.client.config.tswill likely need to be configured with a"use client"directive so that turbopack knows it needs to be treated as a file on the client.Our value injection loader currently always prepends the
sentry.client.config.tsfile with statements, rendering any directives in the file useless and crashing turbopack when the file is attempted to be imported somewhere.This PR detects any comments and directives on top of a file to only inject values after.