Merge remote-tracking branch 'origin/canary' into beta

toeverything · May 7, 2024 · cff3eb7 · cff3eb7
2 parents d9ad3ca + d76a635
commit cff3eb7
Show file tree

Hide file tree

Showing 18 changed files with 260 additions and 438 deletions.
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "@faker-js/faker": "^8.4.1",
     "@istanbuljs/schema": "^0.1.3",
     "@magic-works/i18n-codegen": "^0.5.0",
-    "@nx/vite": "18.2.4",
+    "@nx/vite": "19.0.0",
     "@playwright/test": "^1.43.0",
     "@taplo/cli": "^0.7.0",
     "@testing-library/react": "^15.0.0",
@@ -93,7 +93,7 @@
     "lint-staged": "^15.2.2",
     "msw": "^2.2.13",
     "nanoid": "^5.0.7",
-    "nx": "^18.2.4",
+    "nx": "^19.0.0",
     "nyc": "^15.1.0",
     "oxlint": "0.3.1",
     "prettier": "^3.2.5",

diff --git a/packages/backend/native/package.json b/packages/backend/native/package.json
@@ -34,7 +34,7 @@
   "devDependencies": {
     "@napi-rs/cli": "3.0.0-alpha.46",
     "lib0": "^0.2.93",
-    "nx": "^18.2.4",
+    "nx": "^19.0.0",
     "nx-cloud": "^18.0.0",
     "yjs": "^13.6.14"
   }

diff --git a/packages/common/env/package.json b/packages/common/env/package.json
@@ -3,8 +3,8 @@
   "private": true,
   "type": "module",
   "devDependencies": {
-    "@blocksuite/global": "0.14.0-canary-202405070156-0d03364",
-    "@blocksuite/store": "0.14.0-canary-202405070156-0d03364",
+    "@blocksuite/global": "0.14.0-canary-202405070334-778ff10",
+    "@blocksuite/store": "0.14.0-canary-202405070334-778ff10",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "vitest": "1.4.0"

diff --git a/packages/common/infra/package.json b/packages/common/infra/package.json
@@ -11,9 +11,9 @@
     "@affine/debug": "workspace:*",
     "@affine/env": "workspace:*",
     "@affine/templates": "workspace:*",
-    "@blocksuite/blocks": "0.14.0-canary-202405070156-0d03364",
-    "@blocksuite/global": "0.14.0-canary-202405070156-0d03364",
-    "@blocksuite/store": "0.14.0-canary-202405070156-0d03364",
+    "@blocksuite/blocks": "0.14.0-canary-202405070334-778ff10",
+    "@blocksuite/global": "0.14.0-canary-202405070334-778ff10",
+    "@blocksuite/store": "0.14.0-canary-202405070334-778ff10",
     "@datastructures-js/binary-search-tree": "^5.3.2",
     "foxact": "^0.2.33",
     "jotai": "^2.8.0",
@@ -28,8 +28,8 @@
   "devDependencies": {
     "@affine-test/fixtures": "workspace:*",
     "@affine/templates": "workspace:*",
-    "@blocksuite/block-std": "0.14.0-canary-202405070156-0d03364",
-    "@blocksuite/presets": "0.14.0-canary-202405070156-0d03364",
+    "@blocksuite/block-std": "0.14.0-canary-202405070334-778ff10",
+    "@blocksuite/presets": "0.14.0-canary-202405070334-778ff10",
     "@testing-library/react": "^15.0.0",
     "async-call-rpc": "^6.4.0",
     "react": "^18.2.0",

diff --git a/packages/frontend/component/package.json b/packages/frontend/component/package.json
@@ -75,12 +75,12 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@blocksuite/block-std": "0.14.0-canary-202405070156-0d03364",
-    "@blocksuite/blocks": "0.14.0-canary-202405070156-0d03364",
-    "@blocksuite/global": "0.14.0-canary-202405070156-0d03364",
+    "@blocksuite/block-std": "0.14.0-canary-202405070334-778ff10",
+    "@blocksuite/blocks": "0.14.0-canary-202405070334-778ff10",
+    "@blocksuite/global": "0.14.0-canary-202405070334-778ff10",
     "@blocksuite/icons": "2.1.46",
-    "@blocksuite/presets": "0.14.0-canary-202405070156-0d03364",
-    "@blocksuite/store": "0.14.0-canary-202405070156-0d03364",
+    "@blocksuite/presets": "0.14.0-canary-202405070334-778ff10",
+    "@blocksuite/store": "0.14.0-canary-202405070334-778ff10",
     "@storybook/addon-actions": "^7.6.17",
     "@storybook/addon-essentials": "^7.6.17",
     "@storybook/addon-interactions": "^7.6.17",

diff --git a/packages/frontend/core/package.json b/packages/frontend/core/package.json
@@ -18,13 +18,13 @@
     "@affine/graphql": "workspace:*",
     "@affine/i18n": "workspace:*",
     "@affine/templates": "workspace:*",
-    "@blocksuite/block-std": "0.14.0-canary-202405070156-0d03364",
-    "@blocksuite/blocks": "0.14.0-canary-202405070156-0d03364",
-    "@blocksuite/global": "0.14.0-canary-202405070156-0d03364",
+    "@blocksuite/block-std": "0.14.0-canary-202405070334-778ff10",
+    "@blocksuite/blocks": "0.14.0-canary-202405070334-778ff10",
+    "@blocksuite/global": "0.14.0-canary-202405070334-778ff10",
     "@blocksuite/icons": "2.1.46",
-    "@blocksuite/inline": "0.14.0-canary-202405070156-0d03364",
-    "@blocksuite/presets": "0.14.0-canary-202405070156-0d03364",
-    "@blocksuite/store": "0.14.0-canary-202405070156-0d03364",
+    "@blocksuite/inline": "0.14.0-canary-202405070334-778ff10",
+    "@blocksuite/presets": "0.14.0-canary-202405070334-778ff10",
+    "@blocksuite/store": "0.14.0-canary-202405070334-778ff10",
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/modifiers": "^7.0.0",
     "@dnd-kit/sortable": "^8.0.0",

diff --git a/...ges/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.css.ts b/...ges/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.css.ts
@@ -1,5 +1,5 @@
 import { cssVar } from '@toeverything/theme';
-import { keyframes, style } from '@vanilla-extract/css';
+import { globalStyle, keyframes, style } from '@vanilla-extract/css';
 export const plansLayoutRoot = style({
   display: 'flex',
   flexDirection: 'column',
@@ -100,7 +100,6 @@ export const aiScrollTip = style({
   justifyContent: 'space-between',
   padding: '12px 20px 12px 16px',
   boxShadow: cssVar('shadow1'),
-  display: 'flex',
   marginBottom: -100,
 
   animation: `${slideInBottom} 0.3s ease 0.5s forwards`,
@@ -112,6 +111,10 @@ export const aiScrollTip = style({
     },
   },
 });
+// to override `display: contents !important` in `scrollable.tsx`
+globalStyle(`div.${aiScrollTip}`, {
+  display: 'flex !important',
+});
 export const aiScrollTipLabel = style({
   display: 'flex',
   alignItems: 'center',

diff --git a/packages/frontend/core/src/components/affine/setting-modal/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/index.tsx
@@ -1,4 +1,4 @@
-import { Loading } from '@affine/component';
+import { Loading, Scrollable } from '@affine/component';
 import { WorkspaceDetailSkeleton } from '@affine/component/setting-components';
 import type { ModalProps } from '@affine/component/ui/modal';
 import { Modal } from '@affine/component/ui/modal';
@@ -139,51 +139,54 @@ const SettingModalInner = ({
         onTabChange={onTabChange}
         selectedWorkspaceId={workspaceMetadata?.id ?? null}
       />
-      <div
-        data-testid="setting-modal-content"
-        className={style.wrapper}
-        ref={modalContentWrapperRef}
-      >
-        <div ref={modalContentRef} className={style.centerContainer}>
-          <div className={style.content}>
-            <Suspense fallback={<WorkspaceDetailSkeleton />}>
-              {activeTab.startsWith('workspace:') && workspaceMetadata ? (
-                <WorkspaceSetting
-                  subTab={activeTab.split(':')[1] as WorkspaceSubTab}
-                  key={workspaceMetadata.id}
-                  workspaceMetadata={workspaceMetadata}
-                />
-              ) : null}
-              {isGeneralSetting(activeTab) ? (
-                <GeneralSetting generalKey={activeTab} />
-              ) : null}
-              {activeTab === 'account' && loginStatus === 'authenticated' ? (
-                <AccountSetting />
-              ) : null}
-            </Suspense>
-          </div>
-          <div className={style.footer}>
-            <ContactWithUsIcon fontSize={16} />
-            <Trans
-              i18nKey={'com.affine.settings.suggestion-2'}
-              components={{
-                1: (
-                  <span
-                    className={style.link}
-                    onClick={handleOpenStarAFFiNEModal}
-                  />
-                ),
-                2: (
-                  <span
-                    className={style.link}
-                    onClick={handleOpenIssueFeedbackModal}
+      <Scrollable.Root>
+        <Scrollable.Viewport
+          data-testid="setting-modal-content"
+          className={style.wrapper}
+          ref={modalContentWrapperRef}
+        >
+          <div ref={modalContentRef} className={style.centerContainer}>
+            <div className={style.content}>
+              <Suspense fallback={<WorkspaceDetailSkeleton />}>
+                {activeTab.startsWith('workspace:') && workspaceMetadata ? (
+                  <WorkspaceSetting
+                    subTab={activeTab.split(':')[1] as WorkspaceSubTab}
+                    key={workspaceMetadata.id}
+                    workspaceMetadata={workspaceMetadata}
                   />
-                ),
-              }}
-            />
+                ) : null}
+                {isGeneralSetting(activeTab) ? (
+                  <GeneralSetting generalKey={activeTab} />
+                ) : null}
+                {activeTab === 'account' && loginStatus === 'authenticated' ? (
+                  <AccountSetting />
+                ) : null}
+              </Suspense>
+            </div>
+            <div className={style.footer}>
+              <ContactWithUsIcon fontSize={16} />
+              <Trans
+                i18nKey={'com.affine.settings.suggestion-2'}
+                components={{
+                  1: (
+                    <span
+                      className={style.link}
+                      onClick={handleOpenStarAFFiNEModal}
+                    />
+                  ),
+                  2: (
+                    <span
+                      className={style.link}
+                      onClick={handleOpenIssueFeedbackModal}
+                    />
+                  ),
+                }}
+              />
+            </div>
           </div>
-        </div>
-      </div>
+          <Scrollable.Scrollbar />
+        </Scrollable.Viewport>
+      </Scrollable.Root>
     </>
   );
 };

diff --git a/packages/frontend/core/src/components/affine/setting-modal/style.css.ts b/packages/frontend/core/src/components/affine/setting-modal/style.css.ts
@@ -5,13 +5,8 @@ export const wrapper = style({
   height: '100%',
   // margin: '0 auto',
   padding: '40px 15px 20px 15px',
-  overflowX: 'hidden',
-  overflowY: 'auto',
   display: 'flex',
   justifyContent: 'center',
-  '::-webkit-scrollbar': {
-    display: 'none',
-  },
 });
 export const centerContainer = style({
   width: '100%',

diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/request.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/request.ts
@@ -8,16 +8,6 @@ const TIMEOUT = 50000;
 
 const client = new CopilotClient();
 
-async function calculateBlobHash(blob: Blob) {
-  const buffer = await blob.arrayBuffer();
-  const hashBuffer = await crypto.subtle.digest('SHA-256', buffer);
-  const hashArray = Array.from(new Uint8Array(hashBuffer));
-  return hashArray
-    .map(byte => byte.toString(16).padStart(2, '0'))
-    .join('')
-    .slice(0, 32);
-}
-
 export type TextToTextOptions = {
   docId: string;
   workspaceId: string;
@@ -86,7 +76,7 @@ async function createSessionMessage({
         if (blob instanceof File) {
           return blob;
         } else {
-          return new File([blob], await calculateBlobHash(blob), {
+          return new File([blob], sessionId, {
             type: blob.type,
           });
         }

diff --git a/packages/frontend/core/src/modules/telemetry/services/telemetry.ts b/packages/frontend/core/src/modules/telemetry/services/telemetry.ts
@@ -15,6 +15,12 @@ export class TelemetryService extends Service {
   }
 
   onApplicationStart() {
+    if (process.env.MIXPANEL_TOKEN) {
+      mixpanel.init(process.env.MIXPANEL_TOKEN || '', {
+        track_pageview: true,
+        persistence: 'localStorage',
+      });
+    }
     const account = this.auth.session.account$.value;
     if (account) {
       mixpanel.identify(account.id);

diff --git a/packages/frontend/core/src/telemetry.tsx b/packages/frontend/core/src/telemetry.tsx
@@ -6,14 +6,8 @@ import { useLayoutEffect } from 'react';
 export function Telemetry() {
   const settings = useAtomValue(appSettingAtom);
   useLayoutEffect(() => {
-    if (process.env.MIXPANEL_TOKEN) {
-      mixpanel.init(process.env.MIXPANEL_TOKEN || '', {
-        track_pageview: true,
-        persistence: 'localStorage',
-      });
-      if (settings.enableTelemetry === false) {
-        mixpanel.opt_out_tracking();
-      }
+    if (settings.enableTelemetry === false) {
+      mixpanel.opt_out_tracking();
     }
   }, [settings.enableTelemetry]);
   return null;

diff --git a/packages/frontend/electron/package.json b/packages/frontend/electron/package.json
@@ -29,10 +29,10 @@
     "@affine/env": "workspace:*",
     "@affine/i18n": "workspace:*",
     "@affine/native": "workspace:*",
-    "@blocksuite/block-std": "0.14.0-canary-202405070156-0d03364",
-    "@blocksuite/blocks": "0.14.0-canary-202405070156-0d03364",
-    "@blocksuite/presets": "0.14.0-canary-202405070156-0d03364",
-    "@blocksuite/store": "0.14.0-canary-202405070156-0d03364",
+    "@blocksuite/block-std": "0.14.0-canary-202405070334-778ff10",
+    "@blocksuite/blocks": "0.14.0-canary-202405070334-778ff10",
+    "@blocksuite/presets": "0.14.0-canary-202405070334-778ff10",
+    "@blocksuite/store": "0.14.0-canary-202405070334-778ff10",
     "@electron-forge/cli": "^7.3.0",
     "@electron-forge/core": "^7.3.0",
     "@electron-forge/core-utils": "^7.3.0",

diff --git a/packages/frontend/electron/renderer/index.tsx b/packages/frontend/electron/renderer/index.tsx
@@ -4,7 +4,7 @@ import '@affine/core/bootstrap/preload';
 import { appConfigProxy } from '@affine/core/hooks/use-app-config-storage';
 import { performanceLogger } from '@affine/core/shared';
 import { apis, events } from '@affine/electron-api';
-import { init, replayIntegration, setTags } from '@sentry/electron/renderer';
+import { init, setTags } from '@sentry/electron/renderer';
 import {
   init as reactInit,
   reactRouterV6BrowserTracingIntegration,
@@ -50,7 +50,6 @@ function main() {
               createRoutesFromChildren,
               matchRoutes,
             }),
-            replayIntegration(),
           ],
         },
         reactInit

diff --git a/packages/frontend/native/package.json b/packages/frontend/native/package.json
@@ -39,7 +39,7 @@
     "@types/uuid": "^9.0.8",
     "ava": "^6.1.2",
     "cross-env": "^7.0.3",
-    "nx": "^18.2.4",
+    "nx": "^19.0.0",
     "nx-cloud": "^18.0.0",
     "rxjs": "^7.8.1",
     "ts-node": "^10.9.2",

diff --git a/packages/frontend/web/src/index.tsx b/packages/frontend/web/src/index.tsx
@@ -8,7 +8,6 @@ import { isDesktop } from '@affine/env/constant';
 import {
   init,
   reactRouterV6BrowserTracingIntegration,
-  replayIntegration,
   setTags,
 } from '@sentry/react';
 import { StrictMode, useEffect } from 'react';
@@ -44,7 +43,6 @@ function main() {
             createRoutesFromChildren,
             matchRoutes,
           }),
-          replayIntegration(),
         ],
       });
       setTags({

diff --git a/tools/cli/package.json b/tools/cli/package.json
@@ -6,7 +6,7 @@
     "@affine/env": "workspace:*",
     "@affine/templates": "workspace:*",
     "@aws-sdk/client-s3": "3.537.0",
-    "@blocksuite/presets": "0.14.0-canary-202405070156-0d03364",
+    "@blocksuite/presets": "0.14.0-canary-202405070334-778ff10",
     "@clack/core": "^0.3.4",
     "@clack/prompts": "^0.7.0",
     "@magic-works/i18n-codegen": "^0.5.0",