Merge branch 'remaxToNanachi'

qunarcorp · Jan 23, 2024 · 47646c3 · 47646c3
2 parents 19c410f + 96c6265
commit 47646c3
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 20 deletions.
diff --git a/dist/ReactAli.js b/dist/ReactAli.js
@@ -1,5 +1,5 @@
 /**
- * 运行于支付宝小程序的React by 司徒正美 Copyright 2024-01-11
+ * 运行于支付宝小程序的React by 司徒正美 Copyright 2024-01-19
  */
 
 var arrayPush = Array.prototype.push;
@@ -1954,9 +1954,10 @@ function workLoop(deadline) {
             info = fiber.return;
         } else {
             var dom = getContainer(fiber);
+            var __unmaskedContext = fiber && fiber.stateNode && fiber.stateNode.__unmaskedContext || {};
             info = {
                 containerStack: [dom],
-                contextStack: [fiber.stateNode.__unmaskedContext]
+                contextStack: [__unmaskedContext]
             };
         }
         reconcileDFS(fiber, info, deadline, ENOUGH_TIME);

diff --git a/dist/ReactBu.js b/dist/ReactBu.js
@@ -1,5 +1,5 @@
 /**
- * 运行于支付宝小程序的React by 司徒正美 Copyright 2024-01-11
+ * 运行于支付宝小程序的React by 司徒正美 Copyright 2024-01-19
  */
 
 var arrayPush = Array.prototype.push;
@@ -1960,9 +1960,10 @@ function workLoop(deadline) {
             info = fiber.return;
         } else {
             var dom = getContainer(fiber);
+            var __unmaskedContext = fiber && fiber.stateNode && fiber.stateNode.__unmaskedContext || {};
             info = {
                 containerStack: [dom],
-                contextStack: [fiber.stateNode.__unmaskedContext]
+                contextStack: [__unmaskedContext]
             };
         }
         reconcileDFS(fiber, info, deadline, ENOUGH_TIME);

diff --git a/dist/ReactQuick.js b/dist/ReactQuick.js
@@ -1,5 +1,5 @@
 /**
- * 运行于快应用的React by 司徒正美 Copyright 2024-01-11
+ * 运行于快应用的React by 司徒正美 Copyright 2024-01-19
  */
 
 var arrayPush = Array.prototype.push;
@@ -3112,9 +3112,10 @@ function workLoop(deadline) {
             info = fiber.return;
         } else {
             var dom = getContainer(fiber);
+            var __unmaskedContext = fiber && fiber.stateNode && fiber.stateNode.__unmaskedContext || {};
             info = {
                 containerStack: [dom],
-                contextStack: [fiber.stateNode.__unmaskedContext]
+                contextStack: [__unmaskedContext]
             };
         }
         reconcileDFS(fiber, info, deadline, ENOUGH_TIME);

diff --git a/dist/ReactWX.js b/dist/ReactWX.js
@@ -1,5 +1,5 @@
 /**
- * 运行于微信小程序的React by 司徒正美 Copyright 2024-01-11T10
+ * 运行于微信小程序的React by 司徒正美 Copyright 2024-01-19T11
  * IE9+
  */
 
@@ -2288,9 +2288,10 @@ function workLoop(deadline) {
             info = fiber.return;
         } else {
             var dom = getContainer(fiber);
+            var __unmaskedContext = fiber && fiber.stateNode && fiber.stateNode.__unmaskedContext || {};
             info = {
                 containerStack: [dom],
-                contextStack: [fiber.stateNode.__unmaskedContext]
+                contextStack: [__unmaskedContext]
             };
         }
         reconcileDFS(fiber, info, deadline, ENOUGH_TIME);

diff --git a/packages/cli/lib/ReactAli.js b/packages/cli/lib/ReactAli.js
@@ -1,5 +1,5 @@
 /**
- * 运行于支付宝小程序的React by 司徒正美 Copyright 2024-01-11
+ * 运行于支付宝小程序的React by 司徒正美 Copyright 2024-01-19
  */
 
 var arrayPush = Array.prototype.push;
@@ -1958,9 +1958,10 @@ function workLoop(deadline) {
             info = fiber.return;
         } else {
             var dom = getContainer(fiber);
+            var __unmaskedContext = fiber && fiber.stateNode && fiber.stateNode.__unmaskedContext || {};
             info = {
                 containerStack: [dom],
-                contextStack: [fiber.stateNode.__unmaskedContext]
+                contextStack: [__unmaskedContext]
             };
         }
         reconcileDFS(fiber, info, deadline, ENOUGH_TIME);

diff --git a/packages/cli/lib/ReactBu.js b/packages/cli/lib/ReactBu.js
@@ -1,5 +1,5 @@
 /**
- * 运行于支付宝小程序的React by 司徒正美 Copyright 2024-01-11
+ * 运行于支付宝小程序的React by 司徒正美 Copyright 2024-01-19
  */
 
 var arrayPush = Array.prototype.push;
@@ -1964,9 +1964,10 @@ function workLoop(deadline) {
             info = fiber.return;
         } else {
             var dom = getContainer(fiber);
+            var __unmaskedContext = fiber && fiber.stateNode && fiber.stateNode.__unmaskedContext || {};
             info = {
                 containerStack: [dom],
-                contextStack: [fiber.stateNode.__unmaskedContext]
+                contextStack: [__unmaskedContext]
             };
         }
         reconcileDFS(fiber, info, deadline, ENOUGH_TIME);

diff --git a/packages/cli/lib/ReactQuick.js b/packages/cli/lib/ReactQuick.js
@@ -1,5 +1,5 @@
 /**
- * 运行于快应用的React by 司徒正美 Copyright 2024-01-11
+ * 运行于快应用的React by 司徒正美 Copyright 2024-01-19
  */
 
 var arrayPush = Array.prototype.push;
@@ -3112,9 +3112,10 @@ function workLoop(deadline) {
             info = fiber.return;
         } else {
             var dom = getContainer(fiber);
+            var __unmaskedContext = fiber && fiber.stateNode && fiber.stateNode.__unmaskedContext || {};
             info = {
                 containerStack: [dom],
-                contextStack: [fiber.stateNode.__unmaskedContext]
+                contextStack: [__unmaskedContext]
             };
         }
         reconcileDFS(fiber, info, deadline, ENOUGH_TIME);

diff --git a/packages/cli/lib/ReactWX.js b/packages/cli/lib/ReactWX.js
@@ -1,5 +1,5 @@
 /**
- * 运行于微信小程序的React by 司徒正美 Copyright 2024-01-11T10
+ * 运行于微信小程序的React by 司徒正美 Copyright 2024-01-19T11
  * IE9+
  */
 
@@ -2288,9 +2288,10 @@ function workLoop(deadline) {
             info = fiber.return;
         } else {
             var dom = getContainer(fiber);
+            var __unmaskedContext = fiber && fiber.stateNode && fiber.stateNode.__unmaskedContext || {};
             info = {
                 containerStack: [dom],
-                contextStack: [fiber.stateNode.__unmaskedContext]
+                contextStack: [__unmaskedContext]
             };
         }
         reconcileDFS(fiber, info, deadline, ENOUGH_TIME);

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nanachi-cli",
-  "version": "1.8.30",
+  "version": "1.8.31",
   "description": "cli tool for nanachi",
   "bin": {
     "nanachi": "./bin/index.js"

diff --git a/packages/cli/test/ReactWX.js b/packages/cli/test/ReactWX.js
@@ -1,5 +1,5 @@
 /**
- * 运行于微信小程序的React by 司徒正美 Copyright 2024-01-11T10
+ * 运行于微信小程序的React by 司徒正美 Copyright 2024-01-19T11
  * IE9+
  */
 
@@ -2290,9 +2290,10 @@ function workLoop(deadline) {
             info = fiber.return;
         } else {
             var dom = getContainer(fiber);
+            var __unmaskedContext = fiber && fiber.stateNode && fiber.stateNode.__unmaskedContext || {};
             info = {
                 containerStack: [dom],
-                contextStack: [fiber.stateNode.__unmaskedContext]
+                contextStack: [__unmaskedContext]
             };
         }
         reconcileDFS(fiber, info, deadline, ENOUGH_TIME);

diff --git a/packages/fiber/scheduleWork.js b/packages/fiber/scheduleWork.js
@@ -133,9 +133,11 @@ function workLoop(deadline) {
             info = fiber.return;
         } else {
             let dom = getContainer(fiber);
+            // 考虑到有可能页面还没有完全实例化，用户就退出页面的情况。就会报错。
+            const __unmaskedContext = fiber && fiber.stateNode && fiber.stateNode.__unmaskedContext || {};
             info = {
                 containerStack: [dom],
-                contextStack: [fiber.stateNode.__unmaskedContext]
+                contextStack: [__unmaskedContext]
             };
         }