@lynx-js/react 0.114.1 → 0.114.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @lynx-js/react
 
+## 0.114.3
+
+### Patch Changes
+
+- Initialize `ctxNotFoundEventListener` before each test in testing library ([#1888](https://github.com/lynx-family/lynx-stack/pull/1888))
+
+- fix: main thread functions created during the initial render cannot correctly modify `MainThreadRef`s after hydration ([#1884](https://github.com/lynx-family/lynx-stack/pull/1884))
+
+## 0.114.2
+
+### Patch Changes
+
+- fix: main thread functions created during the initial render cannot correctly call `runOnBackground()` after hydration ([#1878](https://github.com/lynx-family/lynx-stack/pull/1878))
+
 ## 0.114.1
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lynx-js/react",
-  "version": "0.114.1",
+  "version": "0.114.3",
   "description": "ReactLynx is a framework for developing Lynx applications with familiar React.",
   "repository": {
     "type": "git",
@@ -176,7 +176,7 @@
   "devDependencies": {
     "@lynx-js/types": "3.4.11",
     "@microsoft/api-extractor": "7.52.15",
-    "@types/react": "^18.3.24"
+    "@types/react": "^18.3.25"
   },
   "peerDependencies": {
     "@lynx-js/types": "*",

package/refresh/.turbo/turbo-build.log

@@ -8,5 +8,5 @@ info    build started...
 ready   built in 0.14 s
 
 File (esm)      Size      
-dist/index.js   11.1 kB
+dist/index.js   10.1 kB
 

package/refresh/dist/index.js

@@ -1,29 +1,18 @@
 import { Component, options } from "@lynx-js/react/internal";
-const VNODE_COMPONENT = '__c';
 const NAMESPACE = '__PREFRESH__';
-const COMPONENT_HOOKS = '__H';
-const HOOKS_LIST = '__';
-const EFFECTS_LIST = '__h';
-const RERENDER_COUNT = '__r';
-const CATCH_ERROR_OPTION = '__e';
-const COMPONENT_DIRTY = '__d';
-const COMPONENT_BITS = '__g';
-const HOOK_VALUE = '__';
-const HOOK_ARGS = '__H';
-const HOOK_CLEANUP = '__c';
 const COMPONENT_DIRTY_BIT = 8;
 const isDirty = (vnode)=>{
-    if (vnode[VNODE_COMPONENT] && vnode[VNODE_COMPONENT][COMPONENT_DIRTY]) return true;
-    if (vnode[VNODE_COMPONENT] && vnode[VNODE_COMPONENT][COMPONENT_BITS] & COMPONENT_DIRTY_BIT) return true;
+    if (vnode["__c"] && vnode["__c"]["__d"]) return true;
+    if (vnode["__c"] && vnode["__c"]["__g"] & COMPONENT_DIRTY_BIT) return true;
 };
 const unsetDirty = (vnode)=>{
-    if (vnode[VNODE_COMPONENT]) {
-        if (vnode[VNODE_COMPONENT][COMPONENT_DIRTY]) vnode[VNODE_COMPONENT][COMPONENT_DIRTY] = false;
-        if (vnode[VNODE_COMPONENT][COMPONENT_BITS]) vnode[VNODE_COMPONENT][COMPONENT_BITS] &= ~COMPONENT_DIRTY_BIT;
+    if (vnode["__c"]) {
+        if (vnode["__c"]["__d"]) vnode["__c"]["__d"] = false;
+        if (vnode["__c"]["__g"]) vnode["__c"]["__g"] &= ~COMPONENT_DIRTY_BIT;
     }
 };
-const oldCatchError = options[CATCH_ERROR_OPTION];
-options[CATCH_ERROR_OPTION] = (error, vnode, oldVNode, info)=>{
+const oldCatchError = options["__e"];
+options["__e"] = (error, vnode, oldVNode, info)=>{
     if (isDirty(vnode)) unsetDirty(vnode);
     if (oldCatchError) oldCatchError(error, vnode, oldVNode, info);
 };
@@ -33,7 +22,7 @@ options.debounceRendering = (process)=>{
         try {
             process();
         } catch (e) {
-            process[RERENDER_COUNT] = 0;
+            process["__r"] = 0;
             throw e;
         }
     });
@@ -68,7 +57,7 @@ options.vnode = (vnode)=>{
             ]);
         }
         vnode.type = foundType;
-        if (vnode[VNODE_COMPONENT] && 'prototype' in vnode.type && vnode.type.prototype.render) vnode[VNODE_COMPONENT].constructor = vnode.type;
+        if (vnode["__c"] && 'prototype' in vnode.type && vnode.type.prototype.render) vnode["__c"].constructor = vnode.type;
     }
     if (oldVnode) oldVnode(vnode);
 };
@@ -155,13 +144,13 @@ function replaceComponent(OldType, NewType, resetHookState) {
         }
         if (!vnode || !vnode.__c || !vnode.__c.__P) return;
         vnode.type = NewType;
-        if (vnode[VNODE_COMPONENT]) {
-            vnode[VNODE_COMPONENT].constructor = vnode.type;
+        if (vnode["__c"]) {
+            vnode["__c"].constructor = vnode.type;
             try {
-                if (vnode[VNODE_COMPONENT] instanceof OldType) {
-                    const oldInst = vnode[VNODE_COMPONENT];
-                    const newInst = new NewType(vnode[VNODE_COMPONENT].props, vnode[VNODE_COMPONENT].context);
-                    vnode[VNODE_COMPONENT] = newInst;
+                if (vnode["__c"] instanceof OldType) {
+                    const oldInst = vnode["__c"];
+                    const newInst = new NewType(vnode["__c"].props, vnode["__c"].context);
+                    vnode["__c"] = newInst;
                     for(let i in oldInst){
                         const type = typeof oldInst[i];
                         if (i in newInst) {
@@ -171,41 +160,41 @@ function replaceComponent(OldType, NewType, resetHookState) {
                     }
                 }
             } catch (e) {
-                vnode[VNODE_COMPONENT].constructor = NewType;
+                vnode["__c"].constructor = NewType;
             }
             if (resetHookState) {
-                if (vnode[VNODE_COMPONENT][COMPONENT_HOOKS] && vnode[VNODE_COMPONENT][COMPONENT_HOOKS][HOOKS_LIST] && vnode[VNODE_COMPONENT][COMPONENT_HOOKS][HOOKS_LIST].length) vnode[VNODE_COMPONENT][COMPONENT_HOOKS][HOOKS_LIST].forEach((possibleEffect)=>{
-                    if (possibleEffect[HOOK_CLEANUP] && 'function' == typeof possibleEffect[HOOK_CLEANUP]) {
-                        possibleEffect[HOOK_CLEANUP]();
-                        possibleEffect[HOOK_CLEANUP] = void 0;
-                    } else if (possibleEffect[HOOK_ARGS] && possibleEffect[HOOK_VALUE] && 3 === Object.keys(possibleEffect).length) {
-                        const cleanupKey = Object.keys(possibleEffect).find((key)=>key !== HOOK_ARGS && key !== HOOK_VALUE);
+                if (vnode["__c"]["__H"] && vnode["__c"]["__H"]["__"] && vnode["__c"]["__H"]["__"].length) vnode["__c"]["__H"]["__"].forEach((possibleEffect)=>{
+                    if (possibleEffect["__c"] && 'function' == typeof possibleEffect["__c"]) {
+                        possibleEffect["__c"]();
+                        possibleEffect["__c"] = void 0;
+                    } else if (possibleEffect["__H"] && possibleEffect["__"] && 3 === Object.keys(possibleEffect).length) {
+                        const cleanupKey = Object.keys(possibleEffect).find((key)=>"__H" !== key && "__" !== key);
                         if (cleanupKey && 'function' == typeof possibleEffect[cleanupKey]) {
                             possibleEffect[cleanupKey]();
                             possibleEffect[cleanupKey] = void 0;
                         }
                     }
                 });
-                vnode[VNODE_COMPONENT][COMPONENT_HOOKS] = {
-                    [HOOKS_LIST]: [],
-                    [EFFECTS_LIST]: []
+                vnode["__c"]["__H"] = {
+                    ["__"]: [],
+                    ["__h"]: []
                 };
-            } else if (vnode[VNODE_COMPONENT][COMPONENT_HOOKS] && vnode[VNODE_COMPONENT][COMPONENT_HOOKS][HOOKS_LIST] && vnode[VNODE_COMPONENT][COMPONENT_HOOKS][HOOKS_LIST].length) {
-                vnode[VNODE_COMPONENT][COMPONENT_HOOKS][HOOKS_LIST].forEach((possibleEffect)=>{
-                    if (possibleEffect[HOOK_CLEANUP] && 'function' == typeof possibleEffect[HOOK_CLEANUP]) {
-                        possibleEffect[HOOK_CLEANUP]();
-                        possibleEffect[HOOK_CLEANUP] = void 0;
-                    } else if (possibleEffect[HOOK_ARGS] && possibleEffect[HOOK_VALUE] && 3 === Object.keys(possibleEffect).length) {
-                        const cleanupKey = Object.keys(possibleEffect).find((key)=>key !== HOOK_ARGS && key !== HOOK_VALUE);
+            } else if (vnode["__c"]["__H"] && vnode["__c"]["__H"]["__"] && vnode["__c"]["__H"]["__"].length) {
+                vnode["__c"]["__H"]["__"].forEach((possibleEffect)=>{
+                    if (possibleEffect["__c"] && 'function' == typeof possibleEffect["__c"]) {
+                        possibleEffect["__c"]();
+                        possibleEffect["__c"] = void 0;
+                    } else if (possibleEffect["__H"] && possibleEffect["__"] && 3 === Object.keys(possibleEffect).length) {
+                        const cleanupKey = Object.keys(possibleEffect).find((key)=>"__H" !== key && "__" !== key);
                         if (cleanupKey && 'function' == typeof possibleEffect[cleanupKey]) possibleEffect[cleanupKey]();
                         possibleEffect[cleanupKey] = void 0;
                     }
                 });
-                vnode[VNODE_COMPONENT][COMPONENT_HOOKS][HOOKS_LIST].forEach((hook)=>{
+                vnode["__c"]["__H"]["__"].forEach((hook)=>{
                     if (hook.__H && Array.isArray(hook.__H)) hook.__H = void 0;
                 });
             }
-            Component.prototype.forceUpdate.call(vnode[VNODE_COMPONENT]);
+            Component.prototype.forceUpdate.call(vnode["__c"]);
         }
     });
 }

package/testing-library/dist/index.d.ts

@@ -970,8 +970,6 @@ export declare class LynxTestingEnv {
     injectGlobals(): void;
     switchToBackgroundThread(): void;
     switchToMainThread(): void;
-    // we do not use it because we have to keep background thread
-    // otherwise we will get error on __MAIN_THREAD__/__BACKGROUND__/lynx not defined etc.
     clearGlobal(): void;
     reset(): void;
 }

package/testing-library/dist/vitest-global-setup.js

@@ -7,6 +7,7 @@ import { injectUpdateMainThread } from "../../runtime/lib/lifecycle/patch/update
 import { injectUpdateMTRefInitValue } from "../../runtime/lib/worklet/ref/updateInitValue.js";
 import { injectCalledByNative } from "../../runtime/lib/lynx/calledByNative.js";
 import { flushDelayedLifecycleEvents, injectTt } from "../../runtime/lib/lynx/tt.js";
+import { addCtxNotFoundEventListener } from "../../runtime/lib/lifecycle/patch/error.js";
 import { setRoot } from "../../runtime/lib/root.js";
 import { SnapshotInstance, backgroundSnapshotInstanceManager, snapshotInstanceManager } from "../../runtime/lib/snapshot.js";
 import { destroyWorklet } from "../../runtime/lib/worklet/destroy.js";
@@ -98,10 +99,6 @@ globalThis.onInjectBackgroundThreadGlobals = (target)=>{
     }
     target._document = setupBackgroundDocument({});
     target.globalPipelineOptions = void 0;
-    const oldLynxCoreInject = globalThis.lynxCoreInject;
-    globalThis.lynxCoreInject = target.lynxCoreInject;
-    injectTt();
-    globalThis.lynxCoreInject = oldLynxCoreInject;
     target.lynx.requireModuleAsync = async (url, callback)=>{
         try {
             callback(null, await __vite_ssr_dynamic_import__(url));
@@ -119,6 +116,8 @@ globalThis.onResetLynxTestingEnv = ()=>{
     lynxTestingEnv.switchToMainThread();
     initEventListeners();
     lynxTestingEnv.switchToBackgroundThread();
+    injectTt();
+    addCtxNotFoundEventListener();
 };
 globalThis.onSwitchedToMainThread = ()=>{
     if (onSwitchedToMainThread) onSwitchedToMainThread();