Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9f400ff
fix typescript pathing to react-native/types
TatianaKapos Oct 29, 2022
833ef60
integration 9/26/22
TatianaKapos Oct 31, 2022
f9b7a87
Merge branch 'main' of https://github.com/TatianaKapos/react-native-w…
TatianaKapos Oct 31, 2022
338409b
Change files
TatianaKapos Oct 31, 2022
e628885
try to fix snapshot test
TatianaKapos Oct 31, 2022
e4167d6
Merge branch 'main' of https://github.com/TatianaKapos/react-native-w…
TatianaKapos Nov 1, 2022
68e1801
fix playground build
TatianaKapos Nov 1, 2022
06df802
update hermes package
TatianaKapos Nov 1, 2022
a53985f
match ts-jest version to jest version
TatianaKapos Nov 1, 2022
1c681ee
Merge branch 'main' of https://github.com/TatianaKapos/react-native-w…
TatianaKapos Nov 2, 2022
b1bdb43
Merge branch 'main' of https://github.com/TatianaKapos/react-native-w…
TatianaKapos Nov 2, 2022
93bdb84
Merge branch 'main' of https://github.com/TatianaKapos/react-native-w…
TatianaKapos Nov 7, 2022
849cfc9
update yarn file
TatianaKapos Nov 7, 2022
0611188
jest done callback not used on async jest tests
acoates-ms Nov 7, 2022
884805f
minor fixes
acoates-ms Nov 8, 2022
15669e9
Merge branch 'main' of https://github.com/TatianaKapos/react-native-w…
TatianaKapos Nov 8, 2022
ae0ae82
Merge branch 'tk-integrate-9-26-22' of https://github.com/TatianaKapo…
TatianaKapos Nov 8, 2022
e10c371
Change files
TatianaKapos Nov 8, 2022
4112d5b
Increase timeout for configToProjectInfo
acoates-ms Nov 8, 2022
786ad74
fix failure transpiling jest-runner
acoates-ms Nov 8, 2022
c7a0541
another attempt at timeout fix
acoates-ms Nov 8, 2022
795b672
more fixes
acoates-ms Nov 8, 2022
37fc138
defork virtualizedlist
acoates-ms Nov 8, 2022
7695008
realign jest version with core - add sample test to rnw and rnwin32 t…
acoates-ms Nov 8, 2022
cbb184d
missing space in repo-config package.json
acoates-ms Nov 9, 2022
87aa2d1
Merge remote-tracking branch 'upstream/main' into tk-integrate-9-26-22
acoates-ms Nov 9, 2022
8e5cbb7
suppress new c++ warning CI hits
acoates-ms Nov 9, 2022
bb8be7e
fix
acoates-ms Nov 9, 2022
35675fd
Unblock most E2E
acoates-ms Nov 9, 2022
ee78902
update snapshot
acoates-ms Nov 9, 2022
7812a26
update snapshot
acoates-ms Nov 9, 2022
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 .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
},
"[typescriptreact]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integration 9/26/22",
"packageName": "@office-iss/react-native-win32",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "integration 9/26/22",
"packageName": "@react-native-windows/automation-channel",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integration 9/26/22",
"packageName": "@react-native-windows/automation-commands",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "integration 9/26/22",
"packageName": "@react-native-windows/automation",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integration 9/26/22",
"packageName": "@react-native-windows/cli",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integration 9/26/22",
"packageName": "@react-native-windows/codegen",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integration 9/26/22",
"packageName": "@react-native-windows/telemetry",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integration 9/26/22",
"packageName": "@react-native-windows/virtualized-list",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "integration 9/26/22",
"packageName": "@rnw-scripts/doxysaurus",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "integration 9/26/22",
"packageName": "@rnw-scripts/integrate-rn",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "integration 9/26/22",
"packageName": "@rnw-scripts/jest-debug-config",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "integration 9/26/22",
"packageName": "@rnw-scripts/jest-e2e-config",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "integration 9/26/22",
"packageName": "@rnw-scripts/jest-unittest-config",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "integration 9/26/22",
"packageName": "@rnw-scripts/just-task",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "integration 9/26/22",
"packageName": "react-native-platform-override",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integration 9/26/22",
"packageName": "react-native-windows",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "integration 9/26/22",
"packageName": "react-native-windows-init",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.0.0-20220912-2028-b0aba1b6f",
"baseVersion": "0.0.0-20220926-2026-8cdc9e7f0",
"overrides": [
{
"type": "patch",
Expand Down Expand Up @@ -54,7 +54,7 @@
"type": "patch",
"file": "src/js/utils/testerStateUtils.win32.js",
"baseFile": "packages/rn-tester/js/utils/testerStateUtils.js",
"baseHash": "304453e496b2569b36f602fa0fb0d521756da3ff",
"baseHash": "48de7389eff1d9704135c4ac97315a69a2877b35",
"issue": 6316
},
{
Expand Down
4 changes: 2 additions & 2 deletions packages/@office-iss/react-native-win32-tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"peerDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.166",
"react": "18.0.0",
"react-native": "0.0.0-20220912-2028-b0aba1b6f"
"react-native": "0.0.0-20220926-2026-8cdc9e7f0"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.166",
Expand All @@ -29,7 +29,7 @@
"@types/node": "^14.14.22",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.0.0-20220912-2028-b0aba1b6f",
"react-native": "0.0.0-20220926-2026-8cdc9e7f0",
"react-native-platform-override": "^1.7.1",
"typescript": "^4.4.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,12 @@ export const getExamplesListWithBookmarksAndRecentlyUsed = ({
}));

const recentlyUsedAPIs = recentlyUsed.apis
.map(recentAPIKey => apis.find(apiEample => apiEample.key === recentAPIKey))
.map(recentAPIKey =>
apis.find(apiExample => apiExample.key === recentAPIKey),
)
.filter(Boolean);

const bookmarkedAPIs = apis.filter(apiEample => apiEample.isBookmarked);
const bookmarkedAPIs = apis.filter(apiExample => apiExample.isBookmarked);

const examplesList: ExamplesList = {
[Screens.COMPONENTS]: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"compilerOptions": {
"rootDir": "src",
"outDir": ".",
"paths": {
"Utilities": ["./../../../node_modules/react-native/types/Utilities.d.ts"],
},

// Some code copied from react-native-win32 is not strict clean
"noImplicitAny": false,
Expand Down
6 changes: 2 additions & 4 deletions packages/@office-iss/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<PROJECT_ROOT>/template/.*

; Ignore the Dangerfile
<PROJECT_ROOT>/bots/dangerfile.js
<PROJECT_ROOT>/packages/react-native-bots/dangerfile.js

; Ignore "BUCK" generated dirs
<PROJECT_ROOT>/\.buckd/
Expand All @@ -69,7 +69,6 @@
[include]
; Need to include hoisted modules
../../../node_modules/
../../@react-native-windows/virtualized-list/

[libs]
interface.js
Expand All @@ -91,7 +90,6 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/index.win32.js'
module.name_mapper='^@office-iss/react-native-win32$' -> '<PROJECT_ROOT>/index.win32.js'
module.name_mapper='^@react-native-windows/virtualized-list$' -> '<PROJECT_ROOT>/../../@react-native-windows/virtualized-list/src/VirtualizedList.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/\1'
module.name_mapper='^@office-iss/react-native-win32/\(.*\)$' -> '<PROJECT_ROOT>/\1'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/Libraries/Image/RelativeImageStub'
Expand Down Expand Up @@ -124,4 +122,4 @@ untyped-import
untyped-type-import

[version]
^0.186.0
^0.187.1
11 changes: 9 additions & 2 deletions packages/@office-iss/react-native-win32/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,16 @@ module.exports = {
'^.+\\.(bmp|gif|jpg|jpeg|mp4|png|psd|svg|webp)$':
'<rootDir>/jest/assetFileTransformer.js',
},
transformIgnorePatterns: [],
transformIgnorePatterns: ['jest-runner'],
Copy link
Contributor

Choose a reason for hiding this comment

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

Was this added by us or by Meta? If us, could we add a note in the PR description on why we needed to add this to get Jest working?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We added it to get jest working again! I'll add it to the PR description but it seems like its a jest issue where we shouldn't be transpiliing jest-runner in the first place and this is the work around (jestjs/jest#13173)

Copy link
Contributor

Choose a reason for hiding this comment

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

This doesn't affect users of RNW. (or RNWin32). The jest transformer errors out when running against jest-runner.

This code was actually already different than core. Core uses a whitelist of packages within node_modules to run the transforms on, whereas we are running it on everything by default. My guess is due to the monorepo setup.

Copy link
Contributor

Choose a reason for hiding this comment

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

Cool thanks for the context!

setupFiles: ['./jest/setup.js'],
timers: 'fake',
fakeTimers: {
enableGlobally: true,
legacyFakeTimers: true,
},
snapshotFormat: {
escapeString: true,
printBasicPrototype: true,
},
testRegex: '/__tests__/.*-test\\.js$',
testPathIgnorePatterns: [
// Only run the version of the tests that are part of the merged source output
Expand Down
74 changes: 10 additions & 64 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,23 @@
"**/__snapshots__/**",
"src/rntypes/**"
],
"baseVersion": "0.0.0-20220912-2028-b0aba1b6f",
"baseVersion": "0.0.0-20220926-2026-8cdc9e7f0",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "21218e40e026cea75af0c938f02d40d123ab6443"
"baseHash": "546380e5169e3921da1413e7d217b3fa9c4acf46"
},
{
"type": "derived",
"file": "src/index.win32.js",
"baseFile": "index.js",
"baseHash": "2f57efec7650cac8b2ce3803ab82b6d2d9ed4f3a"
"baseHash": "f0816560377ebcc92670b01c8f253cf80bbb3d54"
},
{
"type": "platform",
"file": "src/Libraries/__tests__/ButtonWin32-test.js"
},
{
"type": "patch",
Expand Down Expand Up @@ -117,7 +121,7 @@
"type": "derived",
"file": "src/Libraries/Components/TextInput/TextInput.win32.tsx",
"baseFile": "Libraries/Components/TextInput/TextInput.js",
"baseHash": "08c820b6754e0047ff35e275b4a797a3433bfaca"
"baseHash": "ad22c396e62ae28454499a3ff7c67d6606f96e0c"
},
{
"type": "patch",
Expand Down Expand Up @@ -259,72 +263,14 @@
"type": "patch",
"file": "src/Libraries/Inspector/Inspector.win32.js",
"baseFile": "Libraries/Inspector/Inspector.js",
"baseHash": "1520c032d52009981c1710077e3100983b2778d7"
"baseHash": "e564ab7eb7e1a62c141cb3b671c87e9230ed781a"
},
{
"type": "patch",
"file": "src/Libraries/Inspector/InspectorOverlay.win32.js",
"baseFile": "Libraries/Inspector/InspectorOverlay.js",
"baseHash": "539abffc3ea412fe8695babf58461f063068b4da"
},
{
"type": "copy",
"file": "src/Libraries/Lists/__tests__/CellRenderMask-test.js",
"baseFile": "Libraries/Lists/__tests__/CellRenderMask-test.js",
"baseHash": "ac27afe639dc574d8d3e78eb12912b3dbc0333bb"
},
{
"type": "copy",
"file": "src/Libraries/Lists/__tests__/FillRateHelper-test.js",
"baseFile": "Libraries/Lists/__tests__/FillRateHelper-test.js",
"baseHash": "784563e3f8414828196288c01b833b7cdb05608f",
"issue": 0
},
{
"type": "copy",
"file": "src/Libraries/Lists/__tests__/FlatList-test.js",
"baseFile": "Libraries/Lists/__tests__/FlatList-test.js",
"baseHash": "7a706826e19aad7b31fb1f918443a37ee95121b6",
"issue": 0
},
{
"type": "copy",
"file": "src/Libraries/Lists/__tests__/SectionList-test.js",
"baseFile": "Libraries/Lists/__tests__/SectionList-test.js",
"baseHash": "e277498e347542679adf37df904688002d641c37",
"issue": 0
},
{
"type": "copy",
"file": "src/Libraries/Lists/__tests__/ViewabilityHelper-test.js",
"baseFile": "Libraries/Lists/__tests__/ViewabilityHelper-test.js",
"baseHash": "292b601620f14a4e6fa74483e139aa9fb9499620"
},
{
"type": "copy",
"file": "src/Libraries/Lists/__tests__/VirtualizedList-test.js",
"baseFile": "Libraries/Lists/__tests__/VirtualizedList-test.js",
"baseHash": "bcad2a862a1b049e62b4b4316ed511ec91a52474",
"issue": 0
},
{
"type": "copy",
"file": "src/Libraries/Lists/__tests__/VirtualizedSectionList-test.js",
"baseFile": "Libraries/Lists/__tests__/VirtualizedSectionList-test.js",
"baseHash": "09e687ceb59ca9b35b42a641d597f84c8ee7d078",
"issue": 0
},
{
"type": "copy",
"file": "src/Libraries/Lists/__tests__/VirtualizeUtils-test.js",
"baseFile": "Libraries/Lists/__tests__/VirtualizeUtils-test.js",
"baseHash": "20491aae8e327dcb678e6ac4ab9a310d019d9e5a",
"issue": 0
},
{
"type": "platform",
"file": "src/Libraries/Lists/VirtualizedList.win32.js"
},
{
"type": "patch",
"file": "src/Libraries/LogBox/UI/LogBoxInspectorHeader.win32.js",
Expand Down Expand Up @@ -382,7 +328,7 @@
"type": "patch",
"file": "src/Libraries/Pressability/Pressability.win32.js",
"baseFile": "Libraries/Pressability/Pressability.js",
"baseHash": "487a7a4e21fbf611503fc0093fc629fdde62e720",
"baseHash": "e95b2b23c722a18ac5e24489968d0f898a4ecd1a",
"issue": 6240
},
{
Expand Down
Loading