Skip to content
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

Jump to bottom

Force a render when user pkgs don't match the pkgs used in a rendered, shiny-prerendered document #1420

Merged
merged 16 commits into from
Oct 8, 2018
Merged

Force a render when user pkgs don't match the pkgs used in a rendered, shiny-prerendered document #1420

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e0651c0
fix typo
schloerke Aug 3, 2018
d2a7252
Store the pkgVersion in the html deps json
schloerke Aug 3, 2018
00da5fa
make a shiny_prerendered_prerender function
schloerke Aug 3, 2018
fc9de14
check if the pkg field is there. otherwise check for the src file to …
schloerke Aug 3, 2018
6281c12
add some comments
schloerke Aug 6, 2018
e7615ef
store execution pacakges in shiny-prerendered documents and check it …
schloerke Aug 8, 2018
ff9b16c
added news item
schloerke Aug 8, 2018
26c84b0
get standard packages by using installed.packages
schloerke Aug 8, 2018
d04941f
merged from master
schloerke Aug 8, 2018
8456c80
remove r major version
schloerke Aug 14, 2018
ffd19cb
use all loaded pkgs
schloerke Aug 14, 2018
de86f8e
short circuit the exec pkg check
schloerke Aug 14, 2018
a47129e
close broken code
schloerke Aug 23, 2018
ad406f3
remove unnecessary c()
schloerke Aug 23, 2018
07f4a86
merged master
schloerke Aug 23, 2018
9b9f1d8
fix unknown execution_pkgs
schloerke Aug 28, 2018
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
3 changes: 1 addition & 2 deletions R/render.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,7 @@ render <- function(input,
output_options$dependency_resolver <- function(deps) {
shiny_prerendered_dependencies <<- list(
deps = deps,
packages = get_loaded_packages(),
rMajorVersion = R.version$major
packages = get_loaded_packages()
)
list()
}
Expand Down
8 changes: 2 additions & 6 deletions R/shiny_prerendered.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,6 @@ shiny_prerendered_prerender <- function(
execution_json <- shiny_prerendered_extract_context(html_lines, "execution_dependencies")
execution_info <- jsonlite::unserializeJSON(execution_json)

# check that the major R versions match
if (!identical(R.version$major, execution_info$rMajorVersion)) {
return(TRUE)
}

# check for execution package version differences
execution_pkgs <- execution_info$packages
versions_dont_match <- unlist(Map(
Expand Down Expand Up @@ -298,7 +293,8 @@ shiny_prerendered_append_dependencies <- function(input, # always UTF-8

# write r major version and execution package dependencies
execution_json <- jsonlite::serializeJSON(
shiny_prerendered_dependencies[c("rMajorVersion", "packages")],
# visibly display what is being stored
shiny_prerendered_dependencies[c("packages")],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't need c() here

pretty = FALSE
)
shiny_prerendered_append_context(con, "execution_dependencies", execution_json)
Expand Down