From 8a7393a9613b26cb4485592a3ae49318339eb305 Mon Sep 17 00:00:00 2001 From: DarkSky <25152247+darkskygit@users.noreply.github.com> Date: Fri, 10 Feb 2023 20:41:01 +0800 Subject: [PATCH] chore: move client folders (#948) --- .github/deployment/Dockerfile | 2 +- .github/workflows/build-test-version.yml | 4 +- .github/workflows/build.yml | 10 +- .github/workflows/client-app.yml | 4 +- .github/workflows/publish.yml | 4 +- .gitignore | 4 +- .gitmodules | 5 +- .vscode/settings.json | 2 +- {client-app => apps/desktop}/README.md | 2 +- {client-app => apps/desktop}/index.html | 0 {client-app => apps/desktop}/package.json | 2 +- {client-app => apps/desktop}/pnpm-lock.yaml | 0 .../desktop}/scripts/buildAffine.mjs | 2 +- .../desktop}/scripts/buildSubModules.mjs | 0 .../generateTsTypingsFromJsonSchema.mjs | 0 apps/desktop/src-OctoBase | 1 + .../desktop}/src-tauri/.gitignore | 0 .../desktop}/src-tauri/Cargo.lock | 0 .../desktop}/src-tauri/Cargo.toml | 0 .../desktop}/src-tauri/build.rs | 0 .../src-tauri/examples/generate-jsonschema.rs | 0 .../desktop}/src-tauri/icons/128x128.png | Bin .../desktop}/src-tauri/icons/128x128@2x.png | Bin .../desktop}/src-tauri/icons/32x32.png | Bin .../src-tauri/icons/Square107x107Logo.png | Bin .../src-tauri/icons/Square142x142Logo.png | Bin .../src-tauri/icons/Square150x150Logo.png | Bin .../src-tauri/icons/Square284x284Logo.png | Bin .../src-tauri/icons/Square30x30Logo.png | Bin .../src-tauri/icons/Square310x310Logo.png | Bin .../src-tauri/icons/Square44x44Logo.png | Bin .../src-tauri/icons/Square71x71Logo.png | Bin .../src-tauri/icons/Square89x89Logo.png | Bin .../desktop}/src-tauri/icons/StoreLogo.png | Bin .../desktop}/src-tauri/icons/icon.icns | Bin .../desktop}/src-tauri/icons/icon.ico | Bin .../desktop}/src-tauri/rustfmt.toml | 0 .../desktop}/src-tauri/src/commands.rs | 0 .../desktop}/src-tauri/src/commands/blob.rs | 0 .../src-tauri/src/commands/document.rs | 0 .../desktop}/src-tauri/src/commands/user.rs | 0 .../src-tauri/src/commands/workspace.rs | 0 .../desktop}/src-tauri/src/main.rs | 0 .../desktop}/src-tauri/src/state.rs | 0 .../desktop}/src-tauri/tauri.conf.json | 0 .../desktop}/src-tauri/types/Cargo.toml | 0 .../desktop}/src-tauri/types/src/blob.rs | 0 .../desktop}/src-tauri/types/src/document.rs | 0 .../desktop}/src-tauri/types/src/lib.rs | 0 .../desktop}/src-tauri/types/src/user.rs | 0 .../desktop}/src-tauri/types/src/workspace.rs | 0 .../desktop}/src/preload/Readme.md | 0 .../desktop}/src/preload/index.ts | 0 .../desktop}/src/preload/type.ts | 0 {client-app => apps/desktop}/tsconfig.json | 0 {client-app => apps/desktop}/vite.config.ts | 0 .../app => apps/web}/.env.local.template | 0 {packages/app => apps/web}/CHANGELOG.md | 0 {packages/app => apps/web}/README.md | 0 {packages/app => apps/web}/next-env.d.ts | 0 {packages/app => apps/web}/next.config.js | 7 +- {packages/app => apps/web}/package.json | 0 {packages/app => apps/web}/public/.gitignore | 0 .../web}/public/apple-touch-icon.png | Bin .../web}/public/chrome-192x192.png | Bin {packages/app => apps/web}/public/favicon.ico | Bin {packages/app => apps/web}/public/globals.css | 0 .../app => apps/web}/public/manifest.json | 0 .../app => apps/web}/public/variable.css | 0 .../web}/scripts/__tests__/printer.spec.ts | 0 {packages/app => apps/web}/scripts/gitInfo.js | 0 {packages/app => apps/web}/scripts/printer.js | 0 .../web}/src/components/404/index.tsx | 0 .../web}/src/components/404/styles.ts | 0 .../src/components/contact-modal/Icons.tsx | 0 .../contact-modal/affine-text-logo.png | Bin .../web}/src/components/contact-modal/bg.png | Bin .../src/components/contact-modal/index.tsx | 0 .../src/components/contact-modal/style.ts | 0 .../src/components/create-workspace/index.tsx | 0 .../src/components/delete-workspace/index.tsx | 0 .../src/components/edgeless-toolbar/Icons.tsx | 0 .../src/components/edgeless-toolbar/index.tsx | 0 .../src/components/edgeless-toolbar/reply.svg | 0 .../src/components/edgeless-toolbar/style.ts | 0 .../components/editor-mode-switch/Icons.tsx | 0 .../components/editor-mode-switch/index.tsx | 0 .../components/editor-mode-switch/style.ts | 0 .../src/components/editor-mode-switch/type.ts | 0 .../web}/src/components/editor/index.tsx | 0 .../enable-workspace/EnableWorkspaceModal.tsx | 0 .../src/components/enable-workspace/index.tsx | 0 .../web}/src/components/file-upload/index.tsx | 0 .../src/components/header/EditorHeader.tsx | 0 .../web}/src/components/header/Header.tsx | 0 .../src/components/header/PageListHeader.tsx | 0 .../components/header/QuickSearchButton.tsx | 0 .../header-right-items/EditorOptionMenu.tsx | 0 .../header/header-right-items/SyncUser.tsx | 0 .../header-right-items/TrashButtonGroup.tsx | 0 .../theme-mode-switch/Icons.tsx | 0 .../theme-mode-switch/index.tsx | 0 .../theme-mode-switch/style.ts | 0 .../web}/src/components/header/index.tsx | 0 .../web}/src/components/header/styles.ts | 0 .../web}/src/components/header/utils.tsx | 0 .../web}/src/components/help-island/Icons.tsx | 0 .../web}/src/components/help-island/index.tsx | 0 .../web}/src/components/help-island/style.ts | 0 .../web}/src/components/import/index.tsx | 2 +- .../web}/src/components/import/styles.ts | 0 .../web}/src/components/loading/Loading.tsx | 0 .../src/components/loading/PageLoading.tsx | 0 .../web}/src/components/loading/index.tsx | 0 .../web}/src/components/loading/styled.ts | 0 .../src/components/login-modal/GoogleIcon.tsx | 0 .../web}/src/components/login-modal/index.tsx | 0 .../web}/src/components/logout-modal/icon.tsx | 0 .../src/components/logout-modal/index.tsx | 0 .../web}/src/components/mobile-modal/bg.png | Bin .../src/components/mobile-modal/index.tsx | 0 .../src/components/mobile-modal/styles.ts | 0 .../src/components/page-list/DateCell.tsx | 0 .../web}/src/components/page-list/Empty.tsx | 0 .../components/page-list/OperationCell.tsx | 0 .../web}/src/components/page-list/index.tsx | 0 .../web}/src/components/page-list/styles.ts | 0 .../web}/src/components/provider-composer.ts | 0 .../src/components/quick-search/Footer.tsx | 0 .../src/components/quick-search/Input.tsx | 0 .../components/quick-search/NoResultSVG.tsx | 0 .../quick-search/PublishedResults.tsx | 0 .../src/components/quick-search/Results.tsx | 0 .../src/components/quick-search/config.ts | 0 .../src/components/quick-search/index.tsx | 0 .../web}/src/components/quick-search/style.ts | 0 .../src/components/shortcuts-modal/Icons.tsx | 0 .../src/components/shortcuts-modal/config.ts | 0 .../src/components/shortcuts-modal/index.tsx | 0 .../src/components/shortcuts-modal/style.ts | 0 .../src/components/simple-counter/index.ts | 0 .../components/workspace-avatar/Avatar.tsx | 0 .../workspace-avatar/WorkspaceUnitAvatar.tsx | 0 .../src/components/workspace-avatar/index.ts | 0 .../src/components/workspace-layout/index.tsx | 0 .../src/components/workspace-layout/styles.ts | 0 .../src/components/workspace-modal/Footer.tsx | 0 .../workspace-modal/SelectLanguageMenu.tsx | 0 .../workspace-modal/WorkspaceCard.tsx | 0 .../workspace-modal/icons/index.tsx | 0 .../src/components/workspace-modal/index.tsx | 0 .../src/components/workspace-modal/styles.ts | 0 .../workspace-setting/ExportPage.tsx | 0 .../workspace-setting/PublishPage.tsx | 0 .../components/workspace-setting/SyncPage.tsx | 0 .../workspace-setting/general/General.tsx | 0 .../general/delete/Delete.tsx | 0 .../workspace-setting/general/delete/index.ts | 0 .../workspace-setting/general/delete/style.ts | 0 .../workspace-setting/general/icons.tsx | 0 .../workspace-setting/general/index.ts | 0 .../workspace-setting/general/leave/Leave.tsx | 0 .../workspace-setting/general/leave/index.ts | 0 .../workspace-setting/general/leave/style.ts | 0 .../workspace-setting/general/style.ts | 0 .../src/components/workspace-setting/index.ts | 0 .../member/InviteMemberModal.tsx | 0 .../workspace-setting/member/MembersPage.tsx | 0 .../workspace-setting/member/index.ts | 0 .../workspace-setting/member/style.ts | 0 .../src/components/workspace-setting/style.ts | 0 .../WorkspaceItem/ListItem.tsx | 0 .../WorkspaceItem/LoginItem.tsx | 0 .../WorkspaceSelector/WorkspaceItem/index.ts | 0 .../WorkspaceSelector/WorkspaceItem/styles.ts | 0 .../WorkspaceSelector/WorkspaceSelector.tsx | 0 .../WorkspaceSelector/index.ts | 0 .../WorkspaceSelector/styles.ts | 0 .../components/workspace-slider-bar/icons.tsx | 0 .../workspace-slider-bar/icons/Icons.tsx | 0 .../components/workspace-slider-bar/index.tsx | 0 .../components/workspace-slider-bar/style.ts | 0 {packages/app => apps/web}/src/globals.d.ts | 0 .../web}/src/hooks/use-change-page-meta.ts | 0 .../web}/src/hooks/use-current-page-meta.ts | 0 .../web}/src/hooks/use-ensure-workspace.ts | 0 .../web}/src/hooks/use-history-update.ts | 0 .../web}/src/hooks/use-local-storage.ts | 0 .../app => apps/web}/src/hooks/use-members.ts | 0 .../web}/src/hooks/use-page-helper.ts | 0 .../web}/src/hooks/use-props-updated.ts | 0 .../web}/src/hooks/use-workspace-helper.ts | 0 {packages/app => apps/web}/src/pages/404.tsx | 0 {packages/app => apps/web}/src/pages/_app.tsx | 0 .../app => apps/web}/src/pages/_document.tsx | 0 .../app => apps/web}/src/pages/index.tsx | 0 .../web}/src/pages/invite/[invite_code].tsx | 0 .../[workspaceId]/[pageId].tsx | 0 .../public-workspace/[workspaceId]/index.tsx | 0 .../app => apps/web}/src/pages/temporary.css | 0 .../workspace/[workspaceId]/[pageId].tsx | 0 .../src/pages/workspace/[workspaceId]/all.tsx | 0 .../workspace/[workspaceId]/favorite.tsx | 0 .../pages/workspace/[workspaceId]/index.tsx | 0 .../workspace/[workspaceId]/playground.tsx | 0 .../pages/workspace/[workspaceId]/setting.tsx | 0 .../pages/workspace/[workspaceId]/trash.tsx | 0 .../web}/src/pages/workspace/index.tsx | 0 .../web}/src/providers/ConfirmProvider.tsx | 0 .../web}/src/providers/ThemeProvider.tsx | 0 .../providers/app-state-provider/Provider.tsx | 0 .../src/providers/app-state-provider/index.ts | 0 .../providers/app-state-provider/interface.ts | 0 .../src/providers/app-state-provider/utils.ts | 0 .../web}/src/store/globalModal/index.tsx | 0 .../web}/src/templates/AFFiNE-Docs.md | 0 .../Welcome-to-AFFiNE-Abbey-Alpha-Wood.md | 0 .../Welcome-to-AFFiNE-Alpha-Downhills.md | 0 .../templates/Welcome-to-the-AFFiNE-Alpha.md | 0 {packages/app => apps/web}/src/types.ts | 0 .../src/utils/__tests__/get-is-mobile.spec.ts | 0 .../app => apps/web}/src/utils/colors.ts | 0 {packages/app => apps/web}/src/utils/env.ts | 0 .../web}/src/utils/get-is-mobile.ts | 0 {packages/app => apps/web}/src/utils/index.ts | 0 .../web}/src/utils/print-build-info.ts | 0 {packages/app => apps/web}/src/utils/tools.ts | 0 .../app => apps/web}/src/utils/useragent.ts | 0 {packages/app => apps/web}/tsconfig.json | 2 +- benchmarks/README.md | 3 - client-app/src-OctoBase | 1 - packages/component/.storybook/main.js | 2 +- pnpm-lock.yaml | 264 ++++++------------ pnpm-workspace.yaml | 4 +- tests/console.spec.ts | 2 +- 235 files changed, 114 insertions(+), 215 deletions(-) rename {client-app => apps/desktop}/README.md (88%) rename {client-app => apps/desktop}/index.html (100%) rename {client-app => apps/desktop}/package.json (97%) rename {client-app => apps/desktop}/pnpm-lock.yaml (100%) rename {client-app => apps/desktop}/scripts/buildAffine.mjs (94%) rename {client-app => apps/desktop}/scripts/buildSubModules.mjs (100%) rename {client-app => apps/desktop}/scripts/generateTsTypingsFromJsonSchema.mjs (100%) create mode 160000 apps/desktop/src-OctoBase rename {client-app => apps/desktop}/src-tauri/.gitignore (100%) rename {client-app => apps/desktop}/src-tauri/Cargo.lock (100%) rename {client-app => apps/desktop}/src-tauri/Cargo.toml (100%) rename {client-app => apps/desktop}/src-tauri/build.rs (100%) rename {client-app => apps/desktop}/src-tauri/examples/generate-jsonschema.rs (100%) rename {client-app => apps/desktop}/src-tauri/icons/128x128.png (100%) rename {client-app => apps/desktop}/src-tauri/icons/128x128@2x.png (100%) rename {client-app => apps/desktop}/src-tauri/icons/32x32.png (100%) rename {client-app => apps/desktop}/src-tauri/icons/Square107x107Logo.png (100%) rename {client-app => apps/desktop}/src-tauri/icons/Square142x142Logo.png (100%) rename {client-app => apps/desktop}/src-tauri/icons/Square150x150Logo.png (100%) rename {client-app => apps/desktop}/src-tauri/icons/Square284x284Logo.png (100%) rename {client-app => apps/desktop}/src-tauri/icons/Square30x30Logo.png (100%) rename {client-app => apps/desktop}/src-tauri/icons/Square310x310Logo.png (100%) rename {client-app => apps/desktop}/src-tauri/icons/Square44x44Logo.png (100%) rename {client-app => apps/desktop}/src-tauri/icons/Square71x71Logo.png (100%) rename {client-app => apps/desktop}/src-tauri/icons/Square89x89Logo.png (100%) rename {client-app => apps/desktop}/src-tauri/icons/StoreLogo.png (100%) rename {client-app => apps/desktop}/src-tauri/icons/icon.icns (100%) rename {client-app => apps/desktop}/src-tauri/icons/icon.ico (100%) rename {client-app => apps/desktop}/src-tauri/rustfmt.toml (100%) rename {client-app => apps/desktop}/src-tauri/src/commands.rs (100%) rename {client-app => apps/desktop}/src-tauri/src/commands/blob.rs (100%) rename {client-app => apps/desktop}/src-tauri/src/commands/document.rs (100%) rename {client-app => apps/desktop}/src-tauri/src/commands/user.rs (100%) rename {client-app => apps/desktop}/src-tauri/src/commands/workspace.rs (100%) rename {client-app => apps/desktop}/src-tauri/src/main.rs (100%) rename {client-app => apps/desktop}/src-tauri/src/state.rs (100%) rename {client-app => apps/desktop}/src-tauri/tauri.conf.json (100%) rename {client-app => apps/desktop}/src-tauri/types/Cargo.toml (100%) rename {client-app => apps/desktop}/src-tauri/types/src/blob.rs (100%) rename {client-app => apps/desktop}/src-tauri/types/src/document.rs (100%) rename {client-app => apps/desktop}/src-tauri/types/src/lib.rs (100%) rename {client-app => apps/desktop}/src-tauri/types/src/user.rs (100%) rename {client-app => apps/desktop}/src-tauri/types/src/workspace.rs (100%) rename {client-app => apps/desktop}/src/preload/Readme.md (100%) rename {client-app => apps/desktop}/src/preload/index.ts (100%) rename {client-app => apps/desktop}/src/preload/type.ts (100%) rename {client-app => apps/desktop}/tsconfig.json (100%) rename {client-app => apps/desktop}/vite.config.ts (100%) rename {packages/app => apps/web}/.env.local.template (100%) rename {packages/app => apps/web}/CHANGELOG.md (100%) rename {packages/app => apps/web}/README.md (100%) rename {packages/app => apps/web}/next-env.d.ts (100%) rename {packages/app => apps/web}/next.config.js (93%) rename {packages/app => apps/web}/package.json (100%) rename {packages/app => apps/web}/public/.gitignore (100%) rename {packages/app => apps/web}/public/apple-touch-icon.png (100%) rename {packages/app => apps/web}/public/chrome-192x192.png (100%) rename {packages/app => apps/web}/public/favicon.ico (100%) rename {packages/app => apps/web}/public/globals.css (100%) rename {packages/app => apps/web}/public/manifest.json (100%) rename {packages/app => apps/web}/public/variable.css (100%) rename {packages/app => apps/web}/scripts/__tests__/printer.spec.ts (100%) rename {packages/app => apps/web}/scripts/gitInfo.js (100%) rename {packages/app => apps/web}/scripts/printer.js (100%) rename {packages/app => apps/web}/src/components/404/index.tsx (100%) rename {packages/app => apps/web}/src/components/404/styles.ts (100%) rename {packages/app => apps/web}/src/components/contact-modal/Icons.tsx (100%) rename {packages/app => apps/web}/src/components/contact-modal/affine-text-logo.png (100%) rename {packages/app => apps/web}/src/components/contact-modal/bg.png (100%) rename {packages/app => apps/web}/src/components/contact-modal/index.tsx (100%) rename {packages/app => apps/web}/src/components/contact-modal/style.ts (100%) rename {packages/app => apps/web}/src/components/create-workspace/index.tsx (100%) rename {packages/app => apps/web}/src/components/delete-workspace/index.tsx (100%) rename {packages/app => apps/web}/src/components/edgeless-toolbar/Icons.tsx (100%) rename {packages/app => apps/web}/src/components/edgeless-toolbar/index.tsx (100%) rename {packages/app => apps/web}/src/components/edgeless-toolbar/reply.svg (100%) rename {packages/app => apps/web}/src/components/edgeless-toolbar/style.ts (100%) rename {packages/app => apps/web}/src/components/editor-mode-switch/Icons.tsx (100%) rename {packages/app => apps/web}/src/components/editor-mode-switch/index.tsx (100%) rename {packages/app => apps/web}/src/components/editor-mode-switch/style.ts (100%) rename {packages/app => apps/web}/src/components/editor-mode-switch/type.ts (100%) rename {packages/app => apps/web}/src/components/editor/index.tsx (100%) rename {packages/app => apps/web}/src/components/enable-workspace/EnableWorkspaceModal.tsx (100%) rename {packages/app => apps/web}/src/components/enable-workspace/index.tsx (100%) rename {packages/app => apps/web}/src/components/file-upload/index.tsx (100%) rename {packages/app => apps/web}/src/components/header/EditorHeader.tsx (100%) rename {packages/app => apps/web}/src/components/header/Header.tsx (100%) rename {packages/app => apps/web}/src/components/header/PageListHeader.tsx (100%) rename {packages/app => apps/web}/src/components/header/QuickSearchButton.tsx (100%) rename {packages/app => apps/web}/src/components/header/header-right-items/EditorOptionMenu.tsx (100%) rename {packages/app => apps/web}/src/components/header/header-right-items/SyncUser.tsx (100%) rename {packages/app => apps/web}/src/components/header/header-right-items/TrashButtonGroup.tsx (100%) rename {packages/app => apps/web}/src/components/header/header-right-items/theme-mode-switch/Icons.tsx (100%) rename {packages/app => apps/web}/src/components/header/header-right-items/theme-mode-switch/index.tsx (100%) rename {packages/app => apps/web}/src/components/header/header-right-items/theme-mode-switch/style.ts (100%) rename {packages/app => apps/web}/src/components/header/index.tsx (100%) rename {packages/app => apps/web}/src/components/header/styles.ts (100%) rename {packages/app => apps/web}/src/components/header/utils.tsx (100%) rename {packages/app => apps/web}/src/components/help-island/Icons.tsx (100%) rename {packages/app => apps/web}/src/components/help-island/index.tsx (100%) rename {packages/app => apps/web}/src/components/help-island/style.ts (100%) rename {packages/app => apps/web}/src/components/import/index.tsx (99%) rename {packages/app => apps/web}/src/components/import/styles.ts (100%) rename {packages/app => apps/web}/src/components/loading/Loading.tsx (100%) rename {packages/app => apps/web}/src/components/loading/PageLoading.tsx (100%) rename {packages/app => apps/web}/src/components/loading/index.tsx (100%) rename {packages/app => apps/web}/src/components/loading/styled.ts (100%) rename {packages/app => apps/web}/src/components/login-modal/GoogleIcon.tsx (100%) rename {packages/app => apps/web}/src/components/login-modal/index.tsx (100%) rename {packages/app => apps/web}/src/components/logout-modal/icon.tsx (100%) rename {packages/app => apps/web}/src/components/logout-modal/index.tsx (100%) rename {packages/app => apps/web}/src/components/mobile-modal/bg.png (100%) rename {packages/app => apps/web}/src/components/mobile-modal/index.tsx (100%) rename {packages/app => apps/web}/src/components/mobile-modal/styles.ts (100%) rename {packages/app => apps/web}/src/components/page-list/DateCell.tsx (100%) rename {packages/app => apps/web}/src/components/page-list/Empty.tsx (100%) rename {packages/app => apps/web}/src/components/page-list/OperationCell.tsx (100%) rename {packages/app => apps/web}/src/components/page-list/index.tsx (100%) rename {packages/app => apps/web}/src/components/page-list/styles.ts (100%) rename {packages/app => apps/web}/src/components/provider-composer.ts (100%) rename {packages/app => apps/web}/src/components/quick-search/Footer.tsx (100%) rename {packages/app => apps/web}/src/components/quick-search/Input.tsx (100%) rename {packages/app => apps/web}/src/components/quick-search/NoResultSVG.tsx (100%) rename {packages/app => apps/web}/src/components/quick-search/PublishedResults.tsx (100%) rename {packages/app => apps/web}/src/components/quick-search/Results.tsx (100%) rename {packages/app => apps/web}/src/components/quick-search/config.ts (100%) rename {packages/app => apps/web}/src/components/quick-search/index.tsx (100%) rename {packages/app => apps/web}/src/components/quick-search/style.ts (100%) rename {packages/app => apps/web}/src/components/shortcuts-modal/Icons.tsx (100%) rename {packages/app => apps/web}/src/components/shortcuts-modal/config.ts (100%) rename {packages/app => apps/web}/src/components/shortcuts-modal/index.tsx (100%) rename {packages/app => apps/web}/src/components/shortcuts-modal/style.ts (100%) rename {packages/app => apps/web}/src/components/simple-counter/index.ts (100%) rename {packages/app => apps/web}/src/components/workspace-avatar/Avatar.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-avatar/WorkspaceUnitAvatar.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-avatar/index.ts (100%) rename {packages/app => apps/web}/src/components/workspace-layout/index.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-layout/styles.ts (100%) rename {packages/app => apps/web}/src/components/workspace-modal/Footer.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-modal/SelectLanguageMenu.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-modal/WorkspaceCard.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-modal/icons/index.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-modal/index.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-modal/styles.ts (100%) rename {packages/app => apps/web}/src/components/workspace-setting/ExportPage.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-setting/PublishPage.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-setting/SyncPage.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-setting/general/General.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-setting/general/delete/Delete.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-setting/general/delete/index.ts (100%) rename {packages/app => apps/web}/src/components/workspace-setting/general/delete/style.ts (100%) rename {packages/app => apps/web}/src/components/workspace-setting/general/icons.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-setting/general/index.ts (100%) rename {packages/app => apps/web}/src/components/workspace-setting/general/leave/Leave.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-setting/general/leave/index.ts (100%) rename {packages/app => apps/web}/src/components/workspace-setting/general/leave/style.ts (100%) rename {packages/app => apps/web}/src/components/workspace-setting/general/style.ts (100%) rename {packages/app => apps/web}/src/components/workspace-setting/index.ts (100%) rename {packages/app => apps/web}/src/components/workspace-setting/member/InviteMemberModal.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-setting/member/MembersPage.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-setting/member/index.ts (100%) rename {packages/app => apps/web}/src/components/workspace-setting/member/style.ts (100%) rename {packages/app => apps/web}/src/components/workspace-setting/style.ts (100%) rename {packages/app => apps/web}/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/ListItem.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/LoginItem.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/index.ts (100%) rename {packages/app => apps/web}/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/styles.ts (100%) rename {packages/app => apps/web}/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-slider-bar/WorkspaceSelector/index.ts (100%) rename {packages/app => apps/web}/src/components/workspace-slider-bar/WorkspaceSelector/styles.ts (100%) rename {packages/app => apps/web}/src/components/workspace-slider-bar/icons.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-slider-bar/icons/Icons.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-slider-bar/index.tsx (100%) rename {packages/app => apps/web}/src/components/workspace-slider-bar/style.ts (100%) rename {packages/app => apps/web}/src/globals.d.ts (100%) rename {packages/app => apps/web}/src/hooks/use-change-page-meta.ts (100%) rename {packages/app => apps/web}/src/hooks/use-current-page-meta.ts (100%) rename {packages/app => apps/web}/src/hooks/use-ensure-workspace.ts (100%) rename {packages/app => apps/web}/src/hooks/use-history-update.ts (100%) rename {packages/app => apps/web}/src/hooks/use-local-storage.ts (100%) rename {packages/app => apps/web}/src/hooks/use-members.ts (100%) rename {packages/app => apps/web}/src/hooks/use-page-helper.ts (100%) rename {packages/app => apps/web}/src/hooks/use-props-updated.ts (100%) rename {packages/app => apps/web}/src/hooks/use-workspace-helper.ts (100%) rename {packages/app => apps/web}/src/pages/404.tsx (100%) rename {packages/app => apps/web}/src/pages/_app.tsx (100%) rename {packages/app => apps/web}/src/pages/_document.tsx (100%) rename {packages/app => apps/web}/src/pages/index.tsx (100%) rename {packages/app => apps/web}/src/pages/invite/[invite_code].tsx (100%) rename {packages/app => apps/web}/src/pages/public-workspace/[workspaceId]/[pageId].tsx (100%) rename {packages/app => apps/web}/src/pages/public-workspace/[workspaceId]/index.tsx (100%) rename {packages/app => apps/web}/src/pages/temporary.css (100%) rename {packages/app => apps/web}/src/pages/workspace/[workspaceId]/[pageId].tsx (100%) rename {packages/app => apps/web}/src/pages/workspace/[workspaceId]/all.tsx (100%) rename {packages/app => apps/web}/src/pages/workspace/[workspaceId]/favorite.tsx (100%) rename {packages/app => apps/web}/src/pages/workspace/[workspaceId]/index.tsx (100%) rename {packages/app => apps/web}/src/pages/workspace/[workspaceId]/playground.tsx (100%) rename {packages/app => apps/web}/src/pages/workspace/[workspaceId]/setting.tsx (100%) rename {packages/app => apps/web}/src/pages/workspace/[workspaceId]/trash.tsx (100%) rename {packages/app => apps/web}/src/pages/workspace/index.tsx (100%) rename {packages/app => apps/web}/src/providers/ConfirmProvider.tsx (100%) rename {packages/app => apps/web}/src/providers/ThemeProvider.tsx (100%) rename {packages/app => apps/web}/src/providers/app-state-provider/Provider.tsx (100%) rename {packages/app => apps/web}/src/providers/app-state-provider/index.ts (100%) rename {packages/app => apps/web}/src/providers/app-state-provider/interface.ts (100%) rename {packages/app => apps/web}/src/providers/app-state-provider/utils.ts (100%) rename {packages/app => apps/web}/src/store/globalModal/index.tsx (100%) rename {packages/app => apps/web}/src/templates/AFFiNE-Docs.md (100%) rename {packages/app => apps/web}/src/templates/Welcome-to-AFFiNE-Abbey-Alpha-Wood.md (100%) rename {packages/app => apps/web}/src/templates/Welcome-to-AFFiNE-Alpha-Downhills.md (100%) rename {packages/app => apps/web}/src/templates/Welcome-to-the-AFFiNE-Alpha.md (100%) rename {packages/app => apps/web}/src/types.ts (100%) rename {packages/app => apps/web}/src/utils/__tests__/get-is-mobile.spec.ts (100%) rename {packages/app => apps/web}/src/utils/colors.ts (100%) rename {packages/app => apps/web}/src/utils/env.ts (100%) rename {packages/app => apps/web}/src/utils/get-is-mobile.ts (100%) rename {packages/app => apps/web}/src/utils/index.ts (100%) rename {packages/app => apps/web}/src/utils/print-build-info.ts (100%) rename {packages/app => apps/web}/src/utils/tools.ts (100%) rename {packages/app => apps/web}/src/utils/useragent.ts (100%) rename {packages/app => apps/web}/tsconfig.json (90%) delete mode 100644 benchmarks/README.md delete mode 160000 client-app/src-OctoBase diff --git a/.github/deployment/Dockerfile b/.github/deployment/Dockerfile index d163afda15..59639d6c49 100644 --- a/.github/deployment/Dockerfile +++ b/.github/deployment/Dockerfile @@ -1,6 +1,6 @@ FROM node:16-alpine as relocate WORKDIR /app -COPY ./packages/app/out ./dist +COPY ./apps/web/out ./dist COPY ./.github/deployment/Caddyfile ./Caddyfile FROM caddy:2.6.2-alpine diff --git a/.github/workflows/build-test-version.yml b/.github/workflows/build-test-version.yml index 9eb1aaf6d4..55c3c7380a 100644 --- a/.github/workflows/build-test-version.yml +++ b/.github/workflows/build-test-version.yml @@ -78,7 +78,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v3 with: - path: ./packages/app/out + path: ./apps/web/out push_to_registry: # See https://docs.github.com/en/actions/publishing-packages/publishing-docker-images @@ -104,7 +104,7 @@ jobs: uses: actions/download-artifact@v3 with: name: artifact - path: packages/app/out/ + path: apps/web/out/ - name: Log in to Docker Hub uses: docker/login-action@v2 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a41c84f4c3..6b2ffe0e52 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,7 +63,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v3 with: - path: ./packages/app/.next + path: ./apps/web/.next lint: name: Lint and E2E Test @@ -99,7 +99,7 @@ jobs: uses: actions/download-artifact@v3 with: name: artifact - path: packages/app/.next/ + path: apps/web/.next/ - name: Lint & E2E Test & Unit Test run: | @@ -187,7 +187,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v3 with: - path: ./packages/app/out + path: ./apps/web/out publish-community: name: Push Community Image @@ -213,7 +213,7 @@ jobs: uses: actions/download-artifact@v3 with: name: artifact - path: packages/app/out/ + path: apps/web/out/ - name: Log in to Docker Hub uses: docker/login-action@v2 @@ -316,7 +316,7 @@ jobs: uses: actions/download-artifact@v3 with: name: artifact - path: packages/app/out/ + path: apps/web/out/ - name: Log in to Docker Hub uses: docker/login-action@v2 diff --git a/.github/workflows/client-app.yml b/.github/workflows/client-app.yml index f6b6618f11..cae3cc721e 100644 --- a/.github/workflows/client-app.yml +++ b/.github/workflows/client-app.yml @@ -57,7 +57,7 @@ jobs: - name: Make macOS (x64) run: pnpm build:app - working-directory: client-app + working-directory: apps/desktop env: CI: true CI_PULL_REQUEST: ${{ github.event_name == 'pull_request' }} @@ -69,6 +69,6 @@ jobs: with: draft: true generate_release_notes: true - files: client-app/src-tauri/target/release/bundle/dmg/*.dmg + files: apps/desktop/src-tauri/target/release/bundle/dmg/*.dmg env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 09ec455e77..80116776da 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -63,7 +63,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v3 with: - path: ./packages/app/out + path: ./apps/web/out publish-self-hosted: name: Push Community Image @@ -88,7 +88,7 @@ jobs: uses: actions/download-artifact@v3 with: name: artifact - path: packages/app/out/ + path: apps/web/out/ - name: Log in to Docker Hub uses: docker/login-action@v2 diff --git a/.gitignore b/.gitignore index 7adc17a8ba..7b54b96e70 100644 --- a/.gitignore +++ b/.gitignore @@ -60,5 +60,5 @@ module-resolve.cjs .eslintcache # generated assets -client-app/public/affine-out -client-app/public/preload \ No newline at end of file +apps/desktop/public/affine-out +apps/desktop/public/preload \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index ed204c5d1f..6a5545f111 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ -[submodule "client-app/src-OctoBase"] - path = client-app/src-OctoBase +[submodule "apps/desktop/src-OctoBase"] + path = apps/desktop/src-OctoBase url = https://github.com/toeverything/OctoBase + branch = master diff --git a/.vscode/settings.json b/.vscode/settings.json index ba3ec29179..fdea10bf58 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -27,5 +27,5 @@ "[toml]": { "editor.defaultFormatter": "tamasfe.even-better-toml" }, - "rust-analyzer.linkedProjects": ["client-app/src-tauri/Cargo.toml"] + "rust-analyzer.linkedProjects": ["apps/desktop/src-tauri/Cargo.toml"] } diff --git a/client-app/README.md b/apps/desktop/README.md similarity index 88% rename from client-app/README.md rename to apps/desktop/README.md index cac1cfff2b..990ae6db36 100644 --- a/client-app/README.md +++ b/apps/desktop/README.md @@ -14,7 +14,7 @@ pnpm tauri dev ## Development -Currently client-app depends on a rapidly developing rust library "Octobase", we use git-submodule to link it currently. +Currently desktop client depends on a rapidly developing rust library "Octobase", we use git-submodule to link it currently. We will provide its binary binding soon, to replace the git-submodule, before Octobase become opensource. diff --git a/client-app/index.html b/apps/desktop/index.html similarity index 100% rename from client-app/index.html rename to apps/desktop/index.html diff --git a/client-app/package.json b/apps/desktop/package.json similarity index 97% rename from client-app/package.json rename to apps/desktop/package.json index ddb0fc9627..b55fdee1a3 100644 --- a/client-app/package.json +++ b/apps/desktop/package.json @@ -7,7 +7,7 @@ "module": "true", "scripts": { "dev:app": "pnpm build:preload && cross-env NODE_ENV=development tauri dev", - "dev:prerequisite": "concurrently \"cd ../packages/data-center && pnpm dev\" \"cd ../packages/app && pnpm dev\"", + "dev:prerequisite": "concurrently \"cd ../packages/data-center && pnpm dev\" \"cd ../apps/web && pnpm dev\"", "build:prerequisite": "pnpm build:submodules && pnpm build:rs-types && pnpm build:affine && pnpm build:preload", "build:rs-types": "zx scripts/generateTsTypingsFromJsonSchema.mjs", "build:submodules": "zx scripts/buildSubModules.mjs", diff --git a/client-app/pnpm-lock.yaml b/apps/desktop/pnpm-lock.yaml similarity index 100% rename from client-app/pnpm-lock.yaml rename to apps/desktop/pnpm-lock.yaml diff --git a/client-app/scripts/buildAffine.mjs b/apps/desktop/scripts/buildAffine.mjs similarity index 94% rename from client-app/scripts/buildAffine.mjs rename to apps/desktop/scripts/buildAffine.mjs index a86521c302..8d324d9c0e 100644 --- a/client-app/scripts/buildAffine.mjs +++ b/apps/desktop/scripts/buildAffine.mjs @@ -4,7 +4,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-call */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ -const repoDirectory = path.join(__dirname, '..', '..'); +const repoDirectory = path.join(__dirname, '..', '..', '..'); const clientAppDirectory = path.join(__dirname, '..'); const publicDistributionDirectory = path.join(clientAppDirectory, 'public'); const affineSrcDirectory = path.join(repoDirectory, 'packages', 'app'); diff --git a/client-app/scripts/buildSubModules.mjs b/apps/desktop/scripts/buildSubModules.mjs similarity index 100% rename from client-app/scripts/buildSubModules.mjs rename to apps/desktop/scripts/buildSubModules.mjs diff --git a/client-app/scripts/generateTsTypingsFromJsonSchema.mjs b/apps/desktop/scripts/generateTsTypingsFromJsonSchema.mjs similarity index 100% rename from client-app/scripts/generateTsTypingsFromJsonSchema.mjs rename to apps/desktop/scripts/generateTsTypingsFromJsonSchema.mjs diff --git a/apps/desktop/src-OctoBase b/apps/desktop/src-OctoBase new file mode 160000 index 0000000000..f8ce0c0f05 --- /dev/null +++ b/apps/desktop/src-OctoBase @@ -0,0 +1 @@ +Subproject commit f8ce0c0f0547b04efe50d249643217bec7b85c77 diff --git a/client-app/src-tauri/.gitignore b/apps/desktop/src-tauri/.gitignore similarity index 100% rename from client-app/src-tauri/.gitignore rename to apps/desktop/src-tauri/.gitignore diff --git a/client-app/src-tauri/Cargo.lock b/apps/desktop/src-tauri/Cargo.lock similarity index 100% rename from client-app/src-tauri/Cargo.lock rename to apps/desktop/src-tauri/Cargo.lock diff --git a/client-app/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml similarity index 100% rename from client-app/src-tauri/Cargo.toml rename to apps/desktop/src-tauri/Cargo.toml diff --git a/client-app/src-tauri/build.rs b/apps/desktop/src-tauri/build.rs similarity index 100% rename from client-app/src-tauri/build.rs rename to apps/desktop/src-tauri/build.rs diff --git a/client-app/src-tauri/examples/generate-jsonschema.rs b/apps/desktop/src-tauri/examples/generate-jsonschema.rs similarity index 100% rename from client-app/src-tauri/examples/generate-jsonschema.rs rename to apps/desktop/src-tauri/examples/generate-jsonschema.rs diff --git a/client-app/src-tauri/icons/128x128.png b/apps/desktop/src-tauri/icons/128x128.png similarity index 100% rename from client-app/src-tauri/icons/128x128.png rename to apps/desktop/src-tauri/icons/128x128.png diff --git a/client-app/src-tauri/icons/128x128@2x.png b/apps/desktop/src-tauri/icons/128x128@2x.png similarity index 100% rename from client-app/src-tauri/icons/128x128@2x.png rename to apps/desktop/src-tauri/icons/128x128@2x.png diff --git a/client-app/src-tauri/icons/32x32.png b/apps/desktop/src-tauri/icons/32x32.png similarity index 100% rename from client-app/src-tauri/icons/32x32.png rename to apps/desktop/src-tauri/icons/32x32.png diff --git a/client-app/src-tauri/icons/Square107x107Logo.png b/apps/desktop/src-tauri/icons/Square107x107Logo.png similarity index 100% rename from client-app/src-tauri/icons/Square107x107Logo.png rename to apps/desktop/src-tauri/icons/Square107x107Logo.png diff --git a/client-app/src-tauri/icons/Square142x142Logo.png b/apps/desktop/src-tauri/icons/Square142x142Logo.png similarity index 100% rename from client-app/src-tauri/icons/Square142x142Logo.png rename to apps/desktop/src-tauri/icons/Square142x142Logo.png diff --git a/client-app/src-tauri/icons/Square150x150Logo.png b/apps/desktop/src-tauri/icons/Square150x150Logo.png similarity index 100% rename from client-app/src-tauri/icons/Square150x150Logo.png rename to apps/desktop/src-tauri/icons/Square150x150Logo.png diff --git a/client-app/src-tauri/icons/Square284x284Logo.png b/apps/desktop/src-tauri/icons/Square284x284Logo.png similarity index 100% rename from client-app/src-tauri/icons/Square284x284Logo.png rename to apps/desktop/src-tauri/icons/Square284x284Logo.png diff --git a/client-app/src-tauri/icons/Square30x30Logo.png b/apps/desktop/src-tauri/icons/Square30x30Logo.png similarity index 100% rename from client-app/src-tauri/icons/Square30x30Logo.png rename to apps/desktop/src-tauri/icons/Square30x30Logo.png diff --git a/client-app/src-tauri/icons/Square310x310Logo.png b/apps/desktop/src-tauri/icons/Square310x310Logo.png similarity index 100% rename from client-app/src-tauri/icons/Square310x310Logo.png rename to apps/desktop/src-tauri/icons/Square310x310Logo.png diff --git a/client-app/src-tauri/icons/Square44x44Logo.png b/apps/desktop/src-tauri/icons/Square44x44Logo.png similarity index 100% rename from client-app/src-tauri/icons/Square44x44Logo.png rename to apps/desktop/src-tauri/icons/Square44x44Logo.png diff --git a/client-app/src-tauri/icons/Square71x71Logo.png b/apps/desktop/src-tauri/icons/Square71x71Logo.png similarity index 100% rename from client-app/src-tauri/icons/Square71x71Logo.png rename to apps/desktop/src-tauri/icons/Square71x71Logo.png diff --git a/client-app/src-tauri/icons/Square89x89Logo.png b/apps/desktop/src-tauri/icons/Square89x89Logo.png similarity index 100% rename from client-app/src-tauri/icons/Square89x89Logo.png rename to apps/desktop/src-tauri/icons/Square89x89Logo.png diff --git a/client-app/src-tauri/icons/StoreLogo.png b/apps/desktop/src-tauri/icons/StoreLogo.png similarity index 100% rename from client-app/src-tauri/icons/StoreLogo.png rename to apps/desktop/src-tauri/icons/StoreLogo.png diff --git a/client-app/src-tauri/icons/icon.icns b/apps/desktop/src-tauri/icons/icon.icns similarity index 100% rename from client-app/src-tauri/icons/icon.icns rename to apps/desktop/src-tauri/icons/icon.icns diff --git a/client-app/src-tauri/icons/icon.ico b/apps/desktop/src-tauri/icons/icon.ico similarity index 100% rename from client-app/src-tauri/icons/icon.ico rename to apps/desktop/src-tauri/icons/icon.ico diff --git a/client-app/src-tauri/rustfmt.toml b/apps/desktop/src-tauri/rustfmt.toml similarity index 100% rename from client-app/src-tauri/rustfmt.toml rename to apps/desktop/src-tauri/rustfmt.toml diff --git a/client-app/src-tauri/src/commands.rs b/apps/desktop/src-tauri/src/commands.rs similarity index 100% rename from client-app/src-tauri/src/commands.rs rename to apps/desktop/src-tauri/src/commands.rs diff --git a/client-app/src-tauri/src/commands/blob.rs b/apps/desktop/src-tauri/src/commands/blob.rs similarity index 100% rename from client-app/src-tauri/src/commands/blob.rs rename to apps/desktop/src-tauri/src/commands/blob.rs diff --git a/client-app/src-tauri/src/commands/document.rs b/apps/desktop/src-tauri/src/commands/document.rs similarity index 100% rename from client-app/src-tauri/src/commands/document.rs rename to apps/desktop/src-tauri/src/commands/document.rs diff --git a/client-app/src-tauri/src/commands/user.rs b/apps/desktop/src-tauri/src/commands/user.rs similarity index 100% rename from client-app/src-tauri/src/commands/user.rs rename to apps/desktop/src-tauri/src/commands/user.rs diff --git a/client-app/src-tauri/src/commands/workspace.rs b/apps/desktop/src-tauri/src/commands/workspace.rs similarity index 100% rename from client-app/src-tauri/src/commands/workspace.rs rename to apps/desktop/src-tauri/src/commands/workspace.rs diff --git a/client-app/src-tauri/src/main.rs b/apps/desktop/src-tauri/src/main.rs similarity index 100% rename from client-app/src-tauri/src/main.rs rename to apps/desktop/src-tauri/src/main.rs diff --git a/client-app/src-tauri/src/state.rs b/apps/desktop/src-tauri/src/state.rs similarity index 100% rename from client-app/src-tauri/src/state.rs rename to apps/desktop/src-tauri/src/state.rs diff --git a/client-app/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json similarity index 100% rename from client-app/src-tauri/tauri.conf.json rename to apps/desktop/src-tauri/tauri.conf.json diff --git a/client-app/src-tauri/types/Cargo.toml b/apps/desktop/src-tauri/types/Cargo.toml similarity index 100% rename from client-app/src-tauri/types/Cargo.toml rename to apps/desktop/src-tauri/types/Cargo.toml diff --git a/client-app/src-tauri/types/src/blob.rs b/apps/desktop/src-tauri/types/src/blob.rs similarity index 100% rename from client-app/src-tauri/types/src/blob.rs rename to apps/desktop/src-tauri/types/src/blob.rs diff --git a/client-app/src-tauri/types/src/document.rs b/apps/desktop/src-tauri/types/src/document.rs similarity index 100% rename from client-app/src-tauri/types/src/document.rs rename to apps/desktop/src-tauri/types/src/document.rs diff --git a/client-app/src-tauri/types/src/lib.rs b/apps/desktop/src-tauri/types/src/lib.rs similarity index 100% rename from client-app/src-tauri/types/src/lib.rs rename to apps/desktop/src-tauri/types/src/lib.rs diff --git a/client-app/src-tauri/types/src/user.rs b/apps/desktop/src-tauri/types/src/user.rs similarity index 100% rename from client-app/src-tauri/types/src/user.rs rename to apps/desktop/src-tauri/types/src/user.rs diff --git a/client-app/src-tauri/types/src/workspace.rs b/apps/desktop/src-tauri/types/src/workspace.rs similarity index 100% rename from client-app/src-tauri/types/src/workspace.rs rename to apps/desktop/src-tauri/types/src/workspace.rs diff --git a/client-app/src/preload/Readme.md b/apps/desktop/src/preload/Readme.md similarity index 100% rename from client-app/src/preload/Readme.md rename to apps/desktop/src/preload/Readme.md diff --git a/client-app/src/preload/index.ts b/apps/desktop/src/preload/index.ts similarity index 100% rename from client-app/src/preload/index.ts rename to apps/desktop/src/preload/index.ts diff --git a/client-app/src/preload/type.ts b/apps/desktop/src/preload/type.ts similarity index 100% rename from client-app/src/preload/type.ts rename to apps/desktop/src/preload/type.ts diff --git a/client-app/tsconfig.json b/apps/desktop/tsconfig.json similarity index 100% rename from client-app/tsconfig.json rename to apps/desktop/tsconfig.json diff --git a/client-app/vite.config.ts b/apps/desktop/vite.config.ts similarity index 100% rename from client-app/vite.config.ts rename to apps/desktop/vite.config.ts diff --git a/packages/app/.env.local.template b/apps/web/.env.local.template similarity index 100% rename from packages/app/.env.local.template rename to apps/web/.env.local.template diff --git a/packages/app/CHANGELOG.md b/apps/web/CHANGELOG.md similarity index 100% rename from packages/app/CHANGELOG.md rename to apps/web/CHANGELOG.md diff --git a/packages/app/README.md b/apps/web/README.md similarity index 100% rename from packages/app/README.md rename to apps/web/README.md diff --git a/packages/app/next-env.d.ts b/apps/web/next-env.d.ts similarity index 100% rename from packages/app/next-env.d.ts rename to apps/web/next-env.d.ts diff --git a/packages/app/next.config.js b/apps/web/next.config.js similarity index 93% rename from packages/app/next.config.js rename to apps/web/next.config.js index 964b6e65fd..76453deba1 100644 --- a/packages/app/next.config.js +++ b/apps/web/next.config.js @@ -30,6 +30,7 @@ const getRedirectConfig = profile => { }, ], target, + profile || 'dev', ]; }; @@ -62,10 +63,10 @@ const nextConfig = { unoptimized: true, }, rewrites: async () => { - const [profile, desc] = getRedirectConfig(process.env.NODE_API_SERVER); - printer.info( - `API request proxy to [${process.env.NODE_API_SERVER} Server]: ` + desc + const [profile, target, desc] = getRedirectConfig( + process.env.NODE_API_SERVER ); + printer.info(`API request proxy to [${desc} Server]: ` + target); return profile; }, basePath: process.env.BASE_PATH, diff --git a/packages/app/package.json b/apps/web/package.json similarity index 100% rename from packages/app/package.json rename to apps/web/package.json diff --git a/packages/app/public/.gitignore b/apps/web/public/.gitignore similarity index 100% rename from packages/app/public/.gitignore rename to apps/web/public/.gitignore diff --git a/packages/app/public/apple-touch-icon.png b/apps/web/public/apple-touch-icon.png similarity index 100% rename from packages/app/public/apple-touch-icon.png rename to apps/web/public/apple-touch-icon.png diff --git a/packages/app/public/chrome-192x192.png b/apps/web/public/chrome-192x192.png similarity index 100% rename from packages/app/public/chrome-192x192.png rename to apps/web/public/chrome-192x192.png diff --git a/packages/app/public/favicon.ico b/apps/web/public/favicon.ico similarity index 100% rename from packages/app/public/favicon.ico rename to apps/web/public/favicon.ico diff --git a/packages/app/public/globals.css b/apps/web/public/globals.css similarity index 100% rename from packages/app/public/globals.css rename to apps/web/public/globals.css diff --git a/packages/app/public/manifest.json b/apps/web/public/manifest.json similarity index 100% rename from packages/app/public/manifest.json rename to apps/web/public/manifest.json diff --git a/packages/app/public/variable.css b/apps/web/public/variable.css similarity index 100% rename from packages/app/public/variable.css rename to apps/web/public/variable.css diff --git a/packages/app/scripts/__tests__/printer.spec.ts b/apps/web/scripts/__tests__/printer.spec.ts similarity index 100% rename from packages/app/scripts/__tests__/printer.spec.ts rename to apps/web/scripts/__tests__/printer.spec.ts diff --git a/packages/app/scripts/gitInfo.js b/apps/web/scripts/gitInfo.js similarity index 100% rename from packages/app/scripts/gitInfo.js rename to apps/web/scripts/gitInfo.js diff --git a/packages/app/scripts/printer.js b/apps/web/scripts/printer.js similarity index 100% rename from packages/app/scripts/printer.js rename to apps/web/scripts/printer.js diff --git a/packages/app/src/components/404/index.tsx b/apps/web/src/components/404/index.tsx similarity index 100% rename from packages/app/src/components/404/index.tsx rename to apps/web/src/components/404/index.tsx diff --git a/packages/app/src/components/404/styles.ts b/apps/web/src/components/404/styles.ts similarity index 100% rename from packages/app/src/components/404/styles.ts rename to apps/web/src/components/404/styles.ts diff --git a/packages/app/src/components/contact-modal/Icons.tsx b/apps/web/src/components/contact-modal/Icons.tsx similarity index 100% rename from packages/app/src/components/contact-modal/Icons.tsx rename to apps/web/src/components/contact-modal/Icons.tsx diff --git a/packages/app/src/components/contact-modal/affine-text-logo.png b/apps/web/src/components/contact-modal/affine-text-logo.png similarity index 100% rename from packages/app/src/components/contact-modal/affine-text-logo.png rename to apps/web/src/components/contact-modal/affine-text-logo.png diff --git a/packages/app/src/components/contact-modal/bg.png b/apps/web/src/components/contact-modal/bg.png similarity index 100% rename from packages/app/src/components/contact-modal/bg.png rename to apps/web/src/components/contact-modal/bg.png diff --git a/packages/app/src/components/contact-modal/index.tsx b/apps/web/src/components/contact-modal/index.tsx similarity index 100% rename from packages/app/src/components/contact-modal/index.tsx rename to apps/web/src/components/contact-modal/index.tsx diff --git a/packages/app/src/components/contact-modal/style.ts b/apps/web/src/components/contact-modal/style.ts similarity index 100% rename from packages/app/src/components/contact-modal/style.ts rename to apps/web/src/components/contact-modal/style.ts diff --git a/packages/app/src/components/create-workspace/index.tsx b/apps/web/src/components/create-workspace/index.tsx similarity index 100% rename from packages/app/src/components/create-workspace/index.tsx rename to apps/web/src/components/create-workspace/index.tsx diff --git a/packages/app/src/components/delete-workspace/index.tsx b/apps/web/src/components/delete-workspace/index.tsx similarity index 100% rename from packages/app/src/components/delete-workspace/index.tsx rename to apps/web/src/components/delete-workspace/index.tsx diff --git a/packages/app/src/components/edgeless-toolbar/Icons.tsx b/apps/web/src/components/edgeless-toolbar/Icons.tsx similarity index 100% rename from packages/app/src/components/edgeless-toolbar/Icons.tsx rename to apps/web/src/components/edgeless-toolbar/Icons.tsx diff --git a/packages/app/src/components/edgeless-toolbar/index.tsx b/apps/web/src/components/edgeless-toolbar/index.tsx similarity index 100% rename from packages/app/src/components/edgeless-toolbar/index.tsx rename to apps/web/src/components/edgeless-toolbar/index.tsx diff --git a/packages/app/src/components/edgeless-toolbar/reply.svg b/apps/web/src/components/edgeless-toolbar/reply.svg similarity index 100% rename from packages/app/src/components/edgeless-toolbar/reply.svg rename to apps/web/src/components/edgeless-toolbar/reply.svg diff --git a/packages/app/src/components/edgeless-toolbar/style.ts b/apps/web/src/components/edgeless-toolbar/style.ts similarity index 100% rename from packages/app/src/components/edgeless-toolbar/style.ts rename to apps/web/src/components/edgeless-toolbar/style.ts diff --git a/packages/app/src/components/editor-mode-switch/Icons.tsx b/apps/web/src/components/editor-mode-switch/Icons.tsx similarity index 100% rename from packages/app/src/components/editor-mode-switch/Icons.tsx rename to apps/web/src/components/editor-mode-switch/Icons.tsx diff --git a/packages/app/src/components/editor-mode-switch/index.tsx b/apps/web/src/components/editor-mode-switch/index.tsx similarity index 100% rename from packages/app/src/components/editor-mode-switch/index.tsx rename to apps/web/src/components/editor-mode-switch/index.tsx diff --git a/packages/app/src/components/editor-mode-switch/style.ts b/apps/web/src/components/editor-mode-switch/style.ts similarity index 100% rename from packages/app/src/components/editor-mode-switch/style.ts rename to apps/web/src/components/editor-mode-switch/style.ts diff --git a/packages/app/src/components/editor-mode-switch/type.ts b/apps/web/src/components/editor-mode-switch/type.ts similarity index 100% rename from packages/app/src/components/editor-mode-switch/type.ts rename to apps/web/src/components/editor-mode-switch/type.ts diff --git a/packages/app/src/components/editor/index.tsx b/apps/web/src/components/editor/index.tsx similarity index 100% rename from packages/app/src/components/editor/index.tsx rename to apps/web/src/components/editor/index.tsx diff --git a/packages/app/src/components/enable-workspace/EnableWorkspaceModal.tsx b/apps/web/src/components/enable-workspace/EnableWorkspaceModal.tsx similarity index 100% rename from packages/app/src/components/enable-workspace/EnableWorkspaceModal.tsx rename to apps/web/src/components/enable-workspace/EnableWorkspaceModal.tsx diff --git a/packages/app/src/components/enable-workspace/index.tsx b/apps/web/src/components/enable-workspace/index.tsx similarity index 100% rename from packages/app/src/components/enable-workspace/index.tsx rename to apps/web/src/components/enable-workspace/index.tsx diff --git a/packages/app/src/components/file-upload/index.tsx b/apps/web/src/components/file-upload/index.tsx similarity index 100% rename from packages/app/src/components/file-upload/index.tsx rename to apps/web/src/components/file-upload/index.tsx diff --git a/packages/app/src/components/header/EditorHeader.tsx b/apps/web/src/components/header/EditorHeader.tsx similarity index 100% rename from packages/app/src/components/header/EditorHeader.tsx rename to apps/web/src/components/header/EditorHeader.tsx diff --git a/packages/app/src/components/header/Header.tsx b/apps/web/src/components/header/Header.tsx similarity index 100% rename from packages/app/src/components/header/Header.tsx rename to apps/web/src/components/header/Header.tsx diff --git a/packages/app/src/components/header/PageListHeader.tsx b/apps/web/src/components/header/PageListHeader.tsx similarity index 100% rename from packages/app/src/components/header/PageListHeader.tsx rename to apps/web/src/components/header/PageListHeader.tsx diff --git a/packages/app/src/components/header/QuickSearchButton.tsx b/apps/web/src/components/header/QuickSearchButton.tsx similarity index 100% rename from packages/app/src/components/header/QuickSearchButton.tsx rename to apps/web/src/components/header/QuickSearchButton.tsx diff --git a/packages/app/src/components/header/header-right-items/EditorOptionMenu.tsx b/apps/web/src/components/header/header-right-items/EditorOptionMenu.tsx similarity index 100% rename from packages/app/src/components/header/header-right-items/EditorOptionMenu.tsx rename to apps/web/src/components/header/header-right-items/EditorOptionMenu.tsx diff --git a/packages/app/src/components/header/header-right-items/SyncUser.tsx b/apps/web/src/components/header/header-right-items/SyncUser.tsx similarity index 100% rename from packages/app/src/components/header/header-right-items/SyncUser.tsx rename to apps/web/src/components/header/header-right-items/SyncUser.tsx diff --git a/packages/app/src/components/header/header-right-items/TrashButtonGroup.tsx b/apps/web/src/components/header/header-right-items/TrashButtonGroup.tsx similarity index 100% rename from packages/app/src/components/header/header-right-items/TrashButtonGroup.tsx rename to apps/web/src/components/header/header-right-items/TrashButtonGroup.tsx diff --git a/packages/app/src/components/header/header-right-items/theme-mode-switch/Icons.tsx b/apps/web/src/components/header/header-right-items/theme-mode-switch/Icons.tsx similarity index 100% rename from packages/app/src/components/header/header-right-items/theme-mode-switch/Icons.tsx rename to apps/web/src/components/header/header-right-items/theme-mode-switch/Icons.tsx diff --git a/packages/app/src/components/header/header-right-items/theme-mode-switch/index.tsx b/apps/web/src/components/header/header-right-items/theme-mode-switch/index.tsx similarity index 100% rename from packages/app/src/components/header/header-right-items/theme-mode-switch/index.tsx rename to apps/web/src/components/header/header-right-items/theme-mode-switch/index.tsx diff --git a/packages/app/src/components/header/header-right-items/theme-mode-switch/style.ts b/apps/web/src/components/header/header-right-items/theme-mode-switch/style.ts similarity index 100% rename from packages/app/src/components/header/header-right-items/theme-mode-switch/style.ts rename to apps/web/src/components/header/header-right-items/theme-mode-switch/style.ts diff --git a/packages/app/src/components/header/index.tsx b/apps/web/src/components/header/index.tsx similarity index 100% rename from packages/app/src/components/header/index.tsx rename to apps/web/src/components/header/index.tsx diff --git a/packages/app/src/components/header/styles.ts b/apps/web/src/components/header/styles.ts similarity index 100% rename from packages/app/src/components/header/styles.ts rename to apps/web/src/components/header/styles.ts diff --git a/packages/app/src/components/header/utils.tsx b/apps/web/src/components/header/utils.tsx similarity index 100% rename from packages/app/src/components/header/utils.tsx rename to apps/web/src/components/header/utils.tsx diff --git a/packages/app/src/components/help-island/Icons.tsx b/apps/web/src/components/help-island/Icons.tsx similarity index 100% rename from packages/app/src/components/help-island/Icons.tsx rename to apps/web/src/components/help-island/Icons.tsx diff --git a/packages/app/src/components/help-island/index.tsx b/apps/web/src/components/help-island/index.tsx similarity index 100% rename from packages/app/src/components/help-island/index.tsx rename to apps/web/src/components/help-island/index.tsx diff --git a/packages/app/src/components/help-island/style.ts b/apps/web/src/components/help-island/style.ts similarity index 100% rename from packages/app/src/components/help-island/style.ts rename to apps/web/src/components/help-island/style.ts diff --git a/packages/app/src/components/import/index.tsx b/apps/web/src/components/import/index.tsx similarity index 99% rename from packages/app/src/components/import/index.tsx rename to apps/web/src/components/import/index.tsx index e9d1602941..27a57921f4 100644 --- a/packages/app/src/components/import/index.tsx +++ b/apps/web/src/components/import/index.tsx @@ -27,7 +27,7 @@ export const ImportModal = ({ open, onClose }: ImportModalProps) => { const title = template.name; if (page) { currentWorkspace?.blocksuiteWorkspace?.setPageMeta(page.id, { title }); - if (page && page.root === null) { + if (page.root === null) { setTimeout(() => { try { const editor = document.querySelector('editor-container'); diff --git a/packages/app/src/components/import/styles.ts b/apps/web/src/components/import/styles.ts similarity index 100% rename from packages/app/src/components/import/styles.ts rename to apps/web/src/components/import/styles.ts diff --git a/packages/app/src/components/loading/Loading.tsx b/apps/web/src/components/loading/Loading.tsx similarity index 100% rename from packages/app/src/components/loading/Loading.tsx rename to apps/web/src/components/loading/Loading.tsx diff --git a/packages/app/src/components/loading/PageLoading.tsx b/apps/web/src/components/loading/PageLoading.tsx similarity index 100% rename from packages/app/src/components/loading/PageLoading.tsx rename to apps/web/src/components/loading/PageLoading.tsx diff --git a/packages/app/src/components/loading/index.tsx b/apps/web/src/components/loading/index.tsx similarity index 100% rename from packages/app/src/components/loading/index.tsx rename to apps/web/src/components/loading/index.tsx diff --git a/packages/app/src/components/loading/styled.ts b/apps/web/src/components/loading/styled.ts similarity index 100% rename from packages/app/src/components/loading/styled.ts rename to apps/web/src/components/loading/styled.ts diff --git a/packages/app/src/components/login-modal/GoogleIcon.tsx b/apps/web/src/components/login-modal/GoogleIcon.tsx similarity index 100% rename from packages/app/src/components/login-modal/GoogleIcon.tsx rename to apps/web/src/components/login-modal/GoogleIcon.tsx diff --git a/packages/app/src/components/login-modal/index.tsx b/apps/web/src/components/login-modal/index.tsx similarity index 100% rename from packages/app/src/components/login-modal/index.tsx rename to apps/web/src/components/login-modal/index.tsx diff --git a/packages/app/src/components/logout-modal/icon.tsx b/apps/web/src/components/logout-modal/icon.tsx similarity index 100% rename from packages/app/src/components/logout-modal/icon.tsx rename to apps/web/src/components/logout-modal/icon.tsx diff --git a/packages/app/src/components/logout-modal/index.tsx b/apps/web/src/components/logout-modal/index.tsx similarity index 100% rename from packages/app/src/components/logout-modal/index.tsx rename to apps/web/src/components/logout-modal/index.tsx diff --git a/packages/app/src/components/mobile-modal/bg.png b/apps/web/src/components/mobile-modal/bg.png similarity index 100% rename from packages/app/src/components/mobile-modal/bg.png rename to apps/web/src/components/mobile-modal/bg.png diff --git a/packages/app/src/components/mobile-modal/index.tsx b/apps/web/src/components/mobile-modal/index.tsx similarity index 100% rename from packages/app/src/components/mobile-modal/index.tsx rename to apps/web/src/components/mobile-modal/index.tsx diff --git a/packages/app/src/components/mobile-modal/styles.ts b/apps/web/src/components/mobile-modal/styles.ts similarity index 100% rename from packages/app/src/components/mobile-modal/styles.ts rename to apps/web/src/components/mobile-modal/styles.ts diff --git a/packages/app/src/components/page-list/DateCell.tsx b/apps/web/src/components/page-list/DateCell.tsx similarity index 100% rename from packages/app/src/components/page-list/DateCell.tsx rename to apps/web/src/components/page-list/DateCell.tsx diff --git a/packages/app/src/components/page-list/Empty.tsx b/apps/web/src/components/page-list/Empty.tsx similarity index 100% rename from packages/app/src/components/page-list/Empty.tsx rename to apps/web/src/components/page-list/Empty.tsx diff --git a/packages/app/src/components/page-list/OperationCell.tsx b/apps/web/src/components/page-list/OperationCell.tsx similarity index 100% rename from packages/app/src/components/page-list/OperationCell.tsx rename to apps/web/src/components/page-list/OperationCell.tsx diff --git a/packages/app/src/components/page-list/index.tsx b/apps/web/src/components/page-list/index.tsx similarity index 100% rename from packages/app/src/components/page-list/index.tsx rename to apps/web/src/components/page-list/index.tsx diff --git a/packages/app/src/components/page-list/styles.ts b/apps/web/src/components/page-list/styles.ts similarity index 100% rename from packages/app/src/components/page-list/styles.ts rename to apps/web/src/components/page-list/styles.ts diff --git a/packages/app/src/components/provider-composer.ts b/apps/web/src/components/provider-composer.ts similarity index 100% rename from packages/app/src/components/provider-composer.ts rename to apps/web/src/components/provider-composer.ts diff --git a/packages/app/src/components/quick-search/Footer.tsx b/apps/web/src/components/quick-search/Footer.tsx similarity index 100% rename from packages/app/src/components/quick-search/Footer.tsx rename to apps/web/src/components/quick-search/Footer.tsx diff --git a/packages/app/src/components/quick-search/Input.tsx b/apps/web/src/components/quick-search/Input.tsx similarity index 100% rename from packages/app/src/components/quick-search/Input.tsx rename to apps/web/src/components/quick-search/Input.tsx diff --git a/packages/app/src/components/quick-search/NoResultSVG.tsx b/apps/web/src/components/quick-search/NoResultSVG.tsx similarity index 100% rename from packages/app/src/components/quick-search/NoResultSVG.tsx rename to apps/web/src/components/quick-search/NoResultSVG.tsx diff --git a/packages/app/src/components/quick-search/PublishedResults.tsx b/apps/web/src/components/quick-search/PublishedResults.tsx similarity index 100% rename from packages/app/src/components/quick-search/PublishedResults.tsx rename to apps/web/src/components/quick-search/PublishedResults.tsx diff --git a/packages/app/src/components/quick-search/Results.tsx b/apps/web/src/components/quick-search/Results.tsx similarity index 100% rename from packages/app/src/components/quick-search/Results.tsx rename to apps/web/src/components/quick-search/Results.tsx diff --git a/packages/app/src/components/quick-search/config.ts b/apps/web/src/components/quick-search/config.ts similarity index 100% rename from packages/app/src/components/quick-search/config.ts rename to apps/web/src/components/quick-search/config.ts diff --git a/packages/app/src/components/quick-search/index.tsx b/apps/web/src/components/quick-search/index.tsx similarity index 100% rename from packages/app/src/components/quick-search/index.tsx rename to apps/web/src/components/quick-search/index.tsx diff --git a/packages/app/src/components/quick-search/style.ts b/apps/web/src/components/quick-search/style.ts similarity index 100% rename from packages/app/src/components/quick-search/style.ts rename to apps/web/src/components/quick-search/style.ts diff --git a/packages/app/src/components/shortcuts-modal/Icons.tsx b/apps/web/src/components/shortcuts-modal/Icons.tsx similarity index 100% rename from packages/app/src/components/shortcuts-modal/Icons.tsx rename to apps/web/src/components/shortcuts-modal/Icons.tsx diff --git a/packages/app/src/components/shortcuts-modal/config.ts b/apps/web/src/components/shortcuts-modal/config.ts similarity index 100% rename from packages/app/src/components/shortcuts-modal/config.ts rename to apps/web/src/components/shortcuts-modal/config.ts diff --git a/packages/app/src/components/shortcuts-modal/index.tsx b/apps/web/src/components/shortcuts-modal/index.tsx similarity index 100% rename from packages/app/src/components/shortcuts-modal/index.tsx rename to apps/web/src/components/shortcuts-modal/index.tsx diff --git a/packages/app/src/components/shortcuts-modal/style.ts b/apps/web/src/components/shortcuts-modal/style.ts similarity index 100% rename from packages/app/src/components/shortcuts-modal/style.ts rename to apps/web/src/components/shortcuts-modal/style.ts diff --git a/packages/app/src/components/simple-counter/index.ts b/apps/web/src/components/simple-counter/index.ts similarity index 100% rename from packages/app/src/components/simple-counter/index.ts rename to apps/web/src/components/simple-counter/index.ts diff --git a/packages/app/src/components/workspace-avatar/Avatar.tsx b/apps/web/src/components/workspace-avatar/Avatar.tsx similarity index 100% rename from packages/app/src/components/workspace-avatar/Avatar.tsx rename to apps/web/src/components/workspace-avatar/Avatar.tsx diff --git a/packages/app/src/components/workspace-avatar/WorkspaceUnitAvatar.tsx b/apps/web/src/components/workspace-avatar/WorkspaceUnitAvatar.tsx similarity index 100% rename from packages/app/src/components/workspace-avatar/WorkspaceUnitAvatar.tsx rename to apps/web/src/components/workspace-avatar/WorkspaceUnitAvatar.tsx diff --git a/packages/app/src/components/workspace-avatar/index.ts b/apps/web/src/components/workspace-avatar/index.ts similarity index 100% rename from packages/app/src/components/workspace-avatar/index.ts rename to apps/web/src/components/workspace-avatar/index.ts diff --git a/packages/app/src/components/workspace-layout/index.tsx b/apps/web/src/components/workspace-layout/index.tsx similarity index 100% rename from packages/app/src/components/workspace-layout/index.tsx rename to apps/web/src/components/workspace-layout/index.tsx diff --git a/packages/app/src/components/workspace-layout/styles.ts b/apps/web/src/components/workspace-layout/styles.ts similarity index 100% rename from packages/app/src/components/workspace-layout/styles.ts rename to apps/web/src/components/workspace-layout/styles.ts diff --git a/packages/app/src/components/workspace-modal/Footer.tsx b/apps/web/src/components/workspace-modal/Footer.tsx similarity index 100% rename from packages/app/src/components/workspace-modal/Footer.tsx rename to apps/web/src/components/workspace-modal/Footer.tsx diff --git a/packages/app/src/components/workspace-modal/SelectLanguageMenu.tsx b/apps/web/src/components/workspace-modal/SelectLanguageMenu.tsx similarity index 100% rename from packages/app/src/components/workspace-modal/SelectLanguageMenu.tsx rename to apps/web/src/components/workspace-modal/SelectLanguageMenu.tsx diff --git a/packages/app/src/components/workspace-modal/WorkspaceCard.tsx b/apps/web/src/components/workspace-modal/WorkspaceCard.tsx similarity index 100% rename from packages/app/src/components/workspace-modal/WorkspaceCard.tsx rename to apps/web/src/components/workspace-modal/WorkspaceCard.tsx diff --git a/packages/app/src/components/workspace-modal/icons/index.tsx b/apps/web/src/components/workspace-modal/icons/index.tsx similarity index 100% rename from packages/app/src/components/workspace-modal/icons/index.tsx rename to apps/web/src/components/workspace-modal/icons/index.tsx diff --git a/packages/app/src/components/workspace-modal/index.tsx b/apps/web/src/components/workspace-modal/index.tsx similarity index 100% rename from packages/app/src/components/workspace-modal/index.tsx rename to apps/web/src/components/workspace-modal/index.tsx diff --git a/packages/app/src/components/workspace-modal/styles.ts b/apps/web/src/components/workspace-modal/styles.ts similarity index 100% rename from packages/app/src/components/workspace-modal/styles.ts rename to apps/web/src/components/workspace-modal/styles.ts diff --git a/packages/app/src/components/workspace-setting/ExportPage.tsx b/apps/web/src/components/workspace-setting/ExportPage.tsx similarity index 100% rename from packages/app/src/components/workspace-setting/ExportPage.tsx rename to apps/web/src/components/workspace-setting/ExportPage.tsx diff --git a/packages/app/src/components/workspace-setting/PublishPage.tsx b/apps/web/src/components/workspace-setting/PublishPage.tsx similarity index 100% rename from packages/app/src/components/workspace-setting/PublishPage.tsx rename to apps/web/src/components/workspace-setting/PublishPage.tsx diff --git a/packages/app/src/components/workspace-setting/SyncPage.tsx b/apps/web/src/components/workspace-setting/SyncPage.tsx similarity index 100% rename from packages/app/src/components/workspace-setting/SyncPage.tsx rename to apps/web/src/components/workspace-setting/SyncPage.tsx diff --git a/packages/app/src/components/workspace-setting/general/General.tsx b/apps/web/src/components/workspace-setting/general/General.tsx similarity index 100% rename from packages/app/src/components/workspace-setting/general/General.tsx rename to apps/web/src/components/workspace-setting/general/General.tsx diff --git a/packages/app/src/components/workspace-setting/general/delete/Delete.tsx b/apps/web/src/components/workspace-setting/general/delete/Delete.tsx similarity index 100% rename from packages/app/src/components/workspace-setting/general/delete/Delete.tsx rename to apps/web/src/components/workspace-setting/general/delete/Delete.tsx diff --git a/packages/app/src/components/workspace-setting/general/delete/index.ts b/apps/web/src/components/workspace-setting/general/delete/index.ts similarity index 100% rename from packages/app/src/components/workspace-setting/general/delete/index.ts rename to apps/web/src/components/workspace-setting/general/delete/index.ts diff --git a/packages/app/src/components/workspace-setting/general/delete/style.ts b/apps/web/src/components/workspace-setting/general/delete/style.ts similarity index 100% rename from packages/app/src/components/workspace-setting/general/delete/style.ts rename to apps/web/src/components/workspace-setting/general/delete/style.ts diff --git a/packages/app/src/components/workspace-setting/general/icons.tsx b/apps/web/src/components/workspace-setting/general/icons.tsx similarity index 100% rename from packages/app/src/components/workspace-setting/general/icons.tsx rename to apps/web/src/components/workspace-setting/general/icons.tsx diff --git a/packages/app/src/components/workspace-setting/general/index.ts b/apps/web/src/components/workspace-setting/general/index.ts similarity index 100% rename from packages/app/src/components/workspace-setting/general/index.ts rename to apps/web/src/components/workspace-setting/general/index.ts diff --git a/packages/app/src/components/workspace-setting/general/leave/Leave.tsx b/apps/web/src/components/workspace-setting/general/leave/Leave.tsx similarity index 100% rename from packages/app/src/components/workspace-setting/general/leave/Leave.tsx rename to apps/web/src/components/workspace-setting/general/leave/Leave.tsx diff --git a/packages/app/src/components/workspace-setting/general/leave/index.ts b/apps/web/src/components/workspace-setting/general/leave/index.ts similarity index 100% rename from packages/app/src/components/workspace-setting/general/leave/index.ts rename to apps/web/src/components/workspace-setting/general/leave/index.ts diff --git a/packages/app/src/components/workspace-setting/general/leave/style.ts b/apps/web/src/components/workspace-setting/general/leave/style.ts similarity index 100% rename from packages/app/src/components/workspace-setting/general/leave/style.ts rename to apps/web/src/components/workspace-setting/general/leave/style.ts diff --git a/packages/app/src/components/workspace-setting/general/style.ts b/apps/web/src/components/workspace-setting/general/style.ts similarity index 100% rename from packages/app/src/components/workspace-setting/general/style.ts rename to apps/web/src/components/workspace-setting/general/style.ts diff --git a/packages/app/src/components/workspace-setting/index.ts b/apps/web/src/components/workspace-setting/index.ts similarity index 100% rename from packages/app/src/components/workspace-setting/index.ts rename to apps/web/src/components/workspace-setting/index.ts diff --git a/packages/app/src/components/workspace-setting/member/InviteMemberModal.tsx b/apps/web/src/components/workspace-setting/member/InviteMemberModal.tsx similarity index 100% rename from packages/app/src/components/workspace-setting/member/InviteMemberModal.tsx rename to apps/web/src/components/workspace-setting/member/InviteMemberModal.tsx diff --git a/packages/app/src/components/workspace-setting/member/MembersPage.tsx b/apps/web/src/components/workspace-setting/member/MembersPage.tsx similarity index 100% rename from packages/app/src/components/workspace-setting/member/MembersPage.tsx rename to apps/web/src/components/workspace-setting/member/MembersPage.tsx diff --git a/packages/app/src/components/workspace-setting/member/index.ts b/apps/web/src/components/workspace-setting/member/index.ts similarity index 100% rename from packages/app/src/components/workspace-setting/member/index.ts rename to apps/web/src/components/workspace-setting/member/index.ts diff --git a/packages/app/src/components/workspace-setting/member/style.ts b/apps/web/src/components/workspace-setting/member/style.ts similarity index 100% rename from packages/app/src/components/workspace-setting/member/style.ts rename to apps/web/src/components/workspace-setting/member/style.ts diff --git a/packages/app/src/components/workspace-setting/style.ts b/apps/web/src/components/workspace-setting/style.ts similarity index 100% rename from packages/app/src/components/workspace-setting/style.ts rename to apps/web/src/components/workspace-setting/style.ts diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/ListItem.tsx b/apps/web/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/ListItem.tsx similarity index 100% rename from packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/ListItem.tsx rename to apps/web/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/ListItem.tsx diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/LoginItem.tsx b/apps/web/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/LoginItem.tsx similarity index 100% rename from packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/LoginItem.tsx rename to apps/web/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/LoginItem.tsx diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/index.ts b/apps/web/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/index.ts similarity index 100% rename from packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/index.ts rename to apps/web/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/index.ts diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/styles.ts b/apps/web/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/styles.ts similarity index 100% rename from packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/styles.ts rename to apps/web/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/styles.ts diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx b/apps/web/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx similarity index 100% rename from packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx rename to apps/web/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/index.ts b/apps/web/src/components/workspace-slider-bar/WorkspaceSelector/index.ts similarity index 100% rename from packages/app/src/components/workspace-slider-bar/WorkspaceSelector/index.ts rename to apps/web/src/components/workspace-slider-bar/WorkspaceSelector/index.ts diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/styles.ts b/apps/web/src/components/workspace-slider-bar/WorkspaceSelector/styles.ts similarity index 100% rename from packages/app/src/components/workspace-slider-bar/WorkspaceSelector/styles.ts rename to apps/web/src/components/workspace-slider-bar/WorkspaceSelector/styles.ts diff --git a/packages/app/src/components/workspace-slider-bar/icons.tsx b/apps/web/src/components/workspace-slider-bar/icons.tsx similarity index 100% rename from packages/app/src/components/workspace-slider-bar/icons.tsx rename to apps/web/src/components/workspace-slider-bar/icons.tsx diff --git a/packages/app/src/components/workspace-slider-bar/icons/Icons.tsx b/apps/web/src/components/workspace-slider-bar/icons/Icons.tsx similarity index 100% rename from packages/app/src/components/workspace-slider-bar/icons/Icons.tsx rename to apps/web/src/components/workspace-slider-bar/icons/Icons.tsx diff --git a/packages/app/src/components/workspace-slider-bar/index.tsx b/apps/web/src/components/workspace-slider-bar/index.tsx similarity index 100% rename from packages/app/src/components/workspace-slider-bar/index.tsx rename to apps/web/src/components/workspace-slider-bar/index.tsx diff --git a/packages/app/src/components/workspace-slider-bar/style.ts b/apps/web/src/components/workspace-slider-bar/style.ts similarity index 100% rename from packages/app/src/components/workspace-slider-bar/style.ts rename to apps/web/src/components/workspace-slider-bar/style.ts diff --git a/packages/app/src/globals.d.ts b/apps/web/src/globals.d.ts similarity index 100% rename from packages/app/src/globals.d.ts rename to apps/web/src/globals.d.ts diff --git a/packages/app/src/hooks/use-change-page-meta.ts b/apps/web/src/hooks/use-change-page-meta.ts similarity index 100% rename from packages/app/src/hooks/use-change-page-meta.ts rename to apps/web/src/hooks/use-change-page-meta.ts diff --git a/packages/app/src/hooks/use-current-page-meta.ts b/apps/web/src/hooks/use-current-page-meta.ts similarity index 100% rename from packages/app/src/hooks/use-current-page-meta.ts rename to apps/web/src/hooks/use-current-page-meta.ts diff --git a/packages/app/src/hooks/use-ensure-workspace.ts b/apps/web/src/hooks/use-ensure-workspace.ts similarity index 100% rename from packages/app/src/hooks/use-ensure-workspace.ts rename to apps/web/src/hooks/use-ensure-workspace.ts diff --git a/packages/app/src/hooks/use-history-update.ts b/apps/web/src/hooks/use-history-update.ts similarity index 100% rename from packages/app/src/hooks/use-history-update.ts rename to apps/web/src/hooks/use-history-update.ts diff --git a/packages/app/src/hooks/use-local-storage.ts b/apps/web/src/hooks/use-local-storage.ts similarity index 100% rename from packages/app/src/hooks/use-local-storage.ts rename to apps/web/src/hooks/use-local-storage.ts diff --git a/packages/app/src/hooks/use-members.ts b/apps/web/src/hooks/use-members.ts similarity index 100% rename from packages/app/src/hooks/use-members.ts rename to apps/web/src/hooks/use-members.ts diff --git a/packages/app/src/hooks/use-page-helper.ts b/apps/web/src/hooks/use-page-helper.ts similarity index 100% rename from packages/app/src/hooks/use-page-helper.ts rename to apps/web/src/hooks/use-page-helper.ts diff --git a/packages/app/src/hooks/use-props-updated.ts b/apps/web/src/hooks/use-props-updated.ts similarity index 100% rename from packages/app/src/hooks/use-props-updated.ts rename to apps/web/src/hooks/use-props-updated.ts diff --git a/packages/app/src/hooks/use-workspace-helper.ts b/apps/web/src/hooks/use-workspace-helper.ts similarity index 100% rename from packages/app/src/hooks/use-workspace-helper.ts rename to apps/web/src/hooks/use-workspace-helper.ts diff --git a/packages/app/src/pages/404.tsx b/apps/web/src/pages/404.tsx similarity index 100% rename from packages/app/src/pages/404.tsx rename to apps/web/src/pages/404.tsx diff --git a/packages/app/src/pages/_app.tsx b/apps/web/src/pages/_app.tsx similarity index 100% rename from packages/app/src/pages/_app.tsx rename to apps/web/src/pages/_app.tsx diff --git a/packages/app/src/pages/_document.tsx b/apps/web/src/pages/_document.tsx similarity index 100% rename from packages/app/src/pages/_document.tsx rename to apps/web/src/pages/_document.tsx diff --git a/packages/app/src/pages/index.tsx b/apps/web/src/pages/index.tsx similarity index 100% rename from packages/app/src/pages/index.tsx rename to apps/web/src/pages/index.tsx diff --git a/packages/app/src/pages/invite/[invite_code].tsx b/apps/web/src/pages/invite/[invite_code].tsx similarity index 100% rename from packages/app/src/pages/invite/[invite_code].tsx rename to apps/web/src/pages/invite/[invite_code].tsx diff --git a/packages/app/src/pages/public-workspace/[workspaceId]/[pageId].tsx b/apps/web/src/pages/public-workspace/[workspaceId]/[pageId].tsx similarity index 100% rename from packages/app/src/pages/public-workspace/[workspaceId]/[pageId].tsx rename to apps/web/src/pages/public-workspace/[workspaceId]/[pageId].tsx diff --git a/packages/app/src/pages/public-workspace/[workspaceId]/index.tsx b/apps/web/src/pages/public-workspace/[workspaceId]/index.tsx similarity index 100% rename from packages/app/src/pages/public-workspace/[workspaceId]/index.tsx rename to apps/web/src/pages/public-workspace/[workspaceId]/index.tsx diff --git a/packages/app/src/pages/temporary.css b/apps/web/src/pages/temporary.css similarity index 100% rename from packages/app/src/pages/temporary.css rename to apps/web/src/pages/temporary.css diff --git a/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx b/apps/web/src/pages/workspace/[workspaceId]/[pageId].tsx similarity index 100% rename from packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx rename to apps/web/src/pages/workspace/[workspaceId]/[pageId].tsx diff --git a/packages/app/src/pages/workspace/[workspaceId]/all.tsx b/apps/web/src/pages/workspace/[workspaceId]/all.tsx similarity index 100% rename from packages/app/src/pages/workspace/[workspaceId]/all.tsx rename to apps/web/src/pages/workspace/[workspaceId]/all.tsx diff --git a/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx b/apps/web/src/pages/workspace/[workspaceId]/favorite.tsx similarity index 100% rename from packages/app/src/pages/workspace/[workspaceId]/favorite.tsx rename to apps/web/src/pages/workspace/[workspaceId]/favorite.tsx diff --git a/packages/app/src/pages/workspace/[workspaceId]/index.tsx b/apps/web/src/pages/workspace/[workspaceId]/index.tsx similarity index 100% rename from packages/app/src/pages/workspace/[workspaceId]/index.tsx rename to apps/web/src/pages/workspace/[workspaceId]/index.tsx diff --git a/packages/app/src/pages/workspace/[workspaceId]/playground.tsx b/apps/web/src/pages/workspace/[workspaceId]/playground.tsx similarity index 100% rename from packages/app/src/pages/workspace/[workspaceId]/playground.tsx rename to apps/web/src/pages/workspace/[workspaceId]/playground.tsx diff --git a/packages/app/src/pages/workspace/[workspaceId]/setting.tsx b/apps/web/src/pages/workspace/[workspaceId]/setting.tsx similarity index 100% rename from packages/app/src/pages/workspace/[workspaceId]/setting.tsx rename to apps/web/src/pages/workspace/[workspaceId]/setting.tsx diff --git a/packages/app/src/pages/workspace/[workspaceId]/trash.tsx b/apps/web/src/pages/workspace/[workspaceId]/trash.tsx similarity index 100% rename from packages/app/src/pages/workspace/[workspaceId]/trash.tsx rename to apps/web/src/pages/workspace/[workspaceId]/trash.tsx diff --git a/packages/app/src/pages/workspace/index.tsx b/apps/web/src/pages/workspace/index.tsx similarity index 100% rename from packages/app/src/pages/workspace/index.tsx rename to apps/web/src/pages/workspace/index.tsx diff --git a/packages/app/src/providers/ConfirmProvider.tsx b/apps/web/src/providers/ConfirmProvider.tsx similarity index 100% rename from packages/app/src/providers/ConfirmProvider.tsx rename to apps/web/src/providers/ConfirmProvider.tsx diff --git a/packages/app/src/providers/ThemeProvider.tsx b/apps/web/src/providers/ThemeProvider.tsx similarity index 100% rename from packages/app/src/providers/ThemeProvider.tsx rename to apps/web/src/providers/ThemeProvider.tsx diff --git a/packages/app/src/providers/app-state-provider/Provider.tsx b/apps/web/src/providers/app-state-provider/Provider.tsx similarity index 100% rename from packages/app/src/providers/app-state-provider/Provider.tsx rename to apps/web/src/providers/app-state-provider/Provider.tsx diff --git a/packages/app/src/providers/app-state-provider/index.ts b/apps/web/src/providers/app-state-provider/index.ts similarity index 100% rename from packages/app/src/providers/app-state-provider/index.ts rename to apps/web/src/providers/app-state-provider/index.ts diff --git a/packages/app/src/providers/app-state-provider/interface.ts b/apps/web/src/providers/app-state-provider/interface.ts similarity index 100% rename from packages/app/src/providers/app-state-provider/interface.ts rename to apps/web/src/providers/app-state-provider/interface.ts diff --git a/packages/app/src/providers/app-state-provider/utils.ts b/apps/web/src/providers/app-state-provider/utils.ts similarity index 100% rename from packages/app/src/providers/app-state-provider/utils.ts rename to apps/web/src/providers/app-state-provider/utils.ts diff --git a/packages/app/src/store/globalModal/index.tsx b/apps/web/src/store/globalModal/index.tsx similarity index 100% rename from packages/app/src/store/globalModal/index.tsx rename to apps/web/src/store/globalModal/index.tsx diff --git a/packages/app/src/templates/AFFiNE-Docs.md b/apps/web/src/templates/AFFiNE-Docs.md similarity index 100% rename from packages/app/src/templates/AFFiNE-Docs.md rename to apps/web/src/templates/AFFiNE-Docs.md diff --git a/packages/app/src/templates/Welcome-to-AFFiNE-Abbey-Alpha-Wood.md b/apps/web/src/templates/Welcome-to-AFFiNE-Abbey-Alpha-Wood.md similarity index 100% rename from packages/app/src/templates/Welcome-to-AFFiNE-Abbey-Alpha-Wood.md rename to apps/web/src/templates/Welcome-to-AFFiNE-Abbey-Alpha-Wood.md diff --git a/packages/app/src/templates/Welcome-to-AFFiNE-Alpha-Downhills.md b/apps/web/src/templates/Welcome-to-AFFiNE-Alpha-Downhills.md similarity index 100% rename from packages/app/src/templates/Welcome-to-AFFiNE-Alpha-Downhills.md rename to apps/web/src/templates/Welcome-to-AFFiNE-Alpha-Downhills.md diff --git a/packages/app/src/templates/Welcome-to-the-AFFiNE-Alpha.md b/apps/web/src/templates/Welcome-to-the-AFFiNE-Alpha.md similarity index 100% rename from packages/app/src/templates/Welcome-to-the-AFFiNE-Alpha.md rename to apps/web/src/templates/Welcome-to-the-AFFiNE-Alpha.md diff --git a/packages/app/src/types.ts b/apps/web/src/types.ts similarity index 100% rename from packages/app/src/types.ts rename to apps/web/src/types.ts diff --git a/packages/app/src/utils/__tests__/get-is-mobile.spec.ts b/apps/web/src/utils/__tests__/get-is-mobile.spec.ts similarity index 100% rename from packages/app/src/utils/__tests__/get-is-mobile.spec.ts rename to apps/web/src/utils/__tests__/get-is-mobile.spec.ts diff --git a/packages/app/src/utils/colors.ts b/apps/web/src/utils/colors.ts similarity index 100% rename from packages/app/src/utils/colors.ts rename to apps/web/src/utils/colors.ts diff --git a/packages/app/src/utils/env.ts b/apps/web/src/utils/env.ts similarity index 100% rename from packages/app/src/utils/env.ts rename to apps/web/src/utils/env.ts diff --git a/packages/app/src/utils/get-is-mobile.ts b/apps/web/src/utils/get-is-mobile.ts similarity index 100% rename from packages/app/src/utils/get-is-mobile.ts rename to apps/web/src/utils/get-is-mobile.ts diff --git a/packages/app/src/utils/index.ts b/apps/web/src/utils/index.ts similarity index 100% rename from packages/app/src/utils/index.ts rename to apps/web/src/utils/index.ts diff --git a/packages/app/src/utils/print-build-info.ts b/apps/web/src/utils/print-build-info.ts similarity index 100% rename from packages/app/src/utils/print-build-info.ts rename to apps/web/src/utils/print-build-info.ts diff --git a/packages/app/src/utils/tools.ts b/apps/web/src/utils/tools.ts similarity index 100% rename from packages/app/src/utils/tools.ts rename to apps/web/src/utils/tools.ts diff --git a/packages/app/src/utils/useragent.ts b/apps/web/src/utils/useragent.ts similarity index 100% rename from packages/app/src/utils/useragent.ts rename to apps/web/src/utils/useragent.ts diff --git a/packages/app/tsconfig.json b/apps/web/tsconfig.json similarity index 90% rename from packages/app/tsconfig.json rename to apps/web/tsconfig.json index 1dc257d3b7..b186e986d6 100644 --- a/packages/app/tsconfig.json +++ b/apps/web/tsconfig.json @@ -19,7 +19,7 @@ "baseUrl": ".", "paths": { "@/*": ["src/*"], - "@affine/component": ["../component/src/index"] + "@affine/component": ["../../packages/component/src/index"] } }, "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"], diff --git a/benchmarks/README.md b/benchmarks/README.md deleted file mode 100644 index c2e7190ca9..0000000000 --- a/benchmarks/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Benchmarks - -Example sites for benchmarking `AFFiNE`. diff --git a/client-app/src-OctoBase b/client-app/src-OctoBase deleted file mode 160000 index 86bb6fbfde..0000000000 --- a/client-app/src-OctoBase +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 86bb6fbfded4ff5f32d38b30ac510414c636da4d diff --git a/packages/component/.storybook/main.js b/packages/component/.storybook/main.js index 9458beb434..b46dd1b7a7 100644 --- a/packages/component/.storybook/main.js +++ b/packages/component/.storybook/main.js @@ -2,7 +2,7 @@ const path = require('node:path'); module.exports = { stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], - staticDirs: ['../../app/public'], + staticDirs: ['../../../apps/web/public'], addons: ['@storybook/addon-links', '@storybook/addon-essentials'], core: { builder: '@storybook/builder-webpack5', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 872d7a67b4..baec36c3ba 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -52,7 +52,7 @@ importers: prettier: 2.7.1 typescript: 4.9.5 - client-app: + apps/desktop: specifiers: '@blocksuite/store': ^0.3.1 '@emotion/react': ^11.10.5 @@ -108,7 +108,7 @@ importers: '@emotion/styled': 11.10.5_jrh5enlbqfbnumycmktdqgd6se '@tauri-apps/api': 1.2.0_nb4isgkwd3sres4g7j7rgtldsu json-schema-to-typescript: 11.0.3 - lib0: 0.2.61 + lib0: 0.2.62 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 react-is: 18.2.0 @@ -153,7 +153,7 @@ importers: vite: 4.1.1_@types+node@18.11.18 zx: 7.1.1 - packages/app: + apps/web: specifiers: '@affine/component': workspace:* '@affine/datacenter': workspace:* @@ -198,9 +198,9 @@ importers: yjs: ^13.5.45 zustand: ^4.3.2 dependencies: - '@affine/component': link:../component - '@affine/datacenter': link:../data-center - '@affine/i18n': link:../i18n + '@affine/component': link:../../packages/component + '@affine/datacenter': link:../../packages/data-center + '@affine/i18n': link:../../packages/i18n '@blocksuite/blocks': 0.4.0-20230210031655-264744e_tryoyswiy2ympczjdv3b3agdeu '@blocksuite/editor': 0.4.0-20230210031655-264744e_j74rmblk7sdmtedyaf3ziv736m '@blocksuite/icons': 2.0.4_w5j4k42lgipnm43s3brx6h3c34 @@ -214,16 +214,16 @@ importers: '@mui/base': 5.0.0-alpha.117_7ey2zzynotv32rpkwno45fsx4e '@mui/icons-material': 5.11.0_ixytn77exq5nzezlwja6xe4jxi '@mui/material': 5.11.8_pmppvr4gtvd6vpdr5yl42vjwtu - '@toeverything/pathfinder-logger': link:../logger + '@toeverything/pathfinder-logger': link:../../packages/logger cmdk: 0.1.21_7ey2zzynotv32rpkwno45fsx4e css-spring: 4.1.0 dayjs: 1.11.7 lit: 2.6.1 next: 13.1.0_rdilrli7uexa22ralt77ekax24_biqbaboplfbrettd7655fr4n2y next-debug-local: 0.1.5 - prettier: 2.7.1 + prettier: 2.8.1 quill: 1.3.7 - quill-cursors: 4.0.0 + quill-cursors: 4.0.2 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 yjs: 13.5.45 @@ -237,7 +237,7 @@ importers: eslint: 8.22.0 eslint-config-next: 12.3.1_hp3n5f6hao4yyg55iy34n6oive eslint-config-prettier: 8.5.0_eslint@8.22.0 - eslint-plugin-prettier: 4.2.1_i2cojdczqdiurzgttlwdgf764e + eslint-plugin-prettier: 4.2.1_wc6gesg72dpfw5d6hhumtqiqsi next-pwa: 5.6.0_next@13.1.0 raw-loader: 4.0.2 typescript: 4.9.5 @@ -2896,7 +2896,7 @@ packages: flexsearch: 0.7.21 idb-keyval: 6.2.0 ky: 0.33.2 - lib0: 0.2.61 + lib0: 0.2.62 y-protocols: 1.0.5 y-webrtc: 10.2.4 yjs: 13.5.45 @@ -3601,23 +3601,6 @@ packages: eslint-visitor-keys: 3.3.0 dev: true - /@eslint/eslintrc/1.3.2: - resolution: {integrity: sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dependencies: - ajv: 6.12.6 - debug: 4.3.4 - espree: 9.4.0 - globals: 13.17.0 - ignore: 5.2.0 - import-fresh: 3.3.0 - js-yaml: 4.1.0 - minimatch: 3.1.2 - strip-json-comments: 3.1.1 - transitivePeerDependencies: - - supports-color - dev: true - /@eslint/eslintrc/1.4.1: resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -6844,7 +6827,7 @@ packages: /@swc/helpers/0.4.14: resolution: {integrity: sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==} dependencies: - tslib: 2.4.0 + tslib: 2.5.0 /@szmarczak/http-timer/4.0.6: resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==} @@ -8213,7 +8196,7 @@ packages: dependencies: '@types/react': 18.0.20 react: 18.2.0 - tslib: 2.4.0 + tslib: 2.5.0 dev: false /aria-query/4.2.2: @@ -8249,17 +8232,6 @@ packages: resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==} dev: true - /array-includes/3.1.5: - resolution: {integrity: sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.2 - define-properties: 1.1.4 - es-abstract: 1.20.2 - get-intrinsic: 1.1.3 - is-string: 1.0.7 - dev: true - /array-includes/3.1.6: resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==} engines: {node: '>= 0.4'} @@ -8303,16 +8275,6 @@ packages: es-shim-unscopables: 1.0.0 dev: true - /array.prototype.flatmap/1.3.0: - resolution: {integrity: sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.2 - define-properties: 1.1.4 - es-abstract: 1.20.2 - es-shim-unscopables: 1.0.0 - dev: true - /array.prototype.flatmap/1.3.1: resolution: {integrity: sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==} engines: {node: '>= 0.4'} @@ -10718,7 +10680,7 @@ packages: eslint-import-resolver-typescript: 2.7.1_2iahngt3u2tkbdlu6s4gkur3pu eslint-plugin-import: 2.26.0_zznokraecjt4ixvvqcdste35vq eslint-plugin-jsx-a11y: 6.6.1_eslint@8.22.0 - eslint-plugin-react: 7.31.8_eslint@8.22.0 + eslint-plugin-react: 7.31.11_eslint@8.22.0 eslint-plugin-react-hooks: 4.6.0_eslint@8.22.0 typescript: 4.9.5 transitivePeerDependencies: @@ -10743,7 +10705,7 @@ packages: eslint-import-resolver-typescript: 2.7.1_ol7jqilc3wemtdbq3nzhywgxq4 eslint-plugin-import: 2.26.0_o2ymnzkcx6ynnxgq4q5neiwzpe eslint-plugin-jsx-a11y: 6.6.1_eslint@8.31.0 - eslint-plugin-react: 7.31.8_eslint@8.31.0 + eslint-plugin-react: 7.31.11_eslint@8.31.0 eslint-plugin-react-hooks: 4.6.0_eslint@8.31.0 typescript: 4.9.5 transitivePeerDependencies: @@ -11042,7 +11004,7 @@ packages: is-core-module: 2.11.0 is-glob: 4.0.3 minimatch: 3.1.2 - object.values: 1.1.5 + object.values: 1.1.6 resolve: 1.22.1 tsconfig-paths: 3.14.1 transitivePeerDependencies: @@ -11073,7 +11035,7 @@ packages: is-core-module: 2.11.0 is-glob: 4.0.3 minimatch: 3.1.2 - object.values: 1.1.5 + object.values: 1.1.6 resolve: 1.22.1 tsconfig-paths: 3.14.1 transitivePeerDependencies: @@ -11104,7 +11066,7 @@ packages: is-core-module: 2.11.0 is-glob: 4.0.3 minimatch: 3.1.2 - object.values: 1.1.5 + object.values: 1.1.6 resolve: 1.22.1 tsconfig-paths: 3.14.1 transitivePeerDependencies: @@ -11121,7 +11083,7 @@ packages: dependencies: '@babel/runtime': 7.20.7 aria-query: 4.2.2 - array-includes: 3.1.5 + array-includes: 3.1.6 ast-types-flow: 0.0.7 axe-core: 4.4.3 axobject-query: 2.2.0 @@ -11143,7 +11105,7 @@ packages: dependencies: '@babel/runtime': 7.20.7 aria-query: 4.2.2 - array-includes: 3.1.5 + array-includes: 3.1.6 ast-types-flow: 0.0.7 axe-core: 4.4.3 axobject-query: 2.2.0 @@ -11189,23 +11151,6 @@ packages: semver: 6.3.0 dev: true - /eslint-plugin-prettier/4.2.1_i2cojdczqdiurzgttlwdgf764e: - resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} - engines: {node: '>=12.0.0'} - peerDependencies: - eslint: '>=7.28.0' - eslint-config-prettier: '*' - prettier: '>=2.0.0' - peerDependenciesMeta: - eslint-config-prettier: - optional: true - dependencies: - eslint: 8.22.0 - eslint-config-prettier: 8.5.0_eslint@8.22.0 - prettier: 2.7.1 - prettier-linter-helpers: 1.0.0 - dev: true - /eslint-plugin-prettier/4.2.1_kl4pe43v5b43npmso5hoplpbyi: resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} engines: {node: '>=12.0.0'} @@ -11240,6 +11185,23 @@ packages: prettier-linter-helpers: 1.0.0 dev: true + /eslint-plugin-prettier/4.2.1_wc6gesg72dpfw5d6hhumtqiqsi: + resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} + engines: {node: '>=12.0.0'} + peerDependencies: + eslint: '>=7.28.0' + eslint-config-prettier: '*' + prettier: '>=2.0.0' + peerDependenciesMeta: + eslint-config-prettier: + optional: true + dependencies: + eslint: 8.22.0 + eslint-config-prettier: 8.5.0_eslint@8.22.0 + prettier: 2.8.1 + prettier-linter-helpers: 1.0.0 + dev: true + /eslint-plugin-promise/6.1.1_eslint@8.30.0: resolution: {integrity: sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -11276,6 +11238,30 @@ packages: eslint: 8.31.0 dev: true + /eslint-plugin-react/7.31.11_eslint@8.22.0: + resolution: {integrity: sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw==} + engines: {node: '>=4'} + peerDependencies: + eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 + dependencies: + array-includes: 3.1.6 + array.prototype.flatmap: 1.3.1 + array.prototype.tosorted: 1.1.1 + doctrine: 2.1.0 + eslint: 8.22.0 + estraverse: 5.3.0 + jsx-ast-utils: 3.3.3 + minimatch: 3.1.2 + object.entries: 1.1.6 + object.fromentries: 2.0.6 + object.hasown: 1.1.2 + object.values: 1.1.6 + prop-types: 15.8.1 + resolve: 2.0.0-next.4 + semver: 6.3.0 + string.prototype.matchall: 4.0.8 + dev: true + /eslint-plugin-react/7.31.11_eslint@8.30.0: resolution: {integrity: sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw==} engines: {node: '>=4'} @@ -11300,50 +11286,28 @@ packages: string.prototype.matchall: 4.0.8 dev: true - /eslint-plugin-react/7.31.8_eslint@8.22.0: - resolution: {integrity: sha512-5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw==} + /eslint-plugin-react/7.31.11_eslint@8.31.0: + resolution: {integrity: sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw==} engines: {node: '>=4'} peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 dependencies: - array-includes: 3.1.5 - array.prototype.flatmap: 1.3.0 - doctrine: 2.1.0 - eslint: 8.22.0 - estraverse: 5.3.0 - jsx-ast-utils: 3.3.3 - minimatch: 3.1.2 - object.entries: 1.1.5 - object.fromentries: 2.0.5 - object.hasown: 1.1.1 - object.values: 1.1.5 - prop-types: 15.8.1 - resolve: 2.0.0-next.4 - semver: 6.3.0 - string.prototype.matchall: 4.0.7 - dev: true - - /eslint-plugin-react/7.31.8_eslint@8.31.0: - resolution: {integrity: sha512-5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw==} - engines: {node: '>=4'} - peerDependencies: - eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - dependencies: - array-includes: 3.1.5 - array.prototype.flatmap: 1.3.0 + array-includes: 3.1.6 + array.prototype.flatmap: 1.3.1 + array.prototype.tosorted: 1.1.1 doctrine: 2.1.0 eslint: 8.31.0 estraverse: 5.3.0 jsx-ast-utils: 3.3.3 minimatch: 3.1.2 - object.entries: 1.1.5 - object.fromentries: 2.0.5 - object.hasown: 1.1.1 - object.values: 1.1.5 + object.entries: 1.1.6 + object.fromentries: 2.0.6 + object.hasown: 1.1.2 + object.values: 1.1.6 prop-types: 15.8.1 resolve: 2.0.0-next.4 semver: 6.3.0 - string.prototype.matchall: 4.0.7 + string.prototype.matchall: 4.0.8 dev: true /eslint-plugin-security-node/1.1.1: @@ -11499,8 +11463,9 @@ packages: /eslint/8.22.0: resolution: {integrity: sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + hasBin: true dependencies: - '@eslint/eslintrc': 1.3.2 + '@eslint/eslintrc': 1.4.1 '@humanwhocodes/config-array': 0.10.4 '@humanwhocodes/gitignore-to-minimatch': 1.0.2 ajv: 6.12.6 @@ -11520,7 +11485,7 @@ packages: find-up: 5.0.0 functional-red-black-tree: 1.0.1 glob-parent: 6.0.2 - globals: 13.17.0 + globals: 13.19.0 globby: 11.1.0 grapheme-splitter: 1.0.4 ignore: 5.2.0 @@ -12707,13 +12672,6 @@ packages: engines: {node: '>=4'} dev: true - /globals/13.17.0: - resolution: {integrity: sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==} - engines: {node: '>=8'} - dependencies: - type-fest: 0.20.2 - dev: true - /globals/13.19.0: resolution: {integrity: sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==} engines: {node: '>=8'} @@ -13100,6 +13058,7 @@ packages: /html-tokenize/2.0.1: resolution: {integrity: sha512-QY6S+hZ0f5m1WT8WffYN+Hg+xm/w5I8XeUcAq/ZYP5wVC8xbKi4Whhru3FtrAebD5EhBW8rmFzkDI6eCAuFe2w==} + hasBin: true dependencies: buffer-from: 0.1.2 inherits: 2.0.4 @@ -14292,18 +14251,11 @@ packages: isomorphic.js: 0.2.5 dev: false - /lib0/0.2.61: - resolution: {integrity: sha512-yVhT0uMXNWk50KqBgsZPxmcoO7Yft341wDTByKjXIzBpkhUjEzXl/M9b/GfqyDFBdiLCGg19Cv26NHUEnbL1pA==} - engines: {node: '>=14'} - dependencies: - isomorphic.js: 0.2.5 - /lib0/0.2.62: resolution: {integrity: sha512-DY0G8AaQloUvpiss7EpAo/t4R82b9m/AydbQRNAa9Khssn9oGDJnSN8Q1qQ8u82Wog4iaT1O8yM+DfhzGCrrpQ==} engines: {node: '>=14'} dependencies: isomorphic.js: 0.2.5 - dev: false /lilconfig/2.0.6: resolution: {integrity: sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==} @@ -15493,15 +15445,6 @@ packages: object-keys: 1.1.1 dev: true - /object.entries/1.1.5: - resolution: {integrity: sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.2 - define-properties: 1.1.4 - es-abstract: 1.20.2 - dev: true - /object.entries/1.1.6: resolution: {integrity: sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==} engines: {node: '>= 0.4'} @@ -15511,15 +15454,6 @@ packages: es-abstract: 1.21.1 dev: true - /object.fromentries/2.0.5: - resolution: {integrity: sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.2 - define-properties: 1.1.4 - es-abstract: 1.20.2 - dev: true - /object.fromentries/2.0.6: resolution: {integrity: sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==} engines: {node: '>= 0.4'} @@ -15539,13 +15473,6 @@ packages: es-abstract: 1.21.1 dev: true - /object.hasown/1.1.1: - resolution: {integrity: sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==} - dependencies: - define-properties: 1.1.4 - es-abstract: 1.20.2 - dev: true - /object.hasown/1.1.2: resolution: {integrity: sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==} dependencies: @@ -15560,15 +15487,6 @@ packages: isobject: 3.0.1 dev: true - /object.values/1.1.5: - resolution: {integrity: sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.2 - define-properties: 1.1.4 - es-abstract: 1.20.2 - dev: true - /object.values/1.1.6: resolution: {integrity: sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==} engines: {node: '>= 0.4'} @@ -16526,10 +16444,6 @@ packages: engines: {node: '>=10'} dev: true - /quill-cursors/4.0.0: - resolution: {integrity: sha512-nCwCZtQPl4EnxJSheHtb067Jo48A6mc8/t7waGSLqXvbE68a5vHBFfMOQPZI7jxjksbDhpfzQta3a3/MoPvKzQ==} - dev: false - /quill-cursors/4.0.2: resolution: {integrity: sha512-/5mEfB6rDXwBy9rt3XieMKmQE8+OMnMBi2DFwea3t06QXH6i/NsICpteEoC++WGkQ/qyurIACUNnY7eBVh4Bmg==} dev: false @@ -16713,7 +16627,7 @@ packages: '@types/react': 18.0.20 react: 18.2.0 react-style-singleton: 2.2.1_w5j4k42lgipnm43s3brx6h3c34 - tslib: 2.4.0 + tslib: 2.5.0 dev: false /react-remove-scroll/2.5.4_w5j4k42lgipnm43s3brx6h3c34: @@ -16730,7 +16644,7 @@ packages: react: 18.2.0 react-remove-scroll-bar: 2.3.4_w5j4k42lgipnm43s3brx6h3c34 react-style-singleton: 2.2.1_w5j4k42lgipnm43s3brx6h3c34 - tslib: 2.4.0 + tslib: 2.5.0 use-callback-ref: 1.3.0_w5j4k42lgipnm43s3brx6h3c34 use-sidecar: 1.1.2_w5j4k42lgipnm43s3brx6h3c34 dev: false @@ -16772,7 +16686,7 @@ packages: get-nonce: 1.0.1 invariant: 2.2.4 react: 18.2.0 - tslib: 2.4.0 + tslib: 2.5.0 dev: false /react-transition-group/4.4.5_biqbaboplfbrettd7655fr4n2y: @@ -17896,19 +17810,6 @@ packages: strip-ansi: 7.0.1 dev: true - /string.prototype.matchall/4.0.7: - resolution: {integrity: sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==} - dependencies: - call-bind: 1.0.2 - define-properties: 1.1.4 - es-abstract: 1.20.2 - get-intrinsic: 1.1.3 - has-symbols: 1.0.3 - internal-slot: 1.0.3 - regexp.prototype.flags: 1.4.3 - side-channel: 1.0.4 - dev: true - /string.prototype.matchall/4.0.8: resolution: {integrity: sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==} dependencies: @@ -18630,7 +18531,6 @@ packages: /tslib/2.5.0: resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} - dev: true /tsutils/3.21.0_typescript@4.9.5: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} @@ -19016,7 +18916,7 @@ packages: dependencies: '@types/react': 18.0.20 react: 18.2.0 - tslib: 2.4.0 + tslib: 2.5.0 dev: false /use-sidecar/1.1.2_w5j4k42lgipnm43s3brx6h3c34: @@ -19032,7 +18932,7 @@ packages: '@types/react': 18.0.20 detect-node-es: 1.1.0 react: 18.2.0 - tslib: 2.4.0 + tslib: 2.5.0 dev: false /use-sync-external-store/1.2.0: @@ -19773,7 +19673,7 @@ packages: /y-protocols/1.0.5: resolution: {integrity: sha512-Wil92b7cGk712lRHDqS4T90IczF6RkcvCwAD0A2OPg+adKmOe+nOiT/N2hvpQIWS3zfjmtL4CPaH5sIW1Hkm/A==} dependencies: - lib0: 0.2.61 + lib0: 0.2.62 dev: false /y-webrtc/10.2.4: @@ -19883,7 +19783,7 @@ packages: /yjs/13.5.45: resolution: {integrity: sha512-9VUNDvb9oJHdYSMdzIpdM/agVm+EEFKRN+843CFqQuq5bo/BP3EAaxofRG9jQut3sqtGQT4A9YdQvOeeAjU6aA==} dependencies: - lib0: 0.2.61 + lib0: 0.2.62 /yn/3.1.1: resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 7e905d4063..e16572c549 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,5 +1,5 @@ packages: + # apps folder for multiple platform clients + - 'apps/*' # all packages in direct subdirs of packages/ - 'packages/*' - # app folder is on top level because of its importance - - 'client-app' diff --git a/tests/console.spec.ts b/tests/console.spec.ts index 6ff7d5d719..370867afaf 100644 --- a/tests/console.spec.ts +++ b/tests/console.spec.ts @@ -7,7 +7,7 @@ import { fileURLToPath } from 'url'; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); -const pkgPath = path.join(__dirname, '../packages/app/package.json'); +const pkgPath = path.join(__dirname, '../apps/web/package.json'); const record = fs.readFileSync(pkgPath, 'utf8'); const temp = JSON.parse(record); loadPage();