Skip to content

Commit c068efc

Browse files
huntiejacdebug
andauthored
[0.72] Bump Metro to 0.76.2, cherry pick Metro config updates (#36976)
Co-authored-by: Deepak Jacob <[email protected]>
1 parent 51de9e1 commit c068efc

File tree

6 files changed

+226
-358
lines changed

6 files changed

+226
-358
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@
8484
"jest": "^29.2.1",
8585
"jest-junit": "^10.0.0",
8686
"jscodeshift": "^0.14.0",
87-
"metro-babel-register": "0.75.1",
88-
"metro-memory-fs": "0.75.1",
89-
"metro-react-native-babel-transformer": "0.75.1",
87+
"metro-babel-register": "0.76.2",
88+
"metro-memory-fs": "0.76.2",
89+
"metro-react-native-babel-transformer": "0.76.2",
9090
"mkdirp": "^0.5.1",
9191
"mock-fs": "^5.1.4",
9292
"prettier": "^2.4.1",

packages/metro-config/index.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
* @noformat
99
*/
1010

11-
/*:: import type {ConfigT} from 'metro-config'; */
11+
/*:: import type {MetroConfig} from 'metro-config'; */
1212

13-
const {getDefaultConfig: getBaseConfig, mergeConfig} = require('metro-config');
13+
const {mergeConfig} = require('metro-config');
1414

1515
const INTERNAL_CALLSITES_REGEX = new RegExp(
1616
[
@@ -37,12 +37,12 @@ const INTERNAL_CALLSITES_REGEX = new RegExp(
3737
*/
3838
function getDefaultConfig(
3939
projectRoot /*: string */
40-
) /*: ConfigT */ {
41-
const config = {
40+
) /*: MetroConfig */ {
41+
return {
4242
resolver: {
4343
resolverMainFields: ['react-native', 'browser', 'main'],
4444
platforms: ['android', 'ios'],
45-
unstable_conditionNames: ['require', 'react-native'],
45+
unstable_conditionNames: ['require', 'import', 'react-native'],
4646
},
4747
serializer: {
4848
getPolyfills: () => require('@react-native/js-polyfills')(),
@@ -76,11 +76,6 @@ function getDefaultConfig(
7676
},
7777
watchFolders: [],
7878
};
79-
80-
return mergeConfig(
81-
getBaseConfig.getDefaultValues(projectRoot),
82-
config,
83-
);
8479
}
8580

8681
module.exports = {getDefaultConfig, mergeConfig};

packages/metro-config/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native/metro-config",
3-
"version": "0.72.1",
3+
"version": "0.72.2",
44
"description": "Metro configuration for React Native.",
55
"repository": {
66
"type": "git",
@@ -11,8 +11,8 @@
1111
"exports": "./index.js",
1212
"dependencies": {
1313
"@react-native/js-polyfills": "^0.72.1",
14-
"metro-config": "0.76.0",
15-
"metro-react-native-babel-transformer": "0.76.0",
16-
"metro-runtime": "0.76.0"
14+
"metro-config": "0.76.2",
15+
"metro-react-native-babel-transformer": "0.76.2",
16+
"metro-runtime": "0.76.2"
1717
}
1818
}

packages/react-native/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979
},
8080
"dependencies": {
8181
"@jest/create-cache-key-function": "^29.2.1",
82-
"@react-native-community/cli": "11.1.1",
83-
"@react-native-community/cli-platform-android": "11.1.1",
84-
"@react-native-community/cli-platform-ios": "11.1.1",
82+
"@react-native-community/cli": "11.2.0",
83+
"@react-native-community/cli-platform-android": "11.2.0",
84+
"@react-native-community/cli-platform-ios": "11.2.0",
8585
"@react-native/assets-registry": "^0.72.0",
8686
"@react-native/codegen": "^0.72.4",
8787
"@react-native/gradle-plugin": "^0.72.6",
@@ -98,8 +98,8 @@
9898
"jest-environment-node": "^29.2.1",
9999
"jsc-android": "^250231.0.0",
100100
"memoize-one": "^5.0.0",
101-
"metro-runtime": "0.76.0",
102-
"metro-source-map": "0.76.0",
101+
"metro-runtime": "0.76.2",
102+
"metro-source-map": "0.76.2",
103103
"mkdirp": "^0.5.1",
104104
"nullthrows": "^1.1.1",
105105
"pretty-format": "^26.5.2",

packages/react-native/template/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@
1818
"@babel/preset-env": "^7.20.0",
1919
"@babel/runtime": "^7.12.5",
2020
"@react-native/eslint-config": "^0.72.1",
21-
"@react-native/metro-config": "^0.72.1",
21+
"@react-native/metro-config": "^0.72.2",
2222
"@tsconfig/react-native": "^2.0.2",
23-
"@types/metro-config": "^0.76.1",
2423
"@types/react": "^18.0.24",
2524
"@types/react-test-renderer": "^18.0.0",
2625
"babel-jest": "^29.2.1",
2726
"eslint": "^8.19.0",
2827
"jest": "^29.2.1",
29-
"metro-react-native-babel-preset": "0.76.0",
28+
"metro-react-native-babel-preset": "0.76.2",
3029
"prettier": "^2.4.1",
3130
"react-test-renderer": "18.2.0",
3231
"typescript": "4.8.4"

0 commit comments

Comments
 (0)