From ea769365086f2fd408dc59f0963c9f3ebc088474 Mon Sep 17 00:00:00 2001
From: Alex Yang <himself65@outlook.com>
Date: Fri, 4 Aug 2023 16:11:30 -0700
Subject: [PATCH] feat: update 404 page (#3580)

Co-authored-by: QiShaoXuan <qishaoxuan777@gmail.com>
---
 apps/core/package.json      |  1 +
 apps/core/src/app.tsx       |  1 +
 apps/core/src/pages/404.tsx |  3 ++-
 apps/core/tsconfig.json     |  5 +++--
 tsconfig.json               |  8 +++++++-
 yarn.lock                   | 17 ++++++++++++++++-
 6 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/apps/core/package.json b/apps/core/package.json
index 24492a8fb5..242000bbd5 100644
--- a/apps/core/package.json
+++ b/apps/core/package.json
@@ -33,6 +33,7 @@
     "@emotion/styled": "^11.11.0",
     "@mui/material": "^5.14.2",
     "@react-hookz/web": "^23.1.0",
+    "@toeverything/components": "^0.0.6",
     "async-call-rpc": "^6.3.1",
     "cmdk": "^0.2.0",
     "css-spring": "^4.1.0",
diff --git a/apps/core/src/app.tsx b/apps/core/src/app.tsx
index 4b39614070..a1a5ed5b37 100644
--- a/apps/core/src/app.tsx
+++ b/apps/core/src/app.tsx
@@ -1,5 +1,6 @@
 import '@affine/component/theme/global.css';
 import '@affine/component/theme/theme.css';
+import '@toeverything/components/style.css';
 
 import { AffineContext } from '@affine/component/context';
 import { WorkspaceFallback } from '@affine/component/workspace';
diff --git a/apps/core/src/pages/404.tsx b/apps/core/src/pages/404.tsx
index 0056aeb66b..5c342dfd3e 100644
--- a/apps/core/src/pages/404.tsx
+++ b/apps/core/src/pages/404.tsx
@@ -1,6 +1,7 @@
-import { Button, displayFlex, styled } from '@affine/component';
+import { displayFlex, styled } from '@affine/component';
 import { WorkspaceSubPath } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
+import { Button } from '@toeverything/components/button';
 import type { ReactElement } from 'react';
 
 import { useNavigateHelper } from '../hooks/use-navigate-helper';
diff --git a/apps/core/tsconfig.json b/apps/core/tsconfig.json
index 2bfd84ba8e..7b604377e0 100644
--- a/apps/core/tsconfig.json
+++ b/apps/core/tsconfig.json
@@ -8,14 +8,15 @@
     "forceConsistentCasingInFileNames": true,
     "noEmit": true,
     "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "node",
+    "module": "ESNext",
     "resolveJsonModule": true,
     "isolatedModules": true,
+    "moduleResolution": "bundler",
     "jsx": "preserve",
     "jsxImportSource": "@emotion/react",
     "incremental": true,
     "experimentalDecorators": true,
+    "typeRoots": ["../../node_modules", "../../node_modules/@types"],
     "types": ["webpack-env", "ses"]
   },
   "include": ["src/**/*.ts", "src/**/*.tsx"],
diff --git a/tsconfig.json b/tsconfig.json
index 68a39ef863..d431c0f4ce 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -169,5 +169,11 @@
     }
   ],
   "files": [],
-  "exclude": ["node_modules", "target", "lib", "test-results"]
+  "exclude": ["node_modules", "target", "lib", "test-results"],
+  "ts-node": {
+    "compilerOptions": {
+      "module": "ESNext",
+      "moduleResolution": "Node"
+    }
+  }
 }
diff --git a/yarn.lock b/yarn.lock
index 60fb09b0a9..6bd8688f09 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -235,6 +235,7 @@ __metadata:
     "@sentry/webpack-plugin": ^2.5.0
     "@svgr/webpack": ^8.0.1
     "@swc/core": ^1.3.71
+    "@toeverything/components": ^0.0.6
     "@types/webpack-env": ^1.18.1
     async-call-rpc: ^6.3.1
     cmdk: ^0.2.0
@@ -3403,7 +3404,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@blocksuite/icons@npm:^2.1.29":
+"@blocksuite/icons@npm:^2.1.26, @blocksuite/icons@npm:^2.1.29":
   version: 2.1.29
   resolution: "@blocksuite/icons@npm:2.1.29"
   peerDependencies:
@@ -11350,6 +11351,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@toeverything/components@npm:^0.0.6":
+  version: 0.0.6
+  resolution: "@toeverything/components@npm:0.0.6"
+  dependencies:
+    "@blocksuite/icons": ^2.1.26
+  peerDependencies:
+    "@radix-ui/react-avatar": ^1
+    clsx: ^2
+    react: ^18
+    react-dom: ^18
+  checksum: 838bcbecda4eea29c949aa241c99f5512b7d248163156979af93cc70aff396f5ea1087c5e0ea7bee09a964e2960cd9977b065a306bf61cc04894560af6bc166a
+  languageName: node
+  linkType: hard
+
 "@toeverything/hooks@workspace:*, @toeverything/hooks@workspace:packages/hooks":
   version: 0.0.0-use.local
   resolution: "@toeverything/hooks@workspace:packages/hooks"