diff --git a/e2e/detox/src/detox.test.ts b/e2e/detox/src/detox.test.ts index e0626aea90f3d..56e0cd2055206 100644 --- a/e2e/detox/src/detox.test.ts +++ b/e2e/detox/src/detox.test.ts @@ -31,11 +31,7 @@ describe('Detox', () => { describe('React Native Detox MACOS-Tests', () => { if (isOSX()) { - it('should build and test ios MACOS-Tests', async () => { - expect(runCLI(`build-ios ${appName}-e2e --prod`)).toContain( - 'Successfully ran target build-ios' - ); - + it('should test ios MACOS-Tests', async () => { expect( runCLI( `test-ios ${appName}-e2e --prod --debugSynchronization=true --loglevel=trace` diff --git a/package.json b/package.json index f6fa6ebfbd700..80f329a317f60 100644 --- a/package.json +++ b/package.json @@ -183,7 +183,7 @@ "license-webpack-plugin": "^4.0.2", "loader-utils": "1.2.3", "memfs": "^3.0.1", - "metro-resolver": "^0.67.0", + "metro-resolver": "^0.69.1", "mime": "2.4.4", "mini-css-extract-plugin": "~2.4.7", "minimatch": "3.0.4", diff --git a/packages/detox/migrations.json b/packages/detox/migrations.json index f44cc7dd73fdf..9a06182451105 100644 --- a/packages/detox/migrations.json +++ b/packages/detox/migrations.json @@ -38,10 +38,6 @@ "detox": { "version": "18.22.2", "alwaysAddToPackageJson": false - }, - "@types/detox": { - "version": "17.14.3", - "alwaysAddToPackageJson": false } } }, @@ -65,10 +61,6 @@ "version": "19.4.1", "alwaysAddToPackageJson": false }, - "@types/detox": { - "version": "18.1.0", - "alwaysAddToPackageJson": false - }, "@testing-library/jest-dom": { "version": "5.16.1", "alwaysAddToPackageJson": false @@ -96,6 +88,15 @@ "alwaysAddToPackageJson": false } } + }, + "13.9.3": { + "version": "13.9.3-beta.0", + "packages": { + "detox": { + "version": "19.5.7", + "alwaysAddToPackageJson": false + } + } } } } diff --git a/packages/detox/package.json b/packages/detox/package.json index fd400817131af..41e0fe14e6c6e 100644 --- a/packages/detox/package.json +++ b/packages/detox/package.json @@ -32,7 +32,7 @@ "chalk": "^4.1.0" }, "peerDependencies": { - "detox": "^19.5.1" + "detox": "^19.5.7" }, "builders": "./executors.json", "ng-update": { diff --git a/packages/detox/src/utils/versions.ts b/packages/detox/src/utils/versions.ts index 2e217e9e0d506..63517868a9c50 100644 --- a/packages/detox/src/utils/versions.ts +++ b/packages/detox/src/utils/versions.ts @@ -1,4 +1,4 @@ export const nxVersion = '*'; -export const detoxVersion = '19.5.1'; +export const detoxVersion = '19.5.7'; export const testingLibraryJestDom = '5.16.2'; diff --git a/packages/react-native/migrations.json b/packages/react-native/migrations.json index 2abe8b3554452..053e63657d7e9 100644 --- a/packages/react-native/migrations.json +++ b/packages/react-native/migrations.json @@ -407,6 +407,39 @@ "alwaysAddToPackageJson": false } } + }, + "13.9.3": { + "version": "13.9.3-beta.0", + "packages": { + "@types/react-native": { + "version": "0.67.3", + "alwaysAddToPackageJson": false + }, + "metro": { + "version": "0.69.1", + "alwaysAddToPackageJson": false + }, + "metro-resolver": { + "version": "0.69.1", + "alwaysAddToPackageJson": false + }, + "metro-config": { + "version": "0.69.1", + "alwaysAddToPackageJson": false + }, + "metro-react-native-babel-preset": { + "version": "0.69.1", + "alwaysAddToPackageJson": false + }, + "@babel/runtime": { + "version": "7.17.7", + "alwaysAddToPackageJson": false + }, + "@react-native-async-storage/async-storage": { + "version": "1.16.3", + "alwaysAddToPackageJson": false + } + } } } } diff --git a/packages/react-native/package.json b/packages/react-native/package.json index 6892c696b1651..68eaa1db1e9bb 100644 --- a/packages/react-native/package.json +++ b/packages/react-native/package.json @@ -35,7 +35,7 @@ "enhanced-resolve": "^5.8.3", "fs-extra": "^9.1.0", "ignore": "^5.0.4", - "metro-resolver": "^0.67.0", + "metro-resolver": "^0.69.1", "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 78e6602380af2..1c38428aac1d6 100644 --- a/packages/react-native/plugins/metro-resolver.ts +++ b/packages/react-native/plugins/metro-resolver.ts @@ -2,7 +2,6 @@ import * as metroResolver from 'metro-resolver'; import type { MatchPath } from 'tsconfig-paths'; import { createMatchPath, loadConfig } from 'tsconfig-paths'; import * as chalk from 'chalk'; -import { detectPackageManager } from '@nrwl/devkit'; import { CachedInputFileSystem, ResolverFactory } from 'enhanced-resolve'; import { dirname, join } from 'path'; import * as fs from 'fs'; @@ -32,16 +31,14 @@ export function getResolveRequest(extensions: string[]) { return resolvedPath; } - if (detectPackageManager(appRootPath) === 'pnpm') { - resolvedPath = pnpmResolver( - extensions, - context, - realModuleName, - moduleName - ); - if (resolvedPath) { - return resolvedPath; - } + resolvedPath = pnpmResolver( + extensions, + context, + realModuleName, + moduleName + ); + if (resolvedPath) { + return resolvedPath; } return tsconfigPathsResolver( diff --git a/packages/react-native/src/generators/component/schema.json b/packages/react-native/src/generators/component/schema.json index c2dd5864dcb9e..3fefdb44fcb62 100644 --- a/packages/react-native/src/generators/component/schema.json +++ b/packages/react-native/src/generators/component/schema.json @@ -2,7 +2,7 @@ "cli": "nx", "$id": "NxReactNativeApplication", "$schema": "http://json-schema.org/schema", - "title": "Create a React Component for Nx", + "title": "Create a React Native Component for Nx", "type": "object", "examples": [ { diff --git a/packages/react-native/src/generators/init/init.ts b/packages/react-native/src/generators/init/init.ts index 80074e44b2583..f3764cc8493b7 100644 --- a/packages/react-native/src/generators/init/init.ts +++ b/packages/react-native/src/generators/init/init.ts @@ -22,7 +22,7 @@ import { metroReactNativeBabelPresetVersion, metroVersion, nxVersion, - reactNativeAsyncStorageVersion, + reactNativeAsyncStorageAsyncStorageVersion, reactNativeCommunityCli, reactNativeCommunityCliAndroid, reactNativeCommunityCliIos, @@ -90,7 +90,7 @@ export function updateDependencies(host: Tree) { 'react-native-svg': reactNativeSvgVersion, 'react-native-config': reactNativeConfigVersion, '@react-native-async-storage/async-storage': - reactNativeAsyncStorageVersion, + reactNativeAsyncStorageAsyncStorageVersion, ...(isPnpm ? { 'metro-config': metroVersion, // metro-config is used by metro.config.js diff --git a/packages/react-native/src/generators/init/schema.json b/packages/react-native/src/generators/init/schema.json index 69ce55450463f..10061974fb9cf 100644 --- a/packages/react-native/src/generators/init/schema.json +++ b/packages/react-native/src/generators/init/schema.json @@ -2,7 +2,7 @@ "cli": "nx", "$id": "NxReactNativeInit", "$schema": "http://json-schema.org/schema", - "title": "Add Nx React Schematics", + "title": "Add Nx React Native Schematics", "type": "object", "properties": { "unitTestRunner": { diff --git a/packages/react-native/src/utils/versions.ts b/packages/react-native/src/utils/versions.ts index c8e071f41dcaf..8f2b4b913635b 100644 --- a/packages/react-native/src/utils/versions.ts +++ b/packages/react-native/src/utils/versions.ts @@ -1,18 +1,18 @@ export const nxVersion = '*'; export const reactNativeVersion = '0.67.3'; -export const typesReactNativeVersion = '0.67.2'; +export const typesReactNativeVersion = '0.67.3'; -export const metroVersion = '0.69.0'; +export const metroVersion = '0.69.1'; export const reactNativeCommunityCli = '7.0.1'; export const reactNativeCommunityCliIos = '7.0.1'; export const reactNativeCommunityCliAndroid = '7.0.1'; export const reactNativeConfigVersion = '1.4.5'; -export const reactNativeAsyncStorageVersion = '1.16.1'; +export const reactNativeAsyncStorageAsyncStorageVersion = '1.16.3'; -export const metroReactNativeBabelPresetVersion = '0.69.0'; +export const metroReactNativeBabelPresetVersion = '0.69.1'; export const testingLibraryReactNativeVersion = '9.0.0'; export const testingLibraryJestNativeVersion = '4.0.4'; @@ -24,4 +24,4 @@ export const reactTestRendererVersion = '17.0.2'; export const reactNativeSvgTransformerVersion = '1.0.0'; export const reactNativeSvgVersion = '12.3.0'; -export const babelRuntimeVersion = '7.17.2'; +export const babelRuntimeVersion = '7.17.7'; diff --git a/yarn.lock b/yarn.lock index 7747af5078906..8ed9ff0b27ab8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16993,10 +16993,10 @@ methods@~1.1.2: resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -metro-resolver@^0.67.0: - version "0.67.0" - resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.67.0.tgz#8143c716f77e468d1d42eca805243706eb349959" - integrity sha512-d2KS/zAyOA/z/q4/ff41rAp+1txF4H6qItwpsls/RHStV2j6PqgRHUzq/3ga+VIeoUJntYJ8nGW3+3qSrhFlig== +metro-resolver@^0.69.1: + version "0.69.1" + resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.69.1.tgz#0f01285e9e2683debf6599b91e7bf179f94990dd" + integrity sha512-sTUp8n3hP+K6Jm3beqnadPZWj53trzDi0wqLKC2iKNy1+UoBZkiqmHY0dZKaoF8XoOsksoph+aghlBZkchgEng== dependencies: absolute-path "^0.0.0"