Merge branch 'lagoon-voyager' into dev

.gitpod.Dockerfile

@@ -1,16 +1,16 @@
 FROM gitpod/workspace-full
 
 RUN bash -c 'VERSION="18.19.0" \
-    && source $HOME/.nvm/nvm.sh && nvm install $VERSION \
-    && nvm use $VERSION && nvm alias default $VERSION'
+  && source $HOME/.nvm/nvm.sh && nvm install $VERSION \
+  && nvm use $VERSION && nvm alias default $VERSION'
 
 RUN echo "nvm use default &>/dev/null" >> ~/.bashrc.d/51-nvm-fix
 
 RUN sudo update-alternatives --set php $(which php8.2)
 RUN sudo install-packages php8.2-gd php8.2-mbstring php8.2-curl php8.2-sqlite3 php8.2-zip php8.2-xdebug php8.2-imagick
 RUN pnpx [email protected] install-deps
 RUN pnpx [email protected] install
-RUN npm install -g pnpm@8.6.12 @withgraphite/graphite-cli
+RUN npm install -g pnpm@8.15.9 @withgraphite/graphite-cli
 
 COPY .gitpod/xdebug.ini /etc/php/8.2/mods-available/xdebug.ini
 RUN curl -fsSL https://deno.land/x/install/install.sh | sh
@@ -19,8 +19,8 @@ RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-den
   echo 'export PATH="$DENO_INSTALL/bin:$PATH"' >> /home/gitpod/.bashrc.d/90-deno
 
 RUN sudo add-apt-repository ppa:maveonair/helix-editor && \
-    sudo apt update && \
-    sudo apt install helix
+  sudo apt update && \
+  sudo apt install helix
 
 # Install phpactor
 RUN curl -Lo phpactor.phar https://github.com/phpactor/phpactor/releases/latest/download/phpactor.phar

.lagoon/Dockerfile

@@ -9,16 +9,16 @@ COPY --from=node /usr/local/bin/node /usr/local/bin/node
 RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm
 
 # Install pnpm
-RUN npm install -g pnpm@8.6.12 && pnpm config set store-dir /tmp/cache/pnpm
+RUN npm install -g pnpm@8.15.9 && pnpm config set store-dir /tmp/cache/pnpm
 
 # Copy pnpm lockfile and install dependencies.
 COPY pnpm-lock.yaml .npmrc /app/
 # COPY patches /app/patches
 RUN --mount=type=cache,target=/tmp/cache pnpm fetch && \
-    # There is a bug in pnpm: `pnpm fetch` creates _some_ node_modules folders
-    # with _some_ packages. This can lead to an incomplete package installation.
-    # So we remove them now.
-    find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +
+  # There is a bug in pnpm: `pnpm fetch` creates _some_ node_modules folders
+  # with _some_ packages. This can lead to an incomplete package installation.
+  # So we remove them now.
+  find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +
 
 # Install composer dependencies.
 # They may contain directive definitions required by prep scripts.
@@ -43,9 +43,9 @@ ENV VITE_DECAP_BRANCH="$LAGOON_GIT_BRANCH"
 # Copy the all package sources, install and prepare them.
 COPY . /app
 RUN --mount=type=cache,target=/tmp/cache pnpm i && \
-    pnpm turbo:prep && \
-    # Remove all node_modules to reduce the size of the image.
-    find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +
+  pnpm turbo:prep && \
+  # Remove all node_modules to reduce the size of the image.
+  find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +
 
 # Deploy apps.
 RUN --mount=type=cache,target=/tmp/cache pnpm deploy --filter "@custom/cms" /tmp/.deploy/cms --prod
@@ -120,22 +120,22 @@ ENV ALPINE_GLIBC_I18N_PACKAGE_FILENAME="glibc-i18n-$ALPINE_GLIBC_PACKAGE_VERSION
 RUN echo "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BASE_PACKAGE_FILENAME"
 
 RUN apk add --no-cache --virtual=.build-dependencies wget ca-certificates && \
-    echo "-----BEGIN PUBLIC KEY-----        MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApZ2u1KJKUu/fW4A25y9m        y70AGEa/J3Wi5ibNVGNn1gT1r0VfgeWd0pUybS4UmcHdiNzxJPgoWQhV2SSW1JYu        tOqKZF5QSN6X937PTUpNBjUvLtTQ1ve1fp39uf/lEXPpFpOPL88LKnDBgbh7wkCp        m2KzLVGChf83MS0ShL6G9EQIAUxLm99VpgRjwqTQ/KfzGtpke1wqws4au0Ab4qPY        KXvMLSPLUp7cfulWvhmZSegr5AdhNw5KNizPqCJT8ZrGvgHypXyiFvvAH5YRtSsc        Zvo9GI2e2MaZyo9/lvb+LbLEJZKEQckqRj4P26gmASrZEPStwc+yqy1ShHLA0j6m        1QIDAQAB        -----END PUBLIC KEY-----" | sed 's/   */\n/g' > "/etc/apk/keys/sgerrand.rsa.pub" && \
-    wget "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
-      "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
-      "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
-    mv /etc/nsswitch.conf /etc/nsswitch.conf.bak && \
-    apk add --no-cache --force-overwrite  \
-      "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
-      "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
-      "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
-    mv /etc/nsswitch.conf.bak /etc/nsswitch.conf && \
-    rm "/etc/apk/keys/sgerrand.rsa.pub" && \
-    (/usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true) && \
-    echo "export LANG=$LANG" > /etc/profile.d/locale.sh && \
-    apk del glibc-i18n && \
-    apk del .build-dependencies && \
-    rm "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME"
+  echo "-----BEGIN PUBLIC KEY-----        MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApZ2u1KJKUu/fW4A25y9m        y70AGEa/J3Wi5ibNVGNn1gT1r0VfgeWd0pUybS4UmcHdiNzxJPgoWQhV2SSW1JYu        tOqKZF5QSN6X937PTUpNBjUvLtTQ1ve1fp39uf/lEXPpFpOPL88LKnDBgbh7wkCp        m2KzLVGChf83MS0ShL6G9EQIAUxLm99VpgRjwqTQ/KfzGtpke1wqws4au0Ab4qPY        KXvMLSPLUp7cfulWvhmZSegr5AdhNw5KNizPqCJT8ZrGvgHypXyiFvvAH5YRtSsc        Zvo9GI2e2MaZyo9/lvb+LbLEJZKEQckqRj4P26gmASrZEPStwc+yqy1ShHLA0j6m        1QIDAQAB        -----END PUBLIC KEY-----" | sed 's/   */\n/g' > "/etc/apk/keys/sgerrand.rsa.pub" && \
+  wget "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
+  "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
+  "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
+  mv /etc/nsswitch.conf /etc/nsswitch.conf.bak && \
+  apk add --no-cache --force-overwrite  \
+  "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
+  "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
+  "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
+  mv /etc/nsswitch.conf.bak /etc/nsswitch.conf && \
+  rm "/etc/apk/keys/sgerrand.rsa.pub" && \
+  (/usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true) && \
+  echo "export LANG=$LANG" > /etc/profile.d/locale.sh && \
+  apk del glibc-i18n && \
+  apk del .build-dependencies && \
+  rm "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME"
 
 RUN apk add --no-cache sqlite curl
 

package.json

@@ -5,9 +5,9 @@
   "author": "Amazee Labs <[email protected]>",
   "engines": {
     "node": "^18.19.0",
-    "pnpm": "8.6.12"
+    "pnpm": "8.15.9"
   },
-  "packageManager": "pnpm@8.6.12",
+  "packageManager": "pnpm@8.15.9",
   "scripts": {
     "postinstall": "husky install || true",
     "commit": "git-cz",