Skip to content

Integrate 4/22 Nightly Build #5690

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
13 commits merged into from
Aug 11, 2020
Merged

Integrate 4/22 Nightly Build #5690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
afac01c
Progress
NickGerleman Aug 11, 2020
e36e7c7
Merge vnext
NickGerleman Aug 11, 2020
cece364
Remove checkbox from vnext
NickGerleman Aug 11, 2020
bcfc87d
Fixup PlatformColor Imports
NickGerleman Aug 11, 2020
20eefb1
ViewManager Commands for Windows Textbox
NickGerleman Aug 11, 2020
c7249ef
Upgrade react-native-win32 overrides
NickGerleman Aug 11, 2020
dcab848
Change files
NickGerleman Aug 11, 2020
7409211
Lint react-native-win32
NickGerleman Aug 11, 2020
a5da860
Merge branch 'master' of https://github.com/microsoft/react-native-wi…
NickGerleman Aug 11, 2020
bf0af12
Fix integrate-rn bug with dependency syncing added late PR
NickGerleman Aug 11, 2020
966c4bf
Change files
NickGerleman Aug 11, 2020
b9568b0
More checkbox removal
NickGerleman Aug 11, 2020
c3176b8
Update masters
NickGerleman Aug 11, 2020
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
8 changes: 8 additions & 0 deletions change/@office-iss-react-native-win32-2020-08-11-04-28-07-integrate-4-22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "prerelease",
"comment": "Integrate 4/22 Nightly Build",
"packageName": "@office-iss/react-native-win32",
"email": "ngerlem@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-08-11T11:28:00.447Z"
}
8 changes: 8 additions & 0 deletions change/@rnw-scripts-integrate-rn-2020-08-11-05-05-02-integrate-4-22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "patch",
"comment": "Fix integrate-rn bug with dependency syncing added late PR",
"packageName": "@rnw-scripts/integrate-rn",
"email": "ngerlem@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-08-11T12:05:02.815Z"
}
8 changes: 8 additions & 0 deletions change/react-native-windows-2020-08-11-04-28-07-integrate-4-22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "prerelease",
"comment": "Integrate 4/22 Nightly Build",
"packageName": "react-native-windows",
"email": "ngerlem@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-08-11T11:28:07.228Z"
}
2 changes: 2 additions & 0 deletions packages/@rnw-scripts/integrate-rn/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"dependencies": {
"@rnw-scripts/find-repo-root": "^0.0.4",
"@rnw-scripts/package-utils": "^0.0.1",
"async": "^3.2.0",
"lodash": "^4.17.15",
"ora": "^4.0.3",
"react-native-platform-override": "^0.2.1",
Expand All @@ -25,6 +26,7 @@
"@rnw-scripts/eslint-config": "0.0.2",
"@rnw-scripts/just-task": "0.0.2",
"@rnw-scripts/ts-config": "0.1.0",
"@types/async": "^3.2.3",
"@types/lodash": "^4.14.157",
"@types/ora": "^3.2.0",
"@types/semver": "^7.3.1",
Expand Down
30 changes: 21 additions & 9 deletions packages/@rnw-scripts/integrate-rn/src/integrateRN.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

import * as _ from 'lodash';
import * as async from 'async';
import * as fs from 'fs';
import * as ora from 'ora';
import * as path from 'path';
Expand All @@ -15,6 +16,7 @@ import * as yargs from 'yargs';
import {
enumerateLocalPackages,
findPackage,
NpmPackage,
WritableNpmPackage,
} from '@rnw-scripts/package-utils';

Expand Down Expand Up @@ -60,23 +62,33 @@ import findRepoRoot from '@rnw-scripts/find-repo-root';
* Enumerate packages for out-of-tree platforms
*/
async function enumeratePlatformPackages(): Promise<WritableNpmPackage[]> {
return await enumerateLocalPackages(async pkg => {
try {
await fs.promises.access(path.join(pkg.path, 'overrides.json'));
return true;
} catch {
return false;
}
});
return await enumerateLocalPackages(isOutOfTreePlatform);
}

/**
* Does the NPM package correspond to an out-of-tree platform?
*/
async function isOutOfTreePlatform(pkg: NpmPackage): Promise<boolean> {
try {
await fs.promises.access(path.join(pkg.path, 'overrides.json'));
return true;
} catch {
return false;
}
}

/**
* Update all package.json dependencies in the repo to account for a new
* version of React Native
*/
async function updatePackages(newVersion: string) {
// Be careful to share package objects since writing to one may invalidate
// copies
const localPackages = await enumerateLocalPackages();
const platformPackages = await enumeratePlatformPackages();
const platformPackages = await async.filter(
localPackages,
isOutOfTreePlatform,
);

if (platformPackages.length === 0) {
throw new Error(
Expand Down
2 changes: 1 addition & 1 deletion packages/E2ETest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"dependencies": {
"prompt-sync": "^4.2.0",
"react": "16.13.1",
"react-native": "0.0.0-4a48b021d",
"react-native": "0.0.0-2c473e1a3",
"react-native-windows": "0.0.0-canary.137"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/E2ETest/wdio/test/VisitAllPages.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ let pages = [
/* TODO: Disabling most of the test for now due to
instability, tracked by #5661
'<Button>',
'<CheckBox>',
// 'Custom Views',
'<DatePicker>',
'Fast Path Texts',
Expand All @@ -29,6 +28,7 @@ let pages = [
// '<SectionList>',
'<Switch>',
'<Text>',
'<TextInput>',
'<Touchable*> and onPress',
'<TransferProperties>',
'<TransparentHitTestExample>',
Expand Down
134 changes: 2 additions & 132 deletions ...es/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRegularBorder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"Clip": null,
"CornerRadius": "0,0,0,0",
"FlowDirection": "LeftToRight",
"Height": 360,
"Height": 300,
"HorizontalAlignment": "Stretch",
"Margin": "0,0,0,0",
"RenderSize": [759, 360],
"RenderSize": [759, 300],
"VerticalAlignment": "Stretch",
"Visibility": "Visible",
"Width": 759,
Expand Down Expand Up @@ -220,136 +220,6 @@
}
]
},
{
"XamlType": "Windows.UI.Xaml.Controls.CheckBox",
"Background": "#33E1E1E1",
"BorderBrush": "#55FF00FF",
"BorderThickness": "1,1,1,1",
"Clip": null,
"CornerRadius": "0,0,0,0",
"FlowDirection": "LeftToRight",
"Foreground": "#FFFFFFFF",
"Height": 50,
"HorizontalAlignment": "Left",
"Margin": "0,0,0,0",
"Padding": "8,5,0,0",
"RenderSize": [120, 50],
"VerticalAlignment": "Center",
"Visibility": "Visible",
"Width": 32,
"children": [
{
"XamlType": "Windows.UI.Xaml.Controls.Grid",
"Background": "#33E1E1E1",
"BorderBrush": "#55FF00FF",
"BorderThickness": "1,1,1,1",
"Clip": null,
"CornerRadius": "0,0,0,0",
"FlowDirection": "LeftToRight",
"HorizontalAlignment": "Stretch",
"Margin": "0,0,0,0",
"Name": "RootGrid",
"Padding": "0,0,0,0",
"RenderSize": [120, 50],
"VerticalAlignment": "Stretch",
"Visibility": "Visible",
"children": [
{
"XamlType": "Windows.UI.Xaml.Controls.Grid",
"Background": null,
"BorderBrush": null,
"BorderThickness": "0,0,0,0",
"Clip": null,
"CornerRadius": "0,0,0,0",
"FlowDirection": "LeftToRight",
"Height": 32,
"HorizontalAlignment": "Stretch",
"Margin": "0,0,0,0",
"Padding": "0,0,0,0",
"RenderSize": [20, 32],
"VerticalAlignment": "Top",
"Visibility": "Visible",
"children": [
{
"XamlType": "Windows.UI.Xaml.Shapes.Rectangle",
"Clip": null,
"FlowDirection": "LeftToRight",
"Height": 20,
"HorizontalAlignment": "Stretch",
"Margin": "0,0,0,0",
"Name": "NormalRectangle",
"RenderSize": [20, 20],
"VerticalAlignment": "Stretch",
"Visibility": "Visible",
"Width": 20
},
{
"XamlType": "Windows.UI.Xaml.Controls.FontIcon",
"Clip": null,
"FlowDirection": "LeftToRight",
"Foreground": "#FFFFFFFF",
"HorizontalAlignment": "Stretch",
"Margin": "0,0,0,0",
"Name": "CheckGlyph",
"RenderSize": [20, 32],
"VerticalAlignment": "Stretch",
"Visibility": "Visible",
"children": [
{
"XamlType": "Windows.UI.Xaml.Controls.Grid",
"Background": "#00000000",
"BorderBrush": null,
"BorderThickness": "0,0,0,0",
"Clip": null,
"CornerRadius": "0,0,0,0",
"FlowDirection": "LeftToRight",
"HorizontalAlignment": "Stretch",
"Margin": "0,0,0,0",
"Padding": "0,0,0,0",
"RenderSize": [20, 32],
"VerticalAlignment": "Stretch",
"Visibility": "Visible",
"children": [
{
"XamlType": "Windows.UI.Xaml.Controls.TextBlock",
"Clip": null,
"FlowDirection": "LeftToRight",
"Foreground": "#FFFFFFFF",
"HorizontalAlignment": "Stretch",
"Margin": "0,0,0,0",
"Padding": "0,0,0,0",
"RenderSize": [20, 16],
"Text": "",
"VerticalAlignment": "Center",
"Visibility": "Visible"
}
]
}
]
}
]
},
{
"XamlType": "Windows.UI.Xaml.Controls.ContentPresenter",
"Background": null,
"BorderBrush": null,
"BorderThickness": "0,0,0,0",
"Clip": null,
"CornerRadius": "0,0,0,0",
"FlowDirection": "LeftToRight",
"Foreground": "#FF000000",
"HorizontalAlignment": "Left",
"Margin": "8,5,0,0",
"Name": "ContentPresenter",
"Padding": "0,0,0,0",
"RenderSize": [0, 0],
"VerticalAlignment": "Top",
"Visibility": "Visible"
}
]
}
]
},
{
"XamlType": "Windows.UI.Xaml.Controls.TextBox",
"Background": "#33E1E1E1",
Expand Down
Loading