Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion oxlint.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ const restrictedImportRoots = [
"@/commands",
"@/components/layout",
"@/components/screens",
"@/components/dialogs",
];

const restrictedImportPatterns = restrictedImportRoots.flatMap((root) => [root, `${root}/**`]);
Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"@tauri-store/zustand": "^1.2.1",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"immer": "^11.1.15",
"lucide-react": "^1.27.0",
"radix-ui": "^1.6.7",
"react": "^19.2.8",
Expand All @@ -65,7 +64,6 @@
"@testing-library/jest-dom": "^7.0.0",
"@testing-library/react": "^16.3.2",
"@testing-library/user-event": "^14.6.1",
"@types/babel__core": "^7.20.5",
"@types/node": "^25.9.5",
"@types/react": "^19.2.17",
"@types/react-dom": "^19.2.3",
Expand Down
42 changes: 2 additions & 40 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 9 additions & 20 deletions src/features/preferences/stores/recentItems.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { create } from "zustand";
import { immer } from "zustand/middleware/immer";

import { isSamePath } from "@/lib/path";
import { createPersistedTauriStore, definePersistedState } from "@/lib/persistedTauriStore";
Expand Down Expand Up @@ -40,25 +39,15 @@ const addRecentPath = (items: string[], path: string) =>
? [path, ...items.filter((item) => !isSamePath(item, path))].slice(0, RECENT_ITEM_LIMIT)
: items;

export const useRecentItemsStore = create<RecentItemsStore>()(
immer((set) => ({
...createDefaultRecentItemsState(),
clearRecentItems: () =>
set((state) => {
state.recentFiles = [];
state.recentFolders = [];
}),
recordRecentFile: (path) =>
set((state) => {
state.recentFiles = addRecentPath(state.recentFiles, path);
}),
recordRecentFolder: (path) =>
set((state) => {
state.recentFolders = addRecentPath(state.recentFolders, path);
}),
reset: () => set(createDefaultRecentItemsState()),
})),
);
export const useRecentItemsStore = create<RecentItemsStore>()((set) => ({
...createDefaultRecentItemsState(),
clearRecentItems: () => set({ recentFiles: [], recentFolders: [] }),
recordRecentFile: (path) =>
set((state) => ({ recentFiles: addRecentPath(state.recentFiles, path) })),
recordRecentFolder: (path) =>
set((state) => ({ recentFolders: addRecentPath(state.recentFolders, path) })),
reset: () => set(createDefaultRecentItemsState()),
}));

export const recentItemsStoreTauriHandler = createPersistedTauriStore<RecentItemsState>(
"recent-items",
Expand Down
35 changes: 16 additions & 19 deletions src/features/preferences/stores/settings.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { create } from "zustand";
import { immer } from "zustand/middleware/immer";

import {
LINE_ENDINGS,
Expand Down Expand Up @@ -90,24 +89,22 @@ const SETTINGS_CONTRACT = definePersistedState({

export const sanitizeSettingsPersistedState = SETTINGS_CONTRACT.sanitize;

export const useSettingsStore = create<SettingsStore>()(
immer((set) => ({
...createDefaultSettingsState(),
version: SETTINGS_VERSION,

updateSetting: (key, value) =>
set((state) => {
(state as SettingsState)[key] = value;
}),

reset: () => {
set(() => ({
...createDefaultSettingsState(),
version: SETTINGS_VERSION,
}));
},
})),
);
export const useSettingsStore = create<SettingsStore>()((set) => ({
...createDefaultSettingsState(),
version: SETTINGS_VERSION,

updateSetting: (key, value) =>
set((state) => ({
...state,
[key]: value,
})),

reset: () =>
set({
...createDefaultSettingsState(),
version: SETTINGS_VERSION,
}),
}));

export const settingsStoreTauriHandler = createPersistedTauriStore<SettingsPersistedState>(
"settings",
Expand Down
11 changes: 4 additions & 7 deletions src/lib/async.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { CancellationError, CancellationToken, CancellationTokenSource } from "./cancellation";
import { type Disposable, MutableDisposable } from "./lifecycle";
import { runTaskAsPromise } from "./task";

export interface AsyncLazyOptions {
retryOnFailure?: boolean;
Expand Down Expand Up @@ -29,7 +28,7 @@ export class AsyncLazy<T> {

get value() {
if (!this.valuePromise) {
const nextValuePromise = runTaskAsPromise(this.task);
const nextValuePromise = Promise.try(this.task);
this.valuePromise = nextValuePromise;

if (this.options.retryOnFailure) {
Expand Down Expand Up @@ -111,7 +110,7 @@ export class TaskLimiter {
this.activeTaskCount += 1;

try {
const result = await runTaskAsPromise(task);
const result = await Promise.try(task);
this.finishTask();
resolve(result);
} catch (error) {
Expand Down Expand Up @@ -142,9 +141,7 @@ export class SequentialTaskQueue {
private tail: Promise<void> | null = null;

run<T>(task: () => T | PromiseLike<T>) {
const queuedTask = this.tail
? this.tail.then(() => runTaskAsPromise(task))
: runTaskAsPromise(task);
const queuedTask = this.tail ? this.tail.then(() => Promise.try(task)) : Promise.try(task);
const nextTail = queuedTask.then(ignorePromiseResult, ignorePromiseResult);
this.tail = nextTail;

Expand Down Expand Up @@ -258,7 +255,7 @@ export class DebouncedTaskRunner<T> implements Disposable {
this.activeRun = activeRun;

try {
const result = await runTaskAsPromise(() => this.runner(activeRun.cancellation.token));
const result = await Promise.try(() => this.runner(activeRun.cancellation.token));

if (this.activeRun === activeRun) {
activeRun.deferred.resolve(result);
Expand Down
3 changes: 1 addition & 2 deletions src/lib/cancellation.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { Disposable } from "./lifecycle";
import { Signal, SignalSource } from "./signal";
import { runTaskAsPromise } from "./task";

export interface CancellationToken {
readonly isCancellationRequested: boolean;
Expand Down Expand Up @@ -80,7 +79,7 @@ export const raceWithCancellation = async <T>(
});

try {
return await Promise.race([runTaskAsPromise(task), promise]);
return await Promise.race([Promise.try(task), promise]);
} finally {
listenerDisposable.dispose();
}
Expand Down
7 changes: 0 additions & 7 deletions src/lib/task.ts

This file was deleted.

3 changes: 0 additions & 3 deletions src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { enableArrayMethods, enableMapSet } from "immer";
import { StrictMode } from "react";
import ReactDOM from "react-dom/client";

Expand All @@ -7,8 +6,6 @@ import { installUnexpectedErrorDiagnostics } from "./features/diagnostics";
import { installUnexpectedErrorHandlers, invariant } from "./lib/errors";
import { Providers } from "./Providers";

enableArrayMethods();
enableMapSet();
const cleanupUnexpectedErrorHandlers = installUnexpectedErrorHandlers();
const cleanupUnexpectedErrorDiagnostics = installUnexpectedErrorDiagnostics();

Expand Down