diff --git a/package.json b/package.json index 42fb2abf4dde3..7831e1af89e89 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ "license-webpack-plugin": "^4.0.2", "loader-utils": "1.2.3", "memfs": "^3.0.1", - "metro-resolver": "^0.70.2", + "metro-resolver": "^0.70.3", "mime": "2.4.4", "mini-css-extract-plugin": "~2.4.7", "minimatch": "3.0.4", diff --git a/packages/react-native/migrations.json b/packages/react-native/migrations.json index 64e1703a7b797..94251b0dc271b 100644 --- a/packages/react-native/migrations.json +++ b/packages/react-native/migrations.json @@ -562,6 +562,39 @@ "alwaysAddToPackageJson": false } } + }, + "14.1.8": { + "version": "14.1.8-beta.0", + "packages": { + "metro": { + "version": "0.70.3", + "alwaysAddToPackageJson": false + }, + "metro-resolver": { + "version": "0.70.3", + "alwaysAddToPackageJson": false + }, + "metro-babel-register": { + "version": "0.70.3", + "alwaysAddToPackageJson": false + }, + "metro-config": { + "version": "0.70.3", + "alwaysAddToPackageJson": false + }, + "metro-react-native-babel-preset": { + "version": "0.70.3", + "alwaysAddToPackageJson": false + }, + "@types/react-native": { + "version": "0.67.7", + "alwaysAddToPackageJson": false + }, + "react-test-renderer": { + "version": "18.1.0", + "alwaysAddToPackageJson": false + } + } } } } diff --git a/packages/react-native/package.json b/packages/react-native/package.json index cbdca2c836e0f..9d5c092239265 100644 --- a/packages/react-native/package.json +++ b/packages/react-native/package.json @@ -35,7 +35,7 @@ "enhanced-resolve": "^5.8.3", "fs-extra": "^10.1.0", "ignore": "^5.0.4", - "metro-resolver": "^0.70.2", + "metro-resolver": "^0.70.3", "node-fetch": "^2.6.7", "tsconfig-paths": "^3.9.0" }, diff --git a/packages/react-native/plugins/metro-resolver.ts b/packages/react-native/plugins/metro-resolver.ts index 99ffb789d9bc8..4a21a54433abd 100644 --- a/packages/react-native/plugins/metro-resolver.ts +++ b/packages/react-native/plugins/metro-resolver.ts @@ -27,7 +27,7 @@ export function getResolveRequest(extensions: string[]) { const { resolveRequest, ...context } = _context; const resolvedPath = - defaultMetroResolver(context, moduleName, platform, DEBUG) || + defaultMetroResolver(context, realModuleName, platform, DEBUG) || tsconfigPathsResolver( context, extensions, @@ -50,17 +50,17 @@ export function getResolveRequest(extensions: string[]) { */ function defaultMetroResolver( context: any, - moduleName: string, + realModuleName: string, platform: string, debug: boolean ) { try { - return metroResolver.resolve(context, moduleName, platform); + return metroResolver.resolve(context, realModuleName, platform); } catch { if (debug) console.log( chalk.cyan( - `[Nx] Unable to resolve with default Metro resolver: ${moduleName}` + `[Nx] Unable to resolve with default Metro resolver: ${realModuleName}` ) ); } @@ -141,13 +141,13 @@ let matcher: MatchPath; let absoluteBaseUrl: string; let paths: Record; -function getMatcher(DEBUG: boolean) { +function getMatcher(debug: boolean) { if (!matcher) { const result = loadConfig(); if (result.resultType === 'success') { absoluteBaseUrl = result.absoluteBaseUrl; paths = result.paths; - if (DEBUG) { + if (debug) { console.log( chalk.cyan(`[Nx] Located tsconfig at ${chalk.bold(absoluteBaseUrl)}`) ); diff --git a/packages/react-native/src/utils/versions.ts b/packages/react-native/src/utils/versions.ts index 2803771384a67..00e32655e7140 100644 --- a/packages/react-native/src/utils/versions.ts +++ b/packages/react-native/src/utils/versions.ts @@ -1,11 +1,11 @@ export const nxVersion = '*'; export const reactNativeVersion = '0.68.1'; -export const typesReactNativeVersion = '0.67.6'; +export const typesReactNativeVersion = '0.67.7'; export const typesNodeVersion = '16.11.7'; -export const metroVersion = '0.70.2'; +export const metroVersion = '0.70.3'; export const reactNativeCommunityCli = '7.0.3'; export const reactNativeCommunityCliIos = '7.0.1'; @@ -19,7 +19,7 @@ export const testingLibraryJestNativeVersion = '4.0.4'; export const jestReactNativeVersion = '18.0.0'; -export const reactTestRendererVersion = '18.0.0'; +export const reactTestRendererVersion = '18.1.0'; export const reactNativeSvgTransformerVersion = '1.0.0'; export const reactNativeSvgVersion = '12.3.0'; diff --git a/yarn.lock b/yarn.lock index 0e64df9710854..126f78ca50b7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15615,10 +15615,10 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -metro-resolver@^0.70.2: - version "0.70.2" - resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.70.2.tgz#fb7f70634e3832ee2dde37e28df8901a8ae0fec2" - integrity sha512-fYuEOTSB+ri0y2kOLL8PuqblD1/3h3tZ8G02wNFeB5oCbEqZ1jhSAG/f6hj/qy7xUA18oyG5qJqiHtiRDFO6yg== +metro-resolver@^0.70.3: + version "0.70.3" + resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.70.3.tgz#c64fdd6d0a88fa62f3f99f87e539b5f603bd47bf" + integrity sha512-5Pc5S/Gs4RlLbziuIWtvtFd9GRoILlaRC8RZDVq5JZWcWHywKy/PjNmOBNhpyvtRlzpJfy/ssIfLhu8zINt1Mw== dependencies: absolute-path "^0.0.0"