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.

Sign up for GitHub

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

Jump to bottom

fix: 修复getCurrentInstance方法类型声明#6904，修复taro update project报错#6850 #6909

Merged
merged 9 commits into from
Jul 8, 2020
Merged

fix: 修复getCurrentInstance方法类型声明#6904，修复taro update project报错#6850 #6909

merged 9 commits into from
Jul 8, 2020

Conversation

spencer17x
Copy link
Contributor

@spencer17x spencer17x commented Jul 3, 2020 •
edited
Loading

这个 PR 做了什么? (简要描述所做更改)

这个 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 或社区知晓的内容：

@spencer17x spencer17x changed the title fix: 修复getCurrentInstance方法类型声明#6904 fix: 修复getCurrentInstance方法类型声明#6904 修复taro update project报错#6850 Jul 3, 2020
@spencer17x spencer17x changed the title fix: 修复getCurrentInstance方法类型声明#6904 修复taro update project报错#6850 fix: 修复getCurrentInstance方法类型声明#6904，修复taro update project报错#6850 Jul 3, 2020
Chen-jj
Chen-jj requested changes Jul 7, 2020
View reviewed changes
packages/taro/types/taro.extend.d.ts
@@ -106,12 +106,14 @@ declare namespace Taro {

function setIsUsingDiff (flag: boolean)

const Current: {
Copy link
Contributor

Choose a reason for hiding this comment

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

还是要保留 Current 的定义:

const Current: Current

不然用户 import Current 时只能得到一个 interface

Copy link
Contributor Author

Choose a reason for hiding this comment

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

好的、那我修改下

Copy link
Contributor Author

Choose a reason for hiding this comment

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

已修复、你看下

Copy link
Contributor

Choose a reason for hiding this comment

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

老哥改成这样咯：

image

不然 Current 的定义重复了

Copy link
Contributor Author

Choose a reason for hiding this comment

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

改好了

Copy link
Contributor

Choose a reason for hiding this comment

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

赞～

@Chen-jj Chen-jj merged commit ec17056 into NervJS:next Jul 8, 2020
@taro-bot2 taro-bot2 bot mentioned this pull request Jul 11, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Chen-jj Chen-jj Chen-jj approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@spencer17x @Chen-jj