-
Notifications
You must be signed in to change notification settings - Fork 50.2k
Pass prod error messages directly to constructor #17063
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
This file was deleted.
Oops, something went wrong.
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
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
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
54 changes: 19 additions & 35 deletions
54
scripts/error-codes/__tests__/__snapshots__/transform-error-messages.js.snap
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,60 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`error transform should correctly transform invariants that are not in the error codes map 1`] = ` | ||
| "import _ReactError from \\"shared/ReactError\\"; | ||
| import invariant from 'shared/invariant'; | ||
| "import invariant from 'shared/invariant'; | ||
|
|
||
| /*FIXME (minify-errors-in-prod): Unminified error message in production build!*/ | ||
| (function () { | ||
| if (!condition) { | ||
| throw _ReactError(Error(\\"This is not a real error message.\\")); | ||
| } | ||
| })();" | ||
| if (!condition) { | ||
| throw Error(\\"This is not a real error message.\\"); | ||
| }" | ||
| `; | ||
|
|
||
| exports[`error transform should handle escaped characters 1`] = ` | ||
| "import _ReactError from \\"shared/ReactError\\"; | ||
| import invariant from 'shared/invariant'; | ||
| "import invariant from 'shared/invariant'; | ||
|
|
||
| /*FIXME (minify-errors-in-prod): Unminified error message in production build!*/ | ||
| (function () { | ||
| if (!condition) { | ||
| throw _ReactError(Error(\\"What's up?\\")); | ||
| } | ||
| })();" | ||
| if (!condition) { | ||
| throw Error(\\"What's up?\\"); | ||
| }" | ||
| `; | ||
|
|
||
| exports[`error transform should replace simple invariant calls 1`] = ` | ||
| "import _ReactErrorProd from \\"shared/ReactErrorProd\\"; | ||
| import _ReactError from \\"shared/ReactError\\"; | ||
| "import _formatProdErrorMessage from \\"shared/formatProdErrorMessage\\"; | ||
| import invariant from 'shared/invariant'; | ||
|
|
||
| if (!condition) { | ||
| if (__DEV__) { | ||
| throw _ReactError(Error(\\"Do not override existing functions.\\")); | ||
| } else { | ||
| throw _ReactErrorProd(Error(16)); | ||
| { | ||
| throw Error(__DEV__ ? \\"Do not override existing functions.\\" : _formatProdErrorMessage(16)); | ||
| } | ||
| }" | ||
| `; | ||
|
|
||
| exports[`error transform should support invariant calls with a concatenated template string and args 1`] = ` | ||
| "import _ReactErrorProd from \\"shared/ReactErrorProd\\"; | ||
| import _ReactError from \\"shared/ReactError\\"; | ||
| "import _formatProdErrorMessage from \\"shared/formatProdErrorMessage\\"; | ||
| import invariant from 'shared/invariant'; | ||
|
|
||
| if (!condition) { | ||
| if (__DEV__) { | ||
| throw _ReactError(Error(\\"Expected a component class, got \\" + Foo + \\".\\" + Bar)); | ||
| } else { | ||
| throw _ReactErrorProd(Error(18), Foo, Bar); | ||
| { | ||
| throw Error(__DEV__ ? \\"Expected a component class, got \\" + Foo + \\".\\" + Bar : _formatProdErrorMessage(18, Foo, Bar)); | ||
| } | ||
| }" | ||
| `; | ||
|
|
||
| exports[`error transform should support invariant calls with args 1`] = ` | ||
| "import _ReactErrorProd from \\"shared/ReactErrorProd\\"; | ||
| import _ReactError from \\"shared/ReactError\\"; | ||
| "import _formatProdErrorMessage from \\"shared/formatProdErrorMessage\\"; | ||
| import invariant from 'shared/invariant'; | ||
|
|
||
| if (!condition) { | ||
| if (__DEV__) { | ||
| throw _ReactError(Error(\\"Expected \\" + foo + \\" target to be an array; got \\" + bar)); | ||
| } else { | ||
| throw _ReactErrorProd(Error(7), foo, bar); | ||
| { | ||
| throw Error(__DEV__ ? \\"Expected \\" + foo + \\" target to be an array; got \\" + bar : _formatProdErrorMessage(7, foo, bar)); | ||
| } | ||
| }" | ||
| `; | ||
|
|
||
| exports[`error transform should support noMinify option 1`] = ` | ||
| "import _ReactError from \\"shared/ReactError\\"; | ||
| import invariant from 'shared/invariant'; | ||
| "import invariant from 'shared/invariant'; | ||
|
|
||
| if (!condition) { | ||
| throw _ReactError(Error(\\"Do not override existing functions.\\")); | ||
| throw Error(\\"Do not override existing functions.\\"); | ||
| }" | ||
| `; |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wonder why we had a trailing space at the end before and if anything relied on it when appending to the error message. Doesn't look like it was intentional so I assume it's ok :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I think it was just a mistake :D