Skip to content

Commit 8c0f9d2

Browse files
Saadnajmiacoates-ms
Saadnajmi
and
acoates-ms
authored
Update to React Native 0.71 (#2754)
* align-deps: Fix warnigns and issues * Upgrade react-native-test-app * Update align-deps to 0.71 * Fix JS build issues * Try build apple * Change files * babel runtime classic * resolve react-native-svg to 13.9.0 * Fix more bundling errors * Change files * tests * update package versions * Get jest tests working * Change files * Bump rnwin32 version and clean up imports * fix issue which caused a ts-ignore to inserted * Try using a specific image for windows PR * Updated yml * try OE-OfficePublic * update pool * another pipeline fix * Update adapters * Fix UWP tester app * Fix android PR * bump RNW version, and use AutomationProperties.AutomationId for mapping from AccessibilityLabel * Revert back to name - and bump rn-macos * bump RNW * bump @office-iss/rex-win32 version * Try a accessibilty fix for RNW... * undo previous UWP fix attempt * Update react-native-windows * fix * Change files * align-deps on drawer * Move new components to classic runtime * Test * Update iOS wdio config * Revert change that broke windows e2e tests * Use iOS 16.2 * Match iPhone simulators * Fix ActivityIndicator * Disable Drawer test * Specify simulator in CI * Fix yml * Update snapshot * Update azure-pipelines.yml * Update azure-pipelines.yml * Update azure-pipelines.yml --------- Co-authored-by: Andrew Coates <[email protected]> Co-authored-by: Andrew Coates <[email protected]>
1 parent b38277b commit 8c0f9d2

File tree

339 files changed

+18705
-15614
lines changed

Some content is hidden

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

339 files changed

+18705
-15614
lines changed

Diff for: ‎.ado/azure-pipelines.yml

+37-7
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ jobs:
6969
pool:
7070
vmImage: 'internal-macos12'
7171
demands: ['xcode', 'sh', 'npm']
72+
variables:
73+
platform: 'macos'
7274
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
7375
cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
7476

@@ -94,9 +96,17 @@ jobs:
9496
# Select proper Xcode version
9597
- template: templates/apple-xcode-select.yml
9698

97-
- template: templates/apple-yarn-build.yml
98-
parameters:
99-
platform: 'macos'
99+
- bash: |
100+
echo "pod install $(platform)"
101+
pod install
102+
workingDirectory: apps/fluent-tester/$(platform)
103+
displayName: 'pod install $(platform)'
104+
105+
- bash: |
106+
echo "yarn $(platform)"
107+
yarn $(platform)
108+
workingDirectory: apps/fluent-tester
109+
displayName: 'yarn $(platform)'
100110
101111
- template: templates/e2e-testing-macos.yml
102112

@@ -105,6 +115,8 @@ jobs:
105115
pool:
106116
vmImage: 'internal-macos12'
107117
demands: ['xcode', 'sh', 'npm']
118+
variables:
119+
platform: 'ios'
108120
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
109121
cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
110122

@@ -130,16 +142,34 @@ jobs:
130142
# Select proper Xcode version
131143
- template: templates/apple-xcode-select.yml
132144

133-
- template: templates/apple-yarn-build.yml
134-
parameters:
135-
platform: 'ios'
145+
- bash: |
146+
echo "pod install $(platform)"
147+
pod install
148+
workingDirectory: apps/fluent-tester/$(platform)
149+
displayName: 'pod install $(platform)'
150+
151+
- bash: |
152+
echo "Pre boot simulator"
153+
UDID=$(xcrun simctl create test-iphone com.apple.CoreSimulator.SimDeviceType.iPhone-14 com.apple.CoreSimulator.SimRuntime.iOS-16-2)
154+
xcrun simctl boot $UDID
155+
workingDirectory: apps/fluent-tester
156+
displayName: 'Boot simulator'
157+
158+
- bash: |
159+
echo "yarn $(platform)"
160+
yarn $(platform) --simulator "iPhone 14"
161+
workingDirectory: apps/fluent-tester
162+
displayName: 'yarn $(platform)x'
136163
137164
- template: templates/e2e-testing-ios.yml
138165

139166
# Windows bundling and end to end testing
140167
- job: WindowsPR
141168
displayName: Windows PR
142-
pool: rnw-pool-4
169+
pool:
170+
name: rnw-pool-4
171+
demands:
172+
- ImageOverride -equals rnw-img-vs2022
143173
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
144174
cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
145175

Diff for: ‎.ado/templates/apple-yarn-build.yml

-24
This file was deleted.

Diff for: ‎CONTRIBUTING.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,8 @@ Reach out to Samuel Freiberg with any questions related to E2E testing.
6565

6666
1. `index.ts`
6767
- This is the file listed as `main` inside your package.json and simply exports other files.
68-
1. `<new-component>.tsx`
69-
- This is the file that will actually define your function component, and compose it into a higher order component with slots, theming, and design tokens.
70-
- Note that we need the comment `/** @jsx withSlots */` at the top of this file. An explanation can be found in the comment at `packages/experimental/use-slots/src/withSlots.tsx`
68+
1. `<new-component>.tsx` - This is the file that will actually define your function component, and compose it into a higher order component with slots, theming, and design tokens. - Note that we need the comment `/** @jsxRuntime classic */
69+
/** @jsx withSlots */` at the top of this file. An explanation can be found in the comment at `packages/experimental/use-slots/src/withSlots.tsx`
7170
1. `<new-component>.<types | settings | platform | blah>.tsx` (Optional)
7271
- Optional extra files to subdivide your code however you see fit. You can also add platform specific files as you see fit.
7372

Diff for: ‎apps/E2E/package.json

+6-7
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"dist/*"
2222
],
2323
"dependencies": {
24-
"react": "17.0.2",
25-
"react-native": "^0.68.0"
24+
"react": "18.2.0",
25+
"react-native": "^0.71.0"
2626
},
2727
"devDependencies": {
2828
"@babel/core": "^7.8.0",
@@ -32,8 +32,7 @@
3232
"@fluentui-react-native/scripts": "^0.1.1",
3333
"@rnx-kit/metro-config": "^1.3.1",
3434
"@types/jasmine": "3.10.3",
35-
"@types/react": "^17.0.2",
36-
"@types/react-native": "^0.68.0",
35+
"@types/react": "^18.2.0",
3736
"@wdio/appium-service": "7.30.0",
3837
"@wdio/cli": "7.30.1",
3938
"@wdio/jasmine-framework": "7.26.0",
@@ -44,8 +43,8 @@
4443
"appium-uiautomator2-driver": "^2.12.3",
4544
"appium-windows-driver": "2.3.5",
4645
"appium-xcuitest-driver": "4.16.12",
47-
"metro-config": "^0.67.0",
48-
"metro-react-native-babel-preset": "^0.67.0",
46+
"metro-config": "^0.73.7",
47+
"metro-react-native-babel-preset": "^0.73.7",
4948
"ts-node": "^8.10.1",
5049
"typescript": "4.9.4",
5150
"webdriverio": "7.30.1"
@@ -57,7 +56,7 @@
5756
"microsoft/react-native"
5857
],
5958
"requirements": [
60-
"react-native@0.68"
59+
"react-native@0.71"
6160
],
6261
"capabilities": [
6362
"core",

Diff for: ‎apps/E2E/wdio.conf.ios.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ exports.config = {
1414
{
1515
maxInstances: 1, // Maximum number of total parallel running workers.
1616
platformName: 'iOS',
17+
// Keep this in sync with the simulator we run in Azure Pipelines
1718
'appium:platformVersion': '16.2',
18-
'appium:deviceName': 'iPhone 13',
19+
'appium:deviceName': 'iPhone 14',
1920
'appium:automationName': 'XCUITest',
2021
'appium:bundleId': 'com.microsoft.ReactTestApp',
2122
},

Diff for: ‎apps/component-generator/component-templates/ComponentTemplate/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
"@fluentui-react-native/eslint-config-rules": "^0.1.1",
2828
"@fluentui-react-native/test-tools": ">=0.1.1 <1.0.0",
2929
"@fluentui-react-native/scripts": "^0.1.1",
30-
"react": "17.0.2",
31-
"react-native": "^0.68.0"
30+
"react": "18.2.0",
31+
"react-native": "^0.71.0"
3232
},
3333
"peerDependencies": {
34-
"react": "17.0.2",
35-
"react-native": "^0.68.0"
34+
"react": "18.2.0",
35+
"react-native": "^0.71.0"
3636
},
3737
"author": "",
3838
"license": "MIT"

Diff for: ‎apps/component-generator/component-templates/ComponentTemplate/src/ComponentName.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/** @jsxRuntime classic */
12
/** @jsx withSlots */
23
import * as React from 'react';
34
import { View } from 'react-native';

Diff for: ‎apps/fluent-tester/android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

Diff for: ‎apps/fluent-tester/babel.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
presets: ['module:metro-react-native-babel-preset'],
2+
presets: [['module:metro-react-native-babel-preset', { 'runtime': 'classic' }]],
33
};

Diff for: ‎apps/fluent-tester/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
'use strict';
22

3-
import { FluentTesterApp } from './src/FluentTesterApp';
43
import { AppRegistry } from 'react-native';
54

5+
import { FluentTesterApp } from './src/FluentTesterApp';
6+
67
AppRegistry.registerComponent('FluentTester', () => FluentTesterApp);
78

89
export default FluentTesterApp;

0 commit comments

Comments
 (0)