Skip to content

Commit 258dc53

Browse files
vmorozvmoroz
authored
ABI-safe Hermes API and new JSI for Node-API (#11696) (#11755)
1 parent 693e578 commit 258dc53

File tree

55 files changed

+1306
-3309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1306
-3309
lines changed

‎change/@react-native-windows-telemetry-343bcdb6-ead2-4194-a725-5aed956a2a3d.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "ABI-safe Hermes API and new JSI for Node-API",
4+
"packageName": "@react-native-windows/telemetry",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/react-native-windows-678aa7bc-d4ce-4928-8309-19c406957fb5.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "ABI-safe Hermes API and new JSI for Node-API",
4+
"packageName": "react-native-windows",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎packages/@react-native-windows/telemetry/src/test/projects/UsesPackagesConfig/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Microsoft.Windows.CppWinRT" version="2.0.210312.4" targetFramework="native"/>
44
<package id="Microsoft.UI.Xaml" version="2.6.0" targetFramework="native"/>
5-
<package id="ReactNative.Hermes.Windows" version="0.0.0-2302.1002-2d4bf1df" targetFramework="native"/>
5+
<package id="Microsoft.JavaScript.Hermes" version="0.1.15" targetFramework="native"/>
66
</packages>

‎packages/e2e-test-app/windows/RNTesterApp/packages.lock.json‎

Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
"type": "Direct",
1919
"requested": "[2.8.0, )",
2020
"resolved": "2.8.0",
21-
"contentHash": "dB4im13tfmMgL/V3Ei+3kD2rUF+/lTxAmR4gjJ45l577eljHfdo/KUrxpq/3I1Vp6e5GCDG1evDaEGuDxypLMg=="
21+
"contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==",
22+
"dependencies": {
23+
"Microsoft.Web.WebView2": "1.0.1264.42"
24+
}
2225
},
2326
"XamlTreeDump": {
2427
"type": "Direct",
@@ -31,6 +34,16 @@
3134
"resolved": "1.76.0",
3235
"contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
3336
},
37+
"CDebug": {
38+
"type": "Transitive",
39+
"resolved": "0.0.3",
40+
"contentHash": "C6pojNJ2rdJuOdhe0xhJ/FedNLRJkpCVLEEHsfgoU5d5kkOOVKK+7xlGWYgttB51nDB5dLDu/O8j03jSxu81oA=="
41+
},
42+
"Microsoft.JavaScript.Hermes": {
43+
"type": "Transitive",
44+
"resolved": "0.1.15",
45+
"contentHash": "My/u5RvxoymtwWokoweU6iVpuP79w271UjadcmSNqnQ9ESIv00tlVP4sHnIiN3t2lJNDeciyE1EVF4swGPECKQ=="
46+
},
3447
"Microsoft.Net.Native.Compiler": {
3548
"type": "Transitive",
3649
"resolved": "2.2.7-rel-27913-00",
@@ -57,6 +70,11 @@
5770
"resolved": "2.1.0",
5871
"contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA=="
5972
},
73+
"Microsoft.Web.WebView2": {
74+
"type": "Transitive",
75+
"resolved": "1.0.1264.42",
76+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
77+
},
6078
"Microsoft.Windows.SDK.BuildTools": {
6179
"type": "Transitive",
6280
"resolved": "10.0.22000.194",
@@ -70,11 +88,6 @@
7088
"Microsoft.NETCore.Platforms": "1.1.0"
7189
}
7290
},
73-
"ReactNative.Hermes.Windows": {
74-
"type": "Transitive",
75-
"resolved": "0.0.0-2302.1001-19052299",
76-
"contentHash": "b6GLQSLaffgxAXwoTrxfj73W5cxlPxmNlQoVmyAnucXPCwV7HiL0rZsqGpBf+r2rdubUS35patY/c+8RiBR4+Q=="
77-
},
7891
"runtime.win10-arm.Microsoft.Net.Native.Compiler": {
7992
"type": "Transitive",
8093
"resolved": "2.2.7-rel-27913-00",
@@ -167,10 +180,10 @@
167180
"dependencies": {
168181
"Common": "[1.0.0, )",
169182
"Folly": "[1.0.0, )",
183+
"Microsoft.JavaScript.Hermes": "[0.1.15, )",
170184
"Microsoft.UI.Xaml": "[2.8.0, )",
171185
"Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )",
172186
"ReactCommon": "[1.0.0, )",
173-
"ReactNative.Hermes.Windows": "[0.0.0-2302.1001-19052299, )",
174187
"boost": "[1.76.0, )"
175188
}
176189
},
@@ -198,6 +211,7 @@
198211
"reactnativexaml": {
199212
"type": "Project",
200213
"dependencies": {
214+
"CDebug": "[0.0.3, )",
201215
"Microsoft.ReactNative": "[1.0.0, )",
202216
"Microsoft.UI.Xaml": "[2.8.0, )"
203217
}
@@ -217,6 +231,11 @@
217231
"runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9"
218232
}
219233
},
234+
"Microsoft.Web.WebView2": {
235+
"type": "Transitive",
236+
"resolved": "1.0.1264.42",
237+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
238+
},
220239
"runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": {
221240
"type": "Transitive",
222241
"resolved": "6.2.9",
@@ -237,6 +256,11 @@
237256
"runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9"
238257
}
239258
},
259+
"Microsoft.Web.WebView2": {
260+
"type": "Transitive",
261+
"resolved": "1.0.1264.42",
262+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
263+
},
240264
"runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": {
241265
"type": "Transitive",
242266
"resolved": "6.2.9",
@@ -257,6 +281,11 @@
257281
"runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9"
258282
}
259283
},
284+
"Microsoft.Web.WebView2": {
285+
"type": "Transitive",
286+
"resolved": "1.0.1264.42",
287+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
288+
},
260289
"runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": {
261290
"type": "Transitive",
262291
"resolved": "6.2.9",
@@ -277,6 +306,11 @@
277306
"runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9"
278307
}
279308
},
309+
"Microsoft.Web.WebView2": {
310+
"type": "Transitive",
311+
"resolved": "1.0.1264.42",
312+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
313+
},
280314
"runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": {
281315
"type": "Transitive",
282316
"resolved": "6.2.9",
@@ -297,6 +331,11 @@
297331
"runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9"
298332
}
299333
},
334+
"Microsoft.Web.WebView2": {
335+
"type": "Transitive",
336+
"resolved": "1.0.1264.42",
337+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
338+
},
300339
"runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": {
301340
"type": "Transitive",
302341
"resolved": "6.2.9",
@@ -317,6 +356,11 @@
317356
"runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9"
318357
}
319358
},
359+
"Microsoft.Web.WebView2": {
360+
"type": "Transitive",
361+
"resolved": "1.0.1264.42",
362+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
363+
},
320364
"runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": {
321365
"type": "Transitive",
322366
"resolved": "6.2.9",
@@ -337,6 +381,11 @@
337381
"runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9"
338382
}
339383
},
384+
"Microsoft.Web.WebView2": {
385+
"type": "Transitive",
386+
"resolved": "1.0.1264.42",
387+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
388+
},
340389
"runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": {
341390
"type": "Transitive",
342391
"resolved": "6.2.9",

‎packages/integration-test-app/windows/InteropTestModuleCS/packages.lock.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
"resolved": "1.76.0",
2020
"contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
2121
},
22+
"Microsoft.JavaScript.Hermes": {
23+
"type": "Transitive",
24+
"resolved": "0.1.14",
25+
"contentHash": "YhW4fHxZ+ZIt3eZbFiMxhBzkZPISudZx9rEX+4RlB5EZWzpaKUAqfSUQJcapqdPXa4bw4dla9q9THyUqveBBRA=="
26+
},
2227
"Microsoft.Net.Native.Compiler": {
2328
"type": "Transitive",
2429
"resolved": "2.2.7-rel-27913-00",
@@ -71,11 +76,6 @@
7176
"Microsoft.NETCore.Platforms": "1.1.0"
7277
}
7378
},
74-
"ReactNative.Hermes.Windows": {
75-
"type": "Transitive",
76-
"resolved": "0.0.0-2302.1002-2d4bf1df",
77-
"contentHash": "4skpllUPEBkww7FN7iacP7NWrZlEGDNg83qIuFjKn4Sl8JpJQZqfUTrXcvh6tb4mHXkmwFoKhLw4Rc5Op7f+8w=="
78-
},
7979
"runtime.win10-arm.Microsoft.Net.Native.Compiler": {
8080
"type": "Transitive",
8181
"resolved": "2.2.7-rel-27913-00",
@@ -161,10 +161,10 @@
161161
"dependencies": {
162162
"Common": "[1.0.0, )",
163163
"Folly": "[1.0.0, )",
164+
"Microsoft.JavaScript.Hermes": "[0.1.14, )",
164165
"Microsoft.UI.Xaml": "[2.8.0, )",
165166
"Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )",
166167
"ReactCommon": "[1.0.0, )",
167-
"ReactNative.Hermes.Windows": "[0.0.0-2302.1002-2d4bf1df, )",
168168
"boost": "[1.76.0, )"
169169
}
170170
},

‎packages/playground/windows/playground-composition/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
<package id="Microsoft.UI.Xaml" version="2.7.0-prerelease.210913003" targetFramework="native"/>
1010
<package id="Microsoft.VCRTForwarders.140" version="1.0.2-rc" targetFramework="native"/>
1111
<package id="Microsoft.Windows.CppWinRT" version="2.0.210312.4" targetFramework="native"/>
12-
<package id="ReactNative.Hermes.Windows" version="0.0.0-2302.1002-2d4bf1df" targetFramework="native"/>
12+
<package id="Microsoft.JavaScript.Hermes" version="0.1.15" targetFramework="native"/>
1313
</packages>

‎packages/playground/windows/playground-win32/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
<package id="Microsoft.UI.Xaml" version="2.7.0-prerelease.210913003" targetFramework="native"/>
1010
<package id="Microsoft.VCRTForwarders.140" version="1.0.2-rc" targetFramework="native"/>
1111
<package id="Microsoft.Windows.CppWinRT" version="2.0.210312.4" targetFramework="native"/>
12-
<package id="ReactNative.Hermes.Windows" version="0.0.0-2302.1002-2d4bf1df" targetFramework="native"/>
12+
<package id="Microsoft.JavaScript.Hermes" version="0.1.15" targetFramework="native"/>
1313
</packages>

‎packages/playground/windows/playground/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<package id="Microsoft.Windows.CppWinRT" version="2.0.210312.4" targetFramework="native"/>
44
<package id="Microsoft.UI.Xaml" version="2.8.0" targetFramework="native"/>
55
<package id="Microsoft.WinUI" version="3.0.0-preview4.210210.4" targetFramework="native"/>
6-
<package id="ReactNative.Hermes.Windows" version="0.0.0-2302.1002-2d4bf1df" targetFramework="native"/>
6+
<package id="Microsoft.JavaScript.Hermes" version="0.1.15" targetFramework="native"/>
77
</packages>

‎packages/sample-apps/windows/SampleAppCS/packages.lock.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
"resolved": "1.76.0",
2929
"contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
3030
},
31+
"Microsoft.JavaScript.Hermes": {
32+
"type": "Transitive",
33+
"resolved": "0.1.13",
34+
"contentHash": "dzqFCHeC0V4WYNFDWR4eFOVXXMpVUhrTPpuAR5QDyQL8MlvvVQIbBdqeh3GZYgsqwfzfMcgTC/OAGVYbutKE6w=="
35+
},
3136
"Microsoft.Net.Native.Compiler": {
3237
"type": "Transitive",
3338
"resolved": "2.2.7-rel-27913-00",
@@ -52,7 +57,7 @@
5257
"Microsoft.NETCore.Platforms": {
5358
"type": "Transitive",
5459
"resolved": "2.1.0",
55-
"contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ=="
60+
"contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA=="
5661
},
5762
"Microsoft.Web.WebView2": {
5863
"type": "Transitive",
@@ -67,16 +72,11 @@
6772
"NETStandard.Library": {
6873
"type": "Transitive",
6974
"resolved": "2.0.3",
70-
"contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==",
75+
"contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
7176
"dependencies": {
7277
"Microsoft.NETCore.Platforms": "1.1.0"
7378
}
7479
},
75-
"ReactNative.Hermes.Windows": {
76-
"type": "Transitive",
77-
"resolved": "0.0.0-2302.1002-2d4bf1df",
78-
"contentHash": "4skpllUPEBkww7FN7iacP7NWrZlEGDNg83qIuFjKn4Sl8JpJQZqfUTrXcvh6tb4mHXkmwFoKhLw4Rc5Op7f+8w=="
79-
},
8080
"runtime.win10-arm.Microsoft.Net.Native.Compiler": {
8181
"type": "Transitive",
8282
"resolved": "2.2.7-rel-27913-00",
@@ -162,10 +162,10 @@
162162
"dependencies": {
163163
"Common": "[1.0.0, )",
164164
"Folly": "[1.0.0, )",
165+
"Microsoft.JavaScript.Hermes": "[0.1.13, )",
165166
"Microsoft.UI.Xaml": "[2.8.0, )",
166167
"Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )",
167168
"ReactCommon": "[1.0.0, )",
168-
"ReactNative.Hermes.Windows": "[0.0.0-2302.1002-2d4bf1df, )",
169169
"boost": "[1.76.0, )"
170170
}
171171
},

‎packages/sample-apps/windows/SampleLibraryCS/packages.lock.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
"resolved": "1.76.0",
2020
"contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
2121
},
22+
"Microsoft.JavaScript.Hermes": {
23+
"type": "Transitive",
24+
"resolved": "0.1.13",
25+
"contentHash": "dzqFCHeC0V4WYNFDWR4eFOVXXMpVUhrTPpuAR5QDyQL8MlvvVQIbBdqeh3GZYgsqwfzfMcgTC/OAGVYbutKE6w=="
26+
},
2227
"Microsoft.Net.Native.Compiler": {
2328
"type": "Transitive",
2429
"resolved": "2.2.7-rel-27913-00",
@@ -43,7 +48,7 @@
4348
"Microsoft.NETCore.Platforms": {
4449
"type": "Transitive",
4550
"resolved": "2.1.0",
46-
"contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ=="
51+
"contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA=="
4752
},
4853
"Microsoft.UI.Xaml": {
4954
"type": "Transitive",
@@ -66,16 +71,11 @@
6671
"NETStandard.Library": {
6772
"type": "Transitive",
6873
"resolved": "2.0.3",
69-
"contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==",
74+
"contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
7075
"dependencies": {
7176
"Microsoft.NETCore.Platforms": "1.1.0"
7277
}
7378
},
74-
"ReactNative.Hermes.Windows": {
75-
"type": "Transitive",
76-
"resolved": "0.0.0-2302.1002-2d4bf1df",
77-
"contentHash": "4skpllUPEBkww7FN7iacP7NWrZlEGDNg83qIuFjKn4Sl8JpJQZqfUTrXcvh6tb4mHXkmwFoKhLw4Rc5Op7f+8w=="
78-
},
7979
"runtime.win10-arm.Microsoft.Net.Native.Compiler": {
8080
"type": "Transitive",
8181
"resolved": "2.2.7-rel-27913-00",
@@ -161,10 +161,10 @@
161161
"dependencies": {
162162
"Common": "[1.0.0, )",
163163
"Folly": "[1.0.0, )",
164+
"Microsoft.JavaScript.Hermes": "[0.1.13, )",
164165
"Microsoft.UI.Xaml": "[2.8.0, )",
165166
"Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )",
166167
"ReactCommon": "[1.0.0, )",
167-
"ReactNative.Hermes.Windows": "[0.0.0-2302.1002-2d4bf1df, )",
168168
"boost": "[1.76.0, )"
169169
}
170170
},

0 commit comments

Comments
 (0)