Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-17 14:27:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): avoid expand runtime config everywhere used (#7972)

Browse Source
This commit is contained in:
forehalo
2024-08-26 12:22:52 +00:00
parent 9ea4aaaf37
commit 0209e3fa76
5 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,11 +87,23 @@ interface Desktop extends ChromeBrowser {
export type Environment = Browser | Server | Desktop; export type Environment = Browser | Server | Desktop;
function setupRuntimeConfig() {
if (!process.env.RUNTIME_CONFIG) {
return;
}
// registered by [webpack.DefinePlugin]
const runtimeConfig = JSON.parse(process.env.RUNTIME_CONFIG ?? '');
runtimeFlagsSchema.parse(runtimeConfig);
globalThis.runtimeConfig = runtimeConfig;
}
export function setupGlobal() { export function setupGlobal() {
if (globalThis.$AFFINE_SETUP) { if (globalThis.$AFFINE_SETUP) {
return; return;
} }
runtimeFlagsSchema.parse(runtimeConfig);
setupRuntimeConfig();
let environment: Environment; let environment: Environment;
const isDebug = process.env.NODE_ENV === 'development'; const isDebug = process.env.NODE_ENV === 'development';

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

@@ -4,10 +4,6 @@
"private": true, "private": true,
"version": "0.16.0", "version": "0.16.0",
"exports": { "exports": {
"./app": "./src/app.tsx",
"./router": "./src/router.tsx",
"./bootstrap/register-plugins": "./src/bootstrap/register-plugins.ts",
"./hooks/*": "./src/hooks/*",
"./*": "./src/*" "./*": "./src/*"
}, },
"dependencies": { "dependencies": {

14
scripts/setup/global.ts
View File

@@ -1,12 +1,14 @@
import { getRuntimeConfig } from '@affine/cli/src/webpack/runtime-config'; import { getRuntimeConfig } from '@affine/cli/src/webpack/runtime-config';
import { setupGlobal } from '@affine/env/global'; import { setupGlobal } from '@affine/env/global';
globalThis.runtimeConfig = getRuntimeConfig({ process.env.RUNTIME_CONFIG = JSON.stringify(
distribution: 'browser', getRuntimeConfig({
mode: 'development', distribution: 'browser',
channel: 'canary', mode: 'development',
static: false, channel: 'canary',
}); static: false,
})
);
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
window.location.search = '?prefixUrl=http://127.0.0.1:3010/'; window.location.search = '?prefixUrl=http://127.0.0.1:3010/';

4
tools/cli/src/webpack/config.ts
View File

@@ -346,7 +346,9 @@ export const createConfiguration: (
process.env.MIXPANEL_TOKEN process.env.MIXPANEL_TOKEN
), ),
'process.env.DEBUG_JOTAI': JSON.stringify(process.env.DEBUG_JOTAI), 'process.env.DEBUG_JOTAI': JSON.stringify(process.env.DEBUG_JOTAI),
runtimeConfig: JSON.stringify(runtimeConfig), 'process.env.RUNTIME_CONFIG': JSON.stringify(
JSON.stringify(runtimeConfig)
),
}), }),
buildFlags.distribution === 'admin' buildFlags.distribution === 'admin'
? null ? null

1
tsconfig.json
View File

@@ -48,7 +48,6 @@
"skipLibCheck": true, // skip all type checks for .d.ts files "skipLibCheck": true, // skip all type checks for .d.ts files
"paths": { "paths": {
"@affine/core/*": ["./packages/frontend/core/src/*"], "@affine/core/*": ["./packages/frontend/core/src/*"],
"@affine/core": ["./packages/frontend/core/src/index.ts"],
"@affine/admin/*": ["./packages/frontend/admin/src/*"], "@affine/admin/*": ["./packages/frontend/admin/src/*"],
"@affine/admin/components/ui/*": [ "@affine/admin/components/ui/*": [
"./packages/frontend/admin/src/components/ui/*" "./packages/frontend/admin/src/components/ui/*"