Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

Merge branch 'upstream-main' into feat/appflowy_tauri_3

ascarbeka9c8bad599c6
diff --cc frontend/appflowy_tauri/package.json
index 80a652f162,18ec8c8de9..8ad6f3a410
--- a/frontend/appflowy_tauri/package.json
+++ b/frontend/appflowy_tauri/package.json
@@@ -9,13 -9,16 +9,16 @@@
"preview": "vite preview",
"format": "prettier --write .",
"test:code": "eslint --max-warnings=0 --ext .js,.ts,.tsx .",
- "test:errors": "eslint --quiet --ext .js,.ts,.tsx .",
+ "test:errors": "tsc --noEmit",
"test:prettier": "yarn prettier --list-different src",
"tauri:clean": "cargo make --cwd .. tauri_clean",
- "tauri:dev": "tauri dev",
- "test": "jest"
+ "tauri:dev": "tauri dev"
},
"dependencies": {
+ "@emotion/react": "^11.10.6",
+ "@emotion/styled": "^11.10.6",
+ "@mui/icons-material": "^5.11.11",
+ "@mui/material": "^5.11.12",
"@reduxjs/toolkit": "^1.9.2",
"@tauri-apps/api": "^1.2.0",
"google-protobuf": "^3.21.2",