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.

Sign up for GitHub

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

Drop internal base config merge in metro-config #36777

Closed
wants to merge 2 commits into from
Closed

Drop internal base config merge in metro-config #36777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d52ae4e
Bump CLI to 12.0.0-alpha.3 and Metro to 0.76.2 (#36948)
jacdebug Apr 18, 2023
e74ba1e
Drop internal base config merge in metro-config (#36777)
huntie Apr 18, 2023
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
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@
"jest": "^29.2.1",
"jest-junit": "^10.0.0",
"jscodeshift": "^0.14.0",
"metro-babel-register": "0.76.0",
"metro-memory-fs": "0.76.0",
"metro-react-native-babel-transformer": "0.76.0",
"metro-babel-register": "0.76.2",
"metro-memory-fs": "0.76.2",
"metro-react-native-babel-transformer": "0.76.2",
"mkdirp": "^0.5.1",
"mock-fs": "^5.1.4",
"prettier": "^2.4.1",
Expand Down
13 changes: 4 additions & 9 deletions packages/metro-config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
* @noformat
*/

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

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

const INTERNAL_CALLSITES_REGEX = new RegExp(
[
Expand All @@ -37,8 +37,8 @@ const INTERNAL_CALLSITES_REGEX = new RegExp(
*/
function getDefaultConfig(
projectRoot /*: string */
) /*: ConfigT */ {
const config = {
) /*: MetroConfig */ {
return {
resolver: {
resolverMainFields: ['react-native', 'browser', 'main'],
platforms: ['android', 'ios'],
Expand Down Expand Up @@ -76,11 +76,6 @@ function getDefaultConfig(
},
watchFolders: [],
};

return mergeConfig(
getBaseConfig.getDefaultValues(projectRoot),
config,
);
}

module.exports = {getDefaultConfig, mergeConfig};
6 changes: 3 additions & 3 deletions packages/metro-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"exports": "./index.js",
"dependencies": {
"@react-native/js-polyfills": "^0.73.0",
"metro-config": "0.76.0",
"metro-react-native-babel-transformer": "0.76.0",
"metro-runtime": "0.76.0"
"metro-config": "0.76.2",
"metro-react-native-babel-transformer": "0.76.2",
"metro-runtime": "0.76.2"
}
}
10 changes: 5 additions & 5 deletions packages/react-native/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@
},
"dependencies": {
"@jest/create-cache-key-function": "^29.2.1",
"@react-native-community/cli": "12.0.0-alpha.0",
"@react-native-community/cli-platform-android": "12.0.0-alpha.0",
"@react-native-community/cli-platform-ios": "12.0.0-alpha.0",
"@react-native-community/cli": "12.0.0-alpha.3",
"@react-native-community/cli-platform-android": "12.0.0-alpha.3",
"@react-native-community/cli-platform-ios": "12.0.0-alpha.3",
"@react-native/assets-registry": "^0.73.0",
"@react-native/codegen": "^0.73.0",
"@react-native/gradle-plugin": "^0.73.0",
Expand All @@ -98,8 +98,8 @@
"jest-environment-node": "^29.2.1",
"jsc-android": "^250231.0.0",
"memoize-one": "^5.0.0",
"metro-runtime": "0.76.0",
"metro-source-map": "0.76.0",
"metro-runtime": "0.76.2",
"metro-source-map": "0.76.2",
"mkdirp": "^0.5.1",
"nullthrows": "^1.1.1",
"pretty-format": "^26.5.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
"@react-native/eslint-config": "^0.73.0",
"@react-native/metro-config": "^0.73.0",
"@tsconfig/react-native": "^2.0.2",
"@types/metro-config": "^0.76.1",
"@types/metro-config": "^0.76.2",
"@types/react": "^18.0.24",
"@types/react-test-renderer": "^18.0.0",
"babel-jest": "^29.2.1",
"eslint": "^8.19.0",
"jest": "^29.2.1",
"metro-react-native-babel-preset": "0.76.0",
"metro-react-native-babel-preset": "0.76.2",
"prettier": "^2.4.1",
"react-test-renderer": "18.2.0",
"typescript": "4.8.4"
Expand Down
Loading