Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

同步 next 分支代码 #8867

Merged
merged 297 commits into from
Mar 11, 2021
Merged

同步 next 分支代码 #8867

merged 297 commits into from
Mar 11, 2021

Conversation

shinken008
Copy link
Collaborator

这个 PR 做了什么? (简要描述所做更改)
同步 next 分支代码

这个 PR 是什么类型? (至少选择一个)

  • 错误修复(Bugfix) issue id #
  • 新功能(Feature)
  • 代码重构(Refactor)
  • TypeScript 类型定义修改(Typings)
  • 文档修改(Docs)
  • 代码风格更新(Code style update)
  • 其他,请描述(Other, please describe):

这个 PR 满足以下需求:

  • 提交到 master 分支
  • Commit 信息遵循 Angular Style Commit Message Conventions
  • 所有测试用例已经通过
  • 代码遵循相关包中的 .eslintrc, .tslintrc, .stylelintrc 所规定的规范
  • 在本地测试可用,不会影响到其它功能

这个 PR 涉及以下平台:

  • 微信小程序
  • 支付宝小程序
  • 百度小程序
  • 头条小程序
  • QQ 轻应用
  • 快应用平台(QuickApp)
  • Web 平台(H5)
  • 移动端(React-Native)

其它需要 Reviewer 或社区知晓的内容:

Chen-jj and others added 30 commits October 28, 2020 16:07
【breaking】存在不兼容改动,编写 Vue2 时用户的入口组件要这样改:

// app.js
const App = {
  // ...
}
page loader 处理页面时先分析页面代码 AST,识别出是否有调用分享 API,再决定是否自动添加 enableShareAppMessage、enableShareTimeline 配置
# Conflicts:
#	lerna.json
#	package.json
#	packages/babel-plugin-transform-taroapi/package.json
#	packages/babel-preset-taro/package.json
#	packages/babel-preset-taro/yarn.lock
#	packages/eslint-config-taro/package.json
#	packages/eslint-plugin-taro/package.json
#	packages/postcss-plugin-constparse/package.json
#	packages/postcss-pxtransform/package.json
#	packages/shared/package.json
#	packages/shared/src/components.ts
#	packages/shared/src/template.ts
#	packages/taro-api/package.json
#	packages/taro-api/src/native-apis.js
#	packages/taro-cli/package.json
#	packages/taro-cli/src/__tests__/__mocks__/presets.ts
#	packages/taro-cli/src/__tests__/cli.spec.ts
#	packages/taro-cli/src/presets/platforms/alipay.ts
#	packages/taro-cli/src/presets/platforms/jd.ts
#	packages/taro-cli/tsconfig.json
#	packages/taro-components/package.json
#	packages/taro-extend/package.json
#	packages/taro-h5/package.json
#	packages/taro-h5/src/api/request/index.js
#	packages/taro-h5/yarn.lock
#	packages/taro-helper/package.json
#	packages/taro-loader/package.json
#	packages/taro-mini-runner/__tests__/babel.spec.ts
#	packages/taro-mini-runner/__tests__/nerv.spec.ts
#	packages/taro-mini-runner/__tests__/react.spec.ts
#	packages/taro-mini-runner/__tests__/ts.spec.ts
#	packages/taro-mini-runner/package.json
#	packages/taro-mini-runner/src/__tests__/__snapshots__/alipay.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/bytedance.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/jd.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/nerv.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/swan.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/babel.spec.ts
#	packages/taro-mini-runner/src/__tests__/nerv.spec.ts
#	packages/taro-mini-runner/src/__tests__/qq.spec.ts
#	packages/taro-mini-runner/src/__tests__/react.spec.ts
#	packages/taro-mini-runner/src/__tests__/ts.spec.ts
#	packages/taro-mini-runner/tsconfig.json
#	packages/taro-react/package.json
#	packages/taro-router/package.json
#	packages/taro-runner-utils/package.json
#	packages/taro-runner-utils/yarn.lock
#	packages/taro-runtime/package.json
#	packages/taro-service/package.json
#	packages/taro-webpack-runner/__tests__/babel.spec.ts
#	packages/taro-webpack-runner/__tests__/nerv.spec.ts
#	packages/taro-webpack-runner/__tests__/react.spec.ts
#	packages/taro-webpack-runner/__tests__/ts.spec.ts
#	packages/taro-webpack-runner/package.json
#	packages/taro-webpack-runner/src/__tests__/babel.spec.ts
#	packages/taro-webpack-runner/src/__tests__/nerv.spec.ts
#	packages/taro-webpack-runner/src/__tests__/react.spec.ts
#	packages/taro-webpack-runner/src/__tests__/ts.spec.ts
#	packages/taro-with-weapp/package.json
#	packages/taro/package.json
#	packages/taroize/package.json
1. Swiper 可以循环最多 4次。
2. 锁定 stencil 小版本
3. 修复支付宝不触发 Swiper 的 onanimationfinish 事件的问题,#7945
1. React: <View catchMove/>
2. Vue: <view catch-move/>
1. catch 事件能停止冒泡
2. catch 事件能绑定 true 或留空
3. 就 catchtouchmove 不能阻止滚动穿透的问题给出提示
include 多个与引用者在同一目录下的 wxml 时,受缓存影响,所有 include 的结果都会相同。
以下写法测试过都是支持的:

<template is="msgItem" data="{{...item, text}}"/>
<template is="item" data="{{text}}"/>
<template is="item" data="{{...t}}"/>
<template is="item" data="{{text: 'abc'}}"/>
1. 修复不能触发 onLaunch 的问题
2. 修复 convert 不支持挂载到 app 对象的问题
Chen-jj and others added 24 commits February 26, 2021 10:30
* fix(weapp): 为 Video 组件补充广告相关事件
* fix(runtime): 解决事件冒泡失败的问题
修复小程序与 H5 端相关组件、 API等问题
* fix(runtime): 修复小程序渲染html时带属性的style标签无法识别的问题

* fix(runtime): 修复小程序渲染html时skipElement出现死循环的问题

* fix lint error

* test(runtime): 增加小程序渲染html的测试用例

Co-authored-by: lihuadong <1651139630@qq.com>
Co-authored-by: chenjiajian <798095202@qq.com>
@shinken008 shinken008 requested a review from zhiqingchen March 10, 2021 11:25
Copy link
Member

@zhiqingchen zhiqingchen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

version 不对

@shinken008
Copy link
Collaborator Author

version 不对
先合入,等发布的时候提个 pr 统一改

@zhiqingchen zhiqingchen merged commit eb4af7b into feat/react-native Mar 11, 2021
@zhiqingchen zhiqingchen deleted the chore/react-native branch March 11, 2021 02:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.