Use static serving for app's own assets

R/app.R

@@ -170,7 +170,14 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
   }
 
   wwwDir <- file.path.ci(appDir, "www")
+  if (dirExists(wwwDir)) {
+    staticPaths <- list("/" = staticPath(wwwDir, indexhtml = FALSE, fallthrough = TRUE))
+  } else {
+    staticPaths <- list()
+  }
+
   fallbackWWWDir <- system.file("www-dir", package = "shiny")
+
   serverSource <- cachedFuncWithFile(appDir, "server.R", case.sensitive = FALSE,
     function(serverR) {
       # If server.R contains a call to shinyServer (which sets .globals$server),
@@ -220,7 +227,8 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
 
   structure(
     list(
-      httpHandler = joinHandlers(c(uiHandler, wwwDir, fallbackWWWDir)),
+      staticPaths = staticPaths,
+      httpHandler = joinHandlers(c(uiHandler, fallbackWWWDir)),
       serverFuncSource = serverFuncSource,
       onStart = onStart,
       onStop = onStop,
@@ -309,6 +317,20 @@ shinyAppDir_appR <- function(fileName, appDir, options=list())
   }
 
   wwwDir <- file.path.ci(appDir, "www")
+  if (dirExists(wwwDir)) {
+    # wwwDir is a static path served by httpuv. It does _not_ serve up
+    # index.html, for two reasons. (1) It's possible that the user's
+    # www/index.html file is not actually used as the index, but as a template
+    # that gets processed before being sent; and (2) the index content may be
+    # modified by the hosting environment (as in SockJSAdapter.R).
+    #
+    # The call to staticPath normalizes the path, so that if the working dir
+    # later changes, it will continue to point to the right place.
+    staticPaths <- list("/" = staticPath(wwwDir, indexhtml = FALSE, fallthrough = TRUE))
+  } else {
+    staticPaths <- list()
+  }
+
   fallbackWWWDir <- system.file("www-dir", package = "shiny")
 
   oldwd <- NULL
@@ -327,7 +349,13 @@ shinyAppDir_appR <- function(fileName, appDir, options=list())
 
   structure(
     list(
-      httpHandler = joinHandlers(c(dynHttpHandler, wwwDir, fallbackWWWDir)),
+      # fallbackWWWDir is _not_ listed in staticPaths, because it needs to
+      # come after the uiHandler. It also does not need to be fast, since it
+      # should rarely be hit. The order is wwwDir (in staticPaths), then
+      # uiHandler, then falbackWWWDir (which is served up by the R
+      # staticHandler function).
+      staticPaths = staticPaths,
+      httpHandler = joinHandlers(c(dynHttpHandler, fallbackWWWDir)),
       serverFuncSource = dynServerFuncSource,
       onStart = onStart,
       onStop = onStop,

R/server.R

@@ -392,7 +392,10 @@ startApp <- function(appObj, port, host, quiet) {
 
   httpuvApp <- handlerManager$createHttpuvApp()
   httpuvApp$staticPaths <- c(
-    shared = system.file(package="shiny", "www", "shared"),
+    appObj$staticPaths,
+    list(
+      "shared" = system.file(package = "shiny", "www", "shared")
+    ),
     .globals$resourcePaths
   )