fix: Add tslib dependecy for next.js + fixes #3487
Merged
Conversation
This file contains hidden or 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
3 tasks
size-limit report
|
HazAT
changed the title
HazAT
commented
Apr 30, 2021
packages/nextjs/src/utils/config.ts
Outdated
Comment on lines
41
to
70
| // In case we inject our client config, we need to add it after the frontend code | ||
| // otherwise the runtime config isn't loaded. See: https://github.com/getsentry/sentry-javascript/issues/3485 | ||
| const isClient = injectee === './sentry.client.config.js'; | ||
|
|
||
| // Object -> Add it | ||
| if (injectedInto != null && typeof injectedInto == 'object' && !Array.isArray(injectedInto)) { | ||
| let importVal: string | string[] | EntryPointObject; | ||
| if (typeof injectedInto.import === 'string') { | ||
| importVal = isClient ? [injectedInto.import, injectee] : [injectee, injectedInto.import]; | ||
| } else { | ||
| // If it's not a string, the inner value is an array | ||
| importVal = isClient ? [...injectedInto.import, injectee] : [injectee, ...injectedInto.import]; | ||
| } | ||
|
|
||
| injectedInto = { | ||
| ...injectedInto, | ||
| import: importVal, | ||
| }; | ||
| } | ||
|
|
||
| // Array -> Add it | ||
| if (Array.isArray(injectedInto)) { | ||
| injectedInto = isClient ? [...injectedInto, injectee] : [injectee, ...injectedInto]; | ||
| } | ||
|
|
||
| // String -> We need to make it an array | ||
| if (typeof injectedInto === 'string') { | ||
| injectedInto = isClient ? [injectedInto, injectee] : [injectee, injectedInto]; | ||
| } | ||
|
|
There was a problem hiding this comment.
Having a few ifs here makes it easier to understand what's happening. Especially with the client/server different inject order now.
| entryProperty[injectionPoint] = injectedInto; | ||
| }; | ||
|
|
||
| const injectSentry = async (origEntryProperty: EntryProperty, isServer: boolean): Promise<EntryProperty> => { | ||
| // Out of the box, nextjs uses the `() => Promise<EntryPropertyObject>)` flavor of EntryProperty, where the returned | ||
| // object has string arrays for values. But because we don't know whether someone else has come along before us and | ||
| // changed that, we need to check a few things along the way. | ||
| // object has string arrays for values. |
There was a problem hiding this comment.
We have the same sentence below: repetition.
9 tasks
iker-barriocanal
suggested changes
Apr 30, 2021
Co-authored-by: iker barriocanal <32816711+iker-barriocanal@users.noreply.github.com>
iker-barriocanal
approved these changes
Apr 30, 2021
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.
Fixes #3486
Fixes #3485