合并分支3的feature，修复lazy不传递props的BUG

RubyLouvre · Oct 11, 2019 · 580536e · 580536e
1 parent ac74cd6
commit 580536e
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 35 deletions.
diff --git a/dist/React.js b/dist/React.js
@@ -1,5 +1,5 @@
 /**
- * by 司徒正美 Copyright 2019-09-19
+ * by 司徒正美 Copyright 2019-10-11
  * IE9+
  */
 
@@ -831,7 +831,7 @@
  component: null,
  resolved: false
  };
- var promise = props.render();
+ var promise = props.children();
  if (!promise || !isFn(promise.then)) {
  throw "lazy必须返回一个thenable对象";
  }
@@ -853,14 +853,12 @@
  throw "lazy组件必须包一个Suspense组件";
  },
  render: function f2() {
- return this.state.resolved ? createElement(this.state.component) : this.fallback();
+ return this.state.resolved ? createElement(this.state.component, this.props) : this.fallback();
  }
  });
- function lazy(fn) {
- return function () {
- return createElement(LazyComponent, {
- render: fn
- });
+ function lazy(render) {
+ return function (props) {
+ return createElement(LazyComponent, props, render);
  };
  }
 

diff --git a/dist/ReactAli.js b/dist/ReactAli.js
@@ -1,5 +1,5 @@
 /**
- * 运行于支付宝小程序的React by 司徒正美 Copyright 2019-10-09
+ * 运行于支付宝小程序的React by 司徒正美 Copyright 2019-10-11
  */
 
 var arrayPush = Array.prototype.push;
@@ -2867,7 +2867,7 @@ var React = getWindow().React = {
  findDOMNode: function findDOMNode() {
  console.log("小程序不支持findDOMNode");
  },
- version: "1.5.10",
+ version: "1.6.0",
  render: render$1,
  hydrate: render$1,
  webview: webview,

diff --git a/dist/ReactBu.js b/dist/ReactBu.js
@@ -1,5 +1,5 @@
 /**
- * 运行于支付宝小程序的React by 司徒正美 Copyright 2019-10-09
+ * 运行于支付宝小程序的React by 司徒正美 Copyright 2019-10-11
  */
 
 var arrayPush = Array.prototype.push;
@@ -2731,7 +2731,7 @@ var React = getWindow().React = {
  findDOMNode: function findDOMNode() {
  console.log("小程序不支持findDOMNode");
  },
- version: "1.5.10",
+ version: "1.6.0",
  render: render$1,
  hydrate: render$1,
  webview: webview,

diff --git a/dist/ReactH5.js b/dist/ReactH5.js
@@ -1,5 +1,5 @@
 /**
- * 运行于webview的React by 司徒正美 Copyright 2019-10-09T07
+ * 运行于webview的React by 司徒正美 Copyright 2019-10-11T06
  * IE9+
  */
 
@@ -5549,7 +5549,7 @@
  var MAX_PAGE_STACK_NUM = 10;
  var React$2 = getWindow().React = {
  findDOMNode: findDOMNode,
- version: '1.5.10',
+ version: '1.6.0',
  render: render$2,
  hydrate: render$2,
  Fragment: Fragment,

diff --git a/dist/ReactIE.js b/dist/ReactIE.js
@@ -1,5 +1,5 @@
 /**
- * IE6+，有问题请加QQ 370262116 by 司徒正美 Copyright 2019-09-19
+ * IE6+，有问题请加QQ 370262116 by 司徒正美 Copyright 2019-10-11
  */
 
 (function (global, factory) {
@@ -3171,7 +3171,7 @@
  component: null,
  resolved: false
  };
- var promise = props.render();
+ var promise = props.children();
  if (!promise || !isFn(promise.then)) {
  throw "lazy必须返回一个thenable对象";
  }
@@ -3193,14 +3193,12 @@
  throw "lazy组件必须包一个Suspense组件";
  },
  render: function f2() {
- return this.state.resolved ? createElement(this.state.component) : this.fallback();
+ return this.state.resolved ? createElement(this.state.component, this.props) : this.fallback();
  }
  });
- function lazy(fn) {
- return function () {
- return createElement(LazyComponent, {
- render: fn
- });
+ function lazy(render) {
+ return function (props) {
+ return createElement(LazyComponent, props, render);
  };
  }
 

diff --git a/dist/ReactQuick.js b/dist/ReactQuick.js
@@ -1,5 +1,5 @@
 /**
- * 运行于快应用的React by 司徒正美 Copyright 2019-10-09
+ * 运行于快应用的React by 司徒正美 Copyright 2019-10-11
  */
 
 var arrayPush = Array.prototype.push;
@@ -3566,7 +3566,7 @@ var React = getWindow().React = {
  findDOMNode: function findDOMNode() {
  console.log("小程序不支持findDOMNode");
  },
- version: "1.5.10",
+ version: "1.6.0",
  render: render$1,
  hydrate: render$1,
  Fragment: Fragment,

diff --git a/dist/ReactWX.js b/dist/ReactWX.js
@@ -1,5 +1,5 @@
 /**
- * 运行于微信小程序的React by 司徒正美 Copyright 2019-10-09T07
+ * 运行于微信小程序的React by 司徒正美 Copyright 2019-10-11T06
  * IE9+
  */
 

diff --git a/packages/cli/consts/alias.js b/packages/cli/consts/alias.js
@@ -13,6 +13,7 @@ const cwd = process.cwd();
 exports.default = (platform) => {
  const baseAlias = {
  'react': './source/' + index_1.REACT_LIB_MAP[platform],
+ 'react-dom': './source/' + index_1.REACT_LIB_MAP[platform],
  '@react': './source/' + index_1.REACT_LIB_MAP[platform],
  '@components': './source/components'
  };

diff --git a/packages/cli/lib/ReactAli.js b/packages/cli/lib/ReactAli.js
@@ -1,5 +1,5 @@
 /**
- * 运行于支付宝小程序的React by 司徒正美 Copyright 2019-10-09
+ * 运行于支付宝小程序的React by 司徒正美 Copyright 2019-10-11
  */
 
 var arrayPush = Array.prototype.push;
@@ -2867,7 +2867,7 @@ var React = getWindow().React = {
  findDOMNode: function findDOMNode() {
  console.log("小程序不支持findDOMNode");
  },
- version: "1.5.10",
+ version: "1.6.0",
  render: render$1,
  hydrate: render$1,
  webview: webview,

diff --git a/packages/cli/lib/ReactBu.js b/packages/cli/lib/ReactBu.js
@@ -1,5 +1,5 @@
 /**
- * 运行于支付宝小程序的React by 司徒正美 Copyright 2019-10-09
+ * 运行于支付宝小程序的React by 司徒正美 Copyright 2019-10-11
  */
 
 var arrayPush = Array.prototype.push;
@@ -2731,7 +2731,7 @@ var React = getWindow().React = {
  findDOMNode: function findDOMNode() {
  console.log("小程序不支持findDOMNode");
  },
- version: "1.5.10",
+ version: "1.6.0",
  render: render$1,
  hydrate: render$1,
  webview: webview,

diff --git a/packages/cli/lib/ReactH5.js b/packages/cli/lib/ReactH5.js
@@ -1,5 +1,5 @@
 /**
- * 运行于webview的React by 司徒正美 Copyright 2019-10-09T07
+ * 运行于webview的React by 司徒正美 Copyright 2019-10-11T06
  * IE9+
  */
 
@@ -5549,7 +5549,7 @@
  var MAX_PAGE_STACK_NUM = 10;
  var React$2 = getWindow().React = {
  findDOMNode: findDOMNode,
- version: '1.5.10',
+ version: '1.6.0',
  render: render$2,
  hydrate: render$2,
  Fragment: Fragment,

diff --git a/packages/cli/lib/ReactQuick.js b/packages/cli/lib/ReactQuick.js
@@ -1,5 +1,5 @@
 /**
- * 运行于快应用的React by 司徒正美 Copyright 2019-10-09
+ * 运行于快应用的React by 司徒正美 Copyright 2019-10-11
  */
 
 var arrayPush = Array.prototype.push;
@@ -3566,7 +3566,7 @@ var React = getWindow().React = {
  findDOMNode: function findDOMNode() {
  console.log("小程序不支持findDOMNode");
  },
- version: "1.5.10",
+ version: "1.6.0",
  render: render$1,
  hydrate: render$1,
  Fragment: Fragment,

diff --git a/packages/cli/lib/ReactWX.js b/packages/cli/lib/ReactWX.js
@@ -1,5 +1,5 @@
 /**
- * 运行于微信小程序的React by 司徒正美 Copyright 2019-10-09T07
+ * 运行于微信小程序的React by 司徒正美 Copyright 2019-10-11T06
  * IE9+
  */
 

diff --git a/packages/cli/test/ReactWX.js b/packages/cli/test/ReactWX.js
@@ -1,5 +1,5 @@
 /**
- * 运行于微信小程序的React by 司徒正美 Copyright 2019-10-09T07
+ * 运行于微信小程序的React by 司徒正美 Copyright 2019-10-11T06
  * IE9+
  */