There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
ci: fix selfhost (#5920)
liuyi540d07930891
diff --git a/.github/deployment/node/Dockerfile b/.github/deployment/node/Dockerfileindex bd0ab7d514..50e3707002 100644--- a/.github/deployment/node/Dockerfile+++ b/.github/deployment/node/Dockerfile@@ -8,4 +8,4 @@ RUN apt-get update && \apt-get install -y --no-install-recommends openssl && \rm -rf /var/lib/apt/lists/*-CMD ["node", "--es-module-specifier-resolution=node", "./dist/index.js"]+CMD ["node", "--import", "./scripts/register.js", "./dist/index.js"]diff --git a/.github/deployment/self-host/compose.yaml b/.github/deployment/self-host/compose.yamlindex e63238fa39..dc16d7c8fc 100644--- a/.github/deployment/self-host/compose.yaml+++ b/.github/deployment/self-host/compose.yaml@@ -23,7 +23,7 @@ services:max-size: '1000m'restart: unless-stoppedenvironment:- - NODE_OPTIONS="--es-module-specifier-resolution=node"+ - NODE_OPTIONS="--import=./scripts/register.js"- AFFINE_CONFIG_PATH=/root/.affine/config- REDIS_SERVER_HOST=redis- DATABASE_URL=postgres://affine:affine@postgres:5432/affinediff --git a/packages/backend/server/package.json b/packages/backend/server/package.jsonindex 64ff5ab7e0..b0d40f22dd 100644--- a/packages/backend/server/package.json+++ b/packages/backend/server/package.json@@ -9,13 +9,13 @@},"scripts": {"build": "tsc",- "start": "node --loader ts-node/esm/transpile-only.mjs --es-module-specifier-resolution=node ./src/index.ts",+ "start": "node --loader ts-node/esm/transpile-only.mjs ./src/index.ts","dev": "nodemon ./src/index.ts","test": "ava --concurrency 1 --serial","test:coverage": "c8 ava --concurrency 1 --serial","postinstall": "prisma generate",- "data-migration": "node --loader ts-node/esm/transpile-only.mjs --es-module-specifier-resolution=node ./src/data/index.ts",- "predeploy": "yarn prisma migrate deploy && node --es-module-specifier-resolution=node ./dist/data/index.js run"+ "data-migration": "node --loader ts-node/esm/transpile-only.mjs ./src/data/index.ts",+ "predeploy": "yarn prisma migrate deploy && node --import ./scripts/register.js ./dist/data/index.js run"},"dependencies": {"@apollo/server": "^4.10.0",@@ -86,6 +86,8 @@"semver": "^7.6.0","socket.io": "^4.7.4","stripe": "^14.18.0",+ "ts-node": "^10.9.2",+ "typescript": "^5.3.3","ws": "^8.16.0","yjs": "^13.6.12","zod": "^3.22.4"@@ -112,9 +114,7 @@"c8": "^9.1.0","nodemon": "^3.1.0","sinon": "^17.0.1",- "supertest": "^6.3.4",- "ts-node": "^10.9.2",- "typescript": "^5.3.3"+ "supertest": "^6.3.4"},"ava": {"timeout": "1m",diff --git a/packages/backend/server/scripts/loader.js b/packages/backend/server/scripts/loader.jsnew file mode 100644index 0000000000..ce31fb5096--- /dev/null+++ b/packages/backend/server/scripts/loader.js@@ -0,0 +1,11 @@+import { create, createEsmHooks } from 'ts-node';++const service = create({+ experimentalSpecifierResolution: 'node',+ transpileOnly: true,+ logError: true,+ skipProject: true,+});+const hooks = createEsmHooks(service);++export const resolve = hooks.resolve;diff --git a/packages/backend/server/scripts/register.js b/packages/backend/server/scripts/register.jsnew file mode 100644index 0000000000..ce20ff5368--- /dev/null+++ b/packages/backend/server/scripts/register.js@@ -0,0 +1,4 @@+import { register } from 'node:module';+import { pathToFileURL } from 'node:url';++register('./scripts/loader.js', pathToFileURL('./'));diff --git a/packages/backend/server/scripts/self-host-predeploy.js b/packages/backend/server/scripts/self-host-predeploy.jsindex 2e71f738d7..6d2cf55749 100644--- a/packages/backend/server/scripts/self-host-predeploy.js+++ b/packages/backend/server/scripts/self-host-predeploy.js@@ -42,11 +42,9 @@ function prepare() {function runPredeployScript() {console.log('running predeploy script.');execSync('yarn predeploy', {- env: {- ...process.env,- NODE_OPTIONS:- (process.env.NODE_OPTIONS ?? '') + ' --import ./dist/prelude.js',- },+ encoding: 'utf-8',+ env: process.env,+ stdio: 'inherit',});}diff --git a/packages/backend/server/src/core/auth/next-auth-options.ts b/packages/backend/server/src/core/auth/next-auth-options.tsindex 6d7c86b455..f177fd0790 100644--- a/packages/backend/server/src/core/auth/next-auth-options.ts+++ b/packages/backend/server/src/core/auth/next-auth-options.ts@@ -116,9 +116,6 @@ export const NextAuthOptionsProvider: FactoryProvider<NextAuthOptions> = {// @ts-expect-error Third part library type mismatchadapter: prismaAdapter,debug: !config.node.prod,- session: {- strategy: 'database',- },logger: {debug(code, metadata) {logger.debug(`${code}: ${JSON.stringify(metadata)}`);@@ -139,18 +136,6 @@ export const NextAuthOptionsProvider: FactoryProvider<NextAuthOptions> = {},};- if (config.mailer && mailer) {- nextAuthOptions.providers.push(- // @ts-expect-error esm interop issue- Email.default({- server: config.mailer,- from: config.mailer.from,- sendVerificationRequest: (params: SendVerificationRequestParams) =>- sendVerificationRequest(config, logger, mailer, session, params),- })- );- }-nextAuthOptions.providers.push(// @ts-expect-error esm interop issueCredentials.default({@@ -183,6 +168,18 @@ export const NextAuthOptionsProvider: FactoryProvider<NextAuthOptions> = {}));+ if (config.mailer && mailer) {+ nextAuthOptions.providers.push(+ // @ts-expect-error esm interop issue+ Email.default({+ server: config.mailer,+ from: config.mailer.from,+ sendVerificationRequest: (params: SendVerificationRequestParams) =>+ sendVerificationRequest(config, logger, mailer, session, params),+ })+ );+ }+if (config.auth.oauthProviders.github) {nextAuthOptions.providers.push(// @ts-expect-error esm interop issue@@ -209,6 +206,11 @@ export const NextAuthOptionsProvider: FactoryProvider<NextAuthOptions> = {);}+ if (nextAuthOptions.providers.length > 1) {+ // not only credentials provider+ nextAuthOptions.session = { strategy: 'database' };+ }+nextAuthOptions.jwt = {encode: async ({ token, maxAge }) =>encode(config, prisma, token, maxAge),