diff --git a/apps/ligo-virgo/src/index.html b/apps/ligo-virgo/src/index.html index 1291a10917..94f01b6db7 100644 --- a/apps/ligo-virgo/src/index.html +++ b/apps/ligo-virgo/src/index.html @@ -5,7 +5,7 @@ - Affine | Local Dev Environment + AFFiNE | Local Dev Environment diff --git a/apps/ligo-virgo/src/pages/ui/index.tsx b/apps/ligo-virgo/src/pages/ui/index.tsx index cc8273dbe7..be4d79a688 100644 --- a/apps/ligo-virgo/src/pages/ui/index.tsx +++ b/apps/ligo-virgo/src/pages/ui/index.tsx @@ -3,7 +3,7 @@ import React from 'react'; export const UIPage = () => { return (
- This page is used to show ui components of Affine ~ + This page is used to show ui components of AFFiNE ~
); }; diff --git a/apps/ligo-virgo/webpack.config.js b/apps/ligo-virgo/webpack.config.js index 4d7500c60f..edb5305b2b 100644 --- a/apps/ligo-virgo/webpack.config.js +++ b/apps/ligo-virgo/webpack.config.js @@ -151,6 +151,8 @@ module.exports = function (webpackConfig) { } } + addEmotionBabelPlugin(config); + config.plugins = [ ...config.plugins.filter( p => !(isProd && p instanceof MiniCssExtractPlugin) @@ -161,7 +163,7 @@ module.exports = function (webpackConfig) { }), isProd && new HtmlWebpackPlugin({ - title: 'Affine - All In One Workos', + title: 'AFFiNE - All In One Workos', favicon: path.resolve( __dirname, './src/assets/images/favicon.ico' @@ -195,3 +197,59 @@ module.exports = function (webpackConfig) { return config; }; + +// TODO handle nx issue +// see https://github.com/nrwl/nx/issues/8870 +// see https://github.com/nrwl/nx/issues/4520#issuecomment-787473383 +const addEmotionBabelPlugin = config => { + const babelLoader = config.module.rules.find( + rule => + typeof rule !== 'string' && + rule.loader?.toString().includes('babel-loader') + ); + if (!babelLoader) { + return; + } + + babelLoader.options.plugins = [ + [ + require.resolve('@emotion/babel-plugin'), + { + // See https://github.com/mui/material-ui/issues/27380#issuecomment-928973157 + // See https://github.com/emotion-js/emotion/tree/main/packages/babel-plugin#importmap + importMap: { + '@toeverything/components/ui': { + styled: { + canonicalImport: ['@emotion/styled', 'default'], + styledBaseImport: [ + '@toeverything/components/ui', + 'styled', + ], + }, + }, + '@mui/material': { + styled: { + canonicalImport: ['@emotion/styled', 'default'], + styledBaseImport: ['@mui/material', 'styled'], + }, + }, + '@mui/material/styles': { + styled: { + canonicalImport: ['@emotion/styled', 'default'], + styledBaseImport: [ + '@mui/material/styles', + 'styled', + ], + }, + }, + }, + // sourceMap is on by default but source maps are dead code eliminated in production + sourceMap: true, + autoLabel: 'dev-only', + labelFormat: '[filename]-[local]', + cssPropOptimization: true, + }, + ], + ...(babelLoader.options.plugins ?? []), + ]; +}; diff --git a/docs/affine-icons-user-guide.md b/docs/affine-icons-user-guide.md index 70e9742af8..0e376a4099 100644 --- a/docs/affine-icons-user-guide.md +++ b/docs/affine-icons-user-guide.md @@ -1,7 +1,7 @@ -## Affine Icons +## AFFiNE Icons > Abundant and colorful icon resource for free free use Website: [http://localhost:4200/tools/icons](http://localhost:4200/tools/icons) -Figma: [Figma Affine Icons](https://www.figma.com/file/7pyx5gMz6CN0qSRADmScQ7/AFFINE?node-id=665%3A1734) +Figma: [Figma AFFiNE Icons](https://www.figma.com/file/7pyx5gMz6CN0qSRADmScQ7/AFFINE?node-id=665%3A1734) diff --git a/docs/how-to-add-ui-component-in-affine.md b/docs/how-to-add-ui-component-in-affine.md index dc7ea52c5c..acb2a80911 100644 --- a/docs/how-to-add-ui-component-in-affine.md +++ b/docs/how-to-add-ui-component-in-affine.md @@ -1,6 +1,6 @@ # Tutorial -Affine defines a new component development specification in Figma, extends Affine UI Components based on MUI BASE and MUI SYSTEM, and supplements as needed https://github.com/toeverything/AFFiNE/tree/master/libs/components/ui , eg `src/libs/components/ui/src/button/base-button.ts` +AFFiNE defines a new component development specification in Figma, extends AFFiNE UI Components based on MUI BASE and MUI SYSTEM, and supplements as needed https://github.com/toeverything/AFFiNE/tree/master/libs/components/ui , eg `src/libs/components/ui/src/button/base-button.ts` ```jsx import ButtonUnstyled, { diff --git a/libs/components/account/src/login/firebase.tsx b/libs/components/account/src/login/firebase.tsx index e2f0a6b08d..55453782bd 100644 --- a/libs/components/account/src/login/firebase.tsx +++ b/libs/components/account/src/login/firebase.tsx @@ -106,7 +106,7 @@ export const Firebase = () => { /> diff --git a/libs/components/common/src/lib/Logo/LogoImg.tsx b/libs/components/common/src/lib/Logo/LogoImg.tsx index d104588fe3..1048f8a364 100644 --- a/libs/components/common/src/lib/Logo/LogoImg.tsx +++ b/libs/components/common/src/lib/Logo/LogoImg.tsx @@ -6,7 +6,7 @@ export const LogoImg = ({ style = {} }: { style: CSSProperties }) => { Affine Logo ); }; diff --git a/libs/components/editor-core/src/editor/editor.ts b/libs/components/editor-core/src/editor/editor.ts index 45db53c678..da46769ed5 100644 --- a/libs/components/editor-core/src/editor/editor.ts +++ b/libs/components/editor-core/src/editor/editor.ts @@ -59,7 +59,7 @@ export class Editor implements Virgo { public bdCommands: Commands; public ui_container?: HTMLDivElement; public version = '0.0.1'; - public copyright = '@Affine 2019-2022'; + public copyright = '@AFFiNE 2020-2022'; private plugin_manager: PluginManager; private hooks: Hooks; private views: Record = {}; diff --git a/libs/components/layout/src/header/file-exporter/file-exporter.ts b/libs/components/layout/src/header/file-exporter/file-exporter.ts index 428ae0dd6e..ccbe9bc5f5 100644 --- a/libs/components/layout/src/header/file-exporter/file-exporter.ts +++ b/libs/components/layout/src/header/file-exporter/file-exporter.ts @@ -34,7 +34,7 @@ const FileExporter = { `; }, decoreateAffineBrand: (pageTitle: string) => { - return pageTitle + ` Created in Affine`; + return pageTitle + ` Created in AFFiNE`; }, exportHtml: (pageTitle: string, htmlContent: string) => { FileExporter.exportFile( diff --git a/libs/components/layout/src/settings-sidebar/Settings/util/file-exporter.ts b/libs/components/layout/src/settings-sidebar/Settings/util/file-exporter.ts index 99b17d8858..bb561a1399 100644 --- a/libs/components/layout/src/settings-sidebar/Settings/util/file-exporter.ts +++ b/libs/components/layout/src/settings-sidebar/Settings/util/file-exporter.ts @@ -34,7 +34,7 @@ export const fileExporter = { `; }, decoreateAffineBrand: (pageTitle: string) => { - return pageTitle + ` Created in Affine`; + return pageTitle + ` Created in AFFiNE`; }, exportHtml: (pageTitle: string, htmlContent: string) => { fileExporter.exportFile( diff --git a/libs/datasource/db-service/src/services/editor-block/templates/group-templates.ts b/libs/datasource/db-service/src/services/editor-block/templates/group-templates.ts index 75f0b219c6..3888b54333 100644 --- a/libs/datasource/db-service/src/services/editor-block/templates/group-templates.ts +++ b/libs/datasource/db-service/src/services/editor-block/templates/group-templates.ts @@ -200,7 +200,7 @@ const groupTemplateMap: GroupTemplateMap = { text: { value: [ { - text: 'As a collaborative real-time editor, Affine aims to resolve problems in three situations:', + text: 'As a collaborative real-time editor, AFFiNE aims to resolve problems in three situations:', }, ], }, diff --git a/libs/datasource/db-service/src/services/editor-block/templates/template-factory.ts b/libs/datasource/db-service/src/services/editor-block/templates/template-factory.ts index 5a381b1751..3fa16ac460 100644 --- a/libs/datasource/db-service/src/services/editor-block/templates/template-factory.ts +++ b/libs/datasource/db-service/src/services/editor-block/templates/template-factory.ts @@ -13,7 +13,7 @@ const defaultTemplateList: Array = [ const TemplateFactory = { defaultTemplateList: defaultTemplateList, generatePageTemplateByGroupKeys(props: TemplateMeta): Template { - const newTitle = props.name || 'Get Started with Affine'; + const newTitle = props.name || 'Get Started with AFFiNE'; const keys = props.groupKeys || []; const blankPage: Template = { type: 'page', diff --git a/libs/datasource/jwt/src/adapter/yjs/index.ts b/libs/datasource/jwt/src/adapter/yjs/index.ts index 2d14aec56a..1037d9e3f6 100644 --- a/libs/datasource/jwt/src/adapter/yjs/index.ts +++ b/libs/datasource/jwt/src/adapter/yjs/index.ts @@ -343,7 +343,7 @@ export class YjsAdapter implements AsyncDatabaseAdapter { const handles = await window.showOpenFilePicker({ types: [ { - description: 'Affine Package', + description: 'AFFiNE Package', accept: { // eslint-disable-next-line @typescript-eslint/naming-convention 'application/affine': ['.apk'], diff --git a/libs/utils/src/types/user-workspace.ts b/libs/utils/src/types/user-workspace.ts index e6d4fc58cb..85f46a49fe 100644 --- a/libs/utils/src/types/user-workspace.ts +++ b/libs/utils/src/types/user-workspace.ts @@ -1,4 +1,4 @@ -/** user model for Affine */ +/** user model for AFFiNE */ export type UserInfo = { id: string; nickname: string;