From 0af8dbf63db595aafc843ac645bf6dd4d33bddfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Vasconcellos?= <vasconcellos.dev@gmail.com>
Date: Sat, 17 Aug 2024 21:47:30 +0000
Subject: [PATCH] Fix 0.4.2 release (#2670)

* Fix 0.4.2 release

* Fix server release

* Put npm bin dir in PATH before running pnpm prep during server build
---
 Cargo.lock                         | Bin 284373 -> 284373 bytes
 apps/desktop/src-tauri/Cargo.toml  |   2 +-
 apps/desktop/src-tauri/src/main.rs |   1 +
 apps/server/docker/Dockerfile      |  12 ++++++------
 core/Cargo.toml                    |   2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b32a3e8c2fac935f92faabfc504cdec5526e0a6e..56b4031454f98f92528c4f290f07578e997f9753 100644
GIT binary patch
delta 48
zcmcb*R`BXt!G;#bElkH>O+V<$C^r3mJR{p=1s|d9UtcjL^Mb|N^L{XG&-=lg9tQvo
C@D#)V

delta 48
zcmcb*R`BXt!G;#bElkH>O+OgMC_eo`JR|F51s|d9UtcjL^Mb|N^M5dH&;P-k76$+k
CHx%gr

diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml
index 712c0412a..dbf441ec7 100644
--- a/apps/desktop/src-tauri/Cargo.toml
+++ b/apps/desktop/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name    = "sd-desktop"
-version = "0.4.1"
+version = "0.4.2"
 
 authors              = ["Spacedrive Technology Inc <support@spacedrive.com>"]
 default-run          = "sd-desktop"
diff --git a/apps/desktop/src-tauri/src/main.rs b/apps/desktop/src-tauri/src/main.rs
index 7442bf8f6..b4fde3828 100644
--- a/apps/desktop/src-tauri/src/main.rs
+++ b/apps/desktop/src-tauri/src/main.rs
@@ -206,6 +206,7 @@ async fn main() -> tauri::Result<()> {
 		])
 		.events(collect_events![DragAndDropEvent]);
 
+	#[cfg(debug_assertions)]
 	builder
 		.export(
 			Typescript::default()
diff --git a/apps/server/docker/Dockerfile b/apps/server/docker/Dockerfile
index 3c2d7393a..c892f549b 100644
--- a/apps/server/docker/Dockerfile
+++ b/apps/server/docker/Dockerfile
@@ -3,7 +3,7 @@ ARG REPO_REF=main
 
 #--
 
-FROM debian:bookworm as base
+FROM debian:bookworm AS base
 
 ADD --chmod=644 --checksum=sha256:8bea540b2cd1a47c94555e746c75fd41a42847a46d8c8c36c7ab6dd9c8526ab4 \
 	https://gist.githubusercontent.com/HeavenVolkoff/ff7b77b9087f956b8df944772e93c071/raw \
@@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/
 
 #--
 
-FROM base as build-base
+FROM base AS build-base
 
 RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
 	apt-get install build-essential git sudo unzip wget curl python3 python-is-python3
@@ -44,7 +44,7 @@ WORKDIR /srv/spacedrive
 
 #--
 
-FROM build-base as web
+FROM build-base AS web
 
 # Run pnpm install with docker cache
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store --mount=type=cache,target=/root/.cache/pnpm/metadata \
@@ -56,7 +56,7 @@ RUN pnpm web build
 
 #--
 
-FROM build-base as server
+FROM build-base AS server
 
 RUN wget -qO- https://sh.rustup.rs | sh -s -- -yq --profile minimal
 
@@ -74,10 +74,10 @@ RUN curl -L# 'https://github.com/rui314/mold/releases/download/v2.4.0/mold-2.4.0
 RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
 	env CI=true ./scripts/setup.sh
 
-RUN cd ./scripts; npm i --production
+RUN cd ./scripts; npm i --omit=dev && npm i -g prisma
 
 RUN --mount=type=cache,target=/root/.cache/prisma/binaries/cli/ \
-	pnpm prep
+	env PATH="$(npm prefix -g)/bin:$PATH" pnpm prep
 
 COPY --from=web /srv/spacedrive/apps/web/dist /srv/spacedrive/apps/web/dist
 
diff --git a/core/Cargo.toml b/core/Cargo.toml
index b1170a3e6..cc499eae2 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name    = "sd-core"
-version = "0.4.1"
+version = "0.4.2"
 
 authors              = ["Spacedrive Technology Inc <support@spacedrive.com>"]
 description          = "Virtual distributed filesystem engine that powers Spacedrive."