Skip to content

feat(windows): add New Architecture support #1147

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.

Sign up for GitHub

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

Merged
merged 48 commits into from
Nov 8, 2024
Merged

feat(windows): add New Architecture support #1147

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
b3739e6
upgrade to work on 0.74
Yajur-Grover Jul 23, 2024
73e701f
codegen config changes
Yajur-Grover Jul 24, 2024
b231d74
changes from codegen-windows
Yajur-Grover Jul 24, 2024
7967f29
rename example to sample and run the cpp-lib template
Yajur-Grover Jul 25, 2024
7e5116e
add method stubs for turbomodule
Yajur-Grover Aug 7, 2024
beb94d5
fix where codegen runs
Yajur-Grover Aug 12, 2024
10b538b
bump RNTA and fix package.json
Yajur-Grover Aug 14, 2024
36a9635
fix project to include correct module code
Yajur-Grover Aug 14, 2024
f289477
revert sample back to example
Yajur-Grover Aug 15, 2024
50e5255
register turbomodules and fix config issues
Yajur-Grover Aug 22, 2024
66c9429
re-add paper dependencies
Yajur-Grover Sep 23, 2024
b01454d
fix pch.h and untrack ExperimentalFeatures.props
Yajur-Grover Sep 24, 2024
1ea1df7
remove unused asyncstorage files
Yajur-Grover Sep 24, 2024
015b4ab
remove unused testapp directories
Yajur-Grover Sep 25, 2024
6f1d52f
revert some changes
Yajur-Grover Sep 27, 2024
5e055bc
revert according to feedback
Yajur-Grover Sep 27, 2024
a794eb1
delete more unused files
Yajur-Grover Sep 27, 2024
f1fc1d4
address comments
Yajur-Grover Sep 27, 2024
8387705
fix packageprovider
Yajur-Grover Sep 27, 2024
123b3fd
fix turbomodule usage
Yajur-Grover Sep 27, 2024
8dade8c
fix typos
Yajur-Grover Oct 9, 2024
8acb3b0
revert changes
Yajur-Grover Oct 9, 2024
e50e5e1
revert some changes
Yajur-Grover Oct 9, 2024
be17698
remove default-storage/windows/packages/*
Yajur-Grover Oct 9, 2024
3782d55
revert gradlew
Yajur-Grover Oct 9, 2024
539a4c1
revert bad ios change
Yajur-Grover Oct 9, 2024
00913a6
revert bad macos change
Yajur-Grover Oct 9, 2024
e49a0ef
revert yarn.lock
Yajur-Grover Oct 9, 2024
35b24a1
remove resource.h and ReactNativeAsyncStorage.rc
Yajur-Grover Oct 9, 2024
452ed6f
remove unnecessary dependencies
Yajur-Grover Oct 10, 2024
dabd92a
address feedback
Yajur-Grover Oct 10, 2024
66e0c92
run yarn format
Yajur-Grover Oct 10, 2024
ad9ce4d
remove unused imports
Yajur-Grover Oct 10, 2024
456d9fa
revert packageprovider.h
Yajur-Grover Oct 10, 2024
b6bfb3b
update WindowsSDK versions
Yajur-Grover Oct 10, 2024
b9f2e55
test updated yarn.lock
Yajur-Grover Oct 11, 2024
dd5b0fb
change call to asyncstoragetestsupport
Yajur-Grover Oct 14, 2024
eef71c1
test props and targets import changes
Yajur-Grover Oct 16, 2024
ce96c4b
import props
Yajur-Grover Oct 16, 2024
ee87b26
set rnw to 0.75.5 min and fix vcxproj
Yajur-Grover Oct 16, 2024
f79f198
update AsyncStorageTestSupport declaration
Yajur-Grover Oct 16, 2024
ef227e7
remove unused packageproviders
Yajur-Grover Oct 16, 2024
a1d931c
update props and targets files checks
Yajur-Grover Oct 16, 2024
9bc5354
apply changes from feedback
Yajur-Grover Oct 21, 2024
67526ce
fix formatting
Yajur-Grover Oct 21, 2024
c3c8874
update tests
Yajur-Grover Oct 22, 2024
8099d49
format
Yajur-Grover Oct 22, 2024
dd1dbac
fix error conditions
Yajur-Grover Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions packages/default-storage/windows/ReactNativeAsyncStorage/ReactNativeAsyncStorage.vcxproj
View file
Open in desktop
Copy link
Contributor Author

@Yajur-Grover Yajur-Grover Oct 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@acoates-ms this commit should make use of microsoft/react-native-windows#13945 once that PR is backported into 0.76.

I assumed that if someone is building with a canary build, that it would be the latest canary so it will include template update - which is why the check for the new props and targets import is an Or. Does the logic here look good?

Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,13 @@
<ImportGroup Label="PropertySheets" Condition="'$(UseFabric)'!='true'">
<Import Project="PropertySheet.props" />
</ImportGroup>
<ImportGroup Label="ReactNativeWindowsPropertySheets">
<ImportGroup Label="ReactNativeWindowsPropertySheets" Condition="'$(ReactNativeWindowsCanary)'!='true' And '$([MSBuild]::VersionLessThan($(ReactNativeWindowsMinor), 76))'">
Copy link

Choose a reason for hiding this comment

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

$([MSBuild]::VersionLessThan($(ReactNativeWindowsMajor).$(ReactNativeWindowsMinor).$(ReactNativeWindowsPatch), '0.76.0'))

Otherwise if we ever get to a version 1.0, it would count as a version less than 76.

Copy link

Choose a reason for hiding this comment

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

This will still fail to do the right thing if we publish a RNW 1.0.0

I think we want:
Condition="'$(ReactNativeWindowsCanary)'!='true' And $([MSBuild]::VersionLessThan('$(ReactNativeWindowsMajor).$(ReactNativeWindowsMinor).$(ReactNativeWindowsPatch)', '0.76.0'))""

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think this change has the mentioned fix? a1d931c.

Missed a couple of the error conditions at the bottom, fixed here: dd1dbac.

<Import Project="$(ReactNativeWindowsDir)\PropertySheets\external\Microsoft.ReactNative.Uwp.CppLib.props" Condition="'$(UseFabric)'!='true' And Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.props')" />
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.props" Condition="'$(UseFabric)'=='true' And Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.props')" />
</ImportGroup>
<ImportGroup Label="ReactNativeWindowsPropertySheets" Condition="'$(ReactNativeWindowsCanary)'=='true' Or '$([MSBuild]::VersionGreaterThanOrEquals($(ReactNativeWindowsMinor), 76))'">
Copy link

Choose a reason for hiding this comment

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

I think there is a way to do an if else, I think its called choice or something. You should do that, so that we only include one set of the props files.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looking at the When documentation, we cannot add ImportGroup as a child element of a <When> statement. With the current implementation, I don't think both sets of props files will be included since both conditions won't evaluate to true at the same time.

<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.props" Condition="Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.props')" />
</ImportGroup>
<ItemDefinitionGroup>
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
Expand Down Expand Up @@ -161,10 +164,13 @@
<Midl Include="..\code\ReactPackageProvider.idl" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ReactNativeWindowsTargets">
<ImportGroup Label="ReactNativeWindowsTargets" Condition="'$(ReactNativeWindowsCanary)'!='true' And '$([MSBuild]::VersionLessThan($(ReactNativeWindowsMinor), 76))'">
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets" Condition="'$(UseFabric)'!='true' And Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets')" />
Copy link

Choose a reason for hiding this comment

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

We should work out how to use
microsoft/react-native-windows#13945

Do we have any variables available to the vcxproj for RNW version? -- Seems like that would be useful so that we could import Uwp.CppLib on older RNW versions, but the newer import on newer RNW versions.

If we dont have such a variable, we should add one to newer RNW versions, and we can use the lack of such a variable as indication to use the older build logic.

Copy link

Choose a reason for hiding this comment

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

that logic is in Microsoft.ReactNative.CppLib.props and Microsoft.ReactNative.CppLib.targets and will be in 0.76. At some point we just have to say, RNW fabricis soft launching in 0.76, the template in 0.76 is the supported base and 0.76 is the supported min version for fabric. Projects are welcome to use UseFabric themselves to replicate the functionality for RNW < 0.76, but I don't want that in the template.

<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.targets" Condition="'$(UseFabric)'=='true' And Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.targets')" />
</ImportGroup>
<ImportGroup Label="ReactNativeWindowsTargets" Condition="'$(ReactNativeWindowsCanary)'=='true' Or '$([MSBuild]::VersionGreaterThanOrEquals($(ReactNativeWindowsMinor), 76))'">
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.targets" Condition="Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.targets')" />
</ImportGroup>
<ItemGroup>
</ItemGroup>
<Target Name="EnsureReactNativeWindowsTargets" BeforeTargets="PrepareForBuild">
Expand All @@ -175,5 +181,7 @@
<Error Condition="'$(UseFabric)'!='true' And !Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets'))" />
<Error Condition="'$(UseFabric)'=='true' And !Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.props'))" />
<Error Condition="'$(UseFabric)'=='true' And !Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.targets'))" />
<Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.props'))" />
<Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.targets'))" />
</Target>
</Project>
49 changes: 25 additions & 24 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5579,11 +5579,11 @@ __metadata:
languageName: node
linkType: hard

"@react-native-windows/cli@npm:0.75.3":
version: 0.75.3
resolution: "@react-native-windows/cli@npm:0.75.3"
"@react-native-windows/cli@npm:0.75.4":
version: 0.75.4
resolution: "@react-native-windows/cli@npm:0.75.4"
dependencies:
"@react-native-windows/codegen": "npm:0.75.1"
"@react-native-windows/codegen": "npm:0.75.2"
"@react-native-windows/fs": "npm:0.75.0"
"@react-native-windows/package-utils": "npm:0.75.0"
"@react-native-windows/telemetry": "npm:0.75.1"
Expand All @@ -5606,13 +5606,13 @@ __metadata:
xpath: "npm:^0.0.27"
peerDependencies:
react-native: "*"
checksum: 10c0/bce01859f8943ca98fde01c6f2d8f1b16a8155ff93b4a2585a239829194ea5e2baef85176f06be58a71d07bf945ef7a5831b6b705a8abda69541ec71607ca78a
checksum: 10c0/95ff332d2077412268cd8bfd2aaf9591f6bc73cc76d215698d7deb3a5f24bbd33a34782e5bc461e53a48b71c7c76c328c9ba92c37e06bf6c1fa5842be7b9d471
languageName: node
linkType: hard

"@react-native-windows/codegen@npm:0.75.1":
version: 0.75.1
resolution: "@react-native-windows/codegen@npm:0.75.1"
"@react-native-windows/codegen@npm:0.75.2":
version: 0.75.2
resolution: "@react-native-windows/codegen@npm:0.75.2"
dependencies:
"@react-native-windows/fs": "npm:0.75.0"
chalk: "npm:^4.1.0"
Expand All @@ -5624,7 +5624,7 @@ __metadata:
react-native: "*"
bin:
react-native-windows-codegen: bin.js
checksum: 10c0/ba025dc70013811e0c2bbb723057c6fbe67d6a59c5739d263b68c2143f7fb8320c1a1dcea02e06efe6eed90379606b2ced390d6e9d0911695324e388220b032f
checksum: 10c0/f594707a5f2b431a2a89536cf8bde78bc81897b48b5b47205bc2ab6547c812b243660c2ae797ead4ea0ac078924577e828102a8d7db095b785a72426322f0050
languageName: node
linkType: hard

Expand Down Expand Up @@ -20356,28 +20356,29 @@ __metadata:
linkType: hard

"react-native-windows@npm:^0.75.0":
version: 0.75.3
resolution: "react-native-windows@npm:0.75.3"
version: 0.75.5
resolution: "react-native-windows@npm:0.75.5"
dependencies:
"@babel/runtime": "npm:^7.0.0"
"@jest/create-cache-key-function": "npm:^29.6.3"
"@react-native-community/cli": "npm:14.0.0"
"@react-native-community/cli-platform-android": "npm:14.0.0"
"@react-native-community/cli-platform-ios": "npm:14.0.0"
"@react-native-windows/cli": "npm:0.75.3"
"@react-native-community/cli": "npm:14.1.0"
"@react-native-community/cli-platform-android": "npm:14.1.0"
"@react-native-community/cli-platform-ios": "npm:14.1.0"
"@react-native-windows/cli": "npm:0.75.4"
"@react-native/assets": "npm:1.0.0"
"@react-native/assets-registry": "npm:0.75.2"
"@react-native/codegen": "npm:0.75.2"
"@react-native/community-cli-plugin": "npm:0.75.2"
"@react-native/gradle-plugin": "npm:0.75.2"
"@react-native/js-polyfills": "npm:0.75.2"
"@react-native/normalize-colors": "npm:0.75.2"
"@react-native/virtualized-lists": "npm:0.75.2"
"@react-native/assets-registry": "npm:0.75.3"
"@react-native/codegen": "npm:0.75.3"
"@react-native/community-cli-plugin": "npm:0.75.3"
"@react-native/gradle-plugin": "npm:0.75.3"
"@react-native/js-polyfills": "npm:0.75.3"
"@react-native/normalize-colors": "npm:0.75.3"
"@react-native/virtualized-lists": "npm:0.75.3"
abort-controller: "npm:^3.0.0"
anser: "npm:^1.4.9"
ansi-regex: "npm:^5.0.0"
base64-js: "npm:^1.5.1"
chalk: "npm:^4.0.0"
commander: "npm:^9.4.1"
event-target-shim: "npm:^5.0.1"
flow-enums-runtime: "npm:^0.0.6"
glob: "npm:^7.1.1"
Expand Down Expand Up @@ -20405,8 +20406,8 @@ __metadata:
peerDependencies:
"@types/react": ^18.2.6
react: ^18.2.0
react-native: ^0.75.2
checksum: 10c0/fe394d7a642e198aa9789cf3a60682a4db8fd23cd708a3e7934d64aeb9006ba2bed8a2ba0ba8614ebd20e6fe8f9fee15a756333c21045515c0491c2d0641385f
react-native: ^0.75.3
checksum: 10c0/4de9bacbd4c9a5ae2c1e1e8219f6becc95a078dabf0e4582ad35c3e1ba5303cc8ff41a47d4e6b89b8f32a88f7218dee678a21dafa87eb5957bf9630f03488d8f
languageName: node
linkType: hard

Expand Down