Commit 6c70ee8

author

Robert Mosolgo

authored

Merge pull request #704 from reactjs/error-handling

feat(ujs) show errors when component can't be loaded

2 parents 7d0ac32 + 5ae4ebb commit 6c70ee8Copy full SHA for 6c70ee8

File tree

+28

-7

lines changed

lib/assets/javascripts
- react_ujs.js
react_ujs
- dist
  - react_ujs.js
- src/getConstructor
  - fromRequireContextWithGlobalFallback.js
test/react/server_rendering
- bundle_renderer_test.rb

+28

-7

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -185,9 +185,14 @@ module.exports = function(reqctx) {`
`185`	`185`	`try {`
`186`	`186`	// `require` will raise an error if this className isn't found:
`187`	`187`	`component = fromCtx(className)`
`188`		`- } catch (err) {`
	`188`	`+ } catch (firstErr) {`
`189`	`189`	`// fallback to global:`
`190`		`- component = fromGlobal(className)`
	`190`	`+ try {`
	`191`	`+ component = fromGlobal(className)`
	`192`	`+ } catch (secondErr) {`
	`193`	`+ console.error(firstErr)`
	`194`	`+ console.error(secondErr)`
	`195`	`+ }`
`191`	`196`	`}`
`192`	`197`	`return component`
`193`	`198`	`}`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -185,9 +185,14 @@ module.exports = function(reqctx) {`
`185`	`185`	`try {`
`186`	`186`	// `require` will raise an error if this className isn't found:
`187`	`187`	`component = fromCtx(className)`
`188`		`- } catch (err) {`
	`188`	`+ } catch (firstErr) {`
`189`	`189`	`// fallback to global:`
`190`		`- component = fromGlobal(className)`
	`190`	`+ try {`
	`191`	`+ component = fromGlobal(className)`
	`192`	`+ } catch (secondErr) {`
	`193`	`+ console.error(firstErr)`
	`194`	`+ console.error(secondErr)`
	`195`	`+ }`
`191`	`196`	`}`
`192`	`197`	`return component`
`193`	`198`	`}`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,14 @@ module.exports = function(reqctx) {`
`11`	`11`	`try {`
`12`	`12`	// `require` will raise an error if this className isn't found:
`13`	`13`	`component = fromCtx(className)`
`14`		`- } catch (err) {`
	`14`	`+ } catch (firstErr) {`
`15`	`15`	`// fallback to global:`
`16`		`- component = fromGlobal(className)`
	`16`	`+ try {`
	`17`	`+ component = fromGlobal(className)`
	`18`	`+ } catch (secondErr) {`
	`19`	`+ console.error(firstErr)`
	`20`	`+ console.error(secondErr)`
	`21`	`+ }`
`17`	`22`	`}`
`18`	`23`	`return component`
`19`	`24`	`}`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,13 @@ class BundleRendererTest < ActiveSupport::TestCase`
`68`	`68`	`@renderer.render("NonExistentComponent", {}, nil)`
`69`	`69`	`end`
`70`	`70`
`71`		`- assert_match(/ReferenceError/, err.to_s)`
	`71`	`+ if WebpackerHelpers.available?`
	`72`	`+ # require() failed:`
	`73`	`+ assert_match(/Invariant Violation: Element type is invalid: expected a string/, err.to_s)`
	`74`	`+ else`
	`75`	`+ # eval() failed:`
	`76`	`+ assert_match(/ReferenceError/, err.to_s)`
	`77`	`+ end`
`72`	`78`	`assert_match(/NonExistentComponent/, err.to_s, "it names the component")`
`73`	`79`
`74`	`80`	`assert_match(/\n/, err.to_s, "it includes the multi-line backtrace")`

Comments

(0)