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

fix(h5): h5模式下支持链接symlink的递归;排除隐藏文件的处理 #3778

Closed
wants to merge 5,287 commits into from

Conversation

WingGao
Copy link
Contributor

@WingGao WingGao commented Jul 11, 2019

这个 PR 做了什么? (简要描述所做更改)
h5模式下支持链接symlink的递归

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

@WingGao
Copy link
Contributor Author

WingGao commented Jul 11, 2019

关于支付宝的bug是因为转换之后代码是这样的

 }, {
    key: "_createData",
    value: function _createData() {
      this.__state = arguments[0] || this.state || {};
      this.__props = arguments[1] || this.props || {};
      var __isRunloopRef = arguments[2];
      var __prefix = this.$prefix;
      ;
      var $compid__1 = (0, _index.genCompid)(__prefix + "$compid__1");

      var blocks = this.__state.blocks;

      var loopArray0 = blocks.map(function (b, _anonIdx) {
        b = {
          $original: (0, _index.internal_get_original)(b)
        };
        var $compid__0 = (0, _index.genCompid)(__prefix + "NWCmkXuQPj" + _anonIdx);
        _index.propsManager.set({
          "data": b.$original
        }, $compid__0);
        return {
          $compid__0: $compid__0,
          $original: b.$original
        };
      });
      _index.propsManager.set({   // !这里丢失了
        "onTaroCollectChilds": this.$collectChilds
      }, $compid__1);
      Object.assign(this.__state, {
        loopArray0: loopArray0,
        $compid__1: $compid__1
      });
      return this.__state;
    }

@Chen-jj
Copy link
Contributor

Chen-jj commented Jul 11, 2019

@WingGao 支付宝的问题是因为你 CLI 和依赖版本不一致。

d904a79#diff-0b711dc747c2a4b058ecdbaed9561cc0R745

if (Adapter.type === Adapters.alipay) {
const body = ast.program.body
for (const i in body) {
if (t.isImportDeclaration(body[i]) && !t.isImportDeclaration(body[Number(i) + 1])) {
body.splice(Number(i) + 1, 0, t.variableDeclaration(
'const',
[t.variableDeclarator(
t.identifier('propsManager'),
t.memberExpression(
t.identifier('my'),
t.identifier('propsManager')
)
)]
))
break
}
}
}

@WingGao
Copy link
Contributor Author

WingGao commented Jul 12, 2019

@Chen-jj 不好意思确实,我是直接在taro跑的以为会自动关联,现在把link过去就可以了。我把那个alipay的提交回滚了。

@Chen-jj
Copy link
Contributor

Chen-jj commented Jul 12, 2019

@WingGao 没关系哈,感谢关注我们的项目,欢迎 PR

@WingGao
Copy link
Contributor Author

WingGao commented Jul 12, 2019

本地build成功,ci报的是npm的错,好诡异

Copy link
Contributor

@Littly Littly left a comment

Choose a reason for hiding this comment

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

提交具体修改的文件即可 lock文件先不做修改吧~

zhaofinger and others added 7 commits October 25, 2019 16:48
…JS#3765

Bumps [lodash.template](https://github.com/lodash/lodash) from 4.4.0 to 4.5.0. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.4.0...4.5.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>
Bumps [fstream](https://github.com/npm/fstream) from 1.0.11 to 1.0.12. **This update includes a security fix.**
- [Release notes](https://github.com/npm/fstream/releases)
- [Commits](npm/fstream@v1.0.11...v1.0.12)

Signed-off-by: dependabot-preview[bot] <[email protected]>
dependabot-preview bot and others added 17 commits October 26, 2019 15:36
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](jonschlinkert/mixin-deep@1.3.1...1.3.2)

Signed-off-by: dependabot-preview[bot] <[email protected]>
* beautify log when developers init

* optimize: The value of the buffer method getEnv
# Conflicts:
#	packages/taro-cli/yarn.lock
#	packages/taro-components-rn/yarn.lock
#	packages/taro-components/yarn.lock
#	packages/taro-rn/yarn.lock
#	packages/taro-with-weapp/yarn.lock
#	packages/taroize/yarn.lock
#	yarn.lock
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.