From 7234e2344b98513de5967061aa4846261d619a00 Mon Sep 17 00:00:00 2001 From: CatsJuice Date: Tue, 7 May 2024 03:19:40 +0000 Subject: [PATCH 1/5] feat(core): replace setting content scroll with radix ScrollArea (#6787) Use global scroll-area style ![CleanShot 2024-05-07 at 10.58.01@2x.png](https://graphite-user-uploaded-assets-prod.s3.amazonaws.com/LakojjjzZNf6ogjOVwKE/5330b59d-fea0-4b2b-a046-1740c8099a19.png) --- .../general-setting/plans/layout.css.ts | 7 +- .../components/affine/setting-modal/index.tsx | 91 ++++++++++--------- .../affine/setting-modal/style.css.ts | 5 - 3 files changed, 52 insertions(+), 51 deletions(-) diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.css.ts b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.css.ts index 59657ef142..cce52eb514 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.css.ts +++ b/packages/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 index 048ed26f90..4739689044 100644 --- 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} /> -
-
-
- }> - {activeTab.startsWith('workspace:') && workspaceMetadata ? ( - - ) : null} - {isGeneralSetting(activeTab) ? ( - - ) : null} - {activeTab === 'account' && loginStatus === 'authenticated' ? ( - - ) : null} - -
-
- - + +
+
+ }> + {activeTab.startsWith('workspace:') && workspaceMetadata ? ( + - ), - 2: ( - - ), - }} - /> + ) : null} + {isGeneralSetting(activeTab) ? ( + + ) : null} + {activeTab === 'account' && loginStatus === 'authenticated' ? ( + + ) : null} + +
+
+ + + ), + 2: ( + + ), + }} + /> +
-
-
+ + + ); }; 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 index 8b95a4e82a..09585539c0 100644 --- 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%', From 82d4aa8dffce329cc2aee4592d0b031fd575e2b4 Mon Sep 17 00:00:00 2001 From: renovate <29139614+renovate@users.noreply.github.com> Date: Tue, 7 May 2024 03:36:07 +0000 Subject: [PATCH 2/5] chore: bump up nrwl monorepo to v19 (major) (#6783) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@nx/vite](https://nx.dev) ([source](https://togithub.com/nrwl/nx/tree/HEAD/packages/vite)) | [`18.2.4` -> `19.0.0`](https://renovatebot.com/diffs/npm/@nx%2fvite/18.2.4/19.0.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@nx%2fvite/19.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@nx%2fvite/19.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@nx%2fvite/18.2.4/19.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@nx%2fvite/18.2.4/19.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [nx](https://nx.dev) ([source](https://togithub.com/nrwl/nx/tree/HEAD/packages/nx)) | [`^18.2.4` -> `^19.0.0`](https://renovatebot.com/diffs/npm/nx/18.3.2/19.0.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/nx/19.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/nx/19.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/nx/18.3.2/19.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/nx/18.3.2/19.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
nrwl/nx (@​nx/vite) ### [`v19.0.0`](https://togithub.com/nrwl/nx/releases/tag/19.0.0) [Compare Source](https://togithub.com/nrwl/nx/compare/18.3.4...19.0.0) ### 19.0.0 (2024-05-06) ##### 🚀 Features - **bundling:** upgrade rollup to v4 ([#​22656](https://togithub.com/nrwl/nx/pull/22656)) - **core:** load native files from tmp location instead of node_modules ([#​22648](https://togithub.com/nrwl/nx/pull/22648)) - **core:** add root level forwardAllArgs ([#​22753](https://togithub.com/nrwl/nx/pull/22753)) - **core:** add API entrypoint to register metadata ([#​22773](https://togithub.com/nrwl/nx/pull/22773)) - **core:** validate that outputs is an array of strings ([#​22371](https://togithub.com/nrwl/nx/pull/22371)) - **core:** cleanup for v19 ([#​22993](https://togithub.com/nrwl/nx/pull/22993)) - **gradle:** add ci-workflow generator ([#​23125](https://togithub.com/nrwl/nx/pull/23125)) - **graph:** add loading spinner on project details ([#​23023](https://togithub.com/nrwl/nx/pull/23023)) - **graph:** add target groups and technology icon ([#​22839](https://togithub.com/nrwl/nx/pull/22839)) - **graph:** show partial project graph & errors in graph app ([#​22838](https://togithub.com/nrwl/nx/pull/22838)) - **graph:** enable watch mode by default ([#​23092](https://togithub.com/nrwl/nx/pull/23092)) - **graph:** show tooltips that were previously hidden due to upublished docs ([#​23099](https://togithub.com/nrwl/nx/pull/23099)) - **graph:** log errors in console in graph watch mode ([#​23136](https://togithub.com/nrwl/nx/pull/23136)) - **js:** add swc cli options --strip-leading-paths ([#​22856](https://togithub.com/nrwl/nx/pull/22856)) - **linter:** add convert-to-inferred migration generator ([#​23142](https://togithub.com/nrwl/nx/pull/23142)) - **misc:** v19 cleanup for Nx plugins ([#​23104](https://togithub.com/nrwl/nx/pull/23104)) - **nextjs:** Add https option for custom server ([#​22921](https://togithub.com/nrwl/nx/pull/22921)) - **nx-dev:** new main navigation menu ([#​22829](https://togithub.com/nrwl/nx/pull/22829)) - **nx-dev:** disable banner on home page ([#​22992](https://togithub.com/nrwl/nx/pull/22992)) - **nx-dev:** add nx blog ([#​22828](https://togithub.com/nrwl/nx/pull/22828)) - **nx-dev:** add ui-enterprise library ([#​23086](https://togithub.com/nrwl/nx/pull/23086)) - **react:** support react 18.3.1 ([#​23166](https://togithub.com/nrwl/nx/pull/23166)) - **react-native:** upgrade react native to 0.72.6 ([#​22729](https://togithub.com/nrwl/nx/pull/22729)) - **repo:** split e2e tests ([#​22927](https://togithub.com/nrwl/nx/pull/22927)) - **testing:** make playwright default e2e test runner option ([#​22511](https://togithub.com/nrwl/nx/pull/22511)) - **testing:** add playwright generator to convert from executors to plugin ([#​22784](https://togithub.com/nrwl/nx/pull/22784)) - **testing:** add convert-to-inferred migration generator for cypress ([#​22884](https://togithub.com/nrwl/nx/pull/22884)) - **webpack:** change plugin import paths to speed up config loading ([#​23021](https://togithub.com/nrwl/nx/pull/23021)) ##### 🩹 Fixes - **angular:** fix loading postcss configuration in ng-packagr executors ([#​22900](https://togithub.com/nrwl/nx/pull/22900)) - **angular:** ensure buildable libraries in-process tsconfig file extends from the correct path ([#​23165](https://togithub.com/nrwl/nx/pull/23165)) - **bundling:** handle circular dependencies in [@​nx/esbuild](https://togithub.com/nx/esbuild) getExtraDependencies ([#​22644](https://togithub.com/nrwl/nx/pull/22644)) - **core:** repair sourcemap creation in createNodes ([#​22851](https://togithub.com/nrwl/nx/pull/22851)) - **core:** load config util supports absolute paths on windows ([#​22837](https://togithub.com/nrwl/nx/pull/22837)) - **core:** keep plugin workers until main process shutdown ([#​22860](https://togithub.com/nrwl/nx/pull/22860)) - **core:** handle schema validation errors running commands directly ([#​22864](https://togithub.com/nrwl/nx/pull/22864)) - **core:** forward args provided to the nx add command to the invoked init generator ([#​22855](https://togithub.com/nrwl/nx/pull/22855)) - **core:** fix hashing of external dependencies ([#​22865](https://togithub.com/nrwl/nx/pull/22865)) - **core:** group command exit listeners to avoid warning ([#​22892](https://togithub.com/nrwl/nx/pull/22892)) - **core:** handle plugin errors from isolation correctly ([#​22890](https://togithub.com/nrwl/nx/pull/22890)) - **core:** disable pty on windows until stable ([#​22910](https://togithub.com/nrwl/nx/pull/22910)) - **core:** fix cursor being hidden and process shutdown for ctrl c ([#​22895](https://togithub.com/nrwl/nx/pull/22895)) - **core:** different commands should not be considered compatible targets ([#​22863](https://togithub.com/nrwl/nx/pull/22863)) - **core:** fix pnpm install order on ci workflows ([#​22580](https://togithub.com/nrwl/nx/pull/22580)) - **core:** workspace context glob respects exclude ([#​22939](https://togithub.com/nrwl/nx/pull/22939)) - **core:** handle events that do not have paths ([#​22947](https://togithub.com/nrwl/nx/pull/22947)) - **core:** fix exclude for empty array ([#​22951](https://togithub.com/nrwl/nx/pull/22951)) - **core:** move a few api points to return root maps directly ([#​22949](https://togithub.com/nrwl/nx/pull/22949)) - **core:** regression register ts transpiler for local plugin ([#​22964](https://togithub.com/nrwl/nx/pull/22964)) - **core:** handle created directories when watching on linux ([#​22980](https://togithub.com/nrwl/nx/pull/22980)) - **core:** ensure create nodes functions are properly parallelized ([#​23005](https://togithub.com/nrwl/nx/pull/23005)) - **core:** nxComponentTestingPreset should not expose bundler option ([#​23009](https://togithub.com/nrwl/nx/pull/23009)) - **core:** ensure include and excluded return from plugin worker ([#​23032](https://togithub.com/nrwl/nx/pull/23032)) - **core:** read nx.json in the DaemonClient constructor instead of the module ([#​23033](https://togithub.com/nrwl/nx/pull/23033)) - **core:** recommend nx reset when graph errors and print error in da… ([#​23014](https://togithub.com/nrwl/nx/pull/23014)) - **core:** affect all projects when nx.json is touched ([#​23036](https://togithub.com/nrwl/nx/pull/23036)) - **core:** improve performance of pnpm lock file parsing ([#​23017](https://togithub.com/nrwl/nx/pull/23017)) - **core:** prevent device status report from being printed during pty execution ([#​23039](https://togithub.com/nrwl/nx/pull/23039)) - **core:** ensure daemon socket dir exists when specified in env ([#​23071](https://togithub.com/nrwl/nx/pull/23071)) - **core:** do not forward --updatePackageScripts flag to init generators that are not from nx core plugins ([#​23064](https://togithub.com/nrwl/nx/pull/23064)) - **core:** local plugins should be able to use {projectRoot} in options block ([#​23068](https://togithub.com/nrwl/nx/pull/23068)) - **core:** add import for `performance` to increase compatibility ([#​23109](https://togithub.com/nrwl/nx/pull/23109)) - **core:** align padding for output with failed tasks ([#​23119](https://togithub.com/nrwl/nx/pull/23119)) - **core:** ensure project with name undefined is not created ([#​23097](https://togithub.com/nrwl/nx/pull/23097)) - **core:** catch workspace validity check errors ([#​23138](https://togithub.com/nrwl/nx/pull/23138)) - **core:** remove obsolete git track from ci generators ([#​23134](https://togithub.com/nrwl/nx/pull/23134)) - **core:** projectName should not be interpolated as undefined ([#​23145](https://togithub.com/nrwl/nx/pull/23145)) - **core:** forward process execArgv when using the native runner ([#​23195](https://togithub.com/nrwl/nx/pull/23195)) - **core:** ensure setting up nx cloud in nx migrate using the generator from the installed latest version ([#​23194](https://togithub.com/nrwl/nx/pull/23194)) - **devkit:** run callback for forEachProjectConfig when target.options is undefined ([#​23143](https://togithub.com/nrwl/nx/pull/23143)) - **devkit:** executor-to-plugin-migrator should add // targets hint ([#​23167](https://togithub.com/nrwl/nx/pull/23167)) - **devkit:** check if includes is actually necessary ([#​23181](https://togithub.com/nrwl/nx/pull/23181)) - **gradle:** change gradle command to be relative path ([#​22963](https://togithub.com/nrwl/nx/pull/22963)) - **gradle:** should skip println in project report ([#​22862](https://togithub.com/nrwl/nx/pull/22862)) - **gradle:** get gradlew path with projectRoot joins workspaceRoot ([#​22988](https://togithub.com/nrwl/nx/pull/22988)) - **gradle:** fix gradlew exec path for root project ([#​23094](https://togithub.com/nrwl/nx/pull/23094)) - **gradle:** fix gradle not working for spring ([#​23130](https://togithub.com/nrwl/nx/pull/23130)) - **gradle:** add namedInputs to nx.json in gradle init ([#​23152](https://togithub.com/nrwl/nx/pull/23152)) - **gradle:** fix gradle github ci workflow ([#​23154](https://togithub.com/nrwl/nx/pull/23154)) - **graph:** don't listen to system theme changes in console ([#​22938](https://togithub.com/nrwl/nx/pull/22938)) - **graph:** use class sticky for sticky header ([#​23082](https://togithub.com/nrwl/nx/pull/23082)) - **graph:** remove dangling - and move button when PDV is rendered in console ([#​23144](https://togithub.com/nrwl/nx/pull/23144)) - **graph:** remove redux and useState and useContext hook ([#​23085](https://togithub.com/nrwl/nx/pull/23085)) - **graph:** add grayscale to technology icon ([#​23107](https://togithub.com/nrwl/nx/pull/23107)) - **js:** ignore yarn corepack check when updating config ([#​23043](https://togithub.com/nrwl/nx/pull/23043)) - **js:** typescript plugin target hashing ([#​23073](https://togithub.com/nrwl/nx/pull/23073)) - **js:** Correct file path for cjs.js ([#​23081](https://togithub.com/nrwl/nx/pull/23081)) - **js:** copy assets handler should handle ignore globs on windows ([#​23065](https://togithub.com/nrwl/nx/pull/23065)) - **linter:** do not infer lint tasks for projects without files to lint ([#​22944](https://togithub.com/nrwl/nx/pull/22944)) - **linter:** add {options.outputFile} to outputs for inferred targets ([#​23173](https://togithub.com/nrwl/nx/pull/23173)) - **misc:** add --verbose support to nx graph ([#​22889](https://togithub.com/nrwl/nx/pull/22889)) - **misc:** mark migration for escaping env vars as skipped in nx repair ([#​22916](https://togithub.com/nrwl/nx/pull/22916)) - **misc:** don't clear node_modules require cache ([#​22907](https://togithub.com/nrwl/nx/pull/22907)) - **misc:** fix cypress option in workspace preset generator ([#​22975](https://togithub.com/nrwl/nx/pull/22975)) - **misc:** fix publish script ([#​22981](https://togithub.com/nrwl/nx/pull/22981)) - **misc:** perf logging shouldn't be enabled twice ([#​23012](https://togithub.com/nrwl/nx/pull/23012)) - **misc:** propogate NX_PERF_LOGGING to plugin workers ([#​23016](https://togithub.com/nrwl/nx/pull/23016)) - **misc:** dot nx setup shouldn't include target defaults ([#​23180](https://togithub.com/nrwl/nx/pull/23180)) - **misc:** make generated ci workflow work without nx-cloud ([#​23199](https://togithub.com/nrwl/nx/pull/23199)) - **nextjs:** Boolean flags do not need a value ([#​23072](https://togithub.com/nrwl/nx/pull/23072)) - **node:** e2e target fails out of the box ([#​22987](https://togithub.com/nrwl/nx/pull/22987)) - **nx-cloud:** ensure root .env files are loaded during dte ([#​22859](https://togithub.com/nrwl/nx/pull/22859)) - **nx-dev:** header styles fix ([#​23122](https://togithub.com/nrwl/nx/pull/23122)) - **nx-dev:** fix project details in nx dev ([#​23175](https://togithub.com/nrwl/nx/pull/23175)) - **react:** disable tty for next build ([#​23013](https://togithub.com/nrwl/nx/pull/23013)) - **remix:** pin testing-library/jest-dom to compatible version ([#​23161](https://togithub.com/nrwl/nx/pull/23161)) - **remix:** use remix-serve for static-serve ([#​23164](https://togithub.com/nrwl/nx/pull/23164)) - **remix:** ensure default meta tags are always present for generated applications [#​23037](https://togithub.com/nrwl/nx/issues/23037) ([#​23169](https://togithub.com/nrwl/nx/pull/23169), [#​23037](https://togithub.com/nrwl/nx/issues/23037)) - **repo:** downgrade to macos-13 in publish workflow ([#​22961](https://togithub.com/nrwl/nx/pull/22961)) - **repo:** should ensure that unit tests are run correctly across package managers ([#​22978](https://togithub.com/nrwl/nx/pull/22978)) - **repo:** fix pnpm version on freebsd ([#​23045](https://togithub.com/nrwl/nx/pull/23045)) - **repo:** set version of pnpm for docker publishes ([#​23129](https://togithub.com/nrwl/nx/pull/23129)) - **storybook:** handle inherited config correctly when identifying the framework used for inferred tasks ([#​22953](https://togithub.com/nrwl/nx/pull/22953)) - **storybook:** allow overriding default inferred task names in storybook plugin ([#​23030](https://togithub.com/nrwl/nx/pull/23030)) - **storybook:** do not infer a test-storybook task if [@​storybook/test-runner](https://togithub.com/storybook/test-runner) is not installed ([#​23034](https://togithub.com/nrwl/nx/pull/23034)) - **testing:** fix jest ci target names ([#​22858](https://togithub.com/nrwl/nx/pull/22858)) - **testing:** bust require cache in jest plugin so configs reload ([#​22893](https://togithub.com/nrwl/nx/pull/22893)) - **testing:** fix test files pattern for jest inferred split tasks ([#​23025](https://togithub.com/nrwl/nx/pull/23025)) - **testing:** convert-to-inferred generator should handle legacy cypress executor ([#​23151](https://togithub.com/nrwl/nx/pull/23151)) - **testing:** convert-to-inferred generators should add includes only when needed ([#​23159](https://togithub.com/nrwl/nx/pull/23159)) - **testing:** convert-to-inferred for cypress should handle nxE2EPreset with no options object ([#​23171](https://togithub.com/nrwl/nx/pull/23171)) - **vue:** do not add verbatimImportSyntax to tsconfig ([#​22905](https://togithub.com/nrwl/nx/pull/22905)) - **webpack:** should correctly normalize paths in NxWebpackPlugin ([#​23003](https://togithub.com/nrwl/nx/pull/23003)) ##### ❤️ Thank You - Benjamin Cabanes [@​bcabanes](https://togithub.com/bcabanes) - Chabbey François - Colum Ferry [@​Coly010](https://togithub.com/Coly010) - Craigory Coppola [@​AgentEnder](https://togithub.com/AgentEnder) - Denis Bendrikov - Emily Xiong [@​xiongemi](https://togithub.com/xiongemi) - Isaac Mann [@​isaacplmann](https://togithub.com/isaacplmann) - Jack Hsu [@​jaysoo](https://togithub.com/jaysoo) - James Henry [@​JamesHenry](https://togithub.com/JamesHenry) - Jason Jean [@​FrozenPandaz](https://togithub.com/FrozenPandaz) - Jonathan Cammisuli - Kyle Cannon [@​kylecannon](https://togithub.com/kylecannon) - Leosvel Pérez Espinosa [@​leosvelperez](https://togithub.com/leosvelperez) - MaxKless [@​MaxKless](https://togithub.com/MaxKless) - Michal Jez [@​MJez29](https://togithub.com/MJez29) - Miroslav Jonaš [@​meeroslav](https://togithub.com/meeroslav) - Nicholas Cunningham [@​ndcunningham](https://togithub.com/ndcunningham) - Richard Roozenboom [@​Roozenboom](https://togithub.com/Roozenboom) ### [`v18.3.4`](https://togithub.com/nrwl/nx/releases/tag/18.3.4) [Compare Source](https://togithub.com/nrwl/nx/compare/18.3.3...18.3.4) #### 18.3.4 (2024-04-25) ##### 🚀 Features - **core:** add root level forwardAllArgs ([#​22753](https://togithub.com/nrwl/nx/pull/22753)) ##### 🩹 Fixes - **core:** different commands should not be considered compatible targets ([#​22863](https://togithub.com/nrwl/nx/pull/22863)) - **core:** fix pnpm install order on ci workflows ([#​22580](https://togithub.com/nrwl/nx/pull/22580)) - **core:** workspace context glob respects exclude ([#​22939](https://togithub.com/nrwl/nx/pull/22939)) - **core:** handle events that do not have paths ([#​22947](https://togithub.com/nrwl/nx/pull/22947)) - **core:** fix exclude for empty array ([#​22951](https://togithub.com/nrwl/nx/pull/22951)) - **core:** move a few api points to return root maps directly ([#​22949](https://togithub.com/nrwl/nx/pull/22949)) - **core:** regression register ts transpiler for local plugin ([#​22964](https://togithub.com/nrwl/nx/pull/22964)) - **core:** handle created directories when watching on linux ([#​22980](https://togithub.com/nrwl/nx/pull/22980)) - **core:** ensure create nodes functions are properly parallelized ([#​23005](https://togithub.com/nrwl/nx/pull/23005)) - **gradle:** change gradle command to be relative path ([#​22963](https://togithub.com/nrwl/nx/pull/22963)) - **gradle:** should skip println in project report ([#​22862](https://togithub.com/nrwl/nx/pull/22862)) - **gradle:** get gradlew path with projectRoot joins workspaceRoot ([#​22988](https://togithub.com/nrwl/nx/pull/22988)) - **graph:** don't listen to system theme changes in console ([#​22938](https://togithub.com/nrwl/nx/pull/22938)) - **linter:** do not infer lint tasks for projects without files to lint ([#​22944](https://togithub.com/nrwl/nx/pull/22944)) - **misc:** fix publish script ([#​22981](https://togithub.com/nrwl/nx/pull/22981)) - **misc:** perf logging shouldn't be enabled twice ([#​23012](https://togithub.com/nrwl/nx/pull/23012)) - **node:** e2e target fails out of the box ([#​22987](https://togithub.com/nrwl/nx/pull/22987)) - **repo:** downgrade to macos-13 in publish workflow ([#​22961](https://togithub.com/nrwl/nx/pull/22961)) - **storybook:** handle inherited config correctly when identifying the framework used for inferred tasks ([#​22953](https://togithub.com/nrwl/nx/pull/22953)) ##### ❤️ Thank You - Colum Ferry [@​Coly010](https://togithub.com/Coly010) - Craigory Coppola [@​AgentEnder](https://togithub.com/AgentEnder) - Emily Xiong [@​xiongemi](https://togithub.com/xiongemi) - Jack Hsu [@​jaysoo](https://togithub.com/jaysoo) - Jason Jean [@​FrozenPandaz](https://togithub.com/FrozenPandaz) - Jonathan Cammisuli - Leosvel Pérez Espinosa [@​leosvelperez](https://togithub.com/leosvelperez) - MaxKless [@​MaxKless](https://togithub.com/MaxKless) - Miroslav Jonaš [@​meeroslav](https://togithub.com/meeroslav) - Nicholas Cunningham [@​ndcunningham](https://togithub.com/ndcunningham) - Richard Roozenboom [@​Roozenboom](https://togithub.com/Roozenboom) ### [`v18.3.3`](https://togithub.com/nrwl/nx/releases/tag/18.3.3) [Compare Source](https://togithub.com/nrwl/nx/compare/18.3.2...18.3.3) ##### 18.3.3 (2024-04-20) ##### 🩹 Fixes - **angular:** fix loading postcss configuration in ng-packagr executors ([#​22900](https://togithub.com/nrwl/nx/pull/22900)) - **core:** group command exit listeners to avoid warning ([#​22892](https://togithub.com/nrwl/nx/pull/22892)) - **core:** handle plugin errors from isolation correctly ([#​22890](https://togithub.com/nrwl/nx/pull/22890)) - **core:** disable pty on windows until stable ([#​22910](https://togithub.com/nrwl/nx/pull/22910)) - **core:** fix cursor being hidden and process shutdown for ctrl c ([#​22895](https://togithub.com/nrwl/nx/pull/22895)) - **misc:** add --verbose support to nx graph ([#​22889](https://togithub.com/nrwl/nx/pull/22889)) - **misc:** mark migration for escaping env vars as skipped in nx repair ([#​22916](https://togithub.com/nrwl/nx/pull/22916)) - **misc:** don't clear node_modules require cache ([#​22907](https://togithub.com/nrwl/nx/pull/22907)) - **testing:** bust require cache in jest plugin so configs reload ([#​22893](https://togithub.com/nrwl/nx/pull/22893)) - **vue:** do not add verbatimImportSyntax to tsconfig ([#​22905](https://togithub.com/nrwl/nx/pull/22905)) ##### ❤️ Thank You - Colum Ferry [@​Coly010](https://togithub.com/Coly010) - Craigory Coppola [@​AgentEnder](https://togithub.com/AgentEnder) - Jason Jean [@​FrozenPandaz](https://togithub.com/FrozenPandaz) - Leosvel Pérez Espinosa [@​leosvelperez](https://togithub.com/leosvelperez) ### [`v18.3.2`](https://togithub.com/nrwl/nx/releases/tag/18.3.2) [Compare Source](https://togithub.com/nrwl/nx/compare/18.3.1...18.3.2) ##### 18.3.2 (2024-04-18) ##### 🚀 Features - **core:** load native files from tmp location instead of node_modules ([#​22648](https://togithub.com/nrwl/nx/pull/22648)) ##### 🩹 Fixes - **bundling:** handle circular dependencies in [@​nx/esbuild](https://togithub.com/nx/esbuild) getExtraDependencies ([#​22644](https://togithub.com/nrwl/nx/pull/22644)) - **core:** load config util supports absolute paths on windows ([#​22837](https://togithub.com/nrwl/nx/pull/22837)) - **core:** keep plugin workers until main process shutdown ([#​22860](https://togithub.com/nrwl/nx/pull/22860)) - **core:** handle schema validation errors running commands directly ([#​22864](https://togithub.com/nrwl/nx/pull/22864)) - **core:** forward args provided to the nx add command to the invoked init generator ([#​22855](https://togithub.com/nrwl/nx/pull/22855)) - **core:** fix hashing of external dependencies ([#​22865](https://togithub.com/nrwl/nx/pull/22865)) - **nx-cloud:** ensure root .env files are loaded during dte ([#​22859](https://togithub.com/nrwl/nx/pull/22859)) - **testing:** fix jest ci target names ([#​22858](https://togithub.com/nrwl/nx/pull/22858)) ##### ❤️ Thank You - Colum Ferry [@​Coly010](https://togithub.com/Coly010) - Craigory Coppola [@​AgentEnder](https://togithub.com/AgentEnder) - Jason Jean [@​FrozenPandaz](https://togithub.com/FrozenPandaz) - Kyle Cannon [@​kylecannon](https://togithub.com/kylecannon) - Leosvel Pérez Espinosa [@​leosvelperez](https://togithub.com/leosvelperez) - MaxKless [@​MaxKless](https://togithub.com/MaxKless) ### [`v18.3.1`](https://togithub.com/nrwl/nx/releases/tag/18.3.1) [Compare Source](https://togithub.com/nrwl/nx/compare/18.3.0...18.3.1) #### 18.3.1 (2024-04-17) ##### 🩹 Fixes - **core:** repair sourcemap creation in createNodes ([#​22851](https://togithub.com/nrwl/nx/pull/22851)) ##### ❤️ Thank You - MaxKless [@​MaxKless](https://togithub.com/MaxKless) ### [`v18.3.0`](https://togithub.com/nrwl/nx/releases/tag/18.3.0) [Compare Source](https://togithub.com/nrwl/nx/compare/18.2.4...18.3.0) #### 18.3.0 (2024-04-16) ##### 🚀 Features - **core:** add metadata to targets ([#​22655](https://togithub.com/nrwl/nx/pull/22655)) - **core:** list crystal plugins with nx report ([#​22649](https://togithub.com/nrwl/nx/pull/22649)) - **core:** re-enable running plugins in isolation ([#​22527](https://togithub.com/nrwl/nx/pull/22527)) - **core:** load root .env files on daemon ([#​22786](https://togithub.com/nrwl/nx/pull/22786)) - **js:** add swc cli options --strip-leading-paths ([#​22193](https://togithub.com/nrwl/nx/pull/22193)) - **js:** add swc cli options --strip-leading-paths " ([#​22193](https://togithub.com/nrwl/nx/pull/22193), [#​22832](https://togithub.com/nrwl/nx/pull/22832)) - **misc:** non conflicting init/add flow ([#​22791](https://togithub.com/nrwl/nx/pull/22791)) - **nuxt:** update [@​nuxt/eslint-config](https://togithub.com/nuxt/eslint-config) to a stable version ([#​22804](https://togithub.com/nrwl/nx/pull/22804)) - **nx-dev:** link Nx Launch Conf videos ([#​22690](https://togithub.com/nrwl/nx/pull/22690)) - **nx-dev:** remember selected tabs ([#​22699](https://togithub.com/nrwl/nx/pull/22699)) - **nx-dev:** add contact pages ([#​22815](https://togithub.com/nrwl/nx/pull/22815)) - **nx-dev:** banner for webinar ([#​22824](https://togithub.com/nrwl/nx/pull/22824)) - **testing:** add ability to split jest tests ([#​22662](https://togithub.com/nrwl/nx/pull/22662)) - **testing:** add metadata to playwright targets ([#​22768](https://togithub.com/nrwl/nx/pull/22768)) - **vite:** migrate to latest vite-plugin-dts ([#​22614](https://togithub.com/nrwl/nx/pull/22614)) ##### 🩹 Fixes - **angular:** prevent false positive validation due to option default value in dev-server executor ([#​22606](https://togithub.com/nrwl/nx/pull/22606)) - **angular:** respect skipPackageJson correctly in library generator ([#​22608](https://togithub.com/nrwl/nx/pull/22608)) - **angular:** fix @​nx/angular/src/utils entry point ([#​22609](https://togithub.com/nrwl/nx/pull/22609)) - **angular:** fix dynamic module federation generation ([#​22724](https://togithub.com/nrwl/nx/pull/22724)) - **angular:** respect skipPackageJson correctly across generators ([#​22777](https://togithub.com/nrwl/nx/pull/22777)) - **angular:** execute wrapped schematics post tasks and log messages ([#​22780](https://togithub.com/nrwl/nx/pull/22780)) - **bundling:** support exported array of options for rollup ([#​22703](https://togithub.com/nrwl/nx/pull/22703)) - **bundling:** print errors from rollup build ([#​22707](https://togithub.com/nrwl/nx/pull/22707)) - **bundling:** show codeframes for Rollup build errors ([#​22845](https://togithub.com/nrwl/nx/pull/22845)) - **core:** do not assume workspace inputs cause all projects to be af… ([#​22573](https://togithub.com/nrwl/nx/pull/22573)) - **core:** write terminal output to cache folder ([#​22673](https://togithub.com/nrwl/nx/pull/22673)) - **core:** errors from create dependencies should show properly ([#​22695](https://togithub.com/nrwl/nx/pull/22695)) - **core:** not passing props of run-commands to underlying command ([#​22595](https://togithub.com/nrwl/nx/pull/22595)) - **core:** update pty version to add windows specific flags ([#​22711](https://togithub.com/nrwl/nx/pull/22711)) - **core:** detect imports from template literals in dynamic imports ([#​22749](https://togithub.com/nrwl/nx/pull/22749)) - **core:** attach cli args from target options explicitly with '=' ([#​22756](https://togithub.com/nrwl/nx/pull/22756)) - **core:** fix plugin exclude option ([#​22738](https://togithub.com/nrwl/nx/pull/22738)) - **core:** improve `isCI` to better detect other providers ([#​22694](https://togithub.com/nrwl/nx/pull/22694)) - **core:** errors thrown when creating projects should prevent running targets ([#​22807](https://togithub.com/nrwl/nx/pull/22807)) - **core:** use name instead of .prototype.name when comparing errors ([#​22840](https://togithub.com/nrwl/nx/pull/22840)) - **core:** fix init logging and package.json updates ([#​22843](https://togithub.com/nrwl/nx/pull/22843)) - **devkit:** update peer dependency on nx to include Nx 19 ([#​22811](https://togithub.com/nrwl/nx/pull/22811)) - **js:** update jest snapshot after vite-plugin-dts bump ([#​22621](https://togithub.com/nrwl/nx/pull/22621)) - **js:** append target when generating tmp tsconfig to prevent conflicts [#​21396](https://togithub.com/nrwl/nx/issues/21396) ([#​22671](https://togithub.com/nrwl/nx/pull/22671), [#​21396](https://togithub.com/nrwl/nx/issues/21396)) - **js:** propagate error from child process to [@​nx/js](https://togithub.com/nx/js):node executor ([#​22705](https://togithub.com/nrwl/nx/pull/22705)) - **js:** do not default to commonjs type field in package.json ([#​22819](https://togithub.com/nrwl/nx/pull/22819)) - **misc:** fix optional branch tracking on ci pipeline ([#​22652](https://togithub.com/nrwl/nx/pull/22652)) - **module-federation:** serve dynamic remotes statically in their own processes ([#​22688](https://togithub.com/nrwl/nx/pull/22688)) - **nextjs:** Adding tailwind should work when creating an app OOTB ([#​22709](https://togithub.com/nrwl/nx/pull/22709)) - **nuxt:** use loadConfigFile from devkit rather than [@​nuxt/kit](https://togithub.com/nuxt/kit) ([#​22571](https://togithub.com/nrwl/nx/pull/22571)) - **nx-dev:** Update urls that are 404 ([#​22653](https://togithub.com/nrwl/nx/pull/22653)) - **react-native:** storybook relative paths ([#​22031](https://togithub.com/nrwl/nx/pull/22031)) - **react-native:** should ask for app name when preset is react native ([#​22761](https://togithub.com/nrwl/nx/pull/22761)) - **react-native:** fix unable to resolve on windows ([#​22759](https://togithub.com/nrwl/nx/pull/22759)) - **release:** respect root .npmrc registry settings for publishing ([12afa20210](https://togithub.com/nrwl/nx/commit/12afa20210)) - **release:** do not try to interpolate packageRoot for root project ([#​22771](https://togithub.com/nrwl/nx/pull/22771)) - **testing:** fix playwright executor uiPort option schema ([#​22610](https://togithub.com/nrwl/nx/pull/22610)) - **testing:** app generators should create correct e2e config at generation time ([#​22565](https://togithub.com/nrwl/nx/pull/22565)) - **vite:** ensure cache is created correctly for separate vite and vitest config files [#​22244](https://togithub.com/nrwl/nx/issues/22244) ([#​22618](https://togithub.com/nrwl/nx/pull/22618), [#​22244](https://togithub.com/nrwl/nx/issues/22244)) - **vite:** pass cli arguments as options to vitest ([#​22355](https://togithub.com/nrwl/nx/pull/22355)) - **webpack:** bring back previous SVG and SVGR behavior for React projects ([#​22628](https://togithub.com/nrwl/nx/pull/22628)) - **webpack:** support standard webpack config with [@​nx/webpack](https://togithub.com/nx/webpack):dev-server ([#​22660](https://togithub.com/nrwl/nx/pull/22660)) - **webpack:** remove url-loader from dependencies since it is replaced by asset modules ([#​22698](https://togithub.com/nrwl/nx/pull/22698)) - **webpack:** typo for outputPath ([#​22734](https://togithub.com/nrwl/nx/pull/22734)) - **webpack:** Should work when absolute paths are supplied as output ([#​22736](https://togithub.com/nrwl/nx/pull/22736)) ##### ❤️ Thank You - Altan Stalker - arekkubaczkowski [@​arekkubaczkowski](https://togithub.com/arekkubaczkowski) - Austin Fahsl [@​fahslaj](https://togithub.com/fahslaj) - Benjamin Cabanes [@​bcabanes](https://togithub.com/bcabanes) - Colum Ferry [@​Coly010](https://togithub.com/Coly010) - Craigory Coppola [@​AgentEnder](https://togithub.com/AgentEnder) - Emily Xiong [@​xiongemi](https://togithub.com/xiongemi) - Every [@​hongxuWei](https://togithub.com/hongxuWei) - Isaac Mann [@​isaacplmann](https://togithub.com/isaacplmann) - Jack Hsu [@​jaysoo](https://togithub.com/jaysoo) - Jason Jean [@​FrozenPandaz](https://togithub.com/FrozenPandaz) - Juri Strumpflohner [@​juristr](https://togithub.com/juristr) - Leosvel Pérez Espinosa [@​leosvelperez](https://togithub.com/leosvelperez) - Lucca Miranda [@​luckened](https://togithub.com/luckened) - MaxKless [@​MaxKless](https://togithub.com/MaxKless) - Miroslav Jonaš [@​meeroslav](https://togithub.com/meeroslav) - Nicholas Cunningham [@​ndcunningham](https://togithub.com/ndcunningham) - Thomas Dekiere - Younes Jaaidi
nrwl/nx (nx) ### [`v19.0.0`](https://togithub.com/nrwl/nx/compare/18.3.4...41d21ab9ac7fa3682ba535979278bb3c4a349654) [Compare Source](https://togithub.com/nrwl/nx/compare/18.3.4...19.0.0) ### [`v18.3.4`](https://togithub.com/nrwl/nx/releases/tag/18.3.4) [Compare Source](https://togithub.com/nrwl/nx/compare/18.3.3...18.3.4) ##### 18.3.4 (2024-04-25) ##### 🚀 Features - **core:** add root level forwardAllArgs ([#​22753](https://togithub.com/nrwl/nx/pull/22753)) ##### 🩹 Fixes - **core:** different commands should not be considered compatible targets ([#​22863](https://togithub.com/nrwl/nx/pull/22863)) - **core:** fix pnpm install order on ci workflows ([#​22580](https://togithub.com/nrwl/nx/pull/22580)) - **core:** workspace context glob respects exclude ([#​22939](https://togithub.com/nrwl/nx/pull/22939)) - **core:** handle events that do not have paths ([#​22947](https://togithub.com/nrwl/nx/pull/22947)) - **core:** fix exclude for empty array ([#​22951](https://togithub.com/nrwl/nx/pull/22951)) - **core:** move a few api points to return root maps directly ([#​22949](https://togithub.com/nrwl/nx/pull/22949)) - **core:** regression register ts transpiler for local plugin ([#​22964](https://togithub.com/nrwl/nx/pull/22964)) - **core:** handle created directories when watching on linux ([#​22980](https://togithub.com/nrwl/nx/pull/22980)) - **core:** ensure create nodes functions are properly parallelized ([#​23005](https://togithub.com/nrwl/nx/pull/23005)) - **gradle:** change gradle command to be relative path ([#​22963](https://togithub.com/nrwl/nx/pull/22963)) - **gradle:** should skip println in project report ([#​22862](https://togithub.com/nrwl/nx/pull/22862)) - **gradle:** get gradlew path with projectRoot joins workspaceRoot ([#​22988](https://togithub.com/nrwl/nx/pull/22988)) - **graph:** don't listen to system theme changes in console ([#​22938](https://togithub.com/nrwl/nx/pull/22938)) - **linter:** do not infer lint tasks for projects without files to lint ([#​22944](https://togithub.com/nrwl/nx/pull/22944)) - **misc:** fix publish script ([#​22981](https://togithub.com/nrwl/nx/pull/22981)) - **misc:** perf logging shouldn't be enabled twice ([#​23012](https://togithub.com/nrwl/nx/pull/23012)) - **node:** e2e target fails out of the box ([#​22987](https://togithub.com/nrwl/nx/pull/22987)) - **repo:** downgrade to macos-13 in publish workflow ([#​22961](https://togithub.com/nrwl/nx/pull/22961)) - **storybook:** handle inherited config correctly when identifying the framework used for inferred tasks ([#​22953](https://togithub.com/nrwl/nx/pull/22953)) ##### ❤️ Thank You - Colum Ferry [@​Coly010](https://togithub.com/Coly010) - Craigory Coppola [@​AgentEnder](https://togithub.com/AgentEnder) - Emily Xiong [@​xiongemi](https://togithub.com/xiongemi) - Jack Hsu [@​jaysoo](https://togithub.com/jaysoo) - Jason Jean [@​FrozenPandaz](https://togithub.com/FrozenPandaz) - Jonathan Cammisuli - Leosvel Pérez Espinosa [@​leosvelperez](https://togithub.com/leosvelperez) - MaxKless [@​MaxKless](https://togithub.com/MaxKless) - Miroslav Jonaš [@​meeroslav](https://togithub.com/meeroslav) - Nicholas Cunningham [@​ndcunningham](https://togithub.com/ndcunningham) - Richard Roozenboom [@​Roozenboom](https://togithub.com/Roozenboom) ### [`v18.3.3`](https://togithub.com/nrwl/nx/releases/tag/18.3.3) [Compare Source](https://togithub.com/nrwl/nx/compare/18.3.2...18.3.3) #### 18.3.3 (2024-04-20) ##### 🩹 Fixes - **angular:** fix loading postcss configuration in ng-packagr executors ([#​22900](https://togithub.com/nrwl/nx/pull/22900)) - **core:** group command exit listeners to avoid warning ([#​22892](https://togithub.com/nrwl/nx/pull/22892)) - **core:** handle plugin errors from isolation correctly ([#​22890](https://togithub.com/nrwl/nx/pull/22890)) - **core:** disable pty on windows until stable ([#​22910](https://togithub.com/nrwl/nx/pull/22910)) - **core:** fix cursor being hidden and process shutdown for ctrl c ([#​22895](https://togithub.com/nrwl/nx/pull/22895)) - **misc:** add --verbose support to nx graph ([#​22889](https://togithub.com/nrwl/nx/pull/22889)) - **misc:** mark migration for escaping env vars as skipped in nx repair ([#​22916](https://togithub.com/nrwl/nx/pull/22916)) - **misc:** don't clear node_modules require cache ([#​22907](https://togithub.com/nrwl/nx/pull/22907)) - **testing:** bust require cache in jest plugin so configs reload ([#​22893](https://togithub.com/nrwl/nx/pull/22893)) - **vue:** do not add verbatimImportSyntax to tsconfig ([#​22905](https://togithub.com/nrwl/nx/pull/22905)) ##### ❤️ Thank You - Colum Ferry [@​Coly010](https://togithub.com/Coly010) - Craigory Coppola [@​AgentEnder](https://togithub.com/AgentEnder) - Jason Jean [@​FrozenPandaz](https://togithub.com/FrozenPandaz) - Leosvel Pérez Espinosa [@​leosvelperez](https://togithub.com/leosvelperez)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/toeverything/AFFiNE). --- package.json | 4 +- packages/backend/native/package.json | 2 +- packages/frontend/native/package.json | 2 +- yarn.lock | 370 +++++++------------------- 4 files changed, 106 insertions(+), 272 deletions(-) diff --git a/package.json b/package.json index f6b216a04a..7041f80e8d 100644 --- 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 index 6589809f02..06243a9b80 100644 --- 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/frontend/native/package.json b/packages/frontend/native/package.json index 02e65d155b..5b8ebcb342 100644 --- 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/yarn.lock b/yarn.lock index 9bcebc44a5..318ed089ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -574,7 +574,7 @@ __metadata: "@faker-js/faker": "npm:^8.4.1" "@istanbuljs/schema": "npm:^0.1.3" "@magic-works/i18n-codegen": "npm:^0.5.0" - "@nx/vite": "npm:18.2.4" + "@nx/vite": "npm:19.0.0" "@playwright/test": "npm:^1.43.0" "@taplo/cli": "npm:^0.7.0" "@testing-library/react": "npm:^15.0.0" @@ -608,7 +608,7 @@ __metadata: lint-staged: "npm:^15.2.2" msw: "npm:^2.2.13" nanoid: "npm:^5.0.7" - nx: "npm:^18.2.4" + nx: "npm:^19.0.0" nyc: "npm:^15.1.0" oxlint: "npm:0.3.1" prettier: "npm:^3.2.5" @@ -635,7 +635,7 @@ __metadata: "@types/uuid": "npm:^9.0.8" ava: "npm:^6.1.2" cross-env: "npm:^7.0.3" - nx: "npm:^18.2.4" + nx: "npm:^19.0.0" nx-cloud: "npm:^18.0.0" rxjs: "npm:^7.8.1" ts-node: "npm:^10.9.2" @@ -650,7 +650,7 @@ __metadata: dependencies: "@napi-rs/cli": "npm:3.0.0-alpha.46" lib0: "npm:^0.2.93" - nx: "npm:^18.2.4" + nx: "npm:^19.0.0" nx-cloud: "npm:^18.0.0" yjs: "npm:^13.6.14" languageName: unknown @@ -9127,21 +9127,21 @@ __metadata: languageName: node linkType: hard -"@nrwl/devkit@npm:18.2.4": - version: 18.2.4 - resolution: "@nrwl/devkit@npm:18.2.4" +"@nrwl/devkit@npm:19.0.0": + version: 19.0.0 + resolution: "@nrwl/devkit@npm:19.0.0" dependencies: - "@nx/devkit": "npm:18.2.4" - checksum: 10/206aa00f314e564dee029e04aaa2564a50e847c8852ea02e39a6c66a9f98659f43c2a45687d295bcdef10529b051d3c7a15f3f6a56982f832c88e88f2dfdac48 + "@nx/devkit": "npm:19.0.0" + checksum: 10/ccf2c12a8b72c95031a657bb439fada582d7a7fea40f3404ef152bedd8c68020f595c98d1b4a17864230b8ab513a695d9a7f07741b8975dbd685e50c01827920 languageName: node linkType: hard -"@nrwl/js@npm:18.2.4": - version: 18.2.4 - resolution: "@nrwl/js@npm:18.2.4" +"@nrwl/js@npm:19.0.0": + version: 19.0.0 + resolution: "@nrwl/js@npm:19.0.0" dependencies: - "@nx/js": "npm:18.2.4" - checksum: 10/0437cb40effa197577737c4a509e0d586e5267884c8575bf6ddc584eb16ccc9b7a12038f8c43c7e2e3ad97aa84861228889dc3be5a05a59bee791a4a571d9796 + "@nx/js": "npm:19.0.0" + checksum: 10/4c9ccc04783b39411cc7fb4d4d2b55ed350dc7cdb05ded286a7d914a434c1f86330d59c3d5aefe046d8ac201f35700e393ce3454d32141a9c5d734266c2cc6c4 languageName: node linkType: hard @@ -9154,45 +9154,33 @@ __metadata: languageName: node linkType: hard -"@nrwl/tao@npm:18.2.4": - version: 18.2.4 - resolution: "@nrwl/tao@npm:18.2.4" +"@nrwl/tao@npm:19.0.0": + version: 19.0.0 + resolution: "@nrwl/tao@npm:19.0.0" dependencies: - nx: "npm:18.2.4" + nx: "npm:19.0.0" tslib: "npm:^2.3.0" bin: tao: index.js - checksum: 10/f376cca29d0cfd302f70b339414e93c0a72833b66d6660ecf23eb646cfe55f33b83cc977f56a700209084a432c710693e46c1f04cdbd018624271617477766b8 + checksum: 10/a94c01beb2794340fafdb0dc1b2075a6da7299a3bbb2c2edb1111ef4913049cbc220de327c56510c69dcfe8e622aaca44e2fba1bf33bef751a1561eab0b52031 languageName: node linkType: hard -"@nrwl/tao@npm:18.3.2": - version: 18.3.2 - resolution: "@nrwl/tao@npm:18.3.2" +"@nrwl/vite@npm:19.0.0": + version: 19.0.0 + resolution: "@nrwl/vite@npm:19.0.0" dependencies: - nx: "npm:18.3.2" - tslib: "npm:^2.3.0" - bin: - tao: index.js - checksum: 10/da6f6e8b187400bb49f09345d7c7c5fda138046cd941628a7cb75d6f33dddc68308cd456963bc63c67fd5a9837f66d99ad66820b613674ef25c0092d7ff2e910 + "@nx/vite": "npm:19.0.0" + checksum: 10/24b48a40cd8af7da881e8cfc6ca78ba2eb701a8438d8de97612be27100ffa10b849e57d20d4807d83c62aa9e083f1d0207f83d970897a59af687c40bfe50170d languageName: node linkType: hard -"@nrwl/vite@npm:18.2.4": - version: 18.2.4 - resolution: "@nrwl/vite@npm:18.2.4" +"@nrwl/workspace@npm:19.0.0": + version: 19.0.0 + resolution: "@nrwl/workspace@npm:19.0.0" dependencies: - "@nx/vite": "npm:18.2.4" - checksum: 10/0e3b7a95832c628771a0faf179e0c4bf92f53f56c587d91b0bd910b82fa4bde857a3e8ce1fdb6b30bc45d0e15e3929168d073f7ce7ea43c3aa9bcb709290c439 - languageName: node - linkType: hard - -"@nrwl/workspace@npm:18.2.4": - version: 18.2.4 - resolution: "@nrwl/workspace@npm:18.2.4" - dependencies: - "@nx/workspace": "npm:18.2.4" - checksum: 10/8d416b18e45eaea40b3c05f1e82e8488cae0125de6daad2b208986f5d42ec00f0740d756256eeba15d32e539c19e3b2d4c62f0d043bba8b0f8a13fbd4116fcd2 + "@nx/workspace": "npm:19.0.0" + checksum: 10/a92309bbb24d0cffc2986c38ecf8e7a6ca1c2488951709c405e6e7f14378352d0c40c9aaf4874275bf801eb21e0717406daab2d77289ae38e183375607dfcc04 languageName: node linkType: hard @@ -9209,27 +9197,28 @@ __metadata: languageName: node linkType: hard -"@nx/devkit@npm:18.2.4": - version: 18.2.4 - resolution: "@nx/devkit@npm:18.2.4" +"@nx/devkit@npm:19.0.0": + version: 19.0.0 + resolution: "@nx/devkit@npm:19.0.0" dependencies: - "@nrwl/devkit": "npm:18.2.4" + "@nrwl/devkit": "npm:19.0.0" ejs: "npm:^3.1.7" enquirer: "npm:~2.3.6" ignore: "npm:^5.0.4" + minimatch: "npm:9.0.3" semver: "npm:^7.5.3" tmp: "npm:~0.2.1" tslib: "npm:^2.3.0" yargs-parser: "npm:21.1.1" peerDependencies: - nx: ">= 16 <= 18" - checksum: 10/9c50e31ced982f2a48962a8be6babfa259cb1f6857c54d0ab14d104b1d622dd64e47ed9b1461536110acb1c93894f9ad795725cfbd7f3a3406114624cbdbd7c8 + nx: ">= 17 <= 20" + checksum: 10/787f53d5a6b270616f36804df88cd28429bc469829220375c1fe1bd87a5ceb66663f261962a1d5f1652a775174e89c03a9511269b6587f2de87d22dd3df89ba7 languageName: node linkType: hard -"@nx/js@npm:18.2.4": - version: 18.2.4 - resolution: "@nx/js@npm:18.2.4" +"@nx/js@npm:19.0.0": + version: 19.0.0 + resolution: "@nx/js@npm:19.0.0" dependencies: "@babel/core": "npm:^7.23.2" "@babel/plugin-proposal-decorators": "npm:^7.22.7" @@ -9238,10 +9227,9 @@ __metadata: "@babel/preset-env": "npm:^7.23.2" "@babel/preset-typescript": "npm:^7.22.5" "@babel/runtime": "npm:^7.22.6" - "@nrwl/js": "npm:18.2.4" - "@nx/devkit": "npm:18.2.4" - "@nx/workspace": "npm:18.2.4" - "@phenomnomnominal/tsquery": "npm:~5.0.1" + "@nrwl/js": "npm:19.0.0" + "@nx/devkit": "npm:19.0.0" + "@nx/workspace": "npm:19.0.0" babel-plugin-const-enum: "npm:^1.0.1" babel-plugin-macros: "npm:^2.8.0" babel-plugin-transform-typescript-metadata: "npm:^0.3.1" @@ -9266,157 +9254,87 @@ __metadata: peerDependenciesMeta: verdaccio: optional: true - checksum: 10/6f39dd54dfb94fcc61fb0708b3ce9e6430dccf624685e87d1112195aa6457e2d88e33fb5a118c3b3909fd63b2f38d243a1b742c3182ee27f5cca5169fc98c1ef + checksum: 10/65b662e782f684dfe158eccd5fcc56bb41c6b7c7a47e10f02e9a0e4bec1a276f06afe09caad259c05060c2d95c0aaef1348bbc375e07f989305c98c2d7d93b79 languageName: node linkType: hard -"@nx/nx-darwin-arm64@npm:18.2.4": - version: 18.2.4 - resolution: "@nx/nx-darwin-arm64@npm:18.2.4" +"@nx/nx-darwin-arm64@npm:19.0.0": + version: 19.0.0 + resolution: "@nx/nx-darwin-arm64@npm:19.0.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@nx/nx-darwin-arm64@npm:18.3.2": - version: 18.3.2 - resolution: "@nx/nx-darwin-arm64@npm:18.3.2" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - -"@nx/nx-darwin-x64@npm:18.2.4": - version: 18.2.4 - resolution: "@nx/nx-darwin-x64@npm:18.2.4" +"@nx/nx-darwin-x64@npm:19.0.0": + version: 19.0.0 + resolution: "@nx/nx-darwin-x64@npm:19.0.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@nx/nx-darwin-x64@npm:18.3.2": - version: 18.3.2 - resolution: "@nx/nx-darwin-x64@npm:18.3.2" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - -"@nx/nx-freebsd-x64@npm:18.2.4": - version: 18.2.4 - resolution: "@nx/nx-freebsd-x64@npm:18.2.4" +"@nx/nx-freebsd-x64@npm:19.0.0": + version: 19.0.0 + resolution: "@nx/nx-freebsd-x64@npm:19.0.0" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@nx/nx-freebsd-x64@npm:18.3.2": - version: 18.3.2 - resolution: "@nx/nx-freebsd-x64@npm:18.3.2" - conditions: os=freebsd & cpu=x64 - languageName: node - linkType: hard - -"@nx/nx-linux-arm-gnueabihf@npm:18.2.4": - version: 18.2.4 - resolution: "@nx/nx-linux-arm-gnueabihf@npm:18.2.4" +"@nx/nx-linux-arm-gnueabihf@npm:19.0.0": + version: 19.0.0 + resolution: "@nx/nx-linux-arm-gnueabihf@npm:19.0.0" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@nx/nx-linux-arm-gnueabihf@npm:18.3.2": - version: 18.3.2 - resolution: "@nx/nx-linux-arm-gnueabihf@npm:18.3.2" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - -"@nx/nx-linux-arm64-gnu@npm:18.2.4": - version: 18.2.4 - resolution: "@nx/nx-linux-arm64-gnu@npm:18.2.4" +"@nx/nx-linux-arm64-gnu@npm:19.0.0": + version: 19.0.0 + resolution: "@nx/nx-linux-arm64-gnu@npm:19.0.0" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@nx/nx-linux-arm64-gnu@npm:18.3.2": - version: 18.3.2 - resolution: "@nx/nx-linux-arm64-gnu@npm:18.3.2" - conditions: os=linux & cpu=arm64 & libc=glibc - languageName: node - linkType: hard - -"@nx/nx-linux-arm64-musl@npm:18.2.4": - version: 18.2.4 - resolution: "@nx/nx-linux-arm64-musl@npm:18.2.4" +"@nx/nx-linux-arm64-musl@npm:19.0.0": + version: 19.0.0 + resolution: "@nx/nx-linux-arm64-musl@npm:19.0.0" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@nx/nx-linux-arm64-musl@npm:18.3.2": - version: 18.3.2 - resolution: "@nx/nx-linux-arm64-musl@npm:18.3.2" - conditions: os=linux & cpu=arm64 & libc=musl - languageName: node - linkType: hard - -"@nx/nx-linux-x64-gnu@npm:18.2.4": - version: 18.2.4 - resolution: "@nx/nx-linux-x64-gnu@npm:18.2.4" +"@nx/nx-linux-x64-gnu@npm:19.0.0": + version: 19.0.0 + resolution: "@nx/nx-linux-x64-gnu@npm:19.0.0" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@nx/nx-linux-x64-gnu@npm:18.3.2": - version: 18.3.2 - resolution: "@nx/nx-linux-x64-gnu@npm:18.3.2" - conditions: os=linux & cpu=x64 & libc=glibc - languageName: node - linkType: hard - -"@nx/nx-linux-x64-musl@npm:18.2.4": - version: 18.2.4 - resolution: "@nx/nx-linux-x64-musl@npm:18.2.4" +"@nx/nx-linux-x64-musl@npm:19.0.0": + version: 19.0.0 + resolution: "@nx/nx-linux-x64-musl@npm:19.0.0" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@nx/nx-linux-x64-musl@npm:18.3.2": - version: 18.3.2 - resolution: "@nx/nx-linux-x64-musl@npm:18.3.2" - conditions: os=linux & cpu=x64 & libc=musl - languageName: node - linkType: hard - -"@nx/nx-win32-arm64-msvc@npm:18.2.4": - version: 18.2.4 - resolution: "@nx/nx-win32-arm64-msvc@npm:18.2.4" +"@nx/nx-win32-arm64-msvc@npm:19.0.0": + version: 19.0.0 + resolution: "@nx/nx-win32-arm64-msvc@npm:19.0.0" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@nx/nx-win32-arm64-msvc@npm:18.3.2": - version: 18.3.2 - resolution: "@nx/nx-win32-arm64-msvc@npm:18.3.2" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - -"@nx/nx-win32-x64-msvc@npm:18.2.4": - version: 18.2.4 - resolution: "@nx/nx-win32-x64-msvc@npm:18.2.4" +"@nx/nx-win32-x64-msvc@npm:19.0.0": + version: 19.0.0 + resolution: "@nx/nx-win32-x64-msvc@npm:19.0.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@nx/nx-win32-x64-msvc@npm:18.3.2": - version: 18.3.2 - resolution: "@nx/nx-win32-x64-msvc@npm:18.3.2" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - -"@nx/vite@npm:18.2.4": - version: 18.2.4 - resolution: "@nx/vite@npm:18.2.4" +"@nx/vite@npm:19.0.0": + version: 19.0.0 + resolution: "@nx/vite@npm:19.0.0" dependencies: - "@nrwl/vite": "npm:18.2.4" - "@nx/devkit": "npm:18.2.4" - "@nx/js": "npm:18.2.4" + "@nrwl/vite": "npm:19.0.0" + "@nx/devkit": "npm:19.0.0" + "@nx/js": "npm:19.0.0" "@phenomnomnominal/tsquery": "npm:~5.0.1" "@swc/helpers": "npm:~0.5.0" enquirer: "npm:~2.3.6" @@ -9424,22 +9342,22 @@ __metadata: peerDependencies: vite: ^5.0.0 vitest: ^1.3.1 - checksum: 10/f77cbf3c4eb2acc171442376e807f966882041b3b561cf36c388b85feed860b14323fa816beabba79d2683e895e766a08915e20582b2452a06eeeb659e24c223 + checksum: 10/fbd1153e498a8cd1ff9b98a528d5cfccdba64a669d02d0ba26a1efd2615f8b735a363563fab4a548f5d1454c6c77be439e1bae538812005cc078443022d41774 languageName: node linkType: hard -"@nx/workspace@npm:18.2.4": - version: 18.2.4 - resolution: "@nx/workspace@npm:18.2.4" +"@nx/workspace@npm:19.0.0": + version: 19.0.0 + resolution: "@nx/workspace@npm:19.0.0" dependencies: - "@nrwl/workspace": "npm:18.2.4" - "@nx/devkit": "npm:18.2.4" + "@nrwl/workspace": "npm:19.0.0" + "@nx/devkit": "npm:19.0.0" chalk: "npm:^4.1.0" enquirer: "npm:~2.3.6" - nx: "npm:18.2.4" + nx: "npm:19.0.0" tslib: "npm:^2.3.0" yargs-parser: "npm:21.1.1" - checksum: 10/9bb0692b4548c47d3176e03a3857807d28d6a4ab8539c254e69f6e94b12535b11336eb0f0c98c2c541545880111d1ca62ae50a57e51c13f83cbc9e16845ddeb9 + checksum: 10/ca02f443428de0397b267ae14acfcce00eae2dd066fba8c528d472e8c0fcfdc5ce07f5a98b194106cf4d821796c030c38420f76073caa4c21925f94151756a0c languageName: node linkType: hard @@ -29684,21 +29602,21 @@ __metadata: languageName: node linkType: hard -"nx@npm:18.2.4": - version: 18.2.4 - resolution: "nx@npm:18.2.4" +"nx@npm:19.0.0, nx@npm:^19.0.0": + version: 19.0.0 + resolution: "nx@npm:19.0.0" dependencies: - "@nrwl/tao": "npm:18.2.4" - "@nx/nx-darwin-arm64": "npm:18.2.4" - "@nx/nx-darwin-x64": "npm:18.2.4" - "@nx/nx-freebsd-x64": "npm:18.2.4" - "@nx/nx-linux-arm-gnueabihf": "npm:18.2.4" - "@nx/nx-linux-arm64-gnu": "npm:18.2.4" - "@nx/nx-linux-arm64-musl": "npm:18.2.4" - "@nx/nx-linux-x64-gnu": "npm:18.2.4" - "@nx/nx-linux-x64-musl": "npm:18.2.4" - "@nx/nx-win32-arm64-msvc": "npm:18.2.4" - "@nx/nx-win32-x64-msvc": "npm:18.2.4" + "@nrwl/tao": "npm:19.0.0" + "@nx/nx-darwin-arm64": "npm:19.0.0" + "@nx/nx-darwin-x64": "npm:19.0.0" + "@nx/nx-freebsd-x64": "npm:19.0.0" + "@nx/nx-linux-arm-gnueabihf": "npm:19.0.0" + "@nx/nx-linux-arm64-gnu": "npm:19.0.0" + "@nx/nx-linux-arm64-musl": "npm:19.0.0" + "@nx/nx-linux-x64-gnu": "npm:19.0.0" + "@nx/nx-linux-x64-musl": "npm:19.0.0" + "@nx/nx-win32-arm64-msvc": "npm:19.0.0" + "@nx/nx-win32-x64-msvc": "npm:19.0.0" "@yarnpkg/lockfile": "npm:^1.1.0" "@yarnpkg/parsers": "npm:3.0.0-rc.46" "@zkochan/js-yaml": "npm:0.0.6" @@ -29764,91 +29682,7 @@ __metadata: bin: nx: bin/nx.js nx-cloud: bin/nx-cloud.js - checksum: 10/20a95b02b165d08d61870b6e1a05e54d989d74c576ad002b16bfaaf13f058ef899971279ce81b07d92fe1a6923584867b444592f36030de92de85202462c9868 - languageName: node - linkType: hard - -"nx@npm:18.3.2, nx@npm:^18.2.4": - version: 18.3.2 - resolution: "nx@npm:18.3.2" - dependencies: - "@nrwl/tao": "npm:18.3.2" - "@nx/nx-darwin-arm64": "npm:18.3.2" - "@nx/nx-darwin-x64": "npm:18.3.2" - "@nx/nx-freebsd-x64": "npm:18.3.2" - "@nx/nx-linux-arm-gnueabihf": "npm:18.3.2" - "@nx/nx-linux-arm64-gnu": "npm:18.3.2" - "@nx/nx-linux-arm64-musl": "npm:18.3.2" - "@nx/nx-linux-x64-gnu": "npm:18.3.2" - "@nx/nx-linux-x64-musl": "npm:18.3.2" - "@nx/nx-win32-arm64-msvc": "npm:18.3.2" - "@nx/nx-win32-x64-msvc": "npm:18.3.2" - "@yarnpkg/lockfile": "npm:^1.1.0" - "@yarnpkg/parsers": "npm:3.0.0-rc.46" - "@zkochan/js-yaml": "npm:0.0.6" - axios: "npm:^1.6.0" - chalk: "npm:^4.1.0" - cli-cursor: "npm:3.1.0" - cli-spinners: "npm:2.6.1" - cliui: "npm:^8.0.1" - dotenv: "npm:~16.3.1" - dotenv-expand: "npm:~10.0.0" - enquirer: "npm:~2.3.6" - figures: "npm:3.2.0" - flat: "npm:^5.0.2" - fs-extra: "npm:^11.1.0" - ignore: "npm:^5.0.4" - jest-diff: "npm:^29.4.1" - js-yaml: "npm:4.1.0" - jsonc-parser: "npm:3.2.0" - lines-and-columns: "npm:~2.0.3" - minimatch: "npm:9.0.3" - node-machine-id: "npm:1.1.12" - npm-run-path: "npm:^4.0.1" - open: "npm:^8.4.0" - ora: "npm:5.3.0" - semver: "npm:^7.5.3" - string-width: "npm:^4.2.3" - strong-log-transformer: "npm:^2.1.0" - tar-stream: "npm:~2.2.0" - tmp: "npm:~0.2.1" - tsconfig-paths: "npm:^4.1.2" - tslib: "npm:^2.3.0" - yargs: "npm:^17.6.2" - yargs-parser: "npm:21.1.1" - peerDependencies: - "@swc-node/register": ^1.8.0 - "@swc/core": ^1.3.85 - dependenciesMeta: - "@nx/nx-darwin-arm64": - optional: true - "@nx/nx-darwin-x64": - optional: true - "@nx/nx-freebsd-x64": - optional: true - "@nx/nx-linux-arm-gnueabihf": - optional: true - "@nx/nx-linux-arm64-gnu": - optional: true - "@nx/nx-linux-arm64-musl": - optional: true - "@nx/nx-linux-x64-gnu": - optional: true - "@nx/nx-linux-x64-musl": - optional: true - "@nx/nx-win32-arm64-msvc": - optional: true - "@nx/nx-win32-x64-msvc": - optional: true - peerDependenciesMeta: - "@swc-node/register": - optional: true - "@swc/core": - optional: true - bin: - nx: bin/nx.js - nx-cloud: bin/nx-cloud.js - checksum: 10/ec61e4e1eb1a85ae83996e681d92306c15c3cf62facb0de89e1274a7ffe440cdc9fcff0ad78411baafee0975b1d6d0f4fb5aeec077f32c5e363850523c8b75a6 + checksum: 10/a6a11a424a511527e9bc240f86bf712e9830a7639d92324789835c42f31bd7503de1da51b307b329fa1c23401e7b319cf3aa089fe2d645574a0d29ddee896bf2 languageName: node linkType: hard From 12806b0e7b6fc1811974340854352e1242950697 Mon Sep 17 00:00:00 2001 From: pengx17 Date: Tue, 7 May 2024 03:50:30 +0000 Subject: [PATCH 3/5] fix: do not create hash in frontend (#6788) blob is already hashed in https://github.com/toeverything/AFFiNE/blob/6fdf45d4d064ebac9691a71abc800a90c5e6bfb9/packages/backend/server/src/plugins/copilot/resolver.ts#L294 --- .../blocksuite/block-suite-editor/ai/request.ts | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) 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 index 5f08c964bc..6dafab51aa 100644 --- 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, }); } From 6cd0c7cd11cfb9db1ce1fce235a6890a25911a29 Mon Sep 17 00:00:00 2001 From: donteatfriedrice Date: Tue, 7 May 2024 04:01:18 +0000 Subject: [PATCH 4/5] feat: bump blocksuite (#6789) ## Features ## Bugfix - https://github.com/toeverything/BlockSuite/pull/6971 @donteatfriedrice ## Refactor - https://github.com/toeverything/BlockSuite/pull/6970 @fundon ## Misc --- packages/common/env/package.json | 4 +- packages/common/infra/package.json | 10 +- packages/frontend/component/package.json | 10 +- packages/frontend/core/package.json | 12 +- packages/frontend/electron/package.json | 8 +- tools/cli/package.json | 2 +- yarn.lock | 136 +++++++++++------------ 7 files changed, 91 insertions(+), 91 deletions(-) diff --git a/packages/common/env/package.json b/packages/common/env/package.json index 0096a22601..a971316fa2 100644 --- 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 index b0d58594db..4b4858c998 100644 --- 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 index 28878122af..240fe20739 100644 --- 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 index ac4bbb9391..ed235a64e5 100644 --- 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/packages/frontend/electron/package.json b/packages/frontend/electron/package.json index 0047aa2920..4707bc54d9 100644 --- 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/tools/cli/package.json b/tools/cli/package.json index 16fa19d2d5..966c1fec08 100644 --- 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", diff --git a/yarn.lock b/yarn.lock index 318ed089ea..171600a353 100644 --- a/yarn.lock +++ b/yarn.lock @@ -173,7 +173,7 @@ __metadata: "@affine/env": "workspace:*" "@affine/templates": "workspace:*" "@aws-sdk/client-s3": "npm:3.537.0" - "@blocksuite/presets": "npm:0.14.0-canary-202405070156-0d03364" + "@blocksuite/presets": "npm:0.14.0-canary-202405070334-778ff10" "@clack/core": "npm:^0.3.4" "@clack/prompts": "npm:^0.7.0" "@magic-works/i18n-codegen": "npm:^0.5.0" @@ -226,12 +226,12 @@ __metadata: "@affine/electron-api": "workspace:*" "@affine/graphql": "workspace:*" "@affine/i18n": "workspace:*" - "@blocksuite/block-std": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/blocks": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/global": "npm:0.14.0-canary-202405070156-0d03364" + "@blocksuite/block-std": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/blocks": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/global": "npm:0.14.0-canary-202405070334-778ff10" "@blocksuite/icons": "npm:2.1.46" - "@blocksuite/presets": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/store": "npm:0.14.0-canary-202405070156-0d03364" + "@blocksuite/presets": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/store": "npm:0.14.0-canary-202405070334-778ff10" "@dnd-kit/core": "npm:^6.1.0" "@dnd-kit/modifiers": "npm:^7.0.0" "@dnd-kit/sortable": "npm:^8.0.0" @@ -327,13 +327,13 @@ __metadata: "@affine/graphql": "workspace:*" "@affine/i18n": "workspace:*" "@affine/templates": "workspace:*" - "@blocksuite/block-std": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/blocks": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/global": "npm:0.14.0-canary-202405070156-0d03364" + "@blocksuite/block-std": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/blocks": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/global": "npm:0.14.0-canary-202405070334-778ff10" "@blocksuite/icons": "npm:2.1.46" - "@blocksuite/inline": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/presets": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/store": "npm:0.14.0-canary-202405070156-0d03364" + "@blocksuite/inline": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/presets": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/store": "npm:0.14.0-canary-202405070334-778ff10" "@dnd-kit/core": "npm:^6.1.0" "@dnd-kit/modifiers": "npm:^7.0.0" "@dnd-kit/sortable": "npm:^8.0.0" @@ -455,10 +455,10 @@ __metadata: "@affine/env": "workspace:*" "@affine/i18n": "workspace:*" "@affine/native": "workspace:*" - "@blocksuite/block-std": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/blocks": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/presets": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/store": "npm:0.14.0-canary-202405070156-0d03364" + "@blocksuite/block-std": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/blocks": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/presets": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/store": "npm:0.14.0-canary-202405070334-778ff10" "@electron-forge/cli": "npm:^7.3.0" "@electron-forge/core": "npm:^7.3.0" "@electron-forge/core-utils": "npm:^7.3.0" @@ -516,8 +516,8 @@ __metadata: version: 0.0.0-use.local resolution: "@affine/env@workspace:packages/common/env" dependencies: - "@blocksuite/global": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/store": "npm:0.14.0-canary-202405070156-0d03364" + "@blocksuite/global": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/store": "npm:0.14.0-canary-202405070334-778ff10" lit: "npm:^3.1.2" react: "npm:18.2.0" react-dom: "npm:18.2.0" @@ -3731,30 +3731,30 @@ __metadata: languageName: node linkType: hard -"@blocksuite/block-std@npm:0.14.0-canary-202405070156-0d03364": - version: 0.14.0-canary-202405070156-0d03364 - resolution: "@blocksuite/block-std@npm:0.14.0-canary-202405070156-0d03364" +"@blocksuite/block-std@npm:0.14.0-canary-202405070334-778ff10": + version: 0.14.0-canary-202405070334-778ff10 + resolution: "@blocksuite/block-std@npm:0.14.0-canary-202405070334-778ff10" dependencies: - "@blocksuite/global": "npm:0.14.0-canary-202405070156-0d03364" + "@blocksuite/global": "npm:0.14.0-canary-202405070334-778ff10" lit: "npm:^3.1.3" lz-string: "npm:^1.5.0" w3c-keyname: "npm:^2.2.8" zod: "npm:^3.22.4" peerDependencies: - "@blocksuite/inline": 0.14.0-canary-202405070156-0d03364 - "@blocksuite/store": 0.14.0-canary-202405070156-0d03364 - checksum: 10/a88cce463d943124591c65837521791ca83ae2695c60fba21517d45e2141eb7a90540211c4b733efa4076d53ce7946bfc9db8141a3272536516f568420e856c2 + "@blocksuite/inline": 0.14.0-canary-202405070334-778ff10 + "@blocksuite/store": 0.14.0-canary-202405070334-778ff10 + checksum: 10/68c8bf3828ad09c88992060bad4c871e6ec55b873e0a399da053b1587c5e93bd91ea25a5d009418473a9733b86c60494834912293c68676cfbc6ad0374e5eadb languageName: node linkType: hard -"@blocksuite/blocks@npm:0.14.0-canary-202405070156-0d03364": - version: 0.14.0-canary-202405070156-0d03364 - resolution: "@blocksuite/blocks@npm:0.14.0-canary-202405070156-0d03364" +"@blocksuite/blocks@npm:0.14.0-canary-202405070334-778ff10": + version: 0.14.0-canary-202405070334-778ff10 + resolution: "@blocksuite/blocks@npm:0.14.0-canary-202405070334-778ff10" dependencies: - "@blocksuite/block-std": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/global": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/inline": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/store": "npm:0.14.0-canary-202405070156-0d03364" + "@blocksuite/block-std": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/global": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/inline": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/store": "npm:0.14.0-canary-202405070334-778ff10" "@dotlottie/player-component": "npm:^2.7.12" "@fal-ai/serverless-client": "npm:^0.9.3" "@floating-ui/dom": "npm:^1.6.3" @@ -3793,16 +3793,16 @@ __metadata: unified: "npm:^11.0.4" webfontloader: "npm:^1.6.28" zod: "npm:^3.22.4" - checksum: 10/f7bdc56b7dece39df3c417020acd8becce34a9ccbc100071893a8cd4cf8258acb1226198275e5a007536c5255c374f320f26fe82792d7bf38639b13147834d61 + checksum: 10/a1db64bb34641603479eb95625fabd2beca7c4c0caadad7dc6dfb89c96532eab441d571ccdb5cfdc933d9457d52b1dca5138d6b96fcde603adbc16844c364041 languageName: node linkType: hard -"@blocksuite/global@npm:0.14.0-canary-202405070156-0d03364": - version: 0.14.0-canary-202405070156-0d03364 - resolution: "@blocksuite/global@npm:0.14.0-canary-202405070156-0d03364" +"@blocksuite/global@npm:0.14.0-canary-202405070334-778ff10": + version: 0.14.0-canary-202405070334-778ff10 + resolution: "@blocksuite/global@npm:0.14.0-canary-202405070334-778ff10" dependencies: zod: "npm:^3.22.4" - checksum: 10/22f5d71de1d6647222fffb549a984a96b3ae2a2e220ef28451bce09f73ff83e07b03da5c2e6e7c4d9cf2e84a1635bc4c67a9813ce51519fbe1906e2e9b41c3d1 + checksum: 10/abd50f775577789427733fd711324e2d46ed88581dcb9a465a63504e6a2f3ce3ca3950302d066c19be95a42b39e83aa3a0aba20ed88bd6003757344c00316fe0 languageName: node linkType: hard @@ -3816,45 +3816,45 @@ __metadata: languageName: node linkType: hard -"@blocksuite/inline@npm:0.14.0-canary-202405070156-0d03364": - version: 0.14.0-canary-202405070156-0d03364 - resolution: "@blocksuite/inline@npm:0.14.0-canary-202405070156-0d03364" +"@blocksuite/inline@npm:0.14.0-canary-202405070334-778ff10": + version: 0.14.0-canary-202405070334-778ff10 + resolution: "@blocksuite/inline@npm:0.14.0-canary-202405070334-778ff10" dependencies: - "@blocksuite/global": "npm:0.14.0-canary-202405070156-0d03364" + "@blocksuite/global": "npm:0.14.0-canary-202405070334-778ff10" zod: "npm:^3.22.4" peerDependencies: lit: ^3.1.1 yjs: ^13 - checksum: 10/1ba25d1637d21b71d692dd12e4d7d6efdf7f8c11d279047074add251a9476ec407eeb48d8d2e2ca7cf70fb25564a06e1c9ef466a270a895485e13af007b2e1e3 + checksum: 10/05c48f82cbd7db5382b6c094778b4934965afd0839c80094db9d61f92de2aa57ff78515144e6f9edf65376659bf88576776bc3daa1699dda19346ec5840ad462 languageName: node linkType: hard -"@blocksuite/presets@npm:0.14.0-canary-202405070156-0d03364": - version: 0.14.0-canary-202405070156-0d03364 - resolution: "@blocksuite/presets@npm:0.14.0-canary-202405070156-0d03364" +"@blocksuite/presets@npm:0.14.0-canary-202405070334-778ff10": + version: 0.14.0-canary-202405070334-778ff10 + resolution: "@blocksuite/presets@npm:0.14.0-canary-202405070334-778ff10" dependencies: - "@blocksuite/block-std": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/blocks": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/global": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/inline": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/store": "npm:0.14.0-canary-202405070156-0d03364" + "@blocksuite/block-std": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/blocks": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/global": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/inline": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/store": "npm:0.14.0-canary-202405070334-778ff10" "@dotlottie/player-component": "npm:^2.7.12" "@fal-ai/serverless-client": "npm:^0.9.3" "@floating-ui/dom": "npm:^1.6.3" "@toeverything/theme": "npm:^0.7.29" lit: "npm:^3.1.3" openai: "npm:^4.37.1" - checksum: 10/e4ff649622039f8115bdd6cb065d0a1095e2a5bdfd715e963a7ba973a1f229f6938ba4db62a6ce56c3a25b4ef0274417a604ba59982548c7a957c35071e42446 + checksum: 10/1bb86139f425ad39272433453ebf22ca56cb83fae580f4882f3450bb204ba5155190c4ad95907f01cbbfa907bf60472146868512503c94c5068339cd16ae616b languageName: node linkType: hard -"@blocksuite/store@npm:0.14.0-canary-202405070156-0d03364": - version: 0.14.0-canary-202405070156-0d03364 - resolution: "@blocksuite/store@npm:0.14.0-canary-202405070156-0d03364" +"@blocksuite/store@npm:0.14.0-canary-202405070334-778ff10": + version: 0.14.0-canary-202405070334-778ff10 + resolution: "@blocksuite/store@npm:0.14.0-canary-202405070334-778ff10" dependencies: - "@blocksuite/global": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/inline": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/sync": "npm:0.14.0-canary-202405070156-0d03364" + "@blocksuite/global": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/inline": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/sync": "npm:0.14.0-canary-202405070334-778ff10" "@types/flexsearch": "npm:^0.7.6" flexsearch: "npm:0.7.43" idb-keyval: "npm:^6.2.1" @@ -3866,20 +3866,20 @@ __metadata: zod: "npm:^3.22.4" peerDependencies: yjs: ^13 - checksum: 10/870289646bbcaeeb241caf0ef28c72673ba7187f9eab7804fdc323bed6feb0ee9fd3093f8b9325721baec79888b9d6741dd6cbd8d01f58d81aa468f6af391a53 + checksum: 10/a6fbd6449034890b08c73a2a16dc2e0ef426148a9a67dc254976fcd9e7174e9f1e52f676002913d4f71eac9b40d96c79584201d444f884250b07ac1f6472eb56 languageName: node linkType: hard -"@blocksuite/sync@npm:0.14.0-canary-202405070156-0d03364": - version: 0.14.0-canary-202405070156-0d03364 - resolution: "@blocksuite/sync@npm:0.14.0-canary-202405070156-0d03364" +"@blocksuite/sync@npm:0.14.0-canary-202405070334-778ff10": + version: 0.14.0-canary-202405070334-778ff10 + resolution: "@blocksuite/sync@npm:0.14.0-canary-202405070334-778ff10" dependencies: - "@blocksuite/global": "npm:0.14.0-canary-202405070156-0d03364" + "@blocksuite/global": "npm:0.14.0-canary-202405070334-778ff10" idb: "npm:^8.0.0" y-protocols: "npm:^1.0.6" peerDependencies: yjs: ^13 - checksum: 10/5b153687ec026b148fbcae7975de12b7b9d16177c9523e4fb342173f5bbcb70f1c74481bcfe278e8462be18c6c75f954978696f27f3addf98dff71c49fb6a248 + checksum: 10/7154091297a713bbb50a6513e25645b59a734c77bdcb42295bfb3bc0ddbf1720b6841e343c619c0cf3afd4afa934704499fa7fa684fc146758000da418a526b0 languageName: node linkType: hard @@ -14251,11 +14251,11 @@ __metadata: "@affine/debug": "workspace:*" "@affine/env": "workspace:*" "@affine/templates": "workspace:*" - "@blocksuite/block-std": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/blocks": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/global": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/presets": "npm:0.14.0-canary-202405070156-0d03364" - "@blocksuite/store": "npm:0.14.0-canary-202405070156-0d03364" + "@blocksuite/block-std": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/blocks": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/global": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/presets": "npm:0.14.0-canary-202405070334-778ff10" + "@blocksuite/store": "npm:0.14.0-canary-202405070334-778ff10" "@datastructures-js/binary-search-tree": "npm:^5.3.2" "@testing-library/react": "npm:^15.0.0" async-call-rpc: "npm:^6.4.0" From d76a635b00cdc90bf45c047595252ebc367b8619 Mon Sep 17 00:00:00 2001 From: Brooooooklyn Date: Tue, 7 May 2024 04:28:33 +0000 Subject: [PATCH 5/5] chore(core): handle the telemetry warnings in console (#6793) --- .../core/src/modules/telemetry/services/telemetry.ts | 6 ++++++ packages/frontend/core/src/telemetry.tsx | 10 ++-------- packages/frontend/electron/renderer/index.tsx | 3 +-- packages/frontend/web/src/index.tsx | 2 -- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/packages/frontend/core/src/modules/telemetry/services/telemetry.ts b/packages/frontend/core/src/modules/telemetry/services/telemetry.ts index d73482d541..9919bb55e7 100644 --- 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 index c91cd562f8..9854f912f5 100644 --- 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/renderer/index.tsx b/packages/frontend/electron/renderer/index.tsx index 043b0eb6be..ff57a06715 100644 --- 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/web/src/index.tsx b/packages/frontend/web/src/index.tsx index 8f1da00f9a..9dafe62f44 100644 --- 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({