Merge branch 'preview-fixes' into preview-features

This commit is contained in:
the1812 2023-03-26 23:09:01 +08:00
commit f7dc52f425
5 changed files with 28 additions and 2 deletions

View File

@ -16,6 +16,7 @@
"cSpell.words": [
"afterbegin",
"afterend",
"BALH",
"Bangumi",
"bevo",
"bili",

View File

@ -34,12 +34,16 @@ export const init = async () => {
compatibilityPatch()
})
if (unsafeWindow.bangumi_area_limit_hack) {
const { coreApis, externalApis } = await import('@/core/core-apis')
if (
unsafeWindow.bangumi_area_limit_hack &&
coreApis.settings.getComponentSettings<{ disableOnBalh: boolean }>('compatibilities').options
.disableOnBalh
) {
console.log('BALH detected, Bilibili Evolved is disabled.')
return
}
const { coreApis, externalApis } = await import('@/core/core-apis')
unsafeWindow.bilibiliEvolved = externalApis
/** sand-boxed window, safe to use original name */
window.coreApis = coreApis

View File

@ -5,6 +5,7 @@ import { component as I18n } from './i18n'
import { component as AutoUpdate } from './auto-update'
import { component as NotifyNewVersion } from './notify-new-version'
import { component as Bisector } from './bisector'
import { component as Compatibilities } from './compatibilities'
export const getBuiltInComponents = (): ComponentMetadata[] => [
SettingsPanel,
@ -13,6 +14,7 @@ export const getBuiltInComponents = (): ComponentMetadata[] => [
AutoUpdate,
NotifyNewVersion,
Bisector,
Compatibilities,
]
export const isBuiltInComponent = (name: string) =>

View File

@ -0,0 +1 @@
- `与 "解除 B 站区域限制" 互斥`: 若打开此选项, 在检测到 "解除 B 站区域限制" 脚本时, 将停止此脚本的加载以避免布局错乱.

View File

@ -0,0 +1,18 @@
// import { addComponentListener } from '@/core/settings'
import { componentsTags } from '@/components/types'
import { none } from '@/core/utils'
import { defineComponentMetadata } from '../define'
export const component = defineComponentMetadata({
name: 'compatibilities',
displayName: '兼容性选项',
configurable: false,
tags: [componentsTags.general],
options: {
disableOnBalh: {
defaultValue: false,
displayName: '与 "解除 B 站区域限制" 互斥',
},
},
entry: none,
})