+
What's next for Spacedrive?
diff --git a/apps/landing/src/app/team/TeamMember.tsx b/apps/landing/src/app/team/TeamMember.tsx
index 2b94540aa394..7dcf136c1eb2 100644
--- a/apps/landing/src/app/team/TeamMember.tsx
+++ b/apps/landing/src/app/team/TeamMember.tsx
@@ -1,4 +1,4 @@
-import { Dribbble, Github, Twitch, Twitter } from '@sd/assets/svgs/brands';
+import { Dribbble, Github, Gitlab, Twitch, Twitter } from '@sd/assets/svgs/brands';
import clsx from 'clsx';
import Image from 'next/image';
import NextLink from 'next/link';
@@ -19,6 +19,7 @@ export interface TeamMemberProps {
twitter?: string;
twitch?: string;
github?: string;
+ gitlab?: string;
dribbble?: string;
};
@@ -81,6 +82,11 @@ export function TeamMember(props: TeamMemberProps) {
What's next for Spacedrive?
diff --git a/apps/landing/src/app/team/TeamMember.tsx b/apps/landing/src/app/team/TeamMember.tsx
index 2b94540aa394..7dcf136c1eb2 100644
--- a/apps/landing/src/app/team/TeamMember.tsx
+++ b/apps/landing/src/app/team/TeamMember.tsx
@@ -1,4 +1,4 @@
-import { Dribbble, Github, Twitch, Twitter } from '@sd/assets/svgs/brands';
+import { Dribbble, Github, Gitlab, Twitch, Twitter } from '@sd/assets/svgs/brands';
import clsx from 'clsx';
import Image from 'next/image';
import NextLink from 'next/link';
@@ -19,6 +19,7 @@ export interface TeamMemberProps {
twitter?: string;
twitch?: string;
github?: string;
+ gitlab?: string;
dribbble?: string;
};
@@ -81,6 +82,11 @@ export function TeamMember(props: TeamMemberProps) {
= [
role: 'React Engineer & Designer',
imageUrl: '/images/team/vitor.jpg',
socials: {
- github: 'https://github.com/HeavenVolkoff'
+ github: 'https://github.com/HeavenVolkoff',
+ gitlab: 'https://gitlab.com/VitorVasconcellos',
+ twitter: 'https://x.com/vasvas10'
}
},
{
diff --git a/apps/landing/src/components/DocsLayout.tsx b/apps/landing/src/components/DocsLayout.tsx
index 9812a6c02406..55dcbdf0a855 100644
--- a/apps/landing/src/components/DocsLayout.tsx
+++ b/apps/landing/src/components/DocsLayout.tsx
@@ -1,4 +1,4 @@
-import { CaretRight, List, X } from '@phosphor-icons/react';
+import { CaretRight, List, X } from '@phosphor-icons/react/dist/ssr';
import { PropsWithChildren, useState } from 'react';
import { slide as Menu } from 'react-burger-menu';
import { Button } from '@sd/ui';
diff --git a/apps/landing/src/components/DownloadToday.tsx b/apps/landing/src/components/DownloadToday.tsx
index 851369551880..f165da894442 100644
--- a/apps/landing/src/components/DownloadToday.tsx
+++ b/apps/landing/src/components/DownloadToday.tsx
@@ -1,4 +1,4 @@
-import { Download } from '@phosphor-icons/react';
+import { Download } from '@phosphor-icons/react/dist/ssr';
import clsx from 'clsx';
import { useInView } from 'framer-motion';
import React, { useRef } from 'react';
diff --git a/apps/landing/src/components/HomeCTA.tsx b/apps/landing/src/components/HomeCTA.tsx
index 5cccec7d57aa..a9164daa715f 100644
--- a/apps/landing/src/components/HomeCTA.tsx
+++ b/apps/landing/src/components/HomeCTA.tsx
@@ -1,4 +1,4 @@
-import { IconProps } from '@phosphor-icons/react';
+import { type IconProps } from '@phosphor-icons/react';
import clsx from 'clsx';
import { Button, LinkButtonProps } from '@sd/ui';
diff --git a/apps/landing/src/components/MagicCard.tsx b/apps/landing/src/components/MagicCard.tsx
index e839ca6f748c..7212a1504829 100644
--- a/apps/landing/src/components/MagicCard.tsx
+++ b/apps/landing/src/components/MagicCard.tsx
@@ -1,7 +1,7 @@
'use client';
import clsx, { ClassValue } from 'clsx';
-import { CSSProperties, ReactNode, useEffect, useRef, useState } from 'react';
+import { CSSProperties, ReactNode, useCallback, useEffect, useRef, useState } from 'react';
import { twMerge } from 'tailwind-merge';
export function cn(...inputs: ClassValue[]) {
@@ -47,33 +47,14 @@ const MagicContainer = ({ children, className, style }: MagicContainerProps) =>
const containerSize = useRef<{ w: number; h: number }>({ w: 0, h: 0 });
const [boxes, setBoxes] = useState>([]);
- useEffect(() => {
- init();
- containerRef.current &&
- setBoxes(Array.from(containerRef.current.children).map((el) => el as HTMLElement));
- }, []);
-
- useEffect(() => {
- init();
- window.addEventListener('resize', init);
-
- return () => {
- window.removeEventListener('resize', init);
- };
- }, [setBoxes]);
-
- useEffect(() => {
- onMouseMove();
- }, [mousePosition]);
-
- const init = () => {
+ const init = useCallback(() => {
if (containerRef.current) {
containerSize.current.w = containerRef.current.offsetWidth;
containerSize.current.h = containerRef.current.offsetHeight;
}
- };
+ }, []);
- const onMouseMove = () => {
+ const onMouseMove = useCallback(() => {
if (containerRef.current) {
const rect = containerRef.current.getBoundingClientRect();
const { w, h } = containerSize.current;
@@ -96,7 +77,26 @@ const MagicContainer = ({ children, className, style }: MagicContainerProps) =>
}
});
}
- };
+ }, [boxes, mousePosition]);
+
+ useEffect(() => {
+ init();
+ containerRef.current &&
+ setBoxes(Array.from(containerRef.current.children).map((el) => el as HTMLElement));
+ }, [init]);
+
+ useEffect(() => {
+ init();
+ window.addEventListener('resize', init);
+
+ return () => {
+ window.removeEventListener('resize', init);
+ };
+ }, [setBoxes, init]);
+
+ useEffect(() => {
+ onMouseMove();
+ }, [mousePosition, onMouseMove]);
return (
diff --git a/apps/landing/src/components/Markdown.tsx b/apps/landing/src/components/Markdown.tsx
index 19b06695c132..755ff7966f95 100644
--- a/apps/landing/src/components/Markdown.tsx
+++ b/apps/landing/src/components/Markdown.tsx
@@ -12,7 +12,7 @@ function MarkdownPage(props: PropsWithChildren) {
diff --git a/apps/landing/src/components/NavBar.tsx b/apps/landing/src/components/NavBar.tsx
index f3851c0735f2..2c96d9f76215 100644
--- a/apps/landing/src/components/NavBar.tsx
+++ b/apps/landing/src/components/NavBar.tsx
@@ -1,4 +1,4 @@
-import { Book, Chat, DotsThreeVertical, MapPin, User } from '@phosphor-icons/react';
+import { Book, Chat, DotsThreeVertical, MapPin, User } from '@phosphor-icons/react/dist/ssr';
import { Academia, Discord, Github } from '@sd/assets/svgs/brands';
import clsx from 'clsx';
import Image from 'next/image';
diff --git a/apps/landing/src/components/NewBanner.tsx b/apps/landing/src/components/NewBanner.tsx
index 20af83ab3e6e..8d1dd0d5430c 100644
--- a/apps/landing/src/components/NewBanner.tsx
+++ b/apps/landing/src/components/NewBanner.tsx
@@ -1,4 +1,4 @@
-import { Newspaper } from '@phosphor-icons/react';
+import { Newspaper } from '@phosphor-icons/react/dist/ssr';
import clsx from 'clsx';
import Link from 'next/link';
diff --git a/apps/landing/src/components/PageWrapper.tsx b/apps/landing/src/components/PageWrapper.tsx
index 5184fb5b0b23..4dacca4278ab 100644
--- a/apps/landing/src/components/PageWrapper.tsx
+++ b/apps/landing/src/components/PageWrapper.tsx
@@ -3,7 +3,7 @@ import NavBar from './NavBar';
export default function PageWrapper({ children }: { children: React.ReactNode }) {
return (
-
+
{children}
diff --git a/apps/landing/src/components/Space.tsx b/apps/landing/src/components/Space.tsx
index bf55b9078ab2..822d14b4bf0d 100644
--- a/apps/landing/src/components/Space.tsx
+++ b/apps/landing/src/components/Space.tsx
@@ -5,7 +5,6 @@ import { Canvas, useFrame } from '@react-three/fiber';
import { inSphere as randomInSphere } from 'maath/random';
import { useRef, useState } from 'react';
import { Color, type Mesh } from 'three';
-import { hasWebGLContext } from '~/utils/util';
const Stars = (props: any) => {
const ref = useRef();
diff --git a/apps/landing/src/env.ts b/apps/landing/src/env.ts
index 9f0e78963e06..ce45fef61a7f 100644
--- a/apps/landing/src/env.ts
+++ b/apps/landing/src/env.ts
@@ -12,9 +12,9 @@ export const env = createEnv({
AWS_SES_ACCESS_KEY: z.string(),
AWS_SES_SECRET_KEY: z.string(),
AWS_SES_REGION: z.string(),
- MAILER_FROM: z.string().default('Spacedrive '),
- GITHUB_ORG: z.string().default('spacedriveapp'),
- GITHUB_REPO: z.string().default('spacedrive'),
+ MAILER_FROM: z.string(),
+ GITHUB_ORG: z.string(),
+ GITHUB_REPO: z.string(),
SLACK_SIGNING_SECRET: z.string(),
SLACK_RELEASES_CHANNEL: z.string()
},
@@ -23,15 +23,15 @@ export const env = createEnv({
DATABASE_URL: process.env.DATABASE_URL,
SLACK_FEEDBACK_URL: process.env.SLACK_FEEDBACK_URL,
AUTH_SECRET: process.env.AUTH_SECRET,
- GITHUB_PAT: process.env.GITHUB_PAT,
+ GITHUB_PAT: process.env.GITHUB_PAT || process.env.GITHUB_TOKEN,
GITHUB_CLIENT_ID: process.env.GITHUB_CLIENT_ID,
GITHUB_SECRET: process.env.GITHUB_SECRET,
AWS_SES_ACCESS_KEY: process.env.AWS_SES_ACCESS_KEY,
AWS_SES_SECRET_KEY: process.env.AWS_SES_SECRET_KEY,
AWS_SES_REGION: process.env.AWS_SES_REGION,
- MAILER_FROM: process.env.MAILER_FROM,
- GITHUB_ORG: process.env.GITHUB_ORG,
- GITHUB_REPO: process.env.GITHUB_REPO,
+ MAILER_FROM: process.env.MAILER_FROM || 'Spacedrive ',
+ GITHUB_ORG: process.env.GITHUB_ORG || 'spacedriveapp',
+ GITHUB_REPO: process.env.GITHUB_REPO || 'spacedrive',
SLACK_SIGNING_SECRET: process.env.SLACK_SIGNING_SECRET,
SLACK_RELEASES_CHANNEL: process.env.SLACK_RELEASES_CHANNEL
},
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index 00fde306a561..95bcd98ab928 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -28,9 +28,9 @@
"@sd/assets": "workspace:*",
"@sd/client": "workspace:*",
"@shopify/flash-list": "1.5.0",
- "@tanstack/react-query": "^4.35",
- "class-variance-authority": "^0.5.3",
- "dayjs": "^1.11.8",
+ "@tanstack/react-query": "^4.36.1",
+ "class-variance-authority": "^0.7.0",
+ "dayjs": "^1.11.10",
"event-target-polyfill": "^0.0.3",
"expo": "~49.0.8",
"expo-build-properties": "~0.8.3",
@@ -57,14 +57,14 @@
"twrnc": "^3.6.4",
"use-count-up": "^3.0.1",
"use-debounce": "^9.0.4",
- "valtio": "^1.10.4",
+ "valtio": "^1.11.2",
"zod": "~3.22.4"
},
"devDependencies": {
"@babel/core": "^7.23.2",
- "@rnx-kit/metro-config": "^1.3.9",
+ "@rnx-kit/metro-config": "^1.3.11",
"@sd/config": "workspace:*",
- "@types/react": "^18.2.28",
+ "@types/react": "^18.2.31",
"babel-plugin-module-resolver": "^5.0.0",
"eslint-plugin-react-native": "^4.1.0",
"react-native-svg-transformer": "^1.1.0",
diff --git a/apps/mobile/src/App.tsx b/apps/mobile/src/App.tsx
index ef3395be62bf..2381757700ed 100644
--- a/apps/mobile/src/App.tsx
+++ b/apps/mobile/src/App.tsx
@@ -75,7 +75,7 @@ function AppNavigation() {
}, 270 * 1000);
return () => clearInterval(interval);
- }, []);
+ }, [plausibleEvent]);
if (library === null && libraries.data) {
currentLibraryStore.id = libraries.data[0]?.uuid ?? null;
diff --git a/apps/mobile/src/screens/Search.tsx b/apps/mobile/src/screens/Search.tsx
index 8526a8d55058..c0bdd09a6247 100644
--- a/apps/mobile/src/screens/Search.tsx
+++ b/apps/mobile/src/screens/Search.tsx
@@ -42,10 +42,12 @@ const SearchScreen = ({ navigation }: RootStackScreenProps<'Search'>) => {
// Mobile does not thave media layout
// if (explorerStore.layoutMode !== 'media') return items;
- return items?.filter((item) => {
- const { kind } = getExplorerItemData(item);
- return kind === 'Video' || kind === 'Image';
- });
+ return (
+ items?.filter((item) => {
+ const { kind } = getExplorerItemData(item);
+ return kind === 'Video' || kind === 'Image';
+ }) ?? []
+ );
}, [query.data]);
return (
diff --git a/apps/server/docker/Dockerfile b/apps/server/docker/Dockerfile
index 9baaba88dde7..275d8946864e 100644
--- a/apps/server/docker/Dockerfile
+++ b/apps/server/docker/Dockerfile
@@ -1,18 +1,16 @@
ARG REPO=spacedriveapp/spacedrive
ARG REPO_REF=main
-ARG DEBIAN_FRONTEND=noninteractive
#--
FROM debian:bookworm as base
-ARG DEBIAN_FRONTEND
-
ADD https://gist.githubusercontent.com/HeavenVolkoff/ff7b77b9087f956b8df944772e93c071/raw \
/etc/apt/apt.conf.d/99docker-apt-config
-RUN rm -f /etc/apt/apt.conf.d/docker-clean; \
- echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+
+RUN rm -f /etc/apt/apt.conf.d/docker-clean
RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
apt-get update && apt-get upgrade
@@ -21,8 +19,6 @@ RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/
FROM base as build-base
-ARG DEBIAN_FRONTEND
-
RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
apt-get install build-essential git sudo unzip wget
diff --git a/apps/storybook/.storybook/preview.ts b/apps/storybook/.storybook/preview.ts
index eb1ab4236765..79860c5ecc4d 100644
--- a/apps/storybook/.storybook/preview.ts
+++ b/apps/storybook/.storybook/preview.ts
@@ -1,6 +1,6 @@
import type { Preview } from '@storybook/react';
-import '@sd/ui/style.scss';
+import '@sd/ui/style/style.scss';
const preview: Preview = {
parameters: {
diff --git a/apps/storybook/package.json b/apps/storybook/package.json
index a2ba241d2485..06237ac4f84b 100644
--- a/apps/storybook/package.json
+++ b/apps/storybook/package.json
@@ -6,30 +6,30 @@
"build-storybook": "storybook build"
},
"dependencies": {
- "@storybook/addon-essentials": "^7.0.5",
- "@storybook/addon-interactions": "^7.0.5",
- "@storybook/addon-links": "^7.0.5",
- "@storybook/addon-styling": "^1.0.6",
- "@storybook/blocks": "^7.0.5",
- "@storybook/react": "^7.0.5",
- "@storybook/react-vite": "^7.0.5",
- "@storybook/testing-library": "^0.1.0",
- "postcss-pseudo-companion-classes": "^0.1.1",
+ "@storybook/addon-essentials": "^7.5.1",
+ "@storybook/addon-interactions": "^7.5.1",
+ "@storybook/addon-links": "^7.5.1",
+ "@storybook/addon-styling": "^1.3.7",
+ "@storybook/blocks": "^7.5.1",
+ "@storybook/react": "^7.5.1",
+ "@storybook/react-vite": "^7.5.1",
+ "@storybook/testing-library": "^0.2.2",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
+ "postcss-pseudo-companion-classes": "^0.1.1",
"@sd/config": "workspace:*",
"@sd/ui": "workspace:*",
- "@types/react": "^18.2.28",
- "@types/react-dom": "^18.2.13",
+ "@types/react": "^18.2.31",
+ "@types/react-dom": "^18.2.14",
"@vitejs/plugin-react": "^4.1.0",
"autoprefixer": "^10.4.16",
"postcss": "^8.4.31",
"prop-types": "^15.8.1",
- "storybook": "^7.4.6",
+ "storybook": "^7.5.1",
"tailwindcss": "^3.3.3",
"typescript": "^5.2.2",
- "vite": "^4.4.11"
+ "vite": "^4.5.0"
}
}
diff --git a/apps/web/dist/.gitignore b/apps/web/dist/.gitignore
index f08c3af2fb8a..c53272268a25 100644
--- a/apps/web/dist/.gitignore
+++ b/apps/web/dist/.gitignore
@@ -2,4 +2,4 @@
*
# Except this file
!.gitignore
-# This is done so that `include_dir` never complains that '../dist does not exist'
+# This is done so that Tauri never complains that '../dist does not exist'
diff --git a/apps/web/package.json b/apps/web/package.json
index fb7e76502ffc..b41908891284 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -10,29 +10,29 @@
"typecheck": "tsc -b"
},
"dependencies": {
- "@fontsource/inter": "^4.5.13",
+ "@fontsource/inter": "^4.5.15",
"@rspc/client": "=0.0.0-main-799eec5d",
"@sd/client": "workspace:*",
"@sd/interface": "workspace:*",
- "@tanstack/react-query": "^4.35",
+ "@tanstack/react-query": "^4.36.1",
"html-to-image": "^1.11.11",
"html2canvas": "^1.4.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
- "react-router-dom": "6.9.0"
+ "react-router-dom": "6.17.0"
},
"devDependencies": {
"@playwright/test": "^1.39.0",
"@sd/config": "workspace:*",
"@sd/ui": "workspace:*",
- "@types/react": "^18.2.28",
- "@types/react-dom": "^18.2.13",
+ "@types/react": "^18.2.31",
+ "@types/react-dom": "^18.2.14",
"@vitejs/plugin-react": "^4.1.0",
"autoprefixer": "^10.4.16",
"postcss": "^8.4.31",
"rollup-plugin-visualizer": "^5.9.2",
"typescript": "^5.2.2",
- "vite": "^4.4.11",
+ "vite": "^4.5.0",
"vite-plugin-html": "^3.2.0",
"vite-plugin-svgr": "^3.3.0",
"vite-tsconfig-paths": "^4.2.1"
diff --git a/apps/web/src/index.html b/apps/web/src/index.html
index 696b4d475156..ab7161d30911 100644
--- a/apps/web/src/index.html
+++ b/apps/web/src/index.html
@@ -5,6 +5,10 @@
Spacedrive
+
diff --git a/crates/sync/example/web/package.json b/crates/sync/example/web/package.json
index e219e9a5f9e8..5e8a0fcda4e8 100644
--- a/crates/sync/example/web/package.json
+++ b/crates/sync/example/web/package.json
@@ -9,17 +9,17 @@
"typecheck": "tsc --noEmit"
},
"license": "MIT",
- "devDependencies": {
- "@tanstack/react-query": "^4.35",
- "@vitejs/plugin-react": "^4.1",
- "typescript": "^5.2",
- "vite": "^4.4"
- },
"dependencies": {
- "clsx": "^1.2.1",
+ "clsx": "^2.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
- "solid-js": "^1.5.1",
- "tailwindcss": "^3.3.2"
+ "solid-js": "^1.8.3"
+ },
+ "devDependencies": {
+ "@tanstack/react-query": "^4.36.1",
+ "@vitejs/plugin-react": "^4.1",
+ "typescript": "^5.2.2",
+ "vite": "^4.5.0",
+ "tailwindcss": "^3.3.3"
}
}
diff --git a/interface/ErrorFallback.tsx b/interface/ErrorFallback.tsx
index d31f3bee42d7..c1f5b2ab4a15 100644
--- a/interface/ErrorFallback.tsx
+++ b/interface/ErrorFallback.tsx
@@ -82,7 +82,7 @@ export function ErrorPage({
data-tauri-drag-region
role="alert"
className={
- 'flex h-screen w-screen flex-col items-center justify-center border border-app-divider p-4' +
+ 'flex h-screen w-screen flex-col items-center justify-center border border-app-divider bg-app p-4' +
(isMacOS ? ' rounded-lg' : '')
}
>
diff --git a/interface/app/$libraryId/Explorer/Inspector/Note.tsx b/interface/app/$libraryId/Explorer/Inspector/Note.tsx
index 86cc5eddf98e..d7906450ffab 100644
--- a/interface/app/$libraryId/Explorer/Inspector/Note.tsx
+++ b/interface/app/$libraryId/Explorer/Inspector/Note.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
import { useDebouncedCallback } from 'use-debounce';
import { Object as SDObject, useLibraryMutation } from '@sd/client';
import { Divider, TextArea } from '@sd/ui';
@@ -13,8 +13,7 @@ interface Props {
export default function Note(props: Props) {
const setNote = useLibraryMutation('files.setNote');
- const explorerStore = useExplorerStore();
-
+ const flush = useRef<() => void>();
const debouncedSetNote = useDebouncedCallback((note: string) => {
setNote.mutate({
id: props.data.id,
@@ -22,8 +21,11 @@ export default function Note(props: Props) {
});
}, 500);
+ // Don't need to wrap in a arrow func because flush is not a method
+ flush.current = debouncedSetNote.flush;
+
// Force update when component unmounts
- useEffect(() => () => debouncedSetNote.flush(), []);
+ useEffect(() => () => flush.current?.(), []);
const [cachedNote, setCachedNote] = useState(props.data.note);
diff --git a/interface/app/$libraryId/Explorer/QuickPreview/index.tsx b/interface/app/$libraryId/Explorer/QuickPreview/index.tsx
index b93fba969a95..cf35c57009ce 100644
--- a/interface/app/$libraryId/Explorer/QuickPreview/index.tsx
+++ b/interface/app/$libraryId/Explorer/QuickPreview/index.tsx
@@ -83,7 +83,7 @@ export const QuickPreview = () => {
[explorer.selectedItems, open]
);
- const item = useMemo(() => items[itemIndex], [items, itemIndex]);
+ const item = useMemo(() => items[itemIndex] ?? null, [items, itemIndex]);
const renameFile = useLibraryMutation(['files.renameFile'], {
onError: () => setNewName(null),
@@ -570,9 +570,9 @@ const IconButton = ({
return (
diff --git a/apps/landing/src/components/Markdown.tsx b/apps/landing/src/components/Markdown.tsx
index 19b06695c132..755ff7966f95 100644
--- a/apps/landing/src/components/Markdown.tsx
+++ b/apps/landing/src/components/Markdown.tsx
@@ -12,7 +12,7 @@ function MarkdownPage(props: PropsWithChildren) {
diff --git a/apps/landing/src/components/NavBar.tsx b/apps/landing/src/components/NavBar.tsx
index f3851c0735f2..2c96d9f76215 100644
--- a/apps/landing/src/components/NavBar.tsx
+++ b/apps/landing/src/components/NavBar.tsx
@@ -1,4 +1,4 @@
-import { Book, Chat, DotsThreeVertical, MapPin, User } from '@phosphor-icons/react';
+import { Book, Chat, DotsThreeVertical, MapPin, User } from '@phosphor-icons/react/dist/ssr';
import { Academia, Discord, Github } from '@sd/assets/svgs/brands';
import clsx from 'clsx';
import Image from 'next/image';
diff --git a/apps/landing/src/components/NewBanner.tsx b/apps/landing/src/components/NewBanner.tsx
index 20af83ab3e6e..8d1dd0d5430c 100644
--- a/apps/landing/src/components/NewBanner.tsx
+++ b/apps/landing/src/components/NewBanner.tsx
@@ -1,4 +1,4 @@
-import { Newspaper } from '@phosphor-icons/react';
+import { Newspaper } from '@phosphor-icons/react/dist/ssr';
import clsx from 'clsx';
import Link from 'next/link';
diff --git a/apps/landing/src/components/PageWrapper.tsx b/apps/landing/src/components/PageWrapper.tsx
index 5184fb5b0b23..4dacca4278ab 100644
--- a/apps/landing/src/components/PageWrapper.tsx
+++ b/apps/landing/src/components/PageWrapper.tsx
@@ -3,7 +3,7 @@ import NavBar from './NavBar';
export default function PageWrapper({ children }: { children: React.ReactNode }) {
return (
-
+
{children}
diff --git a/apps/landing/src/components/Space.tsx b/apps/landing/src/components/Space.tsx
index bf55b9078ab2..822d14b4bf0d 100644
--- a/apps/landing/src/components/Space.tsx
+++ b/apps/landing/src/components/Space.tsx
@@ -5,7 +5,6 @@ import { Canvas, useFrame } from '@react-three/fiber';
import { inSphere as randomInSphere } from 'maath/random';
import { useRef, useState } from 'react';
import { Color, type Mesh } from 'three';
-import { hasWebGLContext } from '~/utils/util';
const Stars = (props: any) => {
const ref = useRef();
diff --git a/apps/landing/src/env.ts b/apps/landing/src/env.ts
index 9f0e78963e06..ce45fef61a7f 100644
--- a/apps/landing/src/env.ts
+++ b/apps/landing/src/env.ts
@@ -12,9 +12,9 @@ export const env = createEnv({
AWS_SES_ACCESS_KEY: z.string(),
AWS_SES_SECRET_KEY: z.string(),
AWS_SES_REGION: z.string(),
- MAILER_FROM: z.string().default('Spacedrive '),
- GITHUB_ORG: z.string().default('spacedriveapp'),
- GITHUB_REPO: z.string().default('spacedrive'),
+ MAILER_FROM: z.string(),
+ GITHUB_ORG: z.string(),
+ GITHUB_REPO: z.string(),
SLACK_SIGNING_SECRET: z.string(),
SLACK_RELEASES_CHANNEL: z.string()
},
@@ -23,15 +23,15 @@ export const env = createEnv({
DATABASE_URL: process.env.DATABASE_URL,
SLACK_FEEDBACK_URL: process.env.SLACK_FEEDBACK_URL,
AUTH_SECRET: process.env.AUTH_SECRET,
- GITHUB_PAT: process.env.GITHUB_PAT,
+ GITHUB_PAT: process.env.GITHUB_PAT || process.env.GITHUB_TOKEN,
GITHUB_CLIENT_ID: process.env.GITHUB_CLIENT_ID,
GITHUB_SECRET: process.env.GITHUB_SECRET,
AWS_SES_ACCESS_KEY: process.env.AWS_SES_ACCESS_KEY,
AWS_SES_SECRET_KEY: process.env.AWS_SES_SECRET_KEY,
AWS_SES_REGION: process.env.AWS_SES_REGION,
- MAILER_FROM: process.env.MAILER_FROM,
- GITHUB_ORG: process.env.GITHUB_ORG,
- GITHUB_REPO: process.env.GITHUB_REPO,
+ MAILER_FROM: process.env.MAILER_FROM || 'Spacedrive ',
+ GITHUB_ORG: process.env.GITHUB_ORG || 'spacedriveapp',
+ GITHUB_REPO: process.env.GITHUB_REPO || 'spacedrive',
SLACK_SIGNING_SECRET: process.env.SLACK_SIGNING_SECRET,
SLACK_RELEASES_CHANNEL: process.env.SLACK_RELEASES_CHANNEL
},
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index 00fde306a561..95bcd98ab928 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -28,9 +28,9 @@
"@sd/assets": "workspace:*",
"@sd/client": "workspace:*",
"@shopify/flash-list": "1.5.0",
- "@tanstack/react-query": "^4.35",
- "class-variance-authority": "^0.5.3",
- "dayjs": "^1.11.8",
+ "@tanstack/react-query": "^4.36.1",
+ "class-variance-authority": "^0.7.0",
+ "dayjs": "^1.11.10",
"event-target-polyfill": "^0.0.3",
"expo": "~49.0.8",
"expo-build-properties": "~0.8.3",
@@ -57,14 +57,14 @@
"twrnc": "^3.6.4",
"use-count-up": "^3.0.1",
"use-debounce": "^9.0.4",
- "valtio": "^1.10.4",
+ "valtio": "^1.11.2",
"zod": "~3.22.4"
},
"devDependencies": {
"@babel/core": "^7.23.2",
- "@rnx-kit/metro-config": "^1.3.9",
+ "@rnx-kit/metro-config": "^1.3.11",
"@sd/config": "workspace:*",
- "@types/react": "^18.2.28",
+ "@types/react": "^18.2.31",
"babel-plugin-module-resolver": "^5.0.0",
"eslint-plugin-react-native": "^4.1.0",
"react-native-svg-transformer": "^1.1.0",
diff --git a/apps/mobile/src/App.tsx b/apps/mobile/src/App.tsx
index ef3395be62bf..2381757700ed 100644
--- a/apps/mobile/src/App.tsx
+++ b/apps/mobile/src/App.tsx
@@ -75,7 +75,7 @@ function AppNavigation() {
}, 270 * 1000);
return () => clearInterval(interval);
- }, []);
+ }, [plausibleEvent]);
if (library === null && libraries.data) {
currentLibraryStore.id = libraries.data[0]?.uuid ?? null;
diff --git a/apps/mobile/src/screens/Search.tsx b/apps/mobile/src/screens/Search.tsx
index 8526a8d55058..c0bdd09a6247 100644
--- a/apps/mobile/src/screens/Search.tsx
+++ b/apps/mobile/src/screens/Search.tsx
@@ -42,10 +42,12 @@ const SearchScreen = ({ navigation }: RootStackScreenProps<'Search'>) => {
// Mobile does not thave media layout
// if (explorerStore.layoutMode !== 'media') return items;
- return items?.filter((item) => {
- const { kind } = getExplorerItemData(item);
- return kind === 'Video' || kind === 'Image';
- });
+ return (
+ items?.filter((item) => {
+ const { kind } = getExplorerItemData(item);
+ return kind === 'Video' || kind === 'Image';
+ }) ?? []
+ );
}, [query.data]);
return (
diff --git a/apps/server/docker/Dockerfile b/apps/server/docker/Dockerfile
index 9baaba88dde7..275d8946864e 100644
--- a/apps/server/docker/Dockerfile
+++ b/apps/server/docker/Dockerfile
@@ -1,18 +1,16 @@
ARG REPO=spacedriveapp/spacedrive
ARG REPO_REF=main
-ARG DEBIAN_FRONTEND=noninteractive
#--
FROM debian:bookworm as base
-ARG DEBIAN_FRONTEND
-
ADD https://gist.githubusercontent.com/HeavenVolkoff/ff7b77b9087f956b8df944772e93c071/raw \
/etc/apt/apt.conf.d/99docker-apt-config
-RUN rm -f /etc/apt/apt.conf.d/docker-clean; \
- echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+
+RUN rm -f /etc/apt/apt.conf.d/docker-clean
RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
apt-get update && apt-get upgrade
@@ -21,8 +19,6 @@ RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/
FROM base as build-base
-ARG DEBIAN_FRONTEND
-
RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
apt-get install build-essential git sudo unzip wget
diff --git a/apps/storybook/.storybook/preview.ts b/apps/storybook/.storybook/preview.ts
index eb1ab4236765..79860c5ecc4d 100644
--- a/apps/storybook/.storybook/preview.ts
+++ b/apps/storybook/.storybook/preview.ts
@@ -1,6 +1,6 @@
import type { Preview } from '@storybook/react';
-import '@sd/ui/style.scss';
+import '@sd/ui/style/style.scss';
const preview: Preview = {
parameters: {
diff --git a/apps/storybook/package.json b/apps/storybook/package.json
index a2ba241d2485..06237ac4f84b 100644
--- a/apps/storybook/package.json
+++ b/apps/storybook/package.json
@@ -6,30 +6,30 @@
"build-storybook": "storybook build"
},
"dependencies": {
- "@storybook/addon-essentials": "^7.0.5",
- "@storybook/addon-interactions": "^7.0.5",
- "@storybook/addon-links": "^7.0.5",
- "@storybook/addon-styling": "^1.0.6",
- "@storybook/blocks": "^7.0.5",
- "@storybook/react": "^7.0.5",
- "@storybook/react-vite": "^7.0.5",
- "@storybook/testing-library": "^0.1.0",
- "postcss-pseudo-companion-classes": "^0.1.1",
+ "@storybook/addon-essentials": "^7.5.1",
+ "@storybook/addon-interactions": "^7.5.1",
+ "@storybook/addon-links": "^7.5.1",
+ "@storybook/addon-styling": "^1.3.7",
+ "@storybook/blocks": "^7.5.1",
+ "@storybook/react": "^7.5.1",
+ "@storybook/react-vite": "^7.5.1",
+ "@storybook/testing-library": "^0.2.2",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
+ "postcss-pseudo-companion-classes": "^0.1.1",
"@sd/config": "workspace:*",
"@sd/ui": "workspace:*",
- "@types/react": "^18.2.28",
- "@types/react-dom": "^18.2.13",
+ "@types/react": "^18.2.31",
+ "@types/react-dom": "^18.2.14",
"@vitejs/plugin-react": "^4.1.0",
"autoprefixer": "^10.4.16",
"postcss": "^8.4.31",
"prop-types": "^15.8.1",
- "storybook": "^7.4.6",
+ "storybook": "^7.5.1",
"tailwindcss": "^3.3.3",
"typescript": "^5.2.2",
- "vite": "^4.4.11"
+ "vite": "^4.5.0"
}
}
diff --git a/apps/web/dist/.gitignore b/apps/web/dist/.gitignore
index f08c3af2fb8a..c53272268a25 100644
--- a/apps/web/dist/.gitignore
+++ b/apps/web/dist/.gitignore
@@ -2,4 +2,4 @@
*
# Except this file
!.gitignore
-# This is done so that `include_dir` never complains that '../dist does not exist'
+# This is done so that Tauri never complains that '../dist does not exist'
diff --git a/apps/web/package.json b/apps/web/package.json
index fb7e76502ffc..b41908891284 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -10,29 +10,29 @@
"typecheck": "tsc -b"
},
"dependencies": {
- "@fontsource/inter": "^4.5.13",
+ "@fontsource/inter": "^4.5.15",
"@rspc/client": "=0.0.0-main-799eec5d",
"@sd/client": "workspace:*",
"@sd/interface": "workspace:*",
- "@tanstack/react-query": "^4.35",
+ "@tanstack/react-query": "^4.36.1",
"html-to-image": "^1.11.11",
"html2canvas": "^1.4.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
- "react-router-dom": "6.9.0"
+ "react-router-dom": "6.17.0"
},
"devDependencies": {
"@playwright/test": "^1.39.0",
"@sd/config": "workspace:*",
"@sd/ui": "workspace:*",
- "@types/react": "^18.2.28",
- "@types/react-dom": "^18.2.13",
+ "@types/react": "^18.2.31",
+ "@types/react-dom": "^18.2.14",
"@vitejs/plugin-react": "^4.1.0",
"autoprefixer": "^10.4.16",
"postcss": "^8.4.31",
"rollup-plugin-visualizer": "^5.9.2",
"typescript": "^5.2.2",
- "vite": "^4.4.11",
+ "vite": "^4.5.0",
"vite-plugin-html": "^3.2.0",
"vite-plugin-svgr": "^3.3.0",
"vite-tsconfig-paths": "^4.2.1"
diff --git a/apps/web/src/index.html b/apps/web/src/index.html
index 696b4d475156..ab7161d30911 100644
--- a/apps/web/src/index.html
+++ b/apps/web/src/index.html
@@ -5,6 +5,10 @@
Spacedrive
+
diff --git a/crates/sync/example/web/package.json b/crates/sync/example/web/package.json
index e219e9a5f9e8..5e8a0fcda4e8 100644
--- a/crates/sync/example/web/package.json
+++ b/crates/sync/example/web/package.json
@@ -9,17 +9,17 @@
"typecheck": "tsc --noEmit"
},
"license": "MIT",
- "devDependencies": {
- "@tanstack/react-query": "^4.35",
- "@vitejs/plugin-react": "^4.1",
- "typescript": "^5.2",
- "vite": "^4.4"
- },
"dependencies": {
- "clsx": "^1.2.1",
+ "clsx": "^2.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
- "solid-js": "^1.5.1",
- "tailwindcss": "^3.3.2"
+ "solid-js": "^1.8.3"
+ },
+ "devDependencies": {
+ "@tanstack/react-query": "^4.36.1",
+ "@vitejs/plugin-react": "^4.1",
+ "typescript": "^5.2.2",
+ "vite": "^4.5.0",
+ "tailwindcss": "^3.3.3"
}
}
diff --git a/interface/ErrorFallback.tsx b/interface/ErrorFallback.tsx
index d31f3bee42d7..c1f5b2ab4a15 100644
--- a/interface/ErrorFallback.tsx
+++ b/interface/ErrorFallback.tsx
@@ -82,7 +82,7 @@ export function ErrorPage({
data-tauri-drag-region
role="alert"
className={
- 'flex h-screen w-screen flex-col items-center justify-center border border-app-divider p-4' +
+ 'flex h-screen w-screen flex-col items-center justify-center border border-app-divider bg-app p-4' +
(isMacOS ? ' rounded-lg' : '')
}
>
diff --git a/interface/app/$libraryId/Explorer/Inspector/Note.tsx b/interface/app/$libraryId/Explorer/Inspector/Note.tsx
index 86cc5eddf98e..d7906450ffab 100644
--- a/interface/app/$libraryId/Explorer/Inspector/Note.tsx
+++ b/interface/app/$libraryId/Explorer/Inspector/Note.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
import { useDebouncedCallback } from 'use-debounce';
import { Object as SDObject, useLibraryMutation } from '@sd/client';
import { Divider, TextArea } from '@sd/ui';
@@ -13,8 +13,7 @@ interface Props {
export default function Note(props: Props) {
const setNote = useLibraryMutation('files.setNote');
- const explorerStore = useExplorerStore();
-
+ const flush = useRef<() => void>();
const debouncedSetNote = useDebouncedCallback((note: string) => {
setNote.mutate({
id: props.data.id,
@@ -22,8 +21,11 @@ export default function Note(props: Props) {
});
}, 500);
+ // Don't need to wrap in a arrow func because flush is not a method
+ flush.current = debouncedSetNote.flush;
+
// Force update when component unmounts
- useEffect(() => () => debouncedSetNote.flush(), []);
+ useEffect(() => () => flush.current?.(), []);
const [cachedNote, setCachedNote] = useState(props.data.note);
diff --git a/interface/app/$libraryId/Explorer/QuickPreview/index.tsx b/interface/app/$libraryId/Explorer/QuickPreview/index.tsx
index b93fba969a95..cf35c57009ce 100644
--- a/interface/app/$libraryId/Explorer/QuickPreview/index.tsx
+++ b/interface/app/$libraryId/Explorer/QuickPreview/index.tsx
@@ -83,7 +83,7 @@ export const QuickPreview = () => {
[explorer.selectedItems, open]
);
- const item = useMemo(() => items[itemIndex], [items, itemIndex]);
+ const item = useMemo(() => items[itemIndex] ?? null, [items, itemIndex]);
const renameFile = useLibraryMutation(['files.renameFile'], {
onError: () => setNewName(null),
@@ -570,9 +570,9 @@ const IconButton = ({
return (