Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Meta
create-react-app
Commits
3521eb7c
Commit
3521eb7c
authored
7 years ago
by
Dan Abramov
Committed by
GitHub
7 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Make error box messages friendlier (#2123)
parent
a4bd567d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
packages/react-error-overlay/src/components/frame.js
+9
-1
packages/react-error-overlay/src/components/frame.js
packages/react-error-overlay/src/components/overlay.js
+13
-5
packages/react-error-overlay/src/components/overlay.js
packages/react-error-overlay/src/styles.js
+1
-0
packages/react-error-overlay/src/styles.js
with
23 additions
and
6 deletions
+23
-6
packages/react-error-overlay/src/components/frame.js
+
9
-
1
View file @
3521eb7c
...
@@ -127,8 +127,8 @@ function createFrame(
...
@@ -127,8 +127,8 @@ function createFrame(
lastElement
:
boolean
lastElement
:
boolean
)
{
)
{
const
{
compiled
}
=
frameSetting
;
const
{
compiled
}
=
frameSetting
;
let
{
functionName
}
=
frame
;
const
{
const
{
functionName
,
fileName
,
fileName
,
lineNumber
,
lineNumber
,
columnNumber
,
columnNumber
,
...
@@ -139,6 +139,14 @@ function createFrame(
...
@@ -139,6 +139,14 @@ function createFrame(
_originalScriptCode
:
sourceLines
,
_originalScriptCode
:
sourceLines
,
}
=
frame
;
}
=
frame
;
// TODO: find a better place for this.
// Chrome has a bug with inferring function.name:
// https://github.com/facebookincubator/create-react-app/issues/2097
// Let's ignore a meaningless name we get for top-level modules.
if
(
functionName
===
'
Object.friendlySyntaxErrorLabel
'
)
{
functionName
=
'
(anonymous function)
'
;
}
let
url
;
let
url
;
if
(
!
compiled
&&
sourceFileName
&&
sourceLineNumber
)
{
if
(
!
compiled
&&
sourceFileName
&&
sourceLineNumber
)
{
url
=
sourceFileName
+
'
:
'
+
sourceLineNumber
;
url
=
sourceFileName
+
'
:
'
+
sourceLineNumber
;
...
...
This diff is collapsed.
Click to expand it.
packages/react-error-overlay/src/components/overlay.js
+
13
-
5
View file @
3521eb7c
...
@@ -50,11 +50,19 @@ function createOverlay(
...
@@ -50,11 +50,19 @@ function createOverlay(
// Create header
// Create header
const
header
=
document
.
createElement
(
'
div
'
);
const
header
=
document
.
createElement
(
'
div
'
);
applyStyles
(
header
,
headerStyle
);
applyStyles
(
header
,
headerStyle
);
if
(
message
.
match
(
/^
\w
*:/
))
{
header
.
appendChild
(
document
.
createTextNode
(
message
));
// Make message prettier
}
else
{
let
finalMessage
=
message
.
match
(
/^
\w
*:/
)
?
name
+
'
:
'
+
message
:
message
;
header
.
appendChild
(
document
.
createTextNode
(
name
+
'
:
'
+
message
));
finalMessage
=
finalMessage
}
// TODO: maybe remove this prefix from fbjs?
// It's just scaring people
.
replace
(
'
Invariant Violation:
'
,
''
)
// Break the actionable part to the next line.
// AFAIK React 16+ should already do this.
.
replace
(
'
Check the render method
'
,
'
\n\n
Check the render method
'
);
// Put it in the DOM
header
.
appendChild
(
document
.
createTextNode
(
finalMessage
));
container
.
appendChild
(
header
);
container
.
appendChild
(
header
);
// Create trace
// Create trace
...
...
This diff is collapsed.
Click to expand it.
packages/react-error-overlay/src/styles.js
+
1
-
0
View file @
3521eb7c
...
@@ -65,6 +65,7 @@ const headerStyle = {
...
@@ -65,6 +65,7 @@ const headerStyle = {
'
font-size
'
:
'
1.7em
'
,
'
font-size
'
:
'
1.7em
'
,
'
font-weight
'
:
'
bold
'
,
'
font-weight
'
:
'
bold
'
,
color
:
red
,
color
:
red
,
'
white-space
'
:
'
pre-wrap
'
,
};
};
const
functionNameStyle
=
{
const
functionNameStyle
=
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment