diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 17aa0078ba..52e5a7db54 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -15,35 +15,36 @@
"build:app": "tauri build"
},
"dependencies": {
- "@blocksuite/icons": "^2.0.14",
+ "@blocksuite/icons": "2.0.12",
"@blocksuite/store": "0.4.1",
- "@emotion/react": "^11.10.5",
- "@emotion/styled": "^11.10.5",
+ "@emotion/react": "^11.10.6",
+ "@emotion/styled": "^11.10.6",
"@tauri-apps/api": "^1.2.0",
"json-schema-to-typescript": "^11.0.2",
- "lib0": "^0.2.58",
- "next": "^13.1.6",
+ "lib0": "^0.2.62",
+ "next": "13.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"react-router": "^6.5.0",
"react-router-dom": "^6.5.0",
"y-protocols": "^1.0.5",
- "yjs": "^13.5.43"
+ "yjs": "^13.5.46"
},
"devDependencies": {
"@tauri-apps/cli": "^1.2.3",
- "@types/node": "^18.11.17",
- "@types/react": "^18.0.26",
- "@types/react-dom": "^18.0.9",
+ "@types/node": "^18.14.0",
+ "@types/react": "^18.0.28",
+ "@types/react-dom": "^18.0.11",
"concurrently": "^7.6.0",
"cross-env": "^7.0.3",
- "esbuild": "^0.16.10",
- "prettier": "2.8.1",
- "rimraf": "^3.0.2",
+ "esbuild": "^0.17.8",
+ "lit": "^2.6.1",
+ "prettier": "2.8.4",
+ "rimraf": "^4.1.2",
"typescript": "^4.9.4",
- "typesync": "^0.9.2",
- "vite": "^4.0.2",
+ "typesync": "^0.10.0",
+ "vite": "^4.1.2",
"zx": "^7.1.1"
}
}
diff --git a/apps/web/.eslintrc b/apps/web/.eslintrc
index e2081ec106..5d3a253002 100644
--- a/apps/web/.eslintrc
+++ b/apps/web/.eslintrc
@@ -1,4 +1,5 @@
{
"root": false,
- "extends": "next/core-web-vitals"
+ "extends": "next/core-web-vitals",
+ "reportUnusedDisableDirectives": true
}
diff --git a/apps/web/next.config.js b/apps/web/next.config.mjs
similarity index 86%
rename from apps/web/next.config.js
rename to apps/web/next.config.mjs
index fccf586828..643717e814 100644
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.mjs
@@ -1,8 +1,12 @@
-/* eslint @typescript-eslint/no-var-requires: "off" */
-const { getGitVersion, getCommitHash } = require('./scripts/gitInfo');
-const { dependencies } = require('./package.json');
-const path = require('node:path');
-const printer = require('./scripts/printer').printer;
+import { getGitVersion, getCommitHash } from './scripts/gitInfo.mjs';
+import fs from 'node:fs';
+import path from 'node:path';
+import { printer } from './scripts/printer.mjs';
+import debugLocal from 'next-debug-local';
+
+const dependencies = JSON.parse(fs.readFileSync('./package.json', 'utf8'))[
+ 'dependencies'
+];
const enableDebugLocal = path.isAbsolute(process.env.LOCAL_BLOCK_SUITE ?? '');
const EDITOR_VERSION = enableDebugLocal
@@ -56,7 +60,6 @@ const nextConfig = {
],
webpack: config => {
config.experiments = { ...config.experiments, topLevelAwait: true };
- config.resolve.alias['yjs'] = require.resolve('yjs');
config.module.rules.push({
test: /\.md$/i,
loader: 'raw-loader',
@@ -81,7 +84,7 @@ const nextConfig = {
};
const baseDir = process.env.LOCAL_BLOCK_SUITE ?? '/';
-const withDebugLocal = require('next-debug-local')(
+const withDebugLocal = debugLocal(
{
'@blocksuite/editor': path.resolve(baseDir, 'packages', 'editor'),
'@blocksuite/blocks/models': path.resolve(
@@ -115,4 +118,4 @@ const detectFirebaseConfig = () => {
};
detectFirebaseConfig();
-module.exports = withDebugLocal(nextConfig);
+export default withDebugLocal(nextConfig);
diff --git a/apps/web/package.json b/apps/web/package.json
index 2c251cc4bb..5de148d031 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -16,50 +16,42 @@
"@blocksuite/blocks": "0.4.1",
"@blocksuite/editor": "0.4.1",
"@blocksuite/global": "0.4.1",
- "@blocksuite/icons": "^2.0.14",
+ "@blocksuite/icons": "2.0.12",
"@blocksuite/store": "0.4.1",
- "@emotion/css": "^11.10.5",
- "@emotion/react": "^11.10.5",
+ "@emotion/css": "^11.10.6",
+ "@emotion/react": "^11.10.6",
"@emotion/server": "^11.10.0",
- "@emotion/styled": "^11.10.5",
+ "@emotion/styled": "^11.10.6",
"@fontsource/poppins": "^4.5.10",
- "@fontsource/space-mono": "^4.5.10",
- "@mui/base": "=5.0.0-alpha.117",
- "@mui/icons-material": "=5.11.0",
- "@mui/material": "=5.11.8",
+ "@fontsource/space-mono": "^4.5.12",
+ "@mui/base": "5.0.0-alpha.118",
+ "@mui/icons-material": "^5.11.9",
+ "@mui/material": "^5.11.9",
"@toeverything/pathfinder-logger": "workspace:@affine/logger@*",
- "cmdk": "^0.1.20",
+ "cmdk": "^0.1.22",
"css-spring": "^4.1.0",
"dayjs": "^1.11.7",
"lit": "^2.6.1",
"next": "13.1.0",
"next-debug-local": "^0.1.5",
- "prettier": "^2.7.1",
+ "prettier": "^2.8.4",
"quill": "^1.3.7",
"quill-cursors": "^4.0.0",
"react": "18.2.0",
"react-dom": "18.2.0",
- "yjs": "^13.5.45",
- "zustand": "^4.3.2"
+ "yjs": "^13.5.46",
+ "zustand": "^4.3.3"
},
"devDependencies": {
- "@types/node": "18.7.18",
- "@types/react": "18.0.20",
- "@types/react-dom": "18.0.6",
+ "@types/node": "18.14.0",
+ "@types/react": "18.0.28",
+ "@types/react-dom": "18.0.11",
"@types/wicg-file-system-access": "^2020.9.5",
- "chalk": "^4.1.2",
- "eslint-config-next": "12.3.1",
+ "chalk": "^5.2.0",
+ "eslint": "^8.34.0",
+ "eslint-config-next": "13.1.6",
"raw-loader": "^4.0.2",
- "typescript": "^4.9.5"
- },
- "eslintConfig": {
- "extends": [
- "next/core-web-vitals",
- "plugin:@next/next/recommended"
- ],
- "rules": {
- "prettier/prettier": "warn"
- },
- "reportUnusedDisableDirectives": true
+ "typescript": "^4.9.5",
+ "webpack": "^5.75.0"
}
}
diff --git a/apps/web/scripts/gitInfo.js b/apps/web/scripts/gitInfo.mjs
similarity index 77%
rename from apps/web/scripts/gitInfo.js
rename to apps/web/scripts/gitInfo.mjs
index becc95e59e..51ea7d5127 100644
--- a/apps/web/scripts/gitInfo.js
+++ b/apps/web/scripts/gitInfo.mjs
@@ -1,8 +1,5 @@
// @ts-check
-
-// import { execSync } from 'child_process'
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { execSync } = require('child_process');
+import { execSync } from 'node:child_process';
const hasGit = () => {
try {
@@ -41,7 +38,4 @@ const getGitVersion = () => {
const getCommitHash = (rev = 'HEAD') =>
execSync(`git rev-parse --short ${rev}`).toString();
-module.exports = {
- getGitVersion,
- getCommitHash,
-};
+export { getCommitHash, getGitVersion };
diff --git a/apps/web/scripts/printer.js b/apps/web/scripts/printer.mjs
similarity index 74%
rename from apps/web/scripts/printer.js
rename to apps/web/scripts/printer.mjs
index ea86acc91e..b180187ad3 100644
--- a/apps/web/scripts/printer.js
+++ b/apps/web/scripts/printer.mjs
@@ -1,6 +1,5 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const chalk = require('chalk');
-const printer = {
+import chalk from 'chalk';
+export const printer = {
debug: msg => {
const result = chalk.green`debug` + chalk.white(' - ' + msg);
console.log(result);
@@ -17,5 +16,3 @@ const printer = {
return result;
},
};
-
-module.exports = { printer };
diff --git a/apps/web/src/components/editor-mode-switch/style.ts b/apps/web/src/components/editor-mode-switch/style.ts
index 300c44fe1f..cee75ce544 100644
--- a/apps/web/src/components/editor-mode-switch/style.ts
+++ b/apps/web/src/components/editor-mode-switch/style.ts
@@ -1,5 +1,4 @@
import { displayFlex, keyframes, styled } from '@affine/component';
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import spring, { toString } from 'css-spring';
diff --git a/apps/web/src/components/header/header-right-items/theme-mode-switch/style.ts b/apps/web/src/components/header/header-right-items/theme-mode-switch/style.ts
index 0677921750..d03be61940 100644
--- a/apps/web/src/components/header/header-right-items/theme-mode-switch/style.ts
+++ b/apps/web/src/components/header/header-right-items/theme-mode-switch/style.ts
@@ -1,5 +1,4 @@
import { displayFlex, keyframes, styled } from '@affine/component';
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import spring, { toString } from 'css-spring';
import { CSSProperties } from 'react';
diff --git a/apps/web/src/components/provider-composer.ts b/apps/web/src/components/provider-composer.ts
index 23691240ba..188d0b76fb 100644
--- a/apps/web/src/components/provider-composer.ts
+++ b/apps/web/src/components/provider-composer.ts
@@ -2,12 +2,10 @@ import { cloneElement, FC, PropsWithChildren, ReactNode } from 'react';
export const ProviderComposer: FC<
PropsWithChildren<{
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
contexts: any;
}>
> = ({ contexts, children }) =>
contexts.reduceRight(
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
(kids: ReactNode, parent: any) =>
cloneElement(parent, {
children: kids,
diff --git a/apps/web/src/components/workspace-setting/general/delete/Delete.tsx b/apps/web/src/components/workspace-setting/general/delete/Delete.tsx
index 474bc0309d..02a1efe611 100644
--- a/apps/web/src/components/workspace-setting/general/delete/Delete.tsx
+++ b/apps/web/src/components/workspace-setting/general/delete/Delete.tsx
@@ -52,22 +52,18 @@ export const WorkspaceDelete = ({
Deleting (
-
- {{ workspace: workspace.name }}
-
- ) cannot be undone, please proceed with caution. along with all
- its content.
+ {workspace.name})
+ cannot be undone, please proceed with caution. along with all its
+ content.
) : (
Deleting (
-
- {{ workspace: workspace.name }}
-
- ) will delete both local and cloud data, this operation cannot be
- undone, please proceed with caution.
+ {workspace.name}) will
+ delete both local and cloud data, this operation cannot be undone,
+ please proceed with caution.
)}
diff --git a/apps/web/src/components/workspace-setting/member/InviteMemberModal.tsx b/apps/web/src/components/workspace-setting/member/InviteMemberModal.tsx
index 51ebf58668..97cd73d1bd 100644
--- a/apps/web/src/components/workspace-setting/member/InviteMemberModal.tsx
+++ b/apps/web/src/components/workspace-setting/member/InviteMemberModal.tsx
@@ -15,17 +15,16 @@ interface LoginModalProps {
workspaceId: string;
onInviteSuccess: () => void;
}
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
export const debounce = any>(
fn: T,
time?: number,
immediate?: boolean
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
): ((...args: any) => any) => {
let timeoutId: null | number;
let defaultImmediate = immediate || false;
const delay = time || 300;
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
return (...args: any) => {
if (defaultImmediate) {
fn.apply(this, args);
@@ -35,7 +34,7 @@ export const debounce = any>(
if (timeoutId) {
clearTimeout(timeoutId);
}
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+
// @ts-ignore
timeoutId = setTimeout(() => {
fn.apply(this, args);
diff --git a/apps/web/src/components/workspace-setting/member/MembersPage.tsx b/apps/web/src/components/workspace-setting/member/MembersPage.tsx
index 1e0808f6bb..bbd0777263 100644
--- a/apps/web/src/components/workspace-setting/member/MembersPage.tsx
+++ b/apps/web/src/components/workspace-setting/member/MembersPage.tsx
@@ -102,7 +102,7 @@ export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {