Skip to content

Commit caaa33f

Browse files
committed
Merge branch 'master' of github.com:mateoguzmana/react-native into fix/playground-description-not-visible-in-dark-mode
2 parents 5b8d73a + e5dd7d6 commit caaa33f

File tree

338 files changed

+5905
-3741
lines changed

Some content is hidden

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

338 files changed

+5905
-3741
lines changed

.flowconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ untyped-import
9090
untyped-type-import
9191

9292
[version]
93-
^0.250.0
93+
^0.251.1

.github/workflow-scripts/__tests__/publishTemplate-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ describe('#publishTemplate', () => {
4646
expect(github.rest.actions.createWorkflowDispatch).toHaveBeenCalledWith({
4747
owner: 'react-native-community',
4848
repo: 'template',
49-
workflow_id: 'release.yml',
49+
workflow_id: 'release.yaml',
5050
ref: '0.76-stable',
5151
inputs: {
5252
dry_run: true,
@@ -66,7 +66,7 @@ describe('#publishTemplate', () => {
6666
expect(github.rest.actions.createWorkflowDispatch).toHaveBeenCalledWith({
6767
owner: 'react-native-community',
6868
repo: 'template',
69-
workflow_id: 'release.yml',
69+
workflow_id: 'release.yaml',
7070
ref: '0.76-stable',
7171
inputs: {
7272
dry_run: false,

.github/workflow-scripts/publishTemplate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module.exports.publishTemplate = async (github, version, dryRun = true) => {
4242
await github.rest.actions.createWorkflowDispatch({
4343
owner: 'react-native-community',
4444
repo: 'template',
45-
workflow_id: 'release.yml',
45+
workflow_id: 'release.yaml',
4646
ref,
4747
inputs: {
4848
dry_run: dryRun,

.github/workflow-scripts/utils.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
const {execSync} = require('child_process');
1111

12-
function run(...cmd) {
12+
function run(cmd) {
1313
return execSync(cmd, 'utf8').toString().trim();
1414
}
1515
module.exports.run = run;
@@ -21,7 +21,7 @@ module.exports.sleep = sleep;
2121

2222
async function getNpmPackageInfo(pkg, versionOrTag) {
2323
return fetch(`https://registry.npmjs.org/${pkg}/${versionOrTag}`).then(resp =>
24-
res.json(),
24+
resp.json(),
2525
);
2626
}
2727
module.exports.getNpmPackageInfo = getNpmPackageInfo;

.github/workflows/publish-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,9 @@ jobs:
205205
with:
206206
github-token: ${{ secrets.REACT_NATIVE_BOT_GITHUB_TOKEN }}
207207
script: |
208-
const {verifyPublished, isLatest} = require('./.github/workflow-scripts/publishTemplate.js')
208+
const {verifyPublishedTemplate, isLatest} = require('./.github/workflow-scripts/publishTemplate.js')
209209
const version = "${{ github.ref_name }}"
210-
await verifyPublished(version, isLatest());
210+
await verifyPublishedTemplate(version, isLatest());
211211
- name: Update rn-diff-purge to generate upgrade-support diff
212212
run: |
213213
curl -X POST https://api.github.com/repos/react-native-community/rn-diff-purge/dispatches \

CHANGELOG.md

Lines changed: 280 additions & 473 deletions
Large diffs are not rendered by default.

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ ruby ">= 2.6.10"
55

66
gem 'cocoapods', '~> 1.13', '!= 1.15.0', '!= 1.15.1'
77
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
8+
gem 'xcodeproj', '< 1.26.0'

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
"flow": "flow",
1515
"format-check": "prettier --list-different \"./**/*.{js,md,yml,ts,tsx}\"",
1616
"format": "npm run prettier && npm run clang-format",
17-
"featureflags-check": "cd packages/react-native && yarn featureflags-check",
18-
"featureflags-update": "cd packages/react-native && yarn featureflags-update",
17+
"featureflags": "cd packages/react-native && yarn featureflags",
1918
"lint-ci": "./scripts/circleci/analyze_code.sh && yarn shellcheck",
2019
"lint-java": "node ./scripts/lint-java.js",
2120
"lint": "eslint .",
@@ -78,7 +77,7 @@
7877
"eslint-plugin-redundant-undefined": "^0.4.0",
7978
"eslint-plugin-relay": "^1.8.3",
8079
"flow-api-translator": "0.24.0",
81-
"flow-bin": "^0.250.0",
80+
"flow-bin": "^0.251.1",
8281
"glob": "^7.1.1",
8382
"hermes-eslint": "0.24.0",
8483
"hermes-transform": "0.24.0",

packages/debugger-frontend/BUILD_INFO

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@generated SignedSource<<1b9049cb997851561480ca34c5073b7d>>
2-
Git revision: 117c96a1dda920e4dcfcbb22c30cc5f507ebd546
1+
@generated SignedSource<<b5e82d2eb99e1ed4c012065a530ca78b>>
2+
Git revision: ff343d805527223750fafb8573ee48f8e2fb0d1e
33
Built with --nohooks: false
44
Is local checkout: false
55
Remote URL: https://github.com/facebookexperimental/rn-chrome-devtools-frontend

packages/debugger-frontend/dist/third-party/front_end/models/react_native/react_native.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)