Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
07c5d5f
chore: migrate most of the patches to 0.85.3
war-in Jun 1, 2026
eb0a6ab
chore: migrate rest of the patches to 0.85.3
war-in Jun 2, 2026
f48b890
patch 002 fixMVCPAndroid
jakubstec May 29, 2026
af2e41d
Merge branch 'refs/heads/main' into war-in/upgrade-to-rn-0.85
war-in Jun 2, 2026
081ce8c
chore: apply UpgradeHelper changes
war-in Jun 2, 2026
f78ffb1
chore: update expo version
war-in Jun 2, 2026
ac2e9bd
chore: update expo-related packages
war-in Jun 2, 2026
37d55ca
Merge branch 'refs/heads/main' into war-in/upgrade-to-rn-0.85
war-in Jun 3, 2026
8c31a01
fix: update deps to build iOS
war-in Jun 3, 2026
46a5ec0
fix: replace `absoluteFillObject` with new `absoluteFill`
war-in Jun 3, 2026
3ef63c4
fix: override metro dependency versions to support rn 0.85.3
jakubstec Jun 11, 2026
2961636
fix: restore global fetch replaced by expo/fetch in Expo SDK 56, add …
jakubstec Jun 15, 2026
5c6b327
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jun 15, 2026
3d36c39
chore: post-merge fixes
war-in Jun 15, 2026
6066eb0
chore: update native deps
war-in Jun 15, 2026
4c97332
fix: apply global fetch instead of expo/fetch on release builds
jakubstec Jun 15, 2026
00069ab
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jun 16, 2026
7a2c340
chore: update details.md
war-in Jun 16, 2026
038653f
chore: update `react-native-wallet`
war-in Jun 16, 2026
a16c238
chore: update details.md
war-in Jun 16, 2026
0c0523b
fix: validate actions
war-in Jun 16, 2026
fa35129
fix: prettier
war-in Jun 16, 2026
b10496b
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jun 16, 2026
ddad968
fix: tests
war-in Jun 16, 2026
3ce35b1
chore: bump rock
war-in Jun 16, 2026
0a0ded0
chore: update Podfile.lock
war-in Jun 16, 2026
1a17e7e
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jun 17, 2026
c1d68ee
chore: update `expo-store-review`
war-in Jun 17, 2026
1867e0a
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jun 17, 2026
6a2ae26
fix: iOS standalone and sourcemaps
war-in Jun 18, 2026
247342a
chore: add details.md
war-in Jun 18, 2026
811bc60
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jun 18, 2026
e6632bd
fix: handle packed sourcemaps directly in metro.config.js
war-in Jun 18, 2026
de92138
fix: freeze on cold app startup on iOS, add same patch for Android
jakubstec Jun 18, 2026
3b91c77
chore: merge related patches into one
war-in Jun 18, 2026
1fda284
fix: spellcheck & knip
war-in Jun 18, 2026
40bc6b1
chore: update podfile
war-in Jun 18, 2026
e1d285b
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jun 19, 2026
ac3bda9
fix: bootsplash freeze, disable reanimated flag FORCE_REACT_RENDER_FO…
jakubstec Jun 19, 2026
9cb0224
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jun 22, 2026
7f14273
Merge remote-tracking branch 'origin/war-in/upgrade-to-rn-0.85' into …
war-in Jun 22, 2026
4ea9ad8
chore: remove missed fixes
war-in Jun 22, 2026
94050bc
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jun 23, 2026
ded4c58
chore: fix expo-task-manager after merge
war-in Jun 23, 2026
0477230
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jun 23, 2026
55a9c48
chore: fix Mobile-Expensify commit
war-in Jun 23, 2026
e6254ce
fix: iOS freeze after SplashScreenHider
war-in Jun 23, 2026
c729d0e
Merge remote-tracking branch 'origin/main' into war-in/upgrade-to-rn-…
jakubstec Jun 25, 2026
c5e4ce0
fix: explicitly change overflow to visible in text related components…
jakubstec Jun 25, 2026
17c9d71
fix: use useThemeStyles for styles instead of inline ones
jakubstec Jun 25, 2026
75867bb
fix: update details.md
jakubstec Jun 25, 2026
7f467c1
update patches after merging with main
jakubstec Jun 29, 2026
8f347b7
Merge remote-tracking branch 'upstream/main' into war-in/upgrade-to-r…
jakubstec Jun 29, 2026
5d999fd
Merge remote-tracking branch 'origin/main' into war-in/upgrade-to-rn-…
jakubstec Jun 30, 2026
e8029f4
Merge remote-tracking branch 'origin/main' into war-in/upgrade-to-rn-…
jakubstec Jul 2, 2026
2e84f33
Merge remote-tracking branch 'origin/main' into war-in/upgrade-to-rn-…
jakubstec Jul 6, 2026
268f95e
chore: update podfile
jakubstec Jul 6, 2026
7dafd54
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jul 6, 2026
d0c8caf
chore: update Podfile
war-in Jul 6, 2026
835a6de
fix: remove useMemo due to react-compiler
jakubstec Jul 7, 2026
ec9db27
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jul 9, 2026
e81068e
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jul 9, 2026
110354f
fix: typecheck
war-in Jul 9, 2026
33c9063
fix: lint
war-in Jul 9, 2026
316798a
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jul 9, 2026
a1ee384
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jul 9, 2026
79bf993
chore: update RN patch names
war-in Jul 9, 2026
b3d58c2
Merge branch 'main' into war-in/upgrade-to-rn-0.85
war-in Jul 9, 2026
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
69 changes: 46 additions & 23 deletions .github/actions/javascript/authorChecklist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16564,9 +16564,9 @@ class Buffer {
};
return result;
}
append(str, maybeNewline) {
append(str, maybeNewline, ignoreMapping = false) {
this._flush();
this._append(str, maybeNewline);
this._append(str, maybeNewline, ignoreMapping);
}
appendChar(char) {
this._flush();
Expand Down Expand Up @@ -16612,7 +16612,7 @@ class Buffer {
position.column = 0;
}
}
_append(str, maybeNewline) {
_append(str, maybeNewline, ignoreMapping) {
const len = str.length;
const position = this._position;
const sourcePos = this._sourcePosition;
Expand All @@ -16625,7 +16625,7 @@ class Buffer {
} else {
this._str += str;
}
const hasMap = this._map !== null;
const hasMap = !ignoreMapping && this._map !== null;
if (!maybeNewline && !hasMap) {
position.column += len;
return;
Expand Down Expand Up @@ -16709,13 +16709,16 @@ class Buffer {
_normalizePosition(prop, loc, columnOffset) {
this._flush();
const pos = loc[prop];
const target = this._sourcePosition;
if (pos) {
target.line = pos.line;
target.column = Math.max(pos.column + columnOffset, 0);
target.filename = loc.filename;
this.setSourcePosition(pos.line, Math.max(pos.column + columnOffset, 0));
this._sourcePosition.filename = loc.filename;
}
}
setSourcePosition(line, column) {
const target = this._sourcePosition;
target.line = line;
target.column = column;
}
getCurrentColumn() {
return this._position.column + (this._queuedChar ? 1 : 0);
}
Expand Down Expand Up @@ -21049,7 +21052,8 @@ class Printer {
const spacesCount = count > 0 ? column : column - this._buf.getCurrentColumn();
if (spacesCount > 0) {
const spaces = this._originalCode ? this._originalCode.slice(index - spacesCount, index).replace(/[^\t\x0B\f \xA0\u1680\u2000-\u200A\u202F\u205F\u3000\uFEFF]/gu, " ") : " ".repeat(spacesCount);
this._append(spaces, false);
this._buf.append(spaces, false, true);
this._buf.setSourcePosition(line, column);
this.setLastChar(32);
}
}
Expand Down Expand Up @@ -21560,7 +21564,9 @@ class SourceMap {
line,
column: column
});
if (!originalMapping.name && identifierNamePos) {
if (originalMapping.name && (identifierNamePos || identifierName != null && originalMapping.column === column)) {
identifierName = originalMapping.name;
} else if (identifierNamePos) {
const originalIdentifierMapping = (0, _traceMapping.originalPositionFor)(this._inputMap, identifierNamePos);
if (originalIdentifierMapping.name) {
identifierName = originalIdentifierMapping.name;
Expand Down Expand Up @@ -24234,7 +24240,7 @@ var flow = superClass => class FlowParserMixin extends superClass {
}
flowParseDeclareVariable(node) {
this.next();
node.id = this.flowParseTypeAnnotatableIdentifier(true);
node.id = this.flowParseTypeAnnotatableIdentifier();
this.scope.declareName(node.id.name, 5, node.id.loc.start);
this.semicolon();
return this.finishNode(node, "DeclareVariable");
Expand Down Expand Up @@ -24408,9 +24414,14 @@ var flow = superClass => class FlowParserMixin extends superClass {
reservedType: word
});
}
flowParseRestrictedIdentifier(liberal, declaration) {
flowParseRestrictedIdentifierName(liberal, declaration) {
this.checkReservedType(this.state.value, this.state.startLoc, declaration);
return this.parseIdentifier(liberal);
return this.parseIdentifierName(liberal);
}
flowParseRestrictedIdentifier(liberal, declaration) {
const node = this.startNode();
const name = this.flowParseRestrictedIdentifierName(liberal, declaration);
return this.createIdentifier(node, name);
}
flowParseTypeAlias(node) {
node.id = this.flowParseRestrictedIdentifier(false, true);
Expand Down Expand Up @@ -24444,14 +24455,21 @@ var flow = superClass => class FlowParserMixin extends superClass {
this.semicolon();
return this.finishNode(node, "OpaqueType");
}
flowParseTypeParameterBound() {
if (this.match(14) || this.isContextual(81)) {
const node = this.startNode();
this.next();
node.typeAnnotation = this.flowParseType();
return this.finishNode(node, "TypeAnnotation");
}
}
flowParseTypeParameter(requireDefault = false) {
const nodeStartLoc = this.state.startLoc;
const node = this.startNode();
const variance = this.flowParseVariance();
const ident = this.flowParseTypeAnnotatableIdentifier();
node.name = ident.name;
node.name = this.flowParseRestrictedIdentifierName();
node.variance = variance;
node.bound = ident.typeAnnotation;
node.bound = this.flowParseTypeParameterBound();
if (this.match(29)) {
this.eat(29);
node.default = this.flowParseType();
Expand Down Expand Up @@ -25148,13 +25166,13 @@ var flow = superClass => class FlowParserMixin extends superClass {
node.typeAnnotation = this.flowParseTypeInitialiser();
return this.finishNode(node, "TypeAnnotation");
}
flowParseTypeAnnotatableIdentifier(allowPrimitiveOverride) {
const ident = allowPrimitiveOverride ? this.parseIdentifier() : this.flowParseRestrictedIdentifier();
flowParseTypeAnnotatableIdentifier() {
const node = this.startNode();
const name = this.parseIdentifierName();
if (this.match(14)) {
ident.typeAnnotation = this.flowParseTypeAnnotation();
this.resetEndLocation(ident);
node.typeAnnotation = this.flowParseTypeAnnotation();
}
return ident;
return this.createIdentifier(node, name);
}
typeCastToParameter(node) {
node.expression.typeAnnotation = node.typeAnnotation;
Expand Down Expand Up @@ -27381,6 +27399,7 @@ class CommentsParser extends BaseParser {
adjustInnerComments(node, node.properties, commentWS);
break;
case "CallExpression":
case "NewExpression":
case "OptionalCallExpression":
adjustInnerComments(node, node.arguments, commentWS);
break;
Expand All @@ -27393,6 +27412,7 @@ class CommentsParser extends BaseParser {
case "ObjectMethod":
case "ClassMethod":
case "ClassPrivateMethod":
case "TSTypeParameterDeclaration":
adjustInnerComments(node, node.params, commentWS);
break;
case "ArrayExpression":
Expand All @@ -27409,6 +27429,9 @@ class CommentsParser extends BaseParser {
case "TSEnumBody":
adjustInnerComments(node, node.members, commentWS);
break;
case "TSInterfaceBody":
adjustInnerComments(node, node.body, commentWS);
break;
default:
{
if (node.type === "RecordExpression") {
Expand Down Expand Up @@ -33711,7 +33734,7 @@ class ExpressionParser extends LValParser {
this.next();
return this.parseAsyncFunctionExpression(this.startNodeAtNode(id));
} else if (tokenIsIdentifier(type)) {
if (this.lookaheadCharCode() === 61) {
if (canBeArrow && this.lookaheadCharCode() === 61) {
return this.parseAsyncArrowUnaryFunction(this.startNodeAtNode(id));
} else {
return id;
Expand Down Expand Up @@ -43537,7 +43560,7 @@ function verify$1(visitor) {
}
if (shouldIgnoreKey(nodeType)) continue;
if (!TYPES.includes(nodeType)) {
throw new Error(`You gave us a visitor for the node type ${nodeType} but it's not a valid type in @babel/traverse ${"7.29.0"}`);
throw new Error(`You gave us a visitor for the node type ${nodeType} but it's not a valid type in @babel/traverse ${"7.29.7"}`);
}
const visitors = visitor[nodeType];
if (typeof visitors === "object") {
Expand Down
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 1 addition & 4 deletions android/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions android/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
require('dotenv').config();
/**
* Expo SDK 56 replaces global fetch with expo/fetch unless this is set at transform time.
* metro.config.js sets it for the Metro process; babel needs it here so release bundles inline the value.
*/
process.env.EXPO_PUBLIC_USE_RN_FETCH = process.env.EXPO_PUBLIC_USE_RN_FETCH ?? '1';

const BaseReactCompilerConfig = require('./config/babel/reactCompilerConfig');
const {expoInlineEnvVars} = require('babel-preset-expo/build/plugins/inline-env-vars');

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Use the published Expo env plugin path

When this config is loaded after installing this commit's babel-preset-expo@56.0.15, the package exposes build/inline-env-vars.js at the build root and does not contain a build/plugins/ directory, so Metro/Jest/Webpack Babel startup will throw Cannot find module 'babel-preset-expo/build/plugins/inline-env-vars' before any transform runs. Require babel-preset-expo/build/inline-env-vars instead.

Useful? React with 👍 / 👎.


const ReactCompilerConfig = {
...BaseReactCompilerConfig,
Expand Down Expand Up @@ -70,6 +76,9 @@ const metro = {
// It is included in metro-react-native-babel-preset but needs to be before plugin-proposal-class-properties or FlatList will break
'@babel/plugin-transform-flow-strip-types',

// Inline EXPO_PUBLIC_* env vars into release bundles (e.g. EXPO_PUBLIC_USE_RN_FETCH to keep RN fetch).
expoInlineEnvVars,

['@babel/plugin-proposal-class-properties', {loose: true}],
['@babel/plugin-proposal-private-methods', {loose: true}],
['@babel/plugin-proposal-private-property-in-object', {loose: true}],
Expand Down
3 changes: 2 additions & 1 deletion cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,8 @@
"Prefetch",
"Prefetcher",
"knip",
"lottiefiles"
"lottiefiles",
"jsitooling"
],
"ignorePaths": [
".gitignore",
Expand Down
Loading
Loading