merge master into feat/layout

This commit is contained in:
QiShaoXuan
2022-10-20 16:29:39 +08:00
20 changed files with 411 additions and 44 deletions

View File

@@ -1,8 +1,10 @@
const withTM = require('next-transpile-modules')(['@toeverything/pathfinder-logger']);
/** @type {import('next').NextConfig} */
const nextConfig = {
const nextConfig = withTM({
productionBrowserSourceMaps: true,
reactStrictMode: false,
swcMinify: false,
};
});
module.exports = nextConfig;

View File

@@ -10,9 +10,9 @@
"lint": "next lint"
},
"dependencies": {
"@blocksuite/blocks": "^0.2.10",
"@blocksuite/editor": "^0.2.10",
"@blocksuite/store": "^0.2.10",
"@blocksuite/blocks": "^0.2.12",
"@blocksuite/editor": "^0.2.12",
"@blocksuite/store": "^0.2.12",
"@emotion/css": "^11.10.0",
"@emotion/react": "^11.10.4",
"@emotion/server": "^11.10.0",
@@ -20,9 +20,11 @@
"@mui/base": "^5.0.0-alpha.87",
"@mui/material": "^5.8.6",
"@mui/icons-material": "^5.10.9",
"@toeverything/pathfinder-logger": "workspace:@pathfinder/logger@*",
"css-spring": "^4.1.0",
"lit": "^2.3.1",
"next": "12.3.1",
"next-transpile-modules": "^9.1.0",
"prettier": "^2.7.1",
"quill": "^1.3.7",
"quill-cursors": "^4.0.0",

View File

@@ -21,7 +21,7 @@ export const Editor = () => {
});
const groupId = store.addBlock({ flavour: 'group' }, pageId);
const text = new Text('Legend from here...');
const text = new Text(store, 'Legend from here...');
store.addBlock({ flavour: 'paragraph', text }, groupId);
// store.resetHistory();

View File

@@ -5,6 +5,7 @@ import '../../public/variable.css';
import './temporary.css';
import { EditorProvider } from '@/components/editor-provider';
import { ModalProvider } from '@/components/global-modal-provider';
import { Logger } from '@toeverything/pathfinder-logger';
const ThemeProvider = dynamic(() => import('@/styles/themeProvider'), {
ssr: false,
@@ -12,13 +13,16 @@ const ThemeProvider = dynamic(() => import('@/styles/themeProvider'), {
function MyApp({ Component, pageProps }: AppProps) {
return (
<ThemeProvider>
<ModalProvider>
<EditorProvider>
<Component {...pageProps} />
</EditorProvider>
</ModalProvider>
</ThemeProvider>
<>
<Logger />
<ThemeProvider>
<ModalProvider>
<EditorProvider>
<Component {...pageProps} />
</EditorProvider>
</ModalProvider>
</ThemeProvider>
</>
);
}