From 0de9de8655d03f01f7c48d6f7ed1733770136e47 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2023 15:14:31 +0000
Subject: [PATCH 1/2] Update web version 0.55.0 (#4864)

Release notes https://github.com/deephaven/web-client-ui/releases/tag/v0.55.0

# [0.55.0](https://github.com/deephaven/web-client-ui/compare/v0.54.0...v0.55.0) (2023-11-20)


### Bug Fixes

* Changes for Deephaven UI embedding widget plugins ([#1644](https://github.com/deephaven/web-client-ui/issues/1644)) ([b6eeb30](https://github.com/deephaven/web-client-ui/commit/b6eeb309e8e55522d99c1528958bd0c7674e2d0f))
* Fixed chart e2e test changing daily ([#1652](https://github.com/deephaven/web-client-ui/issues/1652)) ([f9f62db](https://github.com/deephaven/web-client-ui/commit/f9f62db37fbb0fbb97a012b33d27d383ccd1ca40)), closes [#1634](https://github.com/deephaven/web-client-ui/issues/1634)
* Isolate Styleguide snapshots ([#1649](https://github.com/deephaven/web-client-ui/issues/1649)) ([a2ef056](https://github.com/deephaven/web-client-ui/commit/a2ef05681f348f02f46859909875e61c959a66dc))


### Features

* forward and back buttons for organize column search ([#1620](https://github.com/deephaven/web-client-ui/issues/1620)) ([75cf184](https://github.com/deephaven/web-client-ui/commit/75cf184f4b4b9d9a771544ea6335e5d2733368d9)), closes [#1529](https://github.com/deephaven/web-client-ui/issues/1529)
* Styleguide regression tests ([#1639](https://github.com/deephaven/web-client-ui/issues/1639)) ([561ff22](https://github.com/deephaven/web-client-ui/commit/561ff22714a8b39cc55b41549712b5ef23bd39cf)), closes [#1634](https://github.com/deephaven/web-client-ui/issues/1634)


### Reverts

* feat: forward and back buttons for organize column search ([#1640](https://github.com/deephaven/web-client-ui/issues/1640)) ([737d1aa](https://github.com/deephaven/web-client-ui/commit/737d1aa98d04800377035d7d189219fefacfa23f))

Co-authored-by: deephaven-internal <deephaven-internal@users.noreply.github.com>
---
 web/client-ui/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/client-ui/Dockerfile b/web/client-ui/Dockerfile
index 15eb40807d4..b5952a9d065 100644
--- a/web/client-ui/Dockerfile
+++ b/web/client-ui/Dockerfile
@@ -2,9 +2,9 @@ FROM deephaven/node:local-build
 WORKDIR /usr/src/app
 
 # Most of the time, these versions are the same, except in cases where a patch only affects one of the packages
-ARG WEB_VERSION=0.54.0
-ARG GRID_VERSION=0.54.0
-ARG CHART_VERSION=0.54.0
+ARG WEB_VERSION=0.55.0
+ARG GRID_VERSION=0.55.0
+ARG CHART_VERSION=0.55.0
 
 # Pull in the published code-studio package from npmjs and extract is
 RUN set -eux; \

From 18c6e7578266a7b7b8dfb923d95329c4729c3faf Mon Sep 17 00:00:00 2001
From: Alex Peters <80283343+alexpeters1208@users.noreply.github.com>
Date: Tue, 21 Nov 2023 11:57:15 -0600
Subject: [PATCH 2/2] Correct R Docsite (#4867)

---
 R/build.gradle | 2 ++
 R/r-site.sh    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/R/build.gradle b/R/build.gradle
index 83f26e670e7..3422148f221 100644
--- a/R/build.gradle
+++ b/R/build.gradle
@@ -164,6 +164,7 @@ def rClientSite = Docker.registerDockerTask(project, 'rClientSite') {
         from(layout.projectDirectory) {
             include 'r-site.sh'
             include 'rdeephaven/man/**'
+            include 'rdeephaven/pkgdown/**'
         }
     }
     copyOut {
@@ -173,6 +174,7 @@ def rClientSite = Docker.registerDockerTask(project, 'rClientSite') {
         from('deephaven/r-client-doc:local-build')
         // We need the contents of 'man' to build the docsite
         copyFile('rdeephaven/man/**', "${prefix}/src/rdeephaven/man/")
+        copyFile('rdeephaven/pkgdown/**', "${prefix}/src/rdeephaven/pkgdown/")
         runCommand("mkdir -p ${prefix}/src/rdeephaven/docs")
         runCommand('''echo "status = tryCatch(" \
                            "   {" \
diff --git a/R/r-site.sh b/R/r-site.sh
index 26fef767c4e..8eb9e89e25f 100755
--- a/R/r-site.sh
+++ b/R/r-site.sh
@@ -15,7 +15,7 @@ R --no-save --no-restore <<EOF
 library('pkgdown')
 status = tryCatch(
   {
-     pkgdown::build_site()
+     pkgdown::build_site(preview=FALSE)
      0
   },
   error=function(e) 1