Skip to content

Commit

Permalink
Merge branch 'fix/skyline' into feat/4.0.8
Browse files Browse the repository at this point in the history
  • Loading branch information
yushijie1 committed Nov 19, 2024
2 parents c4fc51a + 52a7378 commit b7b45e8
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2175,6 +2175,9 @@
"scroll-top": false
},
"custom-wrapper": true,
"double-tap-gesture-handler": {
"should-response-on-move-worklet": false
},
"draggable-sheet": {
"initial-child-size": false,
"min-child-size": false,
Expand All @@ -2190,6 +2193,7 @@
"show-img-resize": false
},
"follow-swan": false,
"force-press-gesture-handler": false,
"form": {
"report-submit": false,
"report-submit-timeout": false
Expand Down Expand Up @@ -2231,6 +2235,9 @@
},
"padding": false
},
"horizontal-drag-gesture-handler": {
"should-response-on-move-worklet": false
},
"icon": {
"type": {
"success": true,
Expand Down Expand Up @@ -2310,7 +2317,8 @@
"safe-password-nonce": false,
"safe-password-salt": false,
"safe-password-custom-hash": false,
"default-value": false
"default-value": false,
"cursor-color": false
},
"keyboard-accessory": false,
"label": {
Expand Down Expand Up @@ -2452,6 +2460,9 @@
"fps": false
},
"login": false,
"long-press-gesture-handler": {
"should-response-on-move-worklet": false
},
"lottie": false,
"map": {
"longitude": true,
Expand Down Expand Up @@ -2628,6 +2639,9 @@
"page-font-size": false,
"page-orientation": false
},
"pan-gesture-handler": {
"should-response-on-move-worklet": false
},
"picker": {
"mode": {
"selector": {
Expand Down Expand Up @@ -2713,13 +2727,23 @@
"ensp": false,
"emsp": false,
"nbsp": false
},
"mode": {
"default": false,
"compat": false,
"aggressive": false,
"inline-block": false,
"web": false
}
},
"root-portal": {
"enable": false
},
"rtc-room": false,
"rtc-room-item": false,
"scale-gesture-handler": {
"should-response-on-move-worklet": false
},
"script": {
"src": false,
"module": false
Expand Down Expand Up @@ -2771,7 +2795,12 @@
"refresher-two-level-close-threshold": false,
"refresher-two-level-scroll-enabled": false,
"refresher-ballistic-refresh-enabled": false,
"refresher-two-level-pinned": false
"refresher-two-level-pinned": false,
"associative-container": {
"draggable-sheet": false,
"nested-scroll-view": false,
"pop-gesture": false
}
},
"share-element": {
"key": false,
Expand All @@ -2795,7 +2824,7 @@
"bounceIn": false,
"bounceOut": false,
"bounceInOut": false,
"cubic-bezier(x1,": false
"cubic-bezier(x1, y1, x2, y2)": false
}
},
"slider": {
Expand Down Expand Up @@ -2851,9 +2880,7 @@
"easeInCubic": false,
"easeOutCubic": false,
"easeInOutCubic": false
},
"scroll-with-animation": false,
"cache-extent": false
}
},
"swiper-item": {
"item-id": true,
Expand All @@ -2871,6 +2898,9 @@
},
"tab-item": false,
"tabs": false,
"tap-gesture-handler": {
"should-response-on-move-worklet": false
},
"text": {
"selectable": false,
"user-select": false,
Expand Down Expand Up @@ -2919,6 +2949,9 @@
"adjust-keyboard-to": false,
"default-value": false
},
"vertical-drag-gesture-handler": {
"should-response-on-move-worklet": false
},
"video": {
"src": true,
"duration": true,
Expand Down
2 changes: 2 additions & 0 deletions packages/taro-service/src/platform-plugin-base/platform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ export default abstract class TaroPlatform<T extends TConfig = TConfig> {
abstract runtimePath: string | string[]
abstract behaviorsName: string

behaviorsName?: string

protected setupTransaction = new Transaction<this>()
protected buildTransaction = new Transaction<this>()

Expand Down
2 changes: 1 addition & 1 deletion packages/taro-vite-runner/src/mini/emit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp
usingComponents: {
[baseCompName]: `./${baseCompName}`
}
}
} as Config & { component?: boolean, usingComponents: Record<string, string> }
if (isUsingCustomWrapper) {
baseCompConfig.usingComponents[customWrapperName] = `./${customWrapperName}`
}
Expand Down
2 changes: 1 addition & 1 deletion packages/taro-webpack5-runner/src/plugins/MiniPlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1231,7 +1231,7 @@ export default class TaroMiniPlugin {
usingComponents: {
[baseCompName]: `./${baseCompName}`
}
}
} as Config & { component?: boolean, usingComponents: Record<string, string> }

if (isUsingCustomWrapper) {
baseCompConfig.usingComponents[customWrapperName] = `./${customWrapperName}`
Expand Down

0 comments on commit b7b45e8

Please sign in to comment.