Skip to content
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.

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

Integrate RN Nightly 7/1 #13508

Merged
merged 47 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
223c5e4
Integrate 7/1
Yajur-Grover Jul 23, 2024
b829aaf
update lockfile
Yajur-Grover Jul 29, 2024
7982dde
Merge branch 'main' into yg-int-7-1
Yajur-Grover Jul 29, 2024
da4943a
revert postinstall removal
Yajur-Grover Jul 29, 2024
d62a1fc
Merge branch 'yg-int-7-1' of https://github.com/Yajur-Grover/react-na…
Yajur-Grover Jul 29, 2024
01e2368
bump yarn to 1.22.22
Yajur-Grover Jul 29, 2024
ea47055
Merge branch 'main' into yg-int-7-1
Yajur-Grover Jul 29, 2024
76d31fb
Remove .yarnrc
jonthysell Jul 29, 2024
6501924
Replace react-native with @react-native-community/cli
jonthysell Jul 29, 2024
be50324
Change files
jonthysell Jul 29, 2024
7bbbe23
Update react-native-init-windows.yml
jonthysell Jul 29, 2024
bc1f34c
update lockfile
Yajur-Grover Jul 29, 2024
a908601
Fix all instances of calling yarn for RN CLI to call npx instead
jonthysell Jul 29, 2024
adc6ab8
Merge branch 'yg-int-7-1' of https://github.com/Yajur-Grover/react-na…
jonthysell Jul 29, 2024
440d757
More npx added
jonthysell Jul 29, 2024
782247a
More npx added
jonthysell Jul 29, 2024
9741827
Fix bundle commands
jonthysell Jul 29, 2024
e0500d3
Add @react-native-community/cli to dev dependencies of each app
jonthysell Jul 29, 2024
8739c39
update cli versions
Yajur-Grover Jul 29, 2024
c14fc6d
Merge branch 'yg-int-7-1' of https://github.com/Yajur-Grover/react-na…
Yajur-Grover Jul 29, 2024
c29578a
fix sample apps just-task
jonthysell Jul 30, 2024
e84707f
Merge branch 'yg-int-7-1' of https://github.com/Yajur-Grover/react-na…
jonthysell Jul 30, 2024
2c47396
Revert test snapshot changes
jonthysell Jul 30, 2024
3803f13
Fix iterateOverValues
jonthysell Jul 30, 2024
ecba430
Merge remote-tracking branch 'upstream/main' into yg-int-7-1
jonthysell Jul 30, 2024
27e0274
Add new fuseboxtracer to ReactCommon
jonthysell Jul 30, 2024
8775d9b
fix upgrading RN for test-cli
jonthysell Jul 30, 2024
be2f76f
add yarn install
jonthysell Jul 30, 2024
6706f12
Fork files with warnings as errors
jonthysell Jul 30, 2024
53cd5ef
fix testcli creation
jonthysell Jul 30, 2024
f5d636e
finx fabric snapshots
jonthysell Jul 30, 2024
8097ea9
Merge remote-tracking branch 'upstream/main' into yg-int-7-1
jonthysell Aug 1, 2024
196e0f9
Merge remote-tracking branch 'upstream/main' into yg-int-7-1
jonthysell Aug 1, 2024
456f787
Fix babel-preset and metro-config versions
jonthysell Aug 1, 2024
4e0051a
Change files
jonthysell Aug 1, 2024
5386ebd
Start stubbing out SampleTurboModule to fix e2etest
jonthysell Aug 2, 2024
a0c0b79
Revert "Start stubbing out SampleTurboModule to fix e2etest"
jonthysell Aug 2, 2024
73469be
Comment out new EventEmiiter usage in example page
jonthysell Aug 2, 2024
895fe07
Merge branch 'main' into yg-int-7-1
jonthysell Aug 2, 2024
7a4614a
Update packages.lock.json
jonthysell Aug 2, 2024
234ae9d
try to fix debug test
jonthysell Aug 5, 2024
5598f62
Merge branch 'main' into yg-int-7-1
jonthysell Aug 5, 2024
5eda83e
Disable debugging tests
jonthysell Aug 6, 2024
0635847
Merge branch 'yg-int-7-1' of https://github.com/Yajur-Grover/react-na…
jonthysell Aug 6, 2024
2de6369
Merge branch 'main' into yg-int-7-1
Yajur-Grover Aug 6, 2024
0f2c676
Merge branch 'main' into yg-int-7-1
Yajur-Grover Aug 7, 2024
d71c052
remove logging statements
Yajur-Grover Aug 7, 2024
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 .ado/jobs/playground.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ jobs:
msbuildArgs:
/p:PackageCertificateKeyFile=$(Build.SourcesDirectory)\EncodedKey.pfx

- ${{if and(endsWith(matrix.Name, 'Universal'), eq(matrix.BuildConfiguration, 'Debug')) }}:
- ${{if and(false, endsWith(matrix.Name, 'Universal'), eq(matrix.BuildConfiguration, 'Debug')) }}: # Disabled as debugging doesn't work,remove false after issue is resolved, see https://github.com/microsoft/react-native-windows/issues/13543
# Execute debug feature tests (skip this step for the Win32 Playground app and for release builds)

# Need to re-setup ProcDump a 2nd time for this to work correctly
Expand Down
10 changes: 5 additions & 5 deletions .ado/templates/react-native-debug-info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ parameters:

steps:
# Useful info to have in the log, but also a necessary workaround to make sure the cli is cached by npx
- script: npx react-native info
- script: npx @react-native-community/cli info
displayName: React Native Info
workingDirectory: ${{ parameters.workingDirectory }}

- ${{ if eq(parameters.doctor, true) }}:
# Verify react-native doctor command works
- script: npx react-native doctor
# Verify @react-native-community/cli doctor command works
- script: npx @react-native-community/cli doctor
displayName: React Native Doctor
workingDirectory: ${{ parameters.workingDirectory }}

- ${{ if eq(parameters.config, true) }}:
# Print the config for debugging react-native CLI commands
- script: npx react-native config
# Print the config for debugging @react-native-community/cli CLI commands
- script: npx @react-native-community/cli config
displayName: React Native Config
workingDirectory: ${{ parameters.workingDirectory }}
36 changes: 27 additions & 9 deletions .ado/templates/react-native-init-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,37 @@ steps:
buildEnvironment: ${{ parameters.buildEnvironment }}

- ${{ if endsWith(parameters.template, '-app') }}:
- script: | # Change version of @react-native-community/template from 'next' to '$(reactNativeDevDependency)' and remove upgrade command - Windows #13446
npx --yes @react-native-community/cli@next init testcli --template @react-native-community/template@next
cd testcli && call yarn upgrade react-native@$(reactNativeDevDependency)
- script: | # Change version of @react-native-community/template from 'nightly' to '$(reactNativeDevDependency)' - Windows #13446
npx --yes @react-native-community/cli@next init testcli --template @react-native-community/template@nightly
displayName: Init new app project with @react-native-community/cli init
workingDirectory: $(Agent.BuildDirectory)

- script: | # Remove upgrade command - Windows #13446
call yarn install
call yarn add react@$(reactDevDependency)
call yarn add react-native@$(reactNativeDevDependency)
displayName: Fix app react-native dependency
workingDirectory: $(Agent.BuildDirectory)\testcli

- ${{ if and(endsWith(parameters.template, '-lib'), not(startsWith(parameters.template, 'old'))) }}:
- script: | # Change version of react-native from 'next' to '$(reactNativeDevDependency)' and remove upgrade commands - Windows #13446
- script: | # Change version of react-native from 'next' to '$(reactNativeDevDependency)' - Windows #13446
npx --yes create-react-native-library@latest --slug testcli --description testcli --author-name "React-Native-Windows Bot" --author-email [email protected] --author-url http://example.com --repo-url http://example.com --languages kotlin-objc --type module-new --react-native-version next --example vanilla testcli
cd testcli && call yarn upgrade react-native@$(reactNativeDevDependency) --dev
cd example && call yarn upgrade react-native@$(reactNativeDevDependency)
displayName: Init new lib project with create-react-native-library
workingDirectory: $(Agent.BuildDirectory)

- script: | # Remove upgrade commands - Windows #13446
call yarn install
call yarn add react@$(reactDevDependency) --dev
call yarn add react-native@$(reactNativeDevDependency) --dev
displayName: Fix lib react-native dependency
workingDirectory: $(Agent.BuildDirectory)\testcli

- script: | # Remove upgrade commands - Windows #13446
call yarn install
call yarn add react@$(reactDevDependency)
call yarn add react-native@$(reactNativeDevDependency)
displayName: Fix example app react-native dependency
workingDirectory: $(Agent.BuildDirectory)\testcli\example
- ${{ elseif and(endsWith(parameters.template, '-lib'), startsWith(parameters.template, 'old')) }}:
- script: |
npx --yes [email protected] --package-name "testcli" testcli
Expand Down Expand Up @@ -105,8 +123,8 @@ steps:
YARN_ENABLE_IMMUTABLE_INSTALLS: false

- script: |
call yarn react-native init-windows --template ${{ parameters.template }} --overwrite --logging ${{ parameters.additionalInitArguments }}
displayName: Call react-native init-windows
call npx @react-native-community/cli init-windows --template ${{ parameters.template }} --overwrite --logging ${{ parameters.additionalInitArguments }}
displayName: Call @react-native-community/cli init-windows
workingDirectory: $(Agent.BuildDirectory)\testcli
env:
YARN_ENABLE_IMMUTABLE_INSTALLS: false
Expand Down Expand Up @@ -178,7 +196,7 @@ steps:

# Only test bundling in debug since we already bundle as part of release builds
- ${{ if and(endsWith(parameters.template, '-app'), eq(parameters.configuration, 'Debug')) }}:
- script: npx react-native bundle --entry-file index.js --platform windows --bundle-output test.bundle
- script: npx @react-native-community/cli bundle --entry-file index.js --platform windows --bundle-output test.bundle
displayName: Create bundle testcli
workingDirectory: $(Agent.BuildDirectory)\testcli

Expand Down
6 changes: 3 additions & 3 deletions .ado/templates/run-windows-with-certificates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ parameters:
steps:
- ${{ if eq(parameters.buildConfiguration, 'Debug') }}:
- script: >
yarn react-native run-windows
npx @react-native-community/cli run-windows
--arch ${{ parameters.buildPlatform }}
--no-launch
--logging
Expand All @@ -45,7 +45,7 @@ steps:

- ${{ if and(eq(parameters.buildConfiguration, 'Release'), endsWith(parameters.buildEnvironment, 'PullRequest')) }}:
- script: >
yarn react-native run-windows
npx @react-native-community/cli run-windows
--arch ${{ parameters.buildPlatform }}
--release
--no-launch
Expand All @@ -60,7 +60,7 @@ steps:
- template: ../templates/write-certificate.yml

- script: >
yarn react-native run-windows
npx @react-native-community/cli run-windows
--arch ${{ parameters.buildPlatform }}
--release
--no-launch
Expand Down
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/bug-report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ body:
attributes:
label: CLI version
description: |
Run the command `npx react-native --version` in your terminal and copy the results here
value: "npx react-native -v"
Run the command `npx @react-native-community/cli --version` in your terminal and copy the results here
value: "npx @react-native-community/cli -v"
id: cli
- type: textarea
validations:
required: true
attributes:
label: Environment
description: |
Run the command `npx react-native info` in your terminal and copy the results here
value: "npx react-native info"
Run the command `npx @react-native-community/cli info` in your terminal and copy the results here
value: "npx @react-native-community/cli info"
render: markdown
id: env
- type: textarea
Expand Down Expand Up @@ -98,7 +98,7 @@ body:
attributes:
value: |
**Troubleshooting**
If you see build failure on `react-native run-windows`, please try again with `react-native run-windows --logging` and provide the output.
If you see build failure on `npx @react-native-community/cli run-windows`, please try again with `npx @react-native-community/cli run-windows --logging` and provide the output.
id: troubleshoot
- type: textarea
attributes:
Expand Down
6 changes: 3 additions & 3 deletions .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -335,14 +335,14 @@ configuration:

If you are using latest version:

1. `npx react-native --version`:
1. `npx @react-native-community/cli --version`:

2. `npx react-native run-windows --info`:
2. `npx @react-native-community/cli run-windows --info`:


Otherwise if `--info` doesn't exist:

1. `react-native -v`:
1. `npx @react-native-community/cli -v`:

2. `npm ls rnpm-plugin-windows`:

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate 7/1",
"packageName": "@office-iss/react-native-win32",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Integrate 7/1",
"packageName": "@react-native-windows/automation-channel",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate 7/1",
"packageName": "@react-native-windows/cli",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate 7/1",
"packageName": "@react-native-windows/codegen",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate 7/1",
"packageName": "@react-native-windows/telemetry",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Integrate 7/1",
"packageName": "@rnw-scripts/eslint-config",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Integrate 7/1",
"packageName": "@rnw-scripts/integrate-rn",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Integrate 7/1",
"packageName": "react-native-platform-override",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate 7/1",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Integrate 7/1",
"packageName": "react-native-windows-init",
"email": "[email protected]",
"dependentChangeType": "patch"
}
4 changes: 2 additions & 2 deletions docs/testing-nuget-packages.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Testing NuGet package for new react-native init templates.
## Testing NuGet package for new @react-native-community/cli init templates.
Today's default is to use the C++ and C# code from the `react-native-windows` npm package as source. We have been working on moving to a binary distribution model for this code via NuGet.

Today we support the following projects as a NuGet package:
Expand Down Expand Up @@ -38,7 +38,7 @@ Today we support the following projects as a NuGet package:
> if it fails with already being registered for another enlistment you can run `yarn unlink`
1. Generate a test project
1. open terminal in a test folder
1. `npx react-native init MyProj`
1. `npx @react-native-community/cli init MyProj`
1. cd `MyProj`
1. Apply the react-native-windows template:
1. `node z:\src\r3\packages\react-native-windows-init\bin.js --useDevMode --overwrite --language cs --experimentalNuGetDependency --nuGetTestFeed c:\temp\RnWNuGetTesting\feed --nuGetTestVersion 0.0.1-MyTest001 `
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.75.0-nightly-20240618-5df5ed1a8",
"baseVersion": "0.76.0-nightly-20240701-9f6cb21ed",
"overrides": [
{
"type": "patch",
Expand Down
6 changes: 3 additions & 3 deletions packages/@office-iss/react-native-win32-tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
"validate-overrides": "react-native-platform-override validate"
},
"dependencies": {
"@react-native/tester": "0.75.0-main",
"@react-native/tester": "0.76.0-main",
"@typescript-eslint/eslint-plugin": "^5.30.5",
"@typescript-eslint/parser": "^5.57.1",
"flow-enums-runtime": "^0.0.5"
},
"peerDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.257",
"react": "18.0.0",
"react-native": "0.75.0-nightly-20240618-5df5ed1a8"
"react-native": "0.76.0-nightly-20240701-9f6cb21ed"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.257",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.75.0-nightly-20240618-5df5ed1a8",
"react-native": "0.76.0-nightly-20240701-9f6cb21ed",
"react-native-platform-override": "^1.9.44",
"typescript": "5.0.4"
},
Expand Down
6 changes: 4 additions & 2 deletions packages/@office-iss/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
.*/node_modules/sample-apps/.*
.*/node_modules/playground/.*

; Ignore templates for 'react-native init'
; Ignore templates for 'npx @react-native-community/cli init'
<PROJECT_ROOT>/packages/react-native/template/.*
<PROJECT_ROOT>/packages/react-native/sdks/.*

Expand Down Expand Up @@ -129,6 +129,8 @@ module.name_mapper='^@office-iss/react-native-win32/\(.*\)$' -> '<PROJECT_ROOT>\
module.name_mapper='^@react-native/dev-middleware$' -> '<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'

one_sided_type_guards=true

suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FlowFixMeProps
Expand Down Expand Up @@ -159,4 +161,4 @@ untyped-import
untyped-type-import

[version]
^0.238.0
^0.238.3
10 changes: 5 additions & 5 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.75.0-nightly-20240618-5df5ed1a8",
"baseVersion": "0.76.0-nightly-20240701-9f6cb21ed",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "75582b181be0cd6790f7c021bfafb761dfc42381"
"baseHash": "2b0a3c4f44b686f254516c51469500bf26c5b113"
},
{
"type": "derived",
"file": "src-win/index.win32.js",
"baseFile": "packages/react-native/index.js",
"baseHash": "dd3b224f82882d17be0a79a368b293c9ac6599a0"
"baseHash": "2690130ef7a40e3fb37fc465979e69b1036cdae8"
},
{
"type": "platform",
Expand Down Expand Up @@ -317,7 +317,7 @@
"type": "patch",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorHeader.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorHeader.js",
"baseHash": "e85290422895e30d58e2d804f11e73407a743282",
"baseHash": "46b6ee5d65a0c820dd0a2415bd8f43e5e8807bae",
"issue": 7952
},
{
Expand Down Expand Up @@ -439,7 +439,7 @@
"type": "derived",
"file": "src-win/Libraries/Text/Text.win32.js",
"baseFile": "packages/react-native/Libraries/Text/Text.js",
"baseHash": "71c24366f3f0baa9a48ba34c08b255483bf77553"
"baseHash": "3b40ec7def4177ef81ad2eb84a0f95bc00cec041"
},
{
"type": "derived",
Expand Down
Loading