Skip to content

Commit 93345e6

Browse files
rpkylerpkyle
authored
Update dash-renderer to 1.2.2 and fix dev tools UI display of stack traces (#137)
* 🚚 upgrade dash-renderer to v1.2.2, 🔨 fix stack traces * 🚚 add polyfill.js
1 parent 006b6d3 commit 93345e6

11 files changed

+25597
-31736
lines changed

‎R/dash.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,6 +1242,7 @@ Dash <- R6::R6Class(
12421242
depsAll <- compact(c(
12431243
private$react_deps()[private$react_versions() %in% private$react_version_enabled()],
12441244
private$dependencies_internal[grepl(pattern = "prop-types", x = private$dependencies_internal)],
1245+
private$dependencies_internal[grepl(pattern = "polyfill", x = private$dependencies_internal)],
12451246
private$dependencies,
12461247
private$dependencies_user,
12471248
private$dependencies_internal[grepl(pattern = "dash-renderer", x = private$dependencies_internal)]

‎R/internal.R

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,22 @@
2323
package = "dash",
2424
all_files = FALSE),
2525
class = "html_dependency"),
26+
`polyfill-prod` = structure(list(name = "polyfill",
27+
version = "7.7.0",
28+
src = list(href = "https://unpkg.com/@babel/[email protected]",
29+
file = "lib/[email protected]"),
30+
meta = NULL,
31+
script = "dist/polyfill.min.js",
32+
stylesheet = NULL,
33+
head = NULL,
34+
attachment = NULL,
35+
package = "dash",
36+
all_files = FALSE),
37+
class = "html_dependency"),
2638
`dash-renderer-dev` = structure(list(name = "dash-renderer",
27-
version = "1.0.0",
28-
src = list(href = "https://unpkg.com/dash-renderer@1.0.0",
29-
file = "lib/dash-renderer@1.0.0"),
39+
version = "1.2.2",
40+
src = list(href = "https://unpkg.com/dash-renderer@1.2.2",
41+
file = "lib/dash-renderer@1.2.2"),
3042
meta = NULL,
3143
script = "dash-renderer/dash_renderer.dev.js",
3244
stylesheet = NULL,
@@ -36,9 +48,9 @@
3648
all_files = FALSE),
3749
class = "html_dependency"),
3850
`dash-renderer-map-dev` = structure(list(name = "dash-renderer",
39-
version = "1.0.0",
40-
src = list(href = "https://unpkg.com/dash-renderer@1.0.0",
41-
file = "lib/dash-renderer@1.0.0"),
51+
version = "1.2.2",
52+
src = list(href = "https://unpkg.com/dash-renderer@1.2.2",
53+
file = "lib/dash-renderer@1.2.2"),
4254
meta = NULL,
4355
script = "dash-renderer/dash_renderer.dev.js.map",
4456
stylesheet = NULL,
@@ -48,9 +60,9 @@
4860
all_files = FALSE),
4961
class = "html_dependency"),
5062
`dash-renderer-prod` = structure(list(name = "dash-renderer",
51-
version = "1.0.0",
52-
src = list(href = "https://unpkg.com/dash-renderer@1.0.0",
53-
file = "lib/dash-renderer@1.0.0"),
63+
version = "1.2.2",
64+
src = list(href = "https://unpkg.com/dash-renderer@1.2.2",
65+
file = "lib/dash-renderer@1.2.2"),
5466
meta = NULL,
5567
script = "dash-renderer/dash_renderer.min.js",
5668
stylesheet = NULL,
@@ -60,9 +72,9 @@
6072
all_files = FALSE),
6173
class = "html_dependency"),
6274
`dash-renderer-map-prod` = structure(list(name = "dash-renderer",
63-
version = "1.0.0",
64-
src = list(href = "https://unpkg.com/dash-renderer@1.0.0",
65-
file = "lib/dash-renderer@1.0.0"),
75+
version = "1.2.2",
76+
src = list(href = "https://unpkg.com/dash-renderer@1.2.2",
77+
file = "lib/dash-renderer@1.2.2"),
6678
meta = NULL,
6779
script = "dash-renderer/dash_renderer.min.js.map",
6880
stylesheet = NULL,

‎R/utils.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ stackTraceToHTML <- function(call_stack,
713713
if(is.null(call_stack)) {
714714
return(NULL)
715715
}
716-
header <- " ### Dash for R Traceback (most recent/innermost call last) ###"
716+
header <- " ### Dash for R Traceback (most recent/innermost call last) ###\n"
717717

718718
formattedStack <- c(paste0(
719719
" ",
@@ -724,19 +724,19 @@ stackTraceToHTML <- function(call_stack,
724724
call_stack,
725725
" ",
726726
lapply(call_stack, attr, "lineref"),
727-
collapse="<br>"
727+
collapse="\n"
728728
)
729729
)
730730

731-
template <- "<!DOCTYPE HTML><html><body><pre><h3>%s</h3><br>Error: %s: %s<br>%s</pre></body></html>"
731+
template <- "%s\nError: %s: %s\n%s"
732732
response <- sprintf(template,
733733
header,
734734
throwing_call,
735735
error_message,
736736
formattedStack)
737737

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

741741
return(response)
742742
}

‎inst/lib/[email protected]/dash-renderer/dash_renderer.dev.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎inst/lib/[email protected]/dash-renderer/dash_renderer.min.js

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎inst/lib/[email protected]/dash-renderer/dash_renderer.min.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)