feat: migrate from yarn to pnpm

2024-07-02 11:13:29 +00:00 · 2022-03-30 18:04:58 +08:00 · 2022-03-30 18:04:58 +08:00 · da002c479d
parent 15c1bbca4f
commit da002c479d
17 changed files with 8311 additions and 7769 deletions
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@ -20,7 +20,7 @@
  },
  "scripts": {
    "vite": "vite",
-    "dev": "concurrently \"yarn tauri dev\" \"vite\"",
+    "dev": "concurrently \"pnpm tauri dev\" \"vite\"",
    "tauri": "tauri",
    "build": "vite build && tauri build"
  },
@ -33,6 +33,9 @@
    "@heroicons/react": "^1.0.4",
    "@radix-ui/react-dialog": "^0.1.5",
    "@radix-ui/react-slider": "^0.1.4",
+    "@sd/core": "*",
+    "@sd/state": "*",
+    "@sd/ui": "*",
    "@tauri-apps/api": "^1.0.0-beta.5",
    "@types/pretty-bytes": "^5.2.0",
    "@types/react-table": "^7.7.6",
@ -41,7 +44,7 @@
    "autoprefixer": "^9",
    "byte-size": "^8.1.0",
    "clsx": "^1.1.1",
-    "immer": "^9.0.6",
+    "immer": "^9.0.12",
    "jotai": "^1.6.0",
    "moment": "^2.29.1",
    "phosphor-react": "^1.3.1",
@ -53,6 +56,7 @@
    "react-hotkeys-hook": "^3.4.4",
    "react-json-view": "^1.21.3",
    "react-portal": "^4.2.1",
+    "react-query": "^3.34.16",
    "react-router": "6.2.1",
    "react-router-dom": "6.2.1",
    "react-spline": "^1.2.1",
@ -60,13 +64,10 @@
    "react-virtuoso": "^2.2.6",
    "rooks": "^5.7.1",
    "tailwindcss": "^3.0.7",
-    "@sd/ui": "*",
-    "@sd/state": "*",
-    "@sd/core": "*",
    "vite": "^2.4.4",
    "vite-plugin-filter-replace": "^0.1.9",
    "vite-plugin-react-svg": "^0.2.0",
    "vite-tsconfig-paths": "^3.3.13",
-    "zustand": "^3.5.13"
+    "zustand": "^3.7.1"
  }
 }
--- a/apps/desktop/src/components/file/Sidebar.tsx
+++ b/apps/desktop/src/components/file/Sidebar.tsx
@ -1,9 +1,9 @@
-import { DownloadIcon, LockClosedIcon } from '@heroicons/react/outline';
+import { LockClosedIcon } from '@heroicons/react/outline';
 import { CogIcon, EyeOffIcon, PlusIcon, ServerIcon } from '@heroicons/react/solid';
 import { appWindow } from '@tauri-apps/api/window';
 import clsx from 'clsx';
 import { CirclesFour, EjectSimple, MonitorPlay, Planet } from 'phosphor-react';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState }  from 'react';
 import { NavLink, NavLinkProps } from 'react-router-dom';
 import { TrafficLights } from '../os/TrafficLights';
 import { Button } from '../primitive';
--- a/apps/desktop/tsconfig.json
+++ b/apps/desktop/tsconfig.json
@ -1,8 +1,21 @@
 {
-    "extends": "@sd/config/tsconfig/tauri.json",
-    "include": ["src"],
-    "exclude": ["node_modules"],
  "compilerOptions": {
-    "jsx": "react"
-  }
-}
+    "target": "ESNext",
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "allowJs": false,
+    "skipLibCheck": false,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react",
+    "outDir": "dist"
+  },
+  "include": ["src"],
+  "exclude": ["node_modules"]
+}
--- a/package.json
+++ b/package.json
@ -3,10 +3,6 @@
  "version": "0.0.0",
  "private": true,
  "workspaces": {
-    "packages": [
-      "apps/*",
-      "packages/*"
-    ],
    "nohoist": [
      "**/react-native",
      "**/react-native/**",
@ -26,19 +22,19 @@
  },
  "scripts": {
    "build": "turbo run build",
-    "setup": "yarn && yarn db:gen && yarn dev",
+    "setup": "pnpm i && pnpm db:gen && pnpm dev",
    "dev": "turbo run dev --parallel --scope=@sd/desktop --scope=@sd/state --scope=@sd/ui",
    "db:migrate": "cd packages/core && prisma migrate dev",
    "db:gen": "cd packages/core && prisma generate",
    "lint": "turbo run lint",
    "format": "prettier --write \"**/*.{ts,tsx,md}\"",
-    "desktop": "yarn workspace @sd/desktop",
-    "mobile": "yarn workspace @sd/mobile",
-    "web": "yarn workspace @sd/web",
-    "core": "yarn workspace @sd/core",
-    "docs": "yarn workspace @sd/docs",
-    "state": "yarn workspace @sd/state",
-    "server": "yarn workspace @sd/server"
+    "desktop": "pnpm --filter @sd/desktop -- ",
+    "mobile": "pnpm --filter @sd/mobile -- ",
+    "web": "pnpm --filter @sd/web -- ",
+    "core": "pnpm --filter @sd/core -- ",
+    "docs": "pnpm --filter @sd/docs -- ",
+    "state": "pnpm --filter @sd/state -- ",
+    "server": "pnpm --filter @sd/server -- "
  },
  "devDependencies": {
    "prettier": "^2.5.1",
--- a/packages/config/tsconfig/tauri.json
+++ b/packages/config/tsconfig/tauri.json
@ -1,21 +0,0 @@
-{
-    "compilerOptions": {
-      "target": "ESNext",
-      "lib": ["DOM", "DOM.Iterable", "ESNext"],
-      "allowJs": false,
-      "skipLibCheck": false,
-      "esModuleInterop": false,
-      "allowSyntheticDefaultImports": true,
-      "strict": true,
-      "forceConsistentCasingInFileNames": true,
-      "module": "ESNext",
-      "moduleResolution": "Node",
-      "resolveJsonModule": true,
-      "isolatedModules": true,
-      "noEmit": true,
-      "jsx": "react",
-      "outDir": "dist"
-    },
-    "include": ["src"]
-  }
-  
--- a/packages/core/bindings/ClientCommand.ts
+++ b/packages/core/bindings/ClientCommand.ts
@ -1,2 +1,2 @@

-export type ClientCommand = { key: "FileRead", params: { id: bigint, } } | { key: "FileDelete", params: { id: bigint, } } | { key: "LibDelete", params: { id: bigint, } } | { key: "TagCreate", params: { name: string, color: string, } } | { key: "TagUpdate", params: { name: string, color: string, } } | { key: "TagAssign", params: { file_id: bigint, tag_id: bigint, } } | { key: "TagDelete", params: { id: bigint, } } | { key: "LocCreate", params: { path: string, } } | { key: "LocUpdate", params: { id: bigint, name: string | null, } } | { key: "LocDelete", params: { id: bigint, } } | { key: "SysVolumeUnmount", params: { id: bigint, } };
+export type ClientCommand = { key: "FileRead", params: { id: number, } } | { key: "FileDelete", params: { id: number, } } | { key: "LibDelete", params: { id: number, } } | { key: "TagCreate", params: { name: string, color: string, } } | { key: "TagUpdate", params: { name: string, color: string, } } | { key: "TagAssign", params: { file_id: number, tag_id: number, } } | { key: "TagDelete", params: { id: number, } } | { key: "LocCreate", params: { path: string, } } | { key: "LocUpdate", params: { id: number, name: string | null, } } | { key: "LocDelete", params: { id: number, } } | { key: "SysVolumeUnmount", params: { id: number, } } | { key: "GenerateThumbsForLocation", params: { id: number, } };
--- a/packages/core/bindings/ClientQuery.ts
+++ b/packages/core/bindings/ClientQuery.ts
@ -1,2 +1,2 @@

-export type ClientQuery = { key: "ClientGetState" } | { key: "SysGetVolumes" } | { key: "LibGetTags" } | { key: "JobGetRunning" } | { key: "JobGetHistory" } | { key: "SysGetLocation", params: { id: bigint, } } | { key: "LibGetExplorerDir", params: { path: string, limit: bigint, } };
+export type ClientQuery = { key: "ClientGetState" } | { key: "SysGetVolumes" } | { key: "LibGetTags" } | { key: "JobGetRunning" } | { key: "JobGetHistory" } | { key: "SysGetLocation", params: { id: number, } } | { key: "LibGetExplorerDir", params: { path: string, limit: number, } };
--- a/packages/core/bindings/File.ts
+++ b/packages/core/bindings/File.ts
@ -2,4 +2,4 @@ import type { EncryptionAlgorithm } from "./EncryptionAlgorithm";
 import type { FilePath } from "./FilePath";
 import type { FileType } from "./FileType";

-export interface File { id: bigint, id_hash: string, name: string, extension: string | null, checksum: string | null, size_in_bytes: string, encryption: EncryptionAlgorithm, file_type: FileType, date_created: string, date_modified: string, date_indexed: string, ipfs_id: string | null, file_paths: Array<FilePath>, }
+export interface File { id: number, partial_checksum: string, checksum: string | null, size_in_bytes: string, encryption: EncryptionAlgorithm, file_type: FileType, date_created: string, date_modified: string, date_indexed: string, ipfs_id: string | null, file_paths: Array<FilePath>, }
--- a/packages/core/bindings/FilePath.ts
+++ b/packages/core/bindings/FilePath.ts
@ -1,2 +1,2 @@

-export interface FilePath { id: bigint, is_dir: boolean, materialized_path: string, file_id: bigint | null, parent_id: bigint | null, location_id: bigint, date_indexed: string, permissions: string | null, }
+export interface FilePath { id: number, is_dir: boolean, location_id: number, materialized_path: string, file_id: number | null, parent_id: number | null, date_indexed: string, permissions: string | null, }
--- a/packages/core/bindings/JobReport.ts
+++ b/packages/core/bindings/JobReport.ts
@ -1,3 +1,3 @@
 import type { JobStatus } from "./JobStatus";

-export interface JobReport { id: string, date_created: string, date_modified: string, status: JobStatus, task_count: bigint, completed_task_count: bigint, message: string, seconds_elapsed: string, }
+export interface JobReport { id: string, date_created: string, date_modified: string, status: JobStatus, task_count: number, completed_task_count: number, message: string, seconds_elapsed: string, }
--- a/packages/core/bindings/LocationResource.ts
+++ b/packages/core/bindings/LocationResource.ts
@ -1,2 +1,2 @@

-export interface LocationResource { id: bigint, name: string | null, path: string | null, total_capacity: bigint | null, available_capacity: bigint | null, is_removable: boolean, is_ejectable: boolean, is_root_filesystem: boolean, is_online: boolean, date_created: string, }
+export interface LocationResource { id: number, name: string | null, path: string | null, total_capacity: number | null, available_capacity: number | null, is_removable: boolean, is_ejectable: boolean, is_root_filesystem: boolean, is_online: boolean, date_created: string, }
--- a/packages/state/package.json
+++ b/packages/state/package.json
@ -25,6 +25,8 @@
  },
  "dependencies": {
    "eventemitter3": "^4.0.7",
-    "react-query": "^3.34.16"
+    "immer": "^9.0.12",
+    "react-query": "^3.34.16",
+    "zustand": "^3.7.1"
  }
 }
--- a/packages/state/tsconfig.json
+++ b/packages/state/tsconfig.json
@ -1,12 +1,11 @@
 {
-    "compilerOptions": {
-        "lib": ["esnext"],
-        "module": "esnext",
-        "outDir": "./dist",
-        "rootDir": "./lib"
-      },
-    "extends": "@sd/config/tsconfig/base.json",
-    "include": ["**/*.ts"],
-    "exclude": ["node_modules", "dist"]
-  }
-  
+  "compilerOptions": {
+      "lib": ["esnext"],
+      "module": "esnext",
+      "outDir": "./dist",
+      "rootDir": "./lib"
+  },
+  "extends": "../config/tsconfig/base.json",
+  "include": ["**/*.ts"],
+  "exclude": ["node_modules", "dist"]
+}
--- a/packages/ui/tsconfig.json
+++ b/packages/ui/tsconfig.json
@ -1,5 +1,5 @@
 {
-  "extends": "@sd/config/tsconfig/react-library.json",
+  "extends": "../config/tsconfig/react-library.json",
  "include": ["."],
  "exclude": ["dist", "build", "node_modules"]
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@ -0,0 +1,3 @@
+packages:
+  - 'packages/*'
+  - 'apps/*'
--- a/yarn.lock
+++ b/yarn.lock