toeverything/AFFiNE
1
1
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2024-12-22 08:31:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor(core): split web entry from core (#6082)

Browse Source 
This pr is trying to split `web` and `electron` entries from `core`. It allows more platform-related optimization to be addressed in each entry.
We should remove all browser/electron only codes from `core` eventually, this is the very first step for that.
This commit is contained in:
LongYinan 2024-03-19 07:48:56 +00:00
parent 26925c96e4
commit 332cd3b380
No known key found for this signature in database
GPG Key ID: 30B1140CE1C07C99
54 changed files with 963 additions and 800 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/download-core/action.yml → .github/actions/download-web/action.yml vendored
View File

@ -11,7 +11,7 @@ runs:
- name: Download tar.gz
uses: actions/download-artifact@v4
with:
name: core
name: web
path: .
- name: Extract core artifacts

2
.github/deployment/front/Dockerfile vendored
View File

@ -1,6 +1,6 @@
FROM openresty/openresty:1.25.3.1-0-buster
WORKDIR /app
COPY ./packages/frontend/core/dist ./dist
COPY ./packages/frontend/web/dist ./dist
COPY ./.github/deployment/front/nginx.conf /usr/local/openresty/nginx/conf/nginx.conf
COPY ./.github/deployment/front/affine.nginx.conf /etc/nginx/conf.d/affine.nginx.conf

2
.github/deployment/node/Dockerfile vendored
View File

@ -1,7 +1,7 @@
FROM node:20-bookworm-slim
COPY ./packages/backend/server /app
COPY ./packages/frontend/core/dist /app/static
COPY ./packages/frontend/web/dist /app/static
WORKDIR /app
RUN apt-get update && \

22
.github/workflows/build-test.yml vendored
View File

@ -266,8 +266,8 @@ jobs:
path: ./packages/backend/storage/storage.node
if-no-files-found: error
build-core:
name: Build @affine/core
build-web:
name: Build @affine/web
runs-on: ubuntu-latest
steps:
@ -277,15 +277,15 @@ jobs:
with:
electron-install: false
full-cache: true
- name: Build Core
- name: Build Web
# always skip cache because its fast, and cache configuration is always changing
run: yarn nx build @affine/core --skip-nx-cache
- name: zip core
run: tar -czf dist.tar.gz --directory=packages/frontend/core/dist .
- name: Upload core artifact
run: yarn nx build @affine/web --skip-nx-cache
- name: zip web
run: tar -czf dist.tar.gz --directory=packages/frontend/web/dist .
- name: Upload web artifact
uses: actions/upload-artifact@v4
with:
name: core
name: web
path: dist.tar.gz
if-no-files-found: error
@ -485,7 +485,7 @@ jobs:
test: true,
}
needs:
- build-core
- build-web
- build-native
steps:
- uses: actions/checkout@v4
@ -516,8 +516,8 @@ jobs:
shell: bash
run: yarn workspace @affine/electron vitest
- name: Download core artifact
uses: ./.github/actions/download-core
- name: Download web artifact
uses: ./.github/actions/download-web
with:
path: packages/frontend/electron/resources/web-static

42
.github/workflows/deploy.yml vendored
View File

@ -38,8 +38,8 @@ jobs:
name: server-dist
path: ./packages/backend/server/dist
if-no-files-found: error
build-core:
name: Build @affine/core
build-web:
name: Build @affine/web
runs-on: ubuntu-latest
environment: ${{ github.event.inputs.flavor }}
steps:
@ -50,7 +50,7 @@ jobs:
- name: Setup Node.js
uses: ./.github/actions/setup-node
- name: Build Core
run: yarn nx build @affine/core --skip-nx-cache
run: yarn nx build @affine/web --skip-nx-cache
env:
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
@ -64,15 +64,15 @@ jobs:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
PERFSEE_TOKEN: ${{ secrets.PERFSEE_TOKEN }}
- name: Upload core artifact
- name: Upload web artifact
uses: actions/upload-artifact@v4
with:
name: core
path: ./packages/frontend/core/dist
name: web
path: ./packages/frontend/web/dist
if-no-files-found: error
build-core-selfhost:
name: Build @affine/core selfhost
build-web-selfhost:
name: Build @affine/web selfhost
runs-on: ubuntu-latest
environment: ${{ github.event.inputs.flavor }}
steps:
@ -83,7 +83,7 @@ jobs:
- name: Setup Node.js
uses: ./.github/actions/setup-node
- name: Build Core
run: yarn nx build @affine/core --skip-nx-cache
run: yarn nx build @affine/web --skip-nx-cache
env:
BUILD_TYPE: ${{ github.event.inputs.flavor }}
SHOULD_REPORT_TRACE: false
@ -91,11 +91,11 @@ jobs:
SELF_HOSTED: true
- name: Download selfhost fonts
run: node ./scripts/download-blocksuite-fonts.mjs
- name: Upload core artifact
- name: Upload web artifact
uses: actions/upload-artifact@v4
with:
name: selfhost-core
path: ./packages/frontend/core/dist
name: selfhost-web
path: ./packages/frontend/web/dist
if-no-files-found: error
build-storage:
@ -143,16 +143,16 @@ jobs:
packages: 'write'
needs:
- build-server
- build-core
- build-core-selfhost
- build-web
- build-web-selfhost
- build-storage
steps:
- uses: actions/checkout@v4
- name: Download core artifact
uses: actions/download-artifact@v4
with:
name: core
path: ./packages/frontend/core/dist
name: web
path: ./packages/frontend/web/dist
- name: Download server dist
uses: actions/download-artifact@v4
with:
@ -218,14 +218,14 @@ jobs:
registry-url: https://npm.pkg.github.com
scope: '@toeverything'
- name: Remove core dist
run: rm -rf ./packages/frontend/core/dist
- name: Remove web dist
run: rm -rf ./packages/frontend/web/dist
- name: Download selfhost core artifact
- name: Download selfhost web artifact
uses: actions/download-artifact@v4
with:
name: selfhost-core
path: ./packages/frontend/core/dist
name: selfhost-web
path: ./packages/frontend/web/dist
- name: Install Node.js dependencies
run: |

10
.github/workflows/release-desktop.yml vendored
View File

@ -60,10 +60,10 @@ jobs:
SKIP_PLUGIN_BUILD: 'true'
SKIP_NX_CACHE: 'true'
- name: Upload core artifact
- name: Upload web artifact
uses: actions/upload-artifact@v4
with:
name: core
name: web
path: packages/frontend/electron/resources/web-static
make-distribution:
@ -110,7 +110,7 @@ jobs:
nx_token: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
- uses: actions/download-artifact@v4
with:
name: core
name: web
path: packages/frontend/electron/resources/web-static
- name: Build Desktop Layers
@ -188,7 +188,7 @@ jobs:
nx_token: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
- uses: actions/download-artifact@v4
with:
name: core
name: web
path: packages/frontend/electron/resources/web-static
- name: Build Desktop Layers
@ -317,7 +317,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: core
name: web
path: web-static
- name: Zip web-static
run: zip -r web-static.zip web-static

6
package.json
View File

@ -17,13 +17,13 @@
"node": "<21.0.0"
},
"scripts": {
"dev": "dev-core",
"dev": "yarn workspace @affine/cli dev",
"dev:electron": "yarn workspace @affine/electron dev",
"build": "yarn nx build @affine/core",
"build": "yarn nx build @affine/web",
"build:electron": "yarn nx build @affine/electron",
"build:storage": "yarn nx run-many -t build -p @affine/storage",
"build:storybook": "yarn nx build @affine/storybook",
"start:web-static": "yarn workspace @affine/core static-server",
"start:web-static": "yarn workspace @affine/web static-server",
"start:storybook": "yarn exec serve tests/storybook/storybook-static -l 6006",
"serve:test-static": "yarn exec serve tests/fixtures --cors -p 8081",
"lint:eslint": "eslint . --ext .js,mjs,.ts,.tsx --cache",

2
packages/backend/server/package.json
View File

@ -20,7 +20,7 @@
"dependencies": {
"@apollo/server": "^4.10.0",
"@auth/prisma-adapter": "^1.4.0",
"@aws-sdk/client-s3": "^3.515.0",
"@aws-sdk/client-s3": "^3.536.0",
"@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.17.0",
"@google-cloud/opentelemetry-cloud-trace-exporter": "^2.1.0",
"@google-cloud/opentelemetry-resource-util": "^2.1.0",

1
packages/common/env/src/global.ts vendored
View File

@ -19,7 +19,6 @@ export const runtimeFlagsSchema = z.object({
enableNewSettingModal: z.boolean(),
enableNewSettingUnstableApi: z.boolean(),
enableSQLiteProvider: z.boolean(),
enableNotificationCenter: z.boolean(),
enableCloud: z.boolean(),
enableCaptcha: z.boolean(),
enableEnhanceShareMode: z.boolean(),

3
packages/frontend/component/.storybook/main.ts
View File

@ -1,8 +1,7 @@
import { StorybookConfig } from '@storybook/react-vite';
import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin';
import { fileURLToPath } from 'url';
import { mergeConfig } from 'vite';
import { getRuntimeConfig } from '../../core/.webpack/runtime-config';
import { getRuntimeConfig } from '@affine/cli/src/webpack/runtime-config';
export default {
stories: ['../src/ui/**/*.stories.@(js|jsx|ts|tsx|mdx)'],

1
packages/frontend/component/package.json
View File

@ -20,6 +20,7 @@
"@blocksuite/store": "*"
},
"dependencies": {
"@affine/cli": "workspace:*",
"@affine/debug": "workspace:*",
"@affine/electron-api": "workspace:*",
"@affine/graphql": "workspace:*",

27
packages/frontend/core/package.json
View File

@ -3,14 +3,9 @@
"type": "module",
"private": true,
"version": "0.14.0",
"scripts": {
"build": "yarn -T run build-core",
"dev": "yarn -T run dev-core",
"static-server": "yarn -T run dev-core --static"
},
"exports": {
"./app": "./src/app.tsx",
"./router": "./src/router.ts",
"./router": "./src/router.tsx",
"./bootstrap/setup": "./src/bootstrap/setup.ts",
"./bootstrap/register-plugins": "./src/bootstrap/register-plugins.ts",
"./*": "./src/*"
@ -40,7 +35,6 @@
"@emotion/react": "^11.11.3",
"@emotion/server": "^11.11.0",
"@emotion/styled": "^11.11.0",
"@juggle/resize-observer": "^3.4.0",
"@marsidev/react-turnstile": "^0.5.3",
"@radix-ui/react-collapsible": "^1.0.3",
"@radix-ui/react-dialog": "^1.0.5",
@ -59,7 +53,6 @@
"clsx": "^2.1.0",
"cmdk": "patch:cmdk@npm%3A0.2.0#~/.yarn/patches/cmdk-npm-0.2.0-302237a911.patch",
"css-spring": "^4.1.0",
"cssnano": "^6.0.4",
"dayjs": "^1.11.10",
"foxact": "^0.2.31",
"fractional-indexing": "^3.2.0",
@ -67,7 +60,6 @@
"history": "^5.3.0",
"idb": "^8.0.0",
"image-blob-reduce": "^4.1.0",
"intl-segmenter-polyfill-rs": "^0.1.7",
"jotai": "^2.6.5",
"jotai-devtools": "^0.8.0",
"jotai-effect": "^0.6.0",
@ -76,10 +68,8 @@
"lodash-es": "^4.17.21",
"lottie-react": "^2.4.0",
"lottie-web": "^5.12.2",
"mini-css-extract-plugin": "^2.8.0",
"nanoid": "^5.0.6",
"next-themes": "^0.3.0",
"postcss-loader": "^8.1.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-error-boundary": "^4.0.12",
@ -108,24 +98,11 @@
"@types/image-blob-reduce": "^4.1.4",
"@types/lodash-es": "^4.17.12",
"@types/uuid": "^9.0.8",
"@types/webpack-env": "^1.18.4",
"@vanilla-extract/css": "^1.14.1",
"copy-webpack-plugin": "^12.0.2",
"css-loader": "^6.10.0",
"express": "^4.18.2",
"fake-indexeddb": "^5.0.2",
"html-webpack-plugin": "^5.6.0",
"lodash-es": "^4.17.21",
"mime-types": "^2.1.35",
"raw-loader": "^4.0.2",
"source-map-loader": "^5.0.0",
"style-loader": "^3.3.4",
"swc-loader": "^0.2.6",
"thread-loader": "^4.0.2",
"vitest": "1.4.0",
"webpack": "^5.90.3",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^5.0.2",
"webpack-merge": "^5.10.0"
"vitest": "1.4.0"
}
}

3
packages/frontend/core/src/hooks/use-app-config-storage.ts
View File

@ -1,4 +1,5 @@
import { apis } from '@affine/electron-api';
import { setupGlobal } from '@affine/env/global';
import { assertExists } from '@blocksuite/global/utils';
import {
type AppConfigSchema,
@ -35,6 +36,8 @@ class AppConfigProxy {
}
export const appConfigProxy = new AppConfigProxy();
setupGlobal();
const storage = environment.isDesktop
? new AppConfigStorage({
config: defaultAppConfig,

44
packages/frontend/core/src/index.tsx
View File

@ -1,43 +1 @@
import './polyfill/intl-segmenter';
import './polyfill/request-idle-callback';
import './polyfill/resize-observer';
import { assertExists } from '@blocksuite/global/utils';
import { StrictMode } from 'react';
import { createRoot } from 'react-dom/client';
import { App } from './app';
import { setup } from './bootstrap/setup';
import { performanceLogger } from './shared';
const performanceMainLogger = performanceLogger.namespace('main');
function main() {
performanceMainLogger.info('start');
// skip bootstrap setup for desktop onboarding
if (window.appInfo?.windowName !== 'onboarding') {
performanceMainLogger.info('setup start');
setup();
performanceMainLogger.info('setup done');
}
mountApp();
}
function mountApp() {
performanceMainLogger.info('import app');
const root = document.getElementById('app');
assertExists(root);
performanceMainLogger.info('render app');
createRoot(root).render(
<StrictMode>
<App />
</StrictMode>
);
}
try {
main();
} catch (err) {
console.error('Failed to bootstrap app', err);
}
export * from './web';

6
packages/frontend/core/src/web.ts
View File

@ -1,6 +1,8 @@
import { configureWorkspaceImplServices } from '@affine/workspace-impl';
import type { ServiceCollection } from '@toeverything/infra';
import { configureInfraServices } from '@toeverything/infra';
import {
configureInfraServices,
type ServiceCollection,
} from '@toeverything/infra';
import {
configureBusinessServices,

8
packages/frontend/electron/package.json
View File

@ -23,7 +23,10 @@
"main": "./dist/main.js",
"devDependencies": {
"@affine-test/kit": "workspace:*",
"@affine/component": "workspace:*",
"@affine/core": "workspace:*",
"@affine/env": "workspace:*",
"@affine/i18n": "workspace:*",
"@affine/native": "workspace:*",
"@blocksuite/blocks": "0.13.0-canary-202403140735-2367cd5",
"@blocksuite/lit": "0.13.0-canary-202403140735-2367cd5",
@ -38,6 +41,7 @@
"@electron-forge/maker-zip": "^7.3.0",
"@electron-forge/plugin-auto-unpack-natives": "^7.3.0",
"@electron-forge/shared-types": "^7.3.0",
"@emotion/react": "^11.11.4",
"@pengx17/electron-forge-maker-appimage": "^1.0.2",
"@toeverything/infra": "workspace:*",
"@types/uuid": "^9.0.8",
@ -51,7 +55,11 @@
"fs-extra": "^11.2.0",
"glob": "^10.3.10",
"jotai": "^2.6.5",
"jotai-devtools": "^0.8.0",
"lodash-es": "^4.17.21",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.22.3",
"rxjs": "^7.8.1",
"semver": "^7.6.0",
"tinykeys": "patch:tinykeys@npm%3A2.1.0#~/.yarn/patches/tinykeys-npm-2.1.0-819feeaed0.patch",

50
packages/frontend/core/src/app.tsx → packages/frontend/electron/renderer/app.tsx
View File

@ -4,24 +4,24 @@ import '@affine/component/theme/theme.css';
import { AffineContext } from '@affine/component/context';
import { GlobalLoading } from '@affine/component/global-loading';
import { NotificationCenter } from '@affine/component/notification-center';
import { WorkspaceFallback } from '@affine/core/components/workspace';
import { GlobalScopeProvider } from '@affine/core/modules/infra-web/global-scope';
import { CloudSessionProvider } from '@affine/core/providers/session-provider';
import { router } from '@affine/core/router';
import {
performanceLogger,
performanceRenderLogger,
} from '@affine/core/shared';
import createEmotionCache from '@affine/core/utils/create-emotion-cache';
import { configureWebServices } from '@affine/core/web';
import { createI18n, setUpLanguage } from '@affine/i18n';
import { CacheProvider } from '@emotion/react';
import { getCurrentStore } from '@toeverything/infra/atom';
import {
ServiceCollection,
ServiceProviderContext,
} from '@toeverything/infra/di';
import { ServiceCollection } from '@toeverything/infra/di';
import type { PropsWithChildren, ReactElement } from 'react';
import { lazy, memo, Suspense } from 'react';
import { lazy, Suspense } from 'react';
import { RouterProvider } from 'react-router-dom';
import { WorkspaceFallback } from './components/workspace';
import { CloudSessionProvider } from './providers/session-provider';
import { router } from './router';
import { performanceLogger, performanceRenderLogger } from './shared';
import createEmotionCache from './utils/create-emotion-cache';
import { configureWebServices } from './web';
const performanceI18nLogger = performanceLogger.namespace('i18n');
const cache = createEmotionCache();
@ -43,16 +43,14 @@ const future = {
} as const;
async function loadLanguage() {
if (environment.isBrowser) {
performanceI18nLogger.info('start');
performanceI18nLogger.info('start');
const i18n = createI18n();
document.documentElement.lang = i18n.language;
const i18n = createI18n();
document.documentElement.lang = i18n.language;
performanceI18nLogger.info('set up');
await setUpLanguage(i18n);
performanceI18nLogger.info('done');
}
performanceI18nLogger.info('set up');
await setUpLanguage(i18n);
performanceI18nLogger.info('done');
}
let languageLoadingPromise: Promise<void> | null = null;
@ -61,7 +59,7 @@ const services = new ServiceCollection();
configureWebServices(services);
const serviceProvider = services.provider();
export const App = memo(function App() {
export function App() {
performanceRenderLogger.info('App');
if (!languageLoadingPromise) {
@ -70,15 +68,13 @@ export const App = memo(function App() {
return (
<Suspense>
<ServiceProviderContext.Provider value={serviceProvider}>
<GlobalScopeProvider provider={serviceProvider}>
<CacheProvider value={cache}>
<AffineContext store={getCurrentStore()}>
<CloudSessionProvider>
<DebugProvider>
<GlobalLoading />
{runtimeConfig.enableNotificationCenter && (
<NotificationCenter />
)}
<NotificationCenter />
<RouterProvider
fallbackElement={<WorkspaceFallback key="RouterFallback" />}
router={router}
@ -88,7 +84,7 @@ export const App = memo(function App() {
</CloudSessionProvider>
</AffineContext>
</CacheProvider>
</ServiceProviderContext.Provider>
</GlobalScopeProvider>
</Suspense>
);
});
}

43
packages/frontend/electron/renderer/index.tsx Normal file
View File

@ -0,0 +1,43 @@
// Side effect import, "declare global"
import '@affine/env/constant';
import { setup } from '@affine/core/bootstrap/setup';
import { performanceLogger } from '@affine/core/shared';
import { StrictMode } from 'react';
import { createRoot } from 'react-dom/client';
import { App } from './app';
const performanceMainLogger = performanceLogger.namespace('main');
function main() {
performanceMainLogger.info('start');
// skip bootstrap setup for desktop onboarding
if (window.appInfo?.windowName === 'onboarding') {
performanceMainLogger.info('skip setup');
} else {
performanceMainLogger.info('setup start');
setup();
performanceMainLogger.info('setup done');
}
mountApp();
}
function mountApp() {
performanceMainLogger.info('import app');
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const root = document.getElementById('app')!;
performanceMainLogger.info('render app');
createRoot(root).render(
<StrictMode>
<App />
</StrictMode>
);
}
try {
main();
} catch (err) {
console.error('Failed to bootstrap app', err);
}

29
packages/frontend/electron/renderer/tsconfig.json Normal file
View File

@ -0,0 +1,29 @@
{
"extends": "../../../../tsconfig.json",
"compilerOptions": {
"composite": true,
"target": "ESNext",
"module": "ESNext",
"resolveJsonModule": true,
"moduleResolution": "Bundler",
"allowSyntheticDefaultImports": true,
"noEmit": false,
"outDir": "../lib",
"allowJs": true
},
"references": [
{
"path": "../../../common/env"
},
{
"path": "../../core"
},
{
"path": "../../component"
},
{
"path": "../../../common/infra"
}
],
"include": ["."]
}

16
packages/frontend/electron/scripts/generate-assets.ts
View File

@ -12,8 +12,8 @@ const __dirname = fileURLToPath(new URL('.', import.meta.url));
const repoRootDir = path.join(__dirname, '..', '..', '..', '..');
const electronRootDir = path.join(__dirname, '..');
const publicDistDir = path.join(electronRootDir, 'resources');
const affineCoreDir = path.join(repoRootDir, 'packages', 'frontend', 'core');
const affineCoreOutDir = path.join(affineCoreDir, 'dist');
const webDir = path.join(repoRootDir, 'packages', 'frontend', 'electron');
const affineWebOutDir = path.join(webDir, 'dist');
const publicAffineOutDir = path.join(publicDistDir, `web-static`);
const releaseVersionEnv = process.env.RELEASE_VERSION || '';
@ -21,8 +21,8 @@ console.log('build with following variables', {
repoRootDir,
electronRootDir,
publicDistDir,
affineSrcDir: affineCoreDir,
affineSrcOutDir: affineCoreOutDir,
affineSrcDir: webDir,
affineSrcOutDir: affineWebOutDir,
publicAffineOutDir,
releaseVersionEnv,
});
@ -45,7 +45,7 @@ const nxFlag = SKIP_NX_CACHE ? '--skip-nx-cache' : '';
// step 1: build web dist
if (!process.env.SKIP_WEB_BUILD) {
spawnSync('yarn', ['nx', 'build', '@affine/core', nxFlag], {
spawnSync('yarn', ['nx', 'build', '@affine/web', nxFlag], {
stdio: 'inherit',
env: process.env,
cwd,
@ -58,10 +58,10 @@ if (!process.env.SKIP_WEB_BUILD) {
});
// step 1.5: amend sourceMappingURL to allow debugging in devtools
await glob('**/*.{js,css}', { cwd: affineCoreOutDir }).then(files => {
await glob('**/*.{js,css}', { cwd: affineWebOutDir }).then(files => {
return files.map(async file => {
const dir = path.dirname(file);
const fullpath = path.join(affineCoreOutDir, file);
const fullpath = path.join(affineWebOutDir, file);
let content = await fs.readFile(fullpath, 'utf-8');
// replace # sourceMappingURL=76-6370cd185962bc89.js.map
// to # sourceMappingURL=assets://./{dir}/76-6370cd185962bc89.js.map
@ -78,7 +78,7 @@ if (!process.env.SKIP_WEB_BUILD) {
});
});
await fs.move(affineCoreOutDir, publicAffineOutDir, { overwrite: true });
await fs.move(affineWebOutDir, publicAffineOutDir, { overwrite: true });
}
// step 2: update app-updater.yml content with build type in resources folder

2
packages/frontend/electron/tsconfig.json
View File

@ -14,7 +14,7 @@
"noImplicitOverride": true
},
"include": ["./src"],
"exclude": ["node_modules", "lib", "dist", "**/__tests__/**/*"],
"exclude": ["renderer", "node_modules", "lib", "dist", "**/__tests__/**/*"],
"references": [
{
"path": "../../frontend/native"

8
packages/frontend/templates/build-edgeless.mjs
View File

@ -306,9 +306,5 @@ export const builtInTemplates = {
});
};
async function main() {
const templatesInGroup = await parseSnapshot();
await buildScript(templatesInGroup);
}
main();
const templatesInGroup = await parseSnapshot();
await buildScript(templatesInGroup);

3
packages/frontend/templates/package.json
View File

@ -9,7 +9,8 @@
"type": "module",
"exports": {
".": "./templates.gen.ts",
"./edgeless": "./edgeless-templates.gen.ts"
"./edgeless": "./edgeless-templates.gen.ts",
"./build-edgeless": "./build-edgeless.mjs"
},
"devDependencies": {
"jszip": "^3.10.1"

27
packages/frontend/web/package.json Normal file
View File

@ -0,0 +1,27 @@
{
"name": "@affine/web",
"version": "0.0.0",
"description": "AFFiNE Desktop Web application",
"private": true,
"browser": "src/index.tsx",
"scripts": {
"build": "yarn workspace @affine/cli build",
"dev": "yarn workspace @affine/cli dev",
"static-server": "yarn workspace @affine/cli dev --static"
},
"dependencies": {
"@affine/component": "workspace:*",
"@affine/core": "workspace:*",
"@affine/env": "workspace:*",
"@juggle/resize-observer": "^3.4.0",
"intl-segmenter-polyfill-rs": "^0.1.7",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@affine/cli": "workspace:*",
"@types/react": "^18.2.60",
"@types/react-dom": "^18.2.19",
"typescript": "^5.3.3"
}
}

6
packages/frontend/core/project.json → packages/frontend/web/project.json
View File

@ -1,5 +1,5 @@
{
"name": "@affine/core",
"name": "@affine/web",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"targets": {
"build": {
@ -13,9 +13,9 @@
"^build"
],
"inputs": [
"{projectRoot}/.webpack/**/*",
"{projectRoot}/**/*",
"{projectRoot}/public/**/*",
"{workspaceRoot}/tools/**/*",
"{workspaceRoot}/packages/frontend/core/**/*",
"{workspaceRoot}/packages/**/*",
{
"env": "BUILD_TYPE"

90
packages/frontend/web/src/app.tsx Normal file
View File

@ -0,0 +1,90 @@
import '@affine/component/theme/global.css';
import '@affine/component/theme/theme.css';
import { AffineContext } from '@affine/component/context';
import { GlobalLoading } from '@affine/component/global-loading';
import { NotificationCenter } from '@affine/component/notification-center';
import { WorkspaceFallback } from '@affine/core/components/workspace';
import { GlobalScopeProvider } from '@affine/core/modules/infra-web/global-scope';
import { CloudSessionProvider } from '@affine/core/providers/session-provider';
import { router } from '@affine/core/router';
import {
performanceLogger,
performanceRenderLogger,
} from '@affine/core/shared';
import createEmotionCache from '@affine/core/utils/create-emotion-cache';
import { configureWebServices } from '@affine/core/web';
import { createI18n, setUpLanguage } from '@affine/i18n';
import { CacheProvider } from '@emotion/react';
import { getCurrentStore } from '@toeverything/infra/atom';
import { ServiceCollection } from '@toeverything/infra/di';
import type { PropsWithChildren, ReactElement } from 'react';
import { lazy, Suspense } from 'react';
import { RouterProvider } from 'react-router-dom';
const performanceI18nLogger = performanceLogger.namespace('i18n');
const cache = createEmotionCache();
const DevTools = lazy(() =>
import('jotai-devtools').then(m => ({ default: m.DevTools }))
);
const DebugProvider = ({ children }: PropsWithChildren): ReactElement => {
return (
<>
<Suspense>{process.env.DEBUG_JOTAI === 'true' && <DevTools />}</Suspense>
{children}
</>
);
};
const future = {
v7_startTransition: true,
} as const;
async function loadLanguage() {
performanceI18nLogger.info('start');
const i18n = createI18n();
document.documentElement.lang = i18n.language;
performanceI18nLogger.info('set up');
await setUpLanguage(i18n);
performanceI18nLogger.info('done');
}
let languageLoadingPromise: Promise<void> | null = null;
const services = new ServiceCollection();
configureWebServices(services);
const serviceProvider = services.provider();
export function App() {
performanceRenderLogger.info('App');
if (!languageLoadingPromise) {
languageLoadingPromise = loadLanguage().catch(console.error);
}
return (
<Suspense>
<GlobalScopeProvider provider={serviceProvider}>
<CacheProvider value={cache}>
<AffineContext store={getCurrentStore()}>
<CloudSessionProvider>
<DebugProvider>
<GlobalLoading />
<NotificationCenter />
<RouterProvider
fallbackElement={<WorkspaceFallback key="RouterFallback" />}
router={router}
future={future}
/>
</DebugProvider>
</CloudSessionProvider>
</AffineContext>
</CacheProvider>
</GlobalScopeProvider>
</Suspense>
);
}

45
packages/frontend/web/src/index.tsx Normal file
View File

@ -0,0 +1,45 @@
import './polyfill/intl-segmenter';
import './polyfill/request-idle-callback';
import './polyfill/resize-observer';
import { setup } from '@affine/core/bootstrap/setup';
import { performanceLogger } from '@affine/core/shared';
import { isDesktop } from '@affine/env/constant';
import { StrictMode } from 'react';
import { createRoot } from 'react-dom/client';
import { App } from './app';
const performanceMainLogger = performanceLogger.namespace('main');
function main() {
performanceMainLogger.info('start');
// skip bootstrap setup for desktop onboarding
if (isDesktop && window.appInfo?.windowName === 'onboarding') {
performanceMainLogger.info('skip setup');
} else {
performanceMainLogger.info('setup start');
setup();
performanceMainLogger.info('setup done');
}
mountApp();
}
function mountApp() {
performanceMainLogger.info('import app');
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const root = document.getElementById('app')!;
performanceMainLogger.info('render app');
createRoot(root).render(
<StrictMode>
<App />
</StrictMode>
);
}
try {
main();
} catch (err) {
console.error('Failed to bootstrap app', err);
}

0
packages/frontend/core/src/polyfill/intl-segmenter.ts → packages/frontend/web/src/polyfill/intl-segmenter.ts
View File

0
packages/frontend/core/src/polyfill/request-idle-callback.ts → packages/frontend/web/src/polyfill/request-idle-callback.ts
View File

0
packages/frontend/core/src/polyfill/resize-observer.ts → packages/frontend/web/src/polyfill/resize-observer.ts
View File

12
packages/frontend/web/tsconfig.json Normal file
View File

@ -0,0 +1,12 @@
{
"extends": "../../../tsconfig.json",
"compilerOptions": {
"composite": true,
"outDir": "lib",
"moduleResolution": "Bundler",
"types": ["affine__env"],
"rootDir": "./src"
},
"include": ["./src"],
"references": [{ "path": "../core" }]
}

2
scripts/download-blocksuite-fonts.mjs
View File

@ -11,7 +11,7 @@ const fontPath = join(
'..',
'packages',
'frontend',
'core',
'web',
'dist',
'assets'
);

3
scripts/setup/global.ts
View File

@ -1,7 +1,6 @@
import { getRuntimeConfig } from '@affine/cli/src/webpack/runtime-config';
import { setupGlobal } from '@affine/env/global';
import { getRuntimeConfig } from '../../packages/frontend/core/.webpack/runtime-config';
globalThis.runtimeConfig = getRuntimeConfig({
distribution: 'browser',
mode: 'development',

2
tests/storybook/.storybook/main.ts
View File

@ -3,7 +3,7 @@ import type { StorybookConfig } from '@storybook/react-vite';
import { fileURLToPath } from 'node:url';
import { mergeConfig } from 'vite';
import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin';
import { getRuntimeConfig } from '../../../packages/frontend/core/.webpack/runtime-config';
import { getRuntimeConfig } from '@affine/cli/src/webpack/runtime-config';
runCli(
{

1
tests/storybook/package.json
View File

@ -7,6 +7,7 @@
"test": "test-storybook"
},
"dependencies": {
"@affine/cli": "workspace:*",
"@affine/component": "workspace:*",
"@affine/i18n": "workspace:*",
"@affine/workspace-impl": "workspace:*",

3
tests/storybook/tsconfig.json
View File

@ -15,6 +15,9 @@
{
"path": "../../packages/frontend/component"
},
{
"path": "../../tools/cli"
},
{
"path": "../../packages/common/env"
},

46
tools/cli/package.json
View File

@ -2,25 +2,45 @@
"name": "@affine/cli",
"type": "module",
"private": true,
"bin": {
"build-core": "./src/bin/build-core.mjs",
"dev-core": "./src/bin/dev-core.mjs"
},
"exports": {
"./config": "./src/config/index.ts"
},
"devDependencies": {
"@affine/env": "workspace:*",
"@affine/templates": "workspace:*",
"@aws-sdk/client-s3": "3.536.0",
"@blocksuite/presets": "0.13.0-canary-202403140735-2367cd5",
"@clack/core": "^0.3.4",
"@clack/prompts": "^0.7.0",
"@magic-works/i18n-codegen": "^0.5.0",
"ts-node": "^10.9.2"
},
"dependencies": {
"@napi-rs/simple-git": "^0.1.16",
"@perfsee/webpack": "^1.12.2",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
"@sentry/webpack-plugin": "^2.14.2",
"@types/webpack-env": "^1.18.4",
"@vanilla-extract/webpack-plugin": "^2.3.7",
"copy-webpack-plugin": "^12.0.2",
"css-loader": "^6.10.0",
"cssnano": "^6.1.0",
"dotenv": "^16.4.5",
"vite": "^5.1.4"
"html-webpack-plugin": "^5.6.0",
"lodash-es": "^4.17.21",
"mime-types": "^2.1.35",
"mini-css-extract-plugin": "^2.8.1",
"postcss-loader": "^8.1.0",
"raw-loader": "^4.0.2",
"source-map-loader": "^5.0.0",
"style-loader": "^3.3.4",
"swc-loader": "^0.2.6",
"terser-webpack-plugin": "^5.3.10",
"thread-loader": "^4.0.2",
"ts-node": "^10.9.2",
"vite": "^5.1.4",
"webpack": "^5.90.3",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^5.0.2",
"webpack-merge": "^5.10.0"
},
"peerDependencies": {
"ts-node": "*"
"scripts": {
"build": "node --loader ts-node/esm/transpile-only.mjs ./src/bin/build.ts",
"dev": "node --loader ts-node/esm/transpile-only.mjs ./src/bin/dev.ts"
},
"version": "0.14.0"
}

16
tools/cli/src/bin/build-core.mjs
View File

@ -1,16 +0,0 @@
#!/usr/bin/env node
import { spawnSync } from 'node:child_process';
import { fileURLToPath } from 'node:url';
const child = spawnSync(
process.execPath,
[
'--loader',
'ts-node/esm/transpile-only',
fileURLToPath(new URL('./build-core.ts', import.meta.url)),
...process.argv.slice(2),
],
{ stdio: 'inherit' }
);
if (child.status) process.exit(child.status);

52
tools/cli/src/bin/build-core.ts → tools/cli/src/bin/build.ts
View File

@ -1,11 +1,13 @@
import { spawn } from 'node:child_process';
import path from 'node:path';
import webpack from 'webpack';
import type { BuildFlags } from '../config/index.js';
import { projectRoot } from '../config/index.js';
import { buildI18N } from '../util/i18n.js';
import { createWebpackConfig } from '../webpack/webpack.config.js';
const cwd = path.resolve(projectRoot, 'packages/frontend/core');
let cwd: string;
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const buildType = process.env.BUILD_TYPE_OVERRIDE || process.env.BUILD_TYPE;
@ -31,15 +33,20 @@ const getChannel = () => {
}
};
let entry: string | undefined;
const { DISTRIBUTION } = process.env;
const getDistribution = () => {
switch (process.env.DISTRIBUTION) {
switch (DISTRIBUTION) {
case 'browser':
case 'desktop':
return process.env.DISTRIBUTION;
case undefined: {
console.log('DISTRIBUTION is not set, defaulting to browser');
case undefined:
cwd = path.join(projectRoot, 'packages/frontend/web');
return 'browser';
}
case 'desktop':
cwd = path.join(projectRoot, 'packages/frontend/electron');
entry = path.join(cwd, 'renderer', 'index.tsx');
return DISTRIBUTION;
default: {
throw new Error('DISTRIBUTION must be one of browser, desktop');
}
@ -51,24 +58,19 @@ const flags = {
mode: 'production',
channel: getChannel(),
coverage: process.env.COVERAGE === 'true',
entry,
} satisfies BuildFlags;
buildI18N();
spawn(
'node',
[
'--loader',
'ts-node/esm/transpile-only',
'../../../node_modules/webpack/bin/webpack.js',
'--mode',
'production',
'--env',
'flags=' + Buffer.from(JSON.stringify(flags), 'utf-8').toString('hex'),
].filter((v): v is string => !!v),
{
cwd,
stdio: 'inherit',
shell: true,
env: process.env,
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
webpack(createWebpackConfig(cwd!, flags), (err, stats) => {
if (err) {
console.error(err);
process.exit(1);
}
);
if (stats?.hasErrors()) {
console.error(stats.toString('errors-only'));
process.exit(1);
}
});

16
tools/cli/src/bin/dev-core.mjs
View File

@ -1,16 +0,0 @@
#!/usr/bin/env node
import { spawnSync } from 'node:child_process';
import { fileURLToPath } from 'node:url';
const child = spawnSync(
process.execPath,
[
'--loader',
'ts-node/esm/transpile-only',
fileURLToPath(new URL('./dev-core.ts', import.meta.url)),
...process.argv.slice(2),
],
{ stdio: 'inherit' }
);
if (child.status) process.exit(child.status);

207
tools/cli/src/bin/dev-core.ts
View File

@ -1,207 +0,0 @@
import type { ChildProcess } from 'node:child_process';
import { spawn } from 'node:child_process';
import { existsSync } from 'node:fs';
import path from 'node:path';
import * as p from '@clack/prompts';
import { config } from 'dotenv';
import { type BuildFlags, projectRoot } from '../config/index.js';
import { watchI18N } from '../util/i18n.js';
const cwd = path.resolve(projectRoot, 'packages/frontend/core');
const flags: BuildFlags = {
distribution: 'browser',
mode: 'development',
channel: 'canary',
coverage: process.env.COVERAGE === 'true',
localBlockSuite: undefined,
};
if (process.argv.includes('--static')) {
await awaitChildProcess(
spawn(
'node',
[
'--loader',
'ts-node/esm/transpile-only',
'../../../node_modules/webpack/bin/webpack.js',
'serve',
'--mode',
'development',
'--no-client-overlay',
'--no-live-reload',
'--env',
'flags=' + Buffer.from(JSON.stringify(flags), 'utf-8').toString('hex'),
].filter((v): v is string => !!v),
{
cwd,
stdio: 'inherit',
shell: true,
env: process.env,
}
)
);
process.exit(0);
}
const files = ['.env', '.env.local'];
for (const file of files) {
if (existsSync(path.resolve(projectRoot, file))) {
config({
path: path.resolve(projectRoot, file),
});
console.log(`${file} loaded`);
break;
}
}
const buildFlags = await p.group(
{
distribution: () =>
p.select({
message: 'Distribution',
options: [
{
value: 'browser',
},
{
value: 'desktop',
},
],
initialValue: 'browser',
}),
mode: () =>
p.select({
message: 'Mode',
options: [
{
value: 'development',
},
{
value: 'production',
},
],
initialValue: 'development',
}),
channel: () =>
p.select({
message: 'Channel',
options: [
{
value: 'canary',
},
{
value: 'beta',
},
{
value: 'stable',
},
],
initialValue: 'canary',
}),
coverage: () =>
p.confirm({
message: 'Enable coverage',
initialValue: process.env.COVERAGE === 'true',
}),
debugBlockSuite: () =>
p.confirm({
message: 'Debug blocksuite locally?',
initialValue: false,
}),
},
{
onCancel: () => {
p.cancel('Operation cancelled.');
process.exit(0);
},
}
);
if (buildFlags.debugBlockSuite) {
const { config } = await import('dotenv');
const envLocal = config({
path: path.resolve(cwd, '.env.local'),
});
const localBlockSuite = await p.text({
message: 'local blocksuite PATH',
initialValue: envLocal.error
? undefined
: envLocal.parsed?.LOCAL_BLOCK_SUITE,
});
if (typeof localBlockSuite !== 'string') {
throw new Error('local blocksuite PATH is required');
}
if (!existsSync(localBlockSuite)) {
throw new Error(`local blocksuite not found: ${localBlockSuite}`);
}
flags.localBlockSuite = localBlockSuite;
}
flags.distribution = buildFlags.distribution as any;
flags.mode = buildFlags.mode as any;
flags.channel = buildFlags.channel as any;
flags.coverage = buildFlags.coverage;
watchI18N();
function awaitChildProcess(child: ChildProcess): Promise<number> {
return new Promise<number>((resolve, reject) => {
const handleExitCode = (code: number | null) => {
if (code) {
reject(
new Error(
`Child process at ${
(child as any).cwd
} fails: ${child.spawnargs.join(' ')}`
)
);
} else {
resolve(0);
}
};
child.on('error', () => handleExitCode(child.exitCode));
child.on('exit', code => handleExitCode(code));
});
}
try {
await awaitChildProcess(
spawn('node', ['build-edgeless.mjs'], {
cwd: path.resolve(projectRoot, 'packages/frontend/templates'),
stdio: 'inherit',
shell: true,
env: process.env,
})
);
// Start webpack
await awaitChildProcess(
spawn(
'node',
[
'--loader',
'ts-node/esm/transpile-only',
'../../../node_modules/webpack/bin/webpack.js',
flags.mode === 'development' ? 'serve' : undefined,
'--mode',
flags.mode === 'development' ? 'development' : 'production',
'--env',
'flags=' + Buffer.from(JSON.stringify(flags), 'utf-8').toString('hex'),
].filter((v): v is string => !!v),
{
cwd,
stdio: 'inherit',
shell: true,
env: process.env,
}
)
);
} catch (error) {
console.error('Error during build:', error);
process.exit(1);
}

143
tools/cli/src/bin/dev.ts Normal file
View File

@ -0,0 +1,143 @@
import { existsSync } from 'node:fs';
import { join } from 'node:path';
import * as p from '@clack/prompts';
import { config } from 'dotenv';
import webpack from 'webpack';
import WebpackDevServer from 'webpack-dev-server';
import { type BuildFlags, projectRoot } from '../config/index.js';
import { watchI18N } from '../util/i18n.js';
import { createWebpackConfig } from '../webpack/webpack.config.js';
const flags: BuildFlags = {
distribution: 'browser',
mode: 'development',
channel: 'canary',
coverage: process.env.COVERAGE === 'true',
localBlockSuite: undefined,
};
const files = ['.env', '.env.local'];
for (const file of files) {
if (existsSync(join(projectRoot, file))) {
config({
path: join(projectRoot, file),
});
console.log(`${file} loaded`);
break;
}
}
const buildFlags = process.argv.includes('--static')
? { ...flags, debugBlockSuite: false }
: ((await p.group(
{
distribution: () =>
p.select({
message: 'Distribution',
options: [
{
value: 'browser',
},
{
value: 'desktop',
},
],
initialValue: 'browser',
}),
mode: () =>
p.select({
message: 'Mode',
options: [
{
value: 'development',
},
{
value: 'production',
},
],
initialValue: 'development',
}),
channel: () =>
p.select({
message: 'Channel',
options: [
{
value: 'canary',
},
{
value: 'beta',
},
{
value: 'stable',
},
],
initialValue: 'canary',
}),
coverage: () =>
p.confirm({
message: 'Enable coverage',
initialValue: process.env.COVERAGE === 'true',
}),
debugBlockSuite: () =>
p.confirm({
message: 'Debug blocksuite locally?',
initialValue: false,
}),
},
{
onCancel: () => {
p.cancel('Operation cancelled.');
process.exit(0);
},
}
)) as BuildFlags & { debugBlockSuite: boolean });
flags.distribution = buildFlags.distribution;
flags.mode = buildFlags.mode;
flags.channel = buildFlags.channel;
flags.coverage = buildFlags.coverage;
const cwd =
flags.distribution === 'browser'
? join(projectRoot, 'packages', 'frontend', 'web')
: join(projectRoot, 'packages', 'frontend', 'electron');
if (buildFlags.debugBlockSuite) {
const { config } = await import('dotenv');
const envLocal = config({
path: join(cwd, '.env.local'),
});
const localBlockSuite = await p.text({
message: 'local blocksuite PATH',
initialValue: envLocal.error
? undefined
: envLocal.parsed?.LOCAL_BLOCK_SUITE,
});
if (typeof localBlockSuite !== 'string') {
throw new Error('local blocksuite PATH is required');
}
if (!existsSync(localBlockSuite)) {
throw new Error(`local blocksuite not found: ${localBlockSuite}`);
}
flags.localBlockSuite = localBlockSuite;
}
watchI18N();
try {
// @ts-expect-error no types
await import('@affine/templates/build-edgeless');
const config = createWebpackConfig(cwd, flags);
const compiler = webpack(config);
// Start webpack
const devServer = new WebpackDevServer(config.devServer, compiler);
await devServer.start();
} catch (error) {
console.error('Error during build:', error);
process.exit(1);
}

1
tools/cli/src/config/index.ts
View File

@ -6,6 +6,7 @@ export type BuildFlags = {
channel: 'stable' | 'beta' | 'canary' | 'internal';
coverage?: boolean;
localBlockSuite?: string;
entry?: string;
};
export const projectRoot = fileURLToPath(

2
packages/frontend/core/.webpack/cache-group.ts → tools/cli/src/webpack/cache-group.ts
View File

@ -69,7 +69,7 @@ export const productionCacheGroups = {
test: (module: any) =>
module.nameForCondition &&
/\.css$/.test(module.nameForCondition()) &&
!/^javascript/.test(module.type),
!module.type.startsWith('javascript'),
chunks: 'all' as const,
minSize: 1,
minChunks: 1,

60
packages/frontend/core/.webpack/config.ts → tools/cli/src/webpack/config.ts
View File

@ -1,29 +1,27 @@
import { createRequire } from 'node:module';
import { join, resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
import { createRequire } from 'node:module';
import type { Configuration as DevServerConfiguration } from 'webpack-dev-server';
import type { RuntimeConfig } from '@affine/env/global';
import { PerfseePlugin } from '@perfsee/webpack';
import { sentryWebpackPlugin } from '@sentry/webpack-plugin';
import CopyPlugin from 'copy-webpack-plugin';
import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
import { sentryWebpackPlugin } from '@sentry/webpack-plugin';
import { VanillaExtractPlugin } from '@vanilla-extract/webpack-plugin';
import CopyPlugin from 'copy-webpack-plugin';
import { compact } from 'lodash-es';
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
import TerserPlugin from 'terser-webpack-plugin';
import webpack from 'webpack';
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
import { compact } from 'lodash-es';
import type { Configuration as DevServerConfiguration } from 'webpack-dev-server';
import { type BuildFlags, projectRoot } from '../config/index.js';
import { productionCacheGroups } from './cache-group.js';
import type { BuildFlags } from '@affine/cli/config';
import { projectRoot } from '@affine/cli/config';
import { VanillaExtractPlugin } from '@vanilla-extract/webpack-plugin';
import type { RuntimeConfig } from '@affine/env/global';
import { WebpackS3Plugin } from './s3-plugin.js';
const IN_CI = !!process.env.CI;
export const rootPath = join(fileURLToPath(import.meta.url), '..', '..');
const workspaceRoot = join(rootPath, '..', '..', '..');
export const workspaceRoot = join(rootPath, '..', '..', '..');
const require = createRequire(rootPath);
@ -89,15 +87,15 @@ export const getPublicPath = (buildFlags: BuildFlags) => {
};
export const createConfiguration: (
cwd: string,
buildFlags: BuildFlags,
runtimeConfig: RuntimeConfig
) => webpack.Configuration = (buildFlags, runtimeConfig) => {
) => webpack.Configuration = (cwd, buildFlags, runtimeConfig) => {
const blocksuiteBaseDir = buildFlags.localBlockSuite;
const config = {
name: 'affine',
// to set a correct base path for the source map
context: projectRoot,
context: cwd,
experiments: {
topLevelAwait: true,
outputModule: false,
@ -124,7 +122,7 @@ export const createConfiguration: (
devtoolModuleFilenameTemplate: 'webpack://[namespace]/[resource-path]',
hotUpdateChunkFilename: 'hot/[id].[fullhash].js',
hotUpdateMainFilename: 'hot/[runtime].[fullhash].json',
path: join(rootPath, 'dist'),
path: join(cwd, 'dist'),
clean: buildFlags.mode === 'production',
globalObject: 'globalThis',
publicPath: getPublicPath(buildFlags),
@ -315,7 +313,7 @@ export const createConfiguration: (
postcssOptions: {
config: resolve(
rootPath,
'.webpack',
'webpack',
'postcss.config.cjs'
),
},
@ -356,8 +354,9 @@ export const createConfiguration: (
new CopyPlugin({
patterns: [
{
from: resolve(rootPath, 'public'),
to: resolve(rootPath, 'dist'),
// copy the shared public assets into dist
from: join(workspaceRoot, 'packages', 'frontend', 'core', 'public'),
to: join(cwd, 'dist'),
},
],
}),
@ -375,11 +374,24 @@ export const createConfiguration: (
overlay: process.env.DISABLE_DEV_OVERLAY === 'true' ? false : undefined,
},
historyApiFallback: true,
static: {
directory: resolve(rootPath, 'public'),
publicPath: '/',
watch: true,
},
static: [
{
directory: join(
projectRoot,
'packages',
'frontend',
'core',
'public'
),
publicPath: '/',
watch: true,
},
{
directory: join(cwd, 'public'),
publicPath: '/',
watch: true,
},
],
proxy: [
{
context: '/api/worker/',

0
packages/frontend/core/.webpack/postcss.config.cjs → tools/cli/src/webpack/postcss.config.cjs
View File

15
packages/frontend/core/.webpack/runtime-config.ts → tools/cli/src/webpack/runtime-config.ts
View File

@ -1,9 +1,7 @@
import type { RuntimeConfig } from '@affine/env/global';
import type { BuildFlags } from '@affine/cli/config';
import { createRequire } from 'node:module';
const require = createRequire(import.meta.url);
const packageJson = require('../package.json');
import packageJson from '../../package.json' assert { type: 'json' };
import type { BuildFlags } from '../config';
export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
const buildPreset: Record<BuildFlags['channel'], RuntimeConfig> = {
@ -21,7 +19,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
enableNewSettingUnstableApi: false,
enableSQLiteProvider: true,
enableMoveDatabase: false,
enableNotificationCenter: true,
enableCloud: true,
enableCaptcha: true,
enableEnhanceShareMode: false,
@ -30,7 +27,7 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
allowLocalWorkspace: false,
serverUrlPrefix: 'https://app.affine.pro',
appVersion: packageJson.version,
editorVersion: packageJson.dependencies['@blocksuite/presets'],
editorVersion: packageJson.devDependencies['@blocksuite/presets'],
appBuildType: 'stable',
},
get beta() {
@ -63,7 +60,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
enableNewSettingUnstableApi: false,
enableSQLiteProvider: true,
enableMoveDatabase: false,
enableNotificationCenter: true,
enableCloud: true,
enableCaptcha: true,
enableEnhanceShareMode: false,
@ -72,7 +68,7 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
allowLocalWorkspace: false,
serverUrlPrefix: 'https://affine.fail',
appVersion: packageJson.version,
editorVersion: packageJson.dependencies['@blocksuite/presets'],
editorVersion: packageJson.devDependencies['@blocksuite/presets'],
appBuildType: 'canary',
},
};
@ -105,9 +101,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
enableNewSettingUnstableApi: process.env.ENABLE_NEW_SETTING_UNSTABLE_API
? process.env.ENABLE_NEW_SETTING_UNSTABLE_API === 'true'
: currentBuildPreset.enableNewSettingUnstableApi,
enableNotificationCenter: process.env.ENABLE_NOTIFICATION_CENTER
? process.env.ENABLE_NOTIFICATION_CENTER === 'true'
: currentBuildPreset.enableNotificationCenter,
enableCloud: process.env.ENABLE_CLOUD
? process.env.ENABLE_CLOUD === 'true'
: currentBuildPreset.enableCloud,

6
packages/frontend/core/.webpack/s3-plugin.ts → tools/cli/src/webpack/s3-plugin.ts
View File

@ -1,5 +1,5 @@
import { join } from 'node:path';
import { readFile } from 'node:fs/promises';
import { join } from 'node:path';
import type { PutObjectCommandInput } from '@aws-sdk/client-s3';
import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
@ -7,7 +7,7 @@ import { lookup } from 'mime-types';
import type { Compiler, WebpackPluginInstance } from 'webpack';
export const R2_BUCKET =
process.env.R2_BUCKET! ??
process.env.R2_BUCKET ??
(process.env.BUILD_TYPE === 'canary' ? 'assets-dev' : 'assets-prod');
export class WebpackS3Plugin implements WebpackPluginInstance {
@ -15,7 +15,9 @@ export class WebpackS3Plugin implements WebpackPluginInstance {
region: 'auto',
endpoint: `https://${process.env.R2_ACCOUNT_ID}.r2.cloudflarestorage.com`,
credentials: {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
accessKeyId: process.env.R2_ACCESS_KEY_ID!,
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
secretAccessKey: process.env.R2_SECRET_ACCESS_KEY!,
},
});

2
packages/frontend/core/.webpack/template.html → tools/cli/src/webpack/template.html
View File

@ -10,7 +10,7 @@
<meta name="theme-color" content="#fafafa" />
<link rel="manifest" href="/manifest.json" />
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
<link rel="icon" sizes="192x192" href="/chrome-192x192.png" />
<link rel="icon" sizes="192x192" href="/favicon-192.png" />
<meta name="emotion-insertion-point" content="" />
<meta property="description" content="<%= DESCRIPTION %>" />
<meta name="twitter:card" content="summary_large_image" />

23
packages/frontend/core/.webpack/webpack.config.ts → tools/cli/src/webpack/webpack.config.ts
View File

@ -1,13 +1,14 @@
import { execSync } from 'node:child_process';
import { join, resolve } from 'node:path';
import type { BuildFlags } from '@affine/cli/config';
import { Repository } from '@napi-rs/simple-git';
import HTMLPlugin from 'html-webpack-plugin';
import { once } from 'lodash-es';
import { merge } from 'webpack-merge';
import type { BuildFlags } from '@affine/cli/config';
import HTMLPlugin from 'html-webpack-plugin';
import { createConfiguration, rootPath, workspaceRoot } from './config.js';
import { getRuntimeConfig } from './runtime-config.js';
import { createConfiguration, rootPath } from './config.js';
const DESCRIPTION = `There can be more than Notion and Miro. AFFiNE is a next-gen knowledge base that brings planning, sorting and creating all together.`;
@ -16,27 +17,29 @@ const gitShortHash = once(() => {
if (GITHUB_SHA) {
return GITHUB_SHA.substring(0, 9);
}
const repo = new Repository(workspaceRoot);
const shortSha = repo.head().target()?.substring(0, 9);
if (shortSha) {
return shortSha;
}
const sha = execSync(`git rev-parse --short HEAD`, {
encoding: 'utf-8',
}).trim();
return sha;
});
export default async function (cli_env: any, _: any) {
const flags: BuildFlags = JSON.parse(
Buffer.from(cli_env.flags, 'hex').toString('utf-8')
);
export function createWebpackConfig(cwd: string, flags: BuildFlags) {
console.log('build flags', flags);
const runtimeConfig = getRuntimeConfig(flags);
console.log('runtime config', runtimeConfig);
const config = createConfiguration(flags, runtimeConfig);
const config = createConfiguration(cwd, flags, runtimeConfig);
return merge(config, {
entry: {
app: resolve(rootPath, 'src/index.tsx'),
app: flags.entry ?? resolve(cwd, 'src/index.tsx'),
},
plugins: [
new HTMLPlugin({
template: join(rootPath, '.webpack', 'template.html'),
template: join(rootPath, 'webpack', 'template.html'),
inject: 'body',
scriptLoading: 'module',
minify: false,

3
tools/cli/tsconfig.json
View File

@ -6,5 +6,6 @@
"moduleResolution": "Node",
"outDir": "lib"
},
"include": ["src"]
"include": ["src", "package.json"],
"references": [{ "path": "../../packages/common/env" }]
}

7
tsconfig.json
View File

@ -48,6 +48,7 @@
"skipLibCheck": true, // skip all type checks for .d.ts files
"paths": {
"@affine/core/*": ["./packages/frontend/core/src/*"],
"@affine/core": ["./packages/frontend/core/src/index.ts"],
"@affine/cli/*": ["./tools/cli/src/*"],
"@affine/server/*": ["./packages/backend/server/src/*"],
"@affine/component": ["./packages/frontend/component/src/index"],
@ -90,9 +91,15 @@
{
"path": "./packages/frontend/core"
},
{
"path": "./packages/frontend/web"
},
{
"path": "./packages/frontend/electron/tsconfig.test.json"
},
{
"path": "./packages/frontend/electron/renderer/tsconfig.json"
},
{
"path": "./packages/frontend/graphql"
},

7
tsconfig.node.json
View File

@ -7,12 +7,7 @@
"allowSyntheticDefaultImports": true,
"outDir": "lib"
},
"include": [
"vite.config.ts",
"vitest.config.ts",
"scripts",
"packages/frontend/core/.webpack/runtime-config.ts"
],
"include": ["vite.config.ts", "vitest.config.ts", "scripts"],
"references": [
{
"path": "./packages/common/env"

634
yarn.lock
View File

File diff suppressed because it is too large Load Diff