Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
strategy:
fail-fast: false
matrix:
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
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
uses: ./.github/workflows/template-testcli.yml
with:
vmImage: windows-2022
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
strategy:
fail-fast: true
matrix:
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
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
uses: ./.github/workflows/template-testcli.yml
with:
vmImage: windows-2022
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Update devDependency to RNW 0.79",
"packageName": "react-native-xaml",
"email": "jthysell@microsoft.com",
"dependentChangeType": "patch"
}
14 changes: 5 additions & 9 deletions example/__tests__/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
* @format
*/

import 'react-native';
import React from 'react';
import ReactTestRenderer from 'react-test-renderer';
import App from '../App';

// Note: import explicitly to use the types shipped with jest.
import {it} from '@jest/globals';

// Note: test renderer must be required after react-native.
import renderer from 'react-test-renderer';

it('renders correctly', () => {
renderer.create(<App />);
test('renders correctly', async () => {
await ReactTestRenderer.act(() => {
ReactTestRenderer.create(<App />);
});
});
28 changes: 14 additions & 14 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,32 @@
"windows": "npx @react-native-community/cli run-windows"
},
"dependencies": {
"react": "18.3.1",
"react-native": "0.77.0",
"react-native-windows": "0.77.2",
"react": "19.0.0",
"react-native": "0.79.0",
"react-native-windows": "0.79.0",
"react-native-xaml": "*"
},
"devDependencies": {
"@babel/core": "^7.25.2",
"@babel/preset-env": "^7.25.3",
"@babel/runtime": "^7.25.0",
"@react-native-community/cli": "15.0.1",
"@react-native-community/cli-platform-android": "15.0.1",
"@react-native-community/cli-platform-ios": "15.0.1",
"@react-native/babel-preset": "0.77.0",
"@react-native/eslint-config": "0.77.0",
"@react-native/metro-config": "0.77.0",
"@react-native/typescript-config": "0.77.0",
"@react-native-community/cli": "18.0.0",
"@react-native-community/cli-platform-android": "18.0.0",
"@react-native-community/cli-platform-ios": "18.0.0",
"@react-native/babel-preset": "0.79.0",
"@react-native/eslint-config": "0.79.0",
"@react-native/metro-config": "0.79.0",
"@react-native/typescript-config": "0.79.0",
"@rnx-kit/metro-config": "^1.3.5",
"@types/jest": "^29.5.13",
"@types/react": "^18.2.6",
"@types/react-test-renderer": "^18.0.0",
"@types/react": "^19.0.0",
"@types/react-test-renderer": "^19.0.0",
"eslint": "^8.19.0",
"jest": "^29.6.3",
"prettier": "2.8.8",
"react-test-renderer": "18.3.1",
"react-test-renderer": "19.0.0",
"typescript": "5.0.4",
"metro-config": "^0.81.1"
"@rnx-kit/jest-preset": "^0.1.17"
},
"engines": {
"node": ">=18"
Expand Down
4 changes: 4 additions & 0 deletions example/windows/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,7 @@ packages/
#Files generated by the VS build
**/Generated Files/**

#Files generated by MS build
*.binlog
*.err
*.wrn
8 changes: 4 additions & 4 deletions example/windows/example/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"native,Version=v0.0": {
"Microsoft.JavaScript.Hermes": {
"type": "Direct",
"requested": "[0.1.23, )",
"resolved": "0.1.23",
"contentHash": "cA9t1GjY4Yo0JD1AfA//e1lOwk48hLANfuX6GXrikmEBNZVr2TIX5ONJt5tqCnpZyLz6xGiPDgTfFNKbSfb21g=="
"requested": "[0.0.0-2505.2001-0e4bc3b9, )",
"resolved": "0.0.0-2505.2001-0e4bc3b9",
"contentHash": "VNSUBgaGzJ/KkK3Br0b9FORkCgKqke54hi48vG42xRACIlxN+uLFMz0hRo+KHogz+Fsn+ltXicGwQsDVpmaCMg=="
},
"Microsoft.UI.Xaml": {
"type": "Direct",
Expand Down Expand Up @@ -59,7 +59,7 @@
"dependencies": {
"Common": "[1.0.0, )",
"Folly": "[1.0.0, )",
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
"Microsoft.JavaScript.Hermes": "[0.0.0-2505.2001-0e4bc3b9, )",
"Microsoft.UI.Xaml": "[2.8.0, )",
"ReactCommon": "[1.0.0, )",
"boost": "[1.83.0, )"
Expand Down
14 changes: 5 additions & 9 deletions examplenuget/__tests__/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
* @format
*/

import 'react-native';
import React from 'react';
import ReactTestRenderer from 'react-test-renderer';
import App from '../App';

// Note: import explicitly to use the types shipped with jest.
import {it} from '@jest/globals';

// Note: test renderer must be required after react-native.
import renderer from 'react-test-renderer';

it('renders correctly', () => {
renderer.create(<App />);
test('renders correctly', async () => {
await ReactTestRenderer.act(() => {
ReactTestRenderer.create(<App />);
});
});
28 changes: 14 additions & 14 deletions examplenuget/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,32 @@
"windows": "npx @react-native-community/cli run-windows"
},
"dependencies": {
"react": "18.3.1",
"react-native": "0.77.0",
"react-native-windows": "0.77.2",
"react": "19.0.0",
"react-native": "0.79.0",
"react-native-windows": "0.79.0",
"react-native-xaml": "*"
},
"devDependencies": {
"@babel/core": "^7.25.2",
"@babel/preset-env": "^7.25.3",
"@babel/runtime": "^7.25.0",
"@react-native-community/cli": "15.0.1",
"@react-native-community/cli-platform-android": "15.0.1",
"@react-native-community/cli-platform-ios": "15.0.1",
"@react-native/babel-preset": "0.77.0",
"@react-native/eslint-config": "0.77.0",
"@react-native/metro-config": "0.77.0",
"@react-native/typescript-config": "0.77.0",
"@react-native-community/cli": "18.0.0",
"@react-native-community/cli-platform-android": "18.0.0",
"@react-native-community/cli-platform-ios": "18.0.0",
"@react-native/babel-preset": "0.79.0",
"@react-native/eslint-config": "0.79.0",
"@react-native/metro-config": "0.79.0",
"@react-native/typescript-config": "0.79.0",
"@rnx-kit/metro-config": "^1.3.5",
"@types/jest": "^29.5.13",
"@types/react": "^18.2.6",
"@types/react-test-renderer": "^18.0.0",
"@types/react": "^19.0.0",
"@types/react-test-renderer": "^19.0.0",
"eslint": "^8.19.0",
"jest": "^29.6.3",
"prettier": "2.8.8",
"react-test-renderer": "18.3.1",
"react-test-renderer": "19.0.0",
"typescript": "5.0.4",
"metro-config": "^0.81.1"
"@rnx-kit/jest-preset": "^0.1.17"
},
"engines": {
"node": ">=18"
Expand Down
4 changes: 4 additions & 0 deletions examplenuget/windows/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,7 @@ packages/
#Files generated by the VS build
**/Generated Files/**

#Files generated by MS build
*.binlog
*.err
*.wrn
66 changes: 33 additions & 33 deletions examplenuget/windows/examplenuget/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
"native,Version=v0.0": {
"Microsoft.JavaScript.Hermes": {
"type": "Direct",
"requested": "[0.1.23, )",
"resolved": "0.1.23",
"contentHash": "cA9t1GjY4Yo0JD1AfA//e1lOwk48hLANfuX6GXrikmEBNZVr2TIX5ONJt5tqCnpZyLz6xGiPDgTfFNKbSfb21g=="
"requested": "[0.0.0-2505.2001-0e4bc3b9, )",
"resolved": "0.0.0-2505.2001-0e4bc3b9",
"contentHash": "VNSUBgaGzJ/KkK3Br0b9FORkCgKqke54hi48vG42xRACIlxN+uLFMz0hRo+KHogz+Fsn+ltXicGwQsDVpmaCMg=="
},
"Microsoft.ReactNative": {
"type": "Direct",
"requested": "[0.77.2, )",
"resolved": "0.77.2",
"contentHash": "JcD3Wu/c5JM+aacUkGQLTHPzdnRZZx+lbYLUQcuUzOpiNqLlVYTOAZ6Zu5HGm8pbY6RltPZDo1qH56nIxb3X/g=="
"requested": "[0.79.0, )",
"resolved": "0.79.0",
"contentHash": "6+8MUOyEhqvfbW/8HfhBV7bJopCFO6d7+DSuR6PMrB6HTf2/ewMUC5Mx14nfHW5iUJr989EwzXBe5tTzroyMvw=="
},
"Microsoft.ReactNative.Cxx": {
"type": "Direct",
"requested": "[0.77.2, )",
"resolved": "0.77.2",
"contentHash": "G5H8buPZyrPZGzr/0KPr1IcWL3XPGOc9iC4P5vxOHlsW82TAA9lTt1mZhtF/LXe6c+axUdVAhW3Lwy2gETsPGg==",
"requested": "[0.79.0, )",
"resolved": "0.79.0",
"contentHash": "SgqS70L8JKB9UId7JMLCp1EEs8LztAXVGYIIrFRzEZtKqN37weP2ndDW6+v0I+gJqNWdV/UThq9cJXHwVM0cZw==",
"dependencies": {
"Microsoft.ReactNative": "0.77.2"
"Microsoft.ReactNative": "0.79.0"
}
},
"Microsoft.UI.Xaml": {
Expand Down Expand Up @@ -52,18 +52,18 @@
"type": "Project",
"dependencies": {
"CDebug": "[0.0.3, )",
"Microsoft.ReactNative": "[0.77.2, )",
"Microsoft.ReactNative.Cxx": "[0.77.2, )",
"Microsoft.ReactNative": "[0.79.0, )",
"Microsoft.ReactNative.Cxx": "[0.79.0, )",
"Microsoft.UI.Xaml": "[2.8.0, )"
}
}
},
"native,Version=v0.0/win10-arm": {
"Microsoft.ReactNative": {
"type": "Direct",
"requested": "[0.77.2, )",
"resolved": "0.77.2",
"contentHash": "JcD3Wu/c5JM+aacUkGQLTHPzdnRZZx+lbYLUQcuUzOpiNqLlVYTOAZ6Zu5HGm8pbY6RltPZDo1qH56nIxb3X/g=="
"requested": "[0.79.0, )",
"resolved": "0.79.0",
"contentHash": "6+8MUOyEhqvfbW/8HfhBV7bJopCFO6d7+DSuR6PMrB6HTf2/ewMUC5Mx14nfHW5iUJr989EwzXBe5tTzroyMvw=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
Expand All @@ -74,9 +74,9 @@
"native,Version=v0.0/win10-arm-aot": {
"Microsoft.ReactNative": {
"type": "Direct",
"requested": "[0.77.2, )",
"resolved": "0.77.2",
"contentHash": "JcD3Wu/c5JM+aacUkGQLTHPzdnRZZx+lbYLUQcuUzOpiNqLlVYTOAZ6Zu5HGm8pbY6RltPZDo1qH56nIxb3X/g=="
"requested": "[0.79.0, )",
"resolved": "0.79.0",
"contentHash": "6+8MUOyEhqvfbW/8HfhBV7bJopCFO6d7+DSuR6PMrB6HTf2/ewMUC5Mx14nfHW5iUJr989EwzXBe5tTzroyMvw=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
Expand All @@ -87,9 +87,9 @@
"native,Version=v0.0/win10-arm64-aot": {
"Microsoft.ReactNative": {
"type": "Direct",
"requested": "[0.77.2, )",
"resolved": "0.77.2",
"contentHash": "JcD3Wu/c5JM+aacUkGQLTHPzdnRZZx+lbYLUQcuUzOpiNqLlVYTOAZ6Zu5HGm8pbY6RltPZDo1qH56nIxb3X/g=="
"requested": "[0.79.0, )",
"resolved": "0.79.0",
"contentHash": "6+8MUOyEhqvfbW/8HfhBV7bJopCFO6d7+DSuR6PMrB6HTf2/ewMUC5Mx14nfHW5iUJr989EwzXBe5tTzroyMvw=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
Expand All @@ -100,9 +100,9 @@
"native,Version=v0.0/win10-x64": {
"Microsoft.ReactNative": {
"type": "Direct",
"requested": "[0.77.2, )",
"resolved": "0.77.2",
"contentHash": "JcD3Wu/c5JM+aacUkGQLTHPzdnRZZx+lbYLUQcuUzOpiNqLlVYTOAZ6Zu5HGm8pbY6RltPZDo1qH56nIxb3X/g=="
"requested": "[0.79.0, )",
"resolved": "0.79.0",
"contentHash": "6+8MUOyEhqvfbW/8HfhBV7bJopCFO6d7+DSuR6PMrB6HTf2/ewMUC5Mx14nfHW5iUJr989EwzXBe5tTzroyMvw=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
Expand All @@ -113,9 +113,9 @@
"native,Version=v0.0/win10-x64-aot": {
"Microsoft.ReactNative": {
"type": "Direct",
"requested": "[0.77.2, )",
"resolved": "0.77.2",
"contentHash": "JcD3Wu/c5JM+aacUkGQLTHPzdnRZZx+lbYLUQcuUzOpiNqLlVYTOAZ6Zu5HGm8pbY6RltPZDo1qH56nIxb3X/g=="
"requested": "[0.79.0, )",
"resolved": "0.79.0",
"contentHash": "6+8MUOyEhqvfbW/8HfhBV7bJopCFO6d7+DSuR6PMrB6HTf2/ewMUC5Mx14nfHW5iUJr989EwzXBe5tTzroyMvw=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
Expand All @@ -126,9 +126,9 @@
"native,Version=v0.0/win10-x86": {
"Microsoft.ReactNative": {
"type": "Direct",
"requested": "[0.77.2, )",
"resolved": "0.77.2",
"contentHash": "JcD3Wu/c5JM+aacUkGQLTHPzdnRZZx+lbYLUQcuUzOpiNqLlVYTOAZ6Zu5HGm8pbY6RltPZDo1qH56nIxb3X/g=="
"requested": "[0.79.0, )",
"resolved": "0.79.0",
"contentHash": "6+8MUOyEhqvfbW/8HfhBV7bJopCFO6d7+DSuR6PMrB6HTf2/ewMUC5Mx14nfHW5iUJr989EwzXBe5tTzroyMvw=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
Expand All @@ -139,9 +139,9 @@
"native,Version=v0.0/win10-x86-aot": {
"Microsoft.ReactNative": {
"type": "Direct",
"requested": "[0.77.2, )",
"resolved": "0.77.2",
"contentHash": "JcD3Wu/c5JM+aacUkGQLTHPzdnRZZx+lbYLUQcuUzOpiNqLlVYTOAZ6Zu5HGm8pbY6RltPZDo1qH56nIxb3X/g=="
"requested": "[0.79.0, )",
"resolved": "0.79.0",
"contentHash": "6+8MUOyEhqvfbW/8HfhBV7bJopCFO6d7+DSuR6PMrB6HTf2/ewMUC5Mx14nfHW5iUJr989EwzXBe5tTzroyMvw=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
Expand Down
8 changes: 4 additions & 4 deletions package/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
},
"devDependencies": {
"@types/jest": "*",
"@types/react": "^18.2.6",
"@types/react": "^19.0.0",
"beachball": "^2.16.0",
"eslint": "^8.19.0",
"react": "18.3.1",
"react-native": "0.77.0",
"react-native-windows": "0.77.2",
"react": "19.0.0",
"react-native": "0.79.0",
"react-native-windows": "0.79.0",
"typescript": "5.0.4"
},
"files": [
Expand Down
4 changes: 4 additions & 0 deletions package/windows/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,7 @@ packages/
#Files generated by the VS build
**/Generated Files/**

#Files generated by MS build
*.binlog
*.err
*.wrn
Loading