Skip to content

Commit 0921a7a

Browse files
authored
Merge branch 'main' into fix/getBoundingClientRect-for-alipay
2 parents a204af6 + bed1b6b commit 0921a7a

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

packages/eslint-config-taro/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"eslint": "^8",
3636
"eslint-plugin-react": "^7.33.2",
3737
"eslint-plugin-react-hooks": "^4.4.0",
38-
"eslint-plugin-vue": "^9.17.0"
38+
"eslint-plugin-vue": "^8.0.0"
3939
},
4040
"peerDependenciesMeta": {
4141
"eslint-plugin-react": {

packages/taro-framework-vue3/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@tarojs/runtime": "workspace:*",
5151
"@tarojs/runner-utils": "workspace:*",
5252
"@tarojs/shared": "workspace:*",
53-
"@vitejs/plugin-vue": "^5",
53+
"@vitejs/plugin-vue": "^4",
5454
"@vitejs/plugin-vue-jsx": "^3",
5555
"vue-loader": "^17.0.0",
5656
"vite": "^4",

packages/taro-h5/src/api/base/weapp/app-event.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const unhandledRejectionListener = (res: PromiseRejectionEvent) => {
1919
let themeMatchMedia: MediaQueryList | null = null
2020
const themeChangeListener = (res: MediaQueryListEvent) => {
2121
themeChangeCallbackManager.trigger({
22-
theme: res.matches ? 'dark' : 'light'
22+
theme: res.matches ? 'light' : 'dark'
2323
})
2424
}
2525

packages/taro-platform-harmony/src/program/arkTS.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ export default class Harmony extends TaroPlatformHarmony {
266266
define.global = 'globalThis'
267267
}
268268
const ext = path.extname(target)
269-
if (![/d\.e?tsx?$/, /\.(json|map|md)$/].some(e => e.test(target))) {
269+
if (![/\.d\.e?tsx?$/, /\.(json|map|md)$/].some(e => e.test(target))) {
270270
code = this.replaceDefineValue(code, define, ext)
271271
}
272272
if (['.ts'].includes(ext)) {

packages/taro/types/taro.config.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ declare module './index' {
581581
desc: string
582582
/** 在该场景下打开小程序时跳转页面 */
583583
path: string
584-
}
584+
}[]
585585
/** 定制化型服务商票据 */
586586
serviceProviderTicket?: string
587587
/** 半屏小程序 appId */

0 commit comments

Comments
 (0)