Skip to content

Commit 4483cbd

Browse files
jonthyselljonthysell
authored
Update RNX to target RNW 0.79 (#298)
This PR bumps RNX to target RNW 0.79, maintaining a minimum of RNW 0.72. ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/microsoft/react-native-xaml/pull/298)
1 parent e029035 commit 4483cbd

File tree

15 files changed

+1623
-823
lines changed

15 files changed

+1623
-823
lines changed

‎.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
rnwVersion: ['latest', 'v0.76-stable', 'v0.75-stable', 'v0.72-stable'] # test *key* versions that use VS 2022. aka any RNW version >= 0.72 used by supported partners and/or Active/Maintenance from https://microsoft.github.io/react-native-windows/support
33+
rnwVersion: ['latest', 'v0.78-stable', 'v0.72-stable'] # test *key* versions that use VS 2022. aka any RNW version >= 0.72 used by supported partners and/or Active/Maintenance from https://microsoft.github.io/react-native-windows/support
3434
uses: ./.github/workflows/template-testcli.yml
3535
with:
3636
vmImage: windows-2022

‎.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
strategy:
4343
fail-fast: true
4444
matrix:
45-
rnwVersion: ['latest', 'v0.76-stable', 'v0.75-stable', 'v0.72-stable'] # test *key* versions that use VS 2022. aka any RNW version >= 0.72 used by supported partners and/or Active/Maintenance from https://microsoft.github.io/react-native-windows/support
45+
rnwVersion: ['latest', 'v0.78-stable', 'v0.72-stable'] # test *key* versions that use VS 2022. aka any RNW version >= 0.72 used by supported partners and/or Active/Maintenance from https://microsoft.github.io/react-native-windows/support
4646
uses: ./.github/workflows/template-testcli.yml
4747
with:
4848
vmImage: windows-2022

‎change/react-native-xaml-dd7aacd9-ef2d-4e6b-96ae-efbbc11a39b1.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Update devDependency to RNW 0.79",
4+
"packageName": "react-native-xaml",
5+
"email": "jthysell@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

‎example/__tests__/App.test.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22
* @format
33
*/
44

5-
import 'react-native';
65
import React from 'react';
6+
import ReactTestRenderer from 'react-test-renderer';
77
import App from '../App';
88

9-
// Note: import explicitly to use the types shipped with jest.
10-
import {it} from '@jest/globals';
11-
12-
// Note: test renderer must be required after react-native.
13-
import renderer from 'react-test-renderer';
14-
15-
it('renders correctly', () => {
16-
renderer.create(<App />);
9+
test('renders correctly', async () => {
10+
await ReactTestRenderer.act(() => {
11+
ReactTestRenderer.create(<App />);
12+
});
1713
});

‎example/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,32 @@
99
"windows": "npx @react-native-community/cli run-windows"
1010
},
1111
"dependencies": {
12-
"react": "18.3.1",
13-
"react-native": "0.77.0",
14-
"react-native-windows": "0.77.2",
12+
"react": "19.0.0",
13+
"react-native": "0.79.0",
14+
"react-native-windows": "0.79.0",
1515
"react-native-xaml": "*"
1616
},
1717
"devDependencies": {
1818
"@babel/core": "^7.25.2",
1919
"@babel/preset-env": "^7.25.3",
2020
"@babel/runtime": "^7.25.0",
21-
"@react-native-community/cli": "15.0.1",
22-
"@react-native-community/cli-platform-android": "15.0.1",
23-
"@react-native-community/cli-platform-ios": "15.0.1",
24-
"@react-native/babel-preset": "0.77.0",
25-
"@react-native/eslint-config": "0.77.0",
26-
"@react-native/metro-config": "0.77.0",
27-
"@react-native/typescript-config": "0.77.0",
21+
"@react-native-community/cli": "18.0.0",
22+
"@react-native-community/cli-platform-android": "18.0.0",
23+
"@react-native-community/cli-platform-ios": "18.0.0",
24+
"@react-native/babel-preset": "0.79.0",
25+
"@react-native/eslint-config": "0.79.0",
26+
"@react-native/metro-config": "0.79.0",
27+
"@react-native/typescript-config": "0.79.0",
2828
"@rnx-kit/metro-config": "^1.3.5",
2929
"@types/jest": "^29.5.13",
30-
"@types/react": "^18.2.6",
31-
"@types/react-test-renderer": "^18.0.0",
30+
"@types/react": "^19.0.0",
31+
"@types/react-test-renderer": "^19.0.0",
3232
"eslint": "^8.19.0",
3333
"jest": "^29.6.3",
3434
"prettier": "2.8.8",
35-
"react-test-renderer": "18.3.1",
35+
"react-test-renderer": "19.0.0",
3636
"typescript": "5.0.4",
37-
"metro-config": "^0.81.1"
37+
"@rnx-kit/jest-preset": "^0.1.17"
3838
},
3939
"engines": {
4040
"node": ">=18"

‎example/windows/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,7 @@ packages/
9090
#Files generated by the VS build
9191
**/Generated Files/**
9292

93+
#Files generated by MS build
94+
*.binlog
95+
*.err
96+
*.wrn

‎example/windows/example/packages.lock.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"native,Version=v0.0": {
55
"Microsoft.JavaScript.Hermes": {
66
"type": "Direct",
7-
"requested": "[0.1.23, )",
8-
"resolved": "0.1.23",
9-
"contentHash": "cA9t1GjY4Yo0JD1AfA//e1lOwk48hLANfuX6GXrikmEBNZVr2TIX5ONJt5tqCnpZyLz6xGiPDgTfFNKbSfb21g=="
7+
"requested": "[0.0.0-2505.2001-0e4bc3b9, )",
8+
"resolved": "0.0.0-2505.2001-0e4bc3b9",
9+
"contentHash": "VNSUBgaGzJ/KkK3Br0b9FORkCgKqke54hi48vG42xRACIlxN+uLFMz0hRo+KHogz+Fsn+ltXicGwQsDVpmaCMg=="
1010
},
1111
"Microsoft.UI.Xaml": {
1212
"type": "Direct",
@@ -59,7 +59,7 @@
5959
"dependencies": {
6060
"Common": "[1.0.0, )",
6161
"Folly": "[1.0.0, )",
62-
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
62+
"Microsoft.JavaScript.Hermes": "[0.0.0-2505.2001-0e4bc3b9, )",
6363
"Microsoft.UI.Xaml": "[2.8.0, )",
6464
"ReactCommon": "[1.0.0, )",
6565
"boost": "[1.83.0, )"

‎examplenuget/__tests__/App.test.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22
* @format
33
*/
44

5-
import 'react-native';
65
import React from 'react';
6+
import ReactTestRenderer from 'react-test-renderer';
77
import App from '../App';
88

9-
// Note: import explicitly to use the types shipped with jest.
10-
import {it} from '@jest/globals';
11-
12-
// Note: test renderer must be required after react-native.
13-
import renderer from 'react-test-renderer';
14-
15-
it('renders correctly', () => {
16-
renderer.create(<App />);
9+
test('renders correctly', async () => {
10+
await ReactTestRenderer.act(() => {
11+
ReactTestRenderer.create(<App />);
12+
});
1713
});

‎examplenuget/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,32 @@
99
"windows": "npx @react-native-community/cli run-windows"
1010
},
1111
"dependencies": {
12-
"react": "18.3.1",
13-
"react-native": "0.77.0",
14-
"react-native-windows": "0.77.2",
12+
"react": "19.0.0",
13+
"react-native": "0.79.0",
14+
"react-native-windows": "0.79.0",
1515
"react-native-xaml": "*"
1616
},
1717
"devDependencies": {
1818
"@babel/core": "^7.25.2",
1919
"@babel/preset-env": "^7.25.3",
2020
"@babel/runtime": "^7.25.0",
21-
"@react-native-community/cli": "15.0.1",
22-
"@react-native-community/cli-platform-android": "15.0.1",
23-
"@react-native-community/cli-platform-ios": "15.0.1",
24-
"@react-native/babel-preset": "0.77.0",
25-
"@react-native/eslint-config": "0.77.0",
26-
"@react-native/metro-config": "0.77.0",
27-
"@react-native/typescript-config": "0.77.0",
21+
"@react-native-community/cli": "18.0.0",
22+
"@react-native-community/cli-platform-android": "18.0.0",
23+
"@react-native-community/cli-platform-ios": "18.0.0",
24+
"@react-native/babel-preset": "0.79.0",
25+
"@react-native/eslint-config": "0.79.0",
26+
"@react-native/metro-config": "0.79.0",
27+
"@react-native/typescript-config": "0.79.0",
2828
"@rnx-kit/metro-config": "^1.3.5",
2929
"@types/jest": "^29.5.13",
30-
"@types/react": "^18.2.6",
31-
"@types/react-test-renderer": "^18.0.0",
30+
"@types/react": "^19.0.0",
31+
"@types/react-test-renderer": "^19.0.0",
3232
"eslint": "^8.19.0",
3333
"jest": "^29.6.3",
3434
"prettier": "2.8.8",
35-
"react-test-renderer": "18.3.1",
35+
"react-test-renderer": "19.0.0",
3636
"typescript": "5.0.4",
37-
"metro-config": "^0.81.1"
37+
"@rnx-kit/jest-preset": "^0.1.17"
3838
},
3939
"engines": {
4040
"node": ">=18"

‎examplenuget/windows/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,7 @@ packages/
9090
#Files generated by the VS build
9191
**/Generated Files/**
9292

93+
#Files generated by MS build
94+
*.binlog
95+
*.err
96+
*.wrn

0 commit comments

Comments
 (0)