Skip to content

Update dash-renderer to 1.2.2 and fix dev tools UI display of stack traces #137

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.

Sign up for GitHub

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 6 commits into from
Dec 25, 2019
Merged

Update dash-renderer to 1.2.2 and fix dev tools UI display of stack traces #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
97a9574
:truck: upgrade dash-renderer, :hammer: fix stack traces
Nov 4, 2019
8ae06a5
Merge branch 'dev' into 994-fix-viewer
rpkyle Dec 4, 2019
f315345
Merge branch 'dev' into 994-fix-viewer
rpkyle Dec 22, 2019
2e1f077
Merge branch 'dev' into 994-fix-viewer
rpkyle Dec 23, 2019
5fe4564
:truck: update dash-renderer to 1.2.2
Dec 23, 2019
a2457f0
:truck: add polyfill.js + v1.2.2 of renderer
Dec 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions R/dash.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,6 +1242,7 @@ Dash <- R6::R6Class(
depsAll <- compact(c(
private$react_deps()[private$react_versions() %in% private$react_version_enabled()],
private$dependencies_internal[grepl(pattern = "prop-types", x = private$dependencies_internal)],
private$dependencies_internal[grepl(pattern = "polyfill", x = private$dependencies_internal)],
private$dependencies,
private$dependencies_user,
private$dependencies_internal[grepl(pattern = "dash-renderer", x = private$dependencies_internal)]
Expand Down
36 changes: 24 additions & 12 deletions R/internal.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,22 @@
package = "dash",
all_files = FALSE),
class = "html_dependency"),
`polyfill-prod` = structure(list(name = "polyfill",
version = "7.7.0",
src = list(href = "https://unpkg.com/@babel/[email protected]",
file = "lib/[email protected]"),
meta = NULL,
script = "dist/polyfill.min.js",
stylesheet = NULL,
head = NULL,
attachment = NULL,
package = "dash",
all_files = FALSE),
class = "html_dependency"),
`dash-renderer-dev` = structure(list(name = "dash-renderer",
version = "1.0.0",
src = list(href = "https://unpkg.com/dash-renderer@1.0.0",
file = "lib/dash-renderer@1.0.0"),
version = "1.2.2",
src = list(href = "https://unpkg.com/dash-renderer@1.2.2",
file = "lib/dash-renderer@1.2.2"),
meta = NULL,
script = "dash-renderer/dash_renderer.dev.js",
stylesheet = NULL,
Expand All @@ -36,9 +48,9 @@
all_files = FALSE),
class = "html_dependency"),
`dash-renderer-map-dev` = structure(list(name = "dash-renderer",
version = "1.0.0",
src = list(href = "https://unpkg.com/dash-renderer@1.0.0",
file = "lib/dash-renderer@1.0.0"),
version = "1.2.2",
src = list(href = "https://unpkg.com/dash-renderer@1.2.2",
file = "lib/dash-renderer@1.2.2"),
meta = NULL,
script = "dash-renderer/dash_renderer.dev.js.map",
stylesheet = NULL,
Expand All @@ -48,9 +60,9 @@
all_files = FALSE),
class = "html_dependency"),
`dash-renderer-prod` = structure(list(name = "dash-renderer",
version = "1.0.0",
src = list(href = "https://unpkg.com/dash-renderer@1.0.0",
file = "lib/dash-renderer@1.0.0"),
version = "1.2.2",
src = list(href = "https://unpkg.com/dash-renderer@1.2.2",
file = "lib/dash-renderer@1.2.2"),
meta = NULL,
script = "dash-renderer/dash_renderer.min.js",
stylesheet = NULL,
Expand All @@ -60,9 +72,9 @@
all_files = FALSE),
class = "html_dependency"),
`dash-renderer-map-prod` = structure(list(name = "dash-renderer",
version = "1.0.0",
src = list(href = "https://unpkg.com/dash-renderer@1.0.0",
file = "lib/dash-renderer@1.0.0"),
version = "1.2.2",
src = list(href = "https://unpkg.com/dash-renderer@1.2.2",
file = "lib/dash-renderer@1.2.2"),
meta = NULL,
script = "dash-renderer/dash_renderer.min.js.map",
stylesheet = NULL,
Expand Down
8 changes: 4 additions & 4 deletions R/utils.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ stackTraceToHTML <- function(call_stack,
if(is.null(call_stack)) {
return(NULL)
}
header <- " ### Dash for R Traceback (most recent/innermost call last) ###"
header <- " ### Dash for R Traceback (most recent/innermost call last) ###\n"

formattedStack <- c(paste0(
" ",
Expand All @@ -724,19 +724,19 @@ stackTraceToHTML <- function(call_stack,
call_stack,
" ",
lapply(call_stack, attr, "lineref"),
collapse="<br>"
collapse="\n"
)
)

template <- "<!DOCTYPE HTML><html><body><pre><h3>%s</h3><br>Error: %s: %s<br>%s</pre></body></html>"
template <- "%s\nError: %s: %s\n%s"
response <- sprintf(template,
header,
throwing_call,
error_message,
formattedStack)

# properly format anonymous tags if present in call stack
response <- gsub("<anonymous>", "&lt;anonymous&gt;", response)
#response <- gsub("<anonymous>", "&lt;anonymous&gt;", response)

return(response)
}
Expand Down
1 change: 0 additions & 1 deletion inst/lib/[email protected]/dash-renderer/dash_renderer.dev.js.map
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions inst/lib/[email protected]/dash-renderer/dash_renderer.min.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion inst/lib/[email protected]/dash-renderer/dash_renderer.min.js.map
View file
Open in desktop

This file was deleted.

Loading