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

feat(core): build config for ios android (#8555)

Browse Source
This commit is contained in:
EYHN
2024-10-21 05:39:04 +00:00
parent d1783b6f8c
commit db374f7feb
10 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@ import { UaHelper } from './ua-helper.js';
export type BUILD_CONFIG_TYPE = { export type BUILD_CONFIG_TYPE = {
debug: boolean; debug: boolean;
distribution: 'web' | 'desktop' | 'admin' | 'mobile'; distribution: 'web' | 'desktop' | 'admin' | 'mobile' | 'ios' | 'android';
/** /**
* 'web' | 'desktop' | 'admin' * 'web' | 'desktop' | 'admin'
*/ */
@@ -15,6 +15,8 @@ export type BUILD_CONFIG_TYPE = {
isElectron: boolean; isElectron: boolean;
isWeb: boolean; isWeb: boolean;
isMobileWeb: boolean; isMobileWeb: boolean;
isIOS: boolean;
isAndroid: boolean;
// this is for the electron app // this is for the electron app
/** /**

6
packages/frontend/component/src/ui/safe-area/index.tsx
View File

@@ -30,7 +30,11 @@ export const SafeArea = forwardRef<HTMLDivElement, SafeAreaProps>(
<div <div
ref={ref} ref={ref}
className={clsx(safeArea, className)} className={clsx(safeArea, className)}
data-standalone={environment.isPwa ? '' : undefined} data-standalone={
environment.isPwa || BUILD_CONFIG.isAndroid || BUILD_CONFIG.isIOS
? ''
: undefined
}
data-bottom={bottom ? '' : undefined} data-bottom={bottom ? '' : undefined}
data-top={top ? '' : undefined} data-top={top ? '' : undefined}
style={{ style={{

5
packages/frontend/core/src/components/affine/auth/oauth.tsx
View File

@@ -50,8 +50,9 @@ function OAuthProvider({ provider }: { provider: OAuthProviderType }) {
const onClick = useCallback(() => { const onClick = useCallback(() => {
let oauthUrl = let oauthUrl =
(BUILD_CONFIG.isElectron ? BUILD_CONFIG.serverUrlPrefix : '') + (BUILD_CONFIG.isElectron || BUILD_CONFIG.isIOS || BUILD_CONFIG.isAndroid
`/oauth/login?provider=${provider}`; ? BUILD_CONFIG.serverUrlPrefix
: '') + `/oauth/login?provider=${provider}`;
if (BUILD_CONFIG.isElectron) { if (BUILD_CONFIG.isElectron) {
oauthUrl += `&client=${appInfo?.schema}`; oauthUrl += `&client=${appInfo?.schema}`;

2
packages/frontend/core/src/modules/cloud/services/fetch.ts
View File

@@ -5,7 +5,7 @@ import { fromPromise, Service } from '@toeverything/infra';
import { BackendError, NetworkError } from '../error'; import { BackendError, NetworkError } from '../error';
export function getAffineCloudBaseUrl(): string { export function getAffineCloudBaseUrl(): string {
if (BUILD_CONFIG.isElectron) { if (BUILD_CONFIG.isElectron || BUILD_CONFIG.isIOS || BUILD_CONFIG.isAndroid) {
return BUILD_CONFIG.serverUrlPrefix; return BUILD_CONFIG.serverUrlPrefix;
} }
const { protocol, hostname, port } = window.location; const { protocol, hostname, port } = window.location;

7
packages/frontend/core/src/utils/popup.ts
View File

@@ -3,9 +3,10 @@ import { apis } from '@affine/electron-api';
const logger = new DebugLogger('popup'); const logger = new DebugLogger('popup');
const origin = BUILD_CONFIG.isElectron const origin =
? BUILD_CONFIG.serverUrlPrefix BUILD_CONFIG.isElectron || BUILD_CONFIG.isIOS || BUILD_CONFIG.isAndroid
: location.origin; ? BUILD_CONFIG.serverUrlPrefix
: location.origin;
/** /**
* @deprecated need to be refactored as [UrlService] dependencies on [ServerConfigService] * @deprecated need to be refactored as [UrlService] dependencies on [ServerConfigService]

2
packages/frontend/graphql/src/index.ts
View File

@@ -10,7 +10,7 @@ import { gqlFetcherFactory } from './fetcher';
setupGlobal(); setupGlobal();
export function getBaseUrl(): string { export function getBaseUrl(): string {
if (BUILD_CONFIG.isElectron) { if (BUILD_CONFIG.isElectron || BUILD_CONFIG.isIOS || BUILD_CONFIG.isAndroid) {
return BUILD_CONFIG.serverUrlPrefix; return BUILD_CONFIG.serverUrlPrefix;
} }
if (typeof window === 'undefined') { if (typeof window === 'undefined') {

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

@@ -1,5 +1,5 @@
export type BuildFlags = { export type BuildFlags = {
distribution: 'web' | 'desktop' | 'admin' | 'mobile'; distribution: 'web' | 'desktop' | 'admin' | 'mobile' | 'ios' | 'android';
mode: 'development' | 'production'; mode: 'development' | 'production';
channel: 'stable' | 'beta' | 'canary' | 'internal'; channel: 'stable' | 'beta' | 'canary' | 'internal';
static: boolean; static: boolean;

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

@@ -69,7 +69,9 @@ export const getPublicPath = (buildFlags: BuildFlags) => {
if ( if (
buildFlags.mode === 'development' || buildFlags.mode === 'development' ||
process.env.COVERAGE || process.env.COVERAGE ||
buildFlags.distribution === 'desktop' buildFlags.distribution === 'desktop' ||
buildFlags.distribution === 'ios' ||
buildFlags.distribution === 'android'
) { ) {
return '/'; return '/';
} }

2
tools/cli/src/webpack/runtime-config.ts
View File

@@ -18,6 +18,8 @@ export function getBuildConfig(buildFlags: BuildFlags): BUILD_CONFIG_TYPE {
isElectron: buildFlags.distribution === 'desktop', isElectron: buildFlags.distribution === 'desktop',
isWeb: buildFlags.distribution === 'web', isWeb: buildFlags.distribution === 'web',
isMobileWeb: buildFlags.distribution === 'mobile', isMobileWeb: buildFlags.distribution === 'mobile',
isIOS: buildFlags.distribution === 'ios',
isAndroid: buildFlags.distribution === 'android',
isSelfHosted: process.env.SELF_HOSTED === 'true', isSelfHosted: process.env.SELF_HOSTED === 'true',
appBuildType: 'stable' as const, appBuildType: 'stable' as const,

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

@@ -58,7 +58,12 @@ export function createWebpackConfig(cwd: string, flags: BuildFlags) {
PRECONNECT: cdnOrigin PRECONNECT: cdnOrigin
? `<link rel="preconnect" href="${cdnOrigin}" />` ? `<link rel="preconnect" href="${cdnOrigin}" />`
: '', : '',
VIEWPORT_FIT: flags.distribution === 'mobile' ? 'cover' : 'auto', VIEWPORT_FIT:
flags.distribution === 'mobile' ||
flags.distribution === 'ios' ||
flags.distribution === 'android'
? 'cover'
: 'auto',
}; };
const createHTMLPlugins = (entryName: string) => { const createHTMLPlugins = (entryName: string) => {