diff --git a/e2e/expo/src/expo.test.ts b/e2e/expo/src/expo.test.ts index 01108caf26..cb9f8a02f9 100644 --- a/e2e/expo/src/expo.test.ts +++ b/e2e/expo/src/expo.test.ts @@ -105,9 +105,7 @@ describe('expo', () => { expect(prebuildResult.combinedOutput).toContain('Config synced'); }); - // TODO(emily): this test failed due to version conflict with conflict with @config-plugins/detox - // https://github.com/expo/config-plugins/issues/178 - xit('should install', async () => { + it('should install', async () => { // run install command const installResults = await runCLIAsync( `install ${appName} --no-interactive` diff --git a/packages/detox/migrations.json b/packages/detox/migrations.json index 5f96aca5ac..4e7f542ea2 100644 --- a/packages/detox/migrations.json +++ b/packages/detox/migrations.json @@ -250,6 +250,19 @@ "alwaysAddToPackageJson": false } } + }, + "16.6.0": { + "version": "16.6.0-beta.6", + "packages": { + "detox": { + "version": "^20.11.1", + "alwaysAddToPackageJson": false + }, + "@config-plugins/detox": { + "version": "~6.0.0", + "alwaysAddToPackageJson": false + } + } } } } diff --git a/packages/detox/src/executors/build/schema.d.ts b/packages/detox/src/executors/build/schema.d.ts index 7a8231e7f5..f4c037be48 100644 --- a/packages/detox/src/executors/build/schema.d.ts +++ b/packages/detox/src/executors/build/schema.d.ts @@ -1,4 +1,4 @@ -// options from https://github.com/wix/Detox/blob/master/docs/APIRef.DetoxCLI.md#build +// options from https://github.com/wix/Detox/blob/master/docs/cli/build.md export interface DetoxBuildOptions { detoxConfiguration?: string; configPath?: string; diff --git a/packages/detox/src/utils/versions.ts b/packages/detox/src/utils/versions.ts index 87be7987b1..2051664bd3 100644 --- a/packages/detox/src/utils/versions.ts +++ b/packages/detox/src/utils/versions.ts @@ -1,5 +1,5 @@ export const nxVersion = require('../../package.json').version; -export const detoxVersion = '^20.9.0'; +export const detoxVersion = '^20.11.1'; export const testingLibraryJestDom = '5.16.5'; -export const configPluginsDetoxVersion = '~5.0.1'; // only required for expo +export const configPluginsDetoxVersion = '~6.0.0'; // only required for expo diff --git a/packages/expo/src/migrations/update-16-6-0/update-metro-config.ts b/packages/expo/src/migrations/update-16-6-0/update-metro-config.ts index 31fee35fe5..be6f6caf6c 100644 --- a/packages/expo/src/migrations/update-16-6-0/update-metro-config.ts +++ b/packages/expo/src/migrations/update-16-6-0/update-metro-config.ts @@ -54,7 +54,7 @@ const customConfig = { resolver: { assetExts: assetExts.filter((ext) => ext !== 'svg'), sourceExts: [...sourceExts, 'svg'], - blockList: exclusionList([/^(?!.*node_modules).*\/dist\/.*/]), + blockList: exclusionList([/^(?!.*node_modules).*\\/dist\\/.*/]), unstable_enableSymlinks: true, unstable_enablePackageExports: true, }, diff --git a/packages/react-native/src/migrations/update-16-6-0/update-metro-config.ts b/packages/react-native/src/migrations/update-16-6-0/update-metro-config.ts index dbc2529160..035cef9722 100644 --- a/packages/react-native/src/migrations/update-16-6-0/update-metro-config.ts +++ b/packages/react-native/src/migrations/update-16-6-0/update-metro-config.ts @@ -53,7 +53,7 @@ const customConfig = { resolver: { assetExts: assetExts.filter((ext) => ext !== 'svg'), sourceExts: [...sourceExts, 'svg'], - blockList: exclusionList([/^(?!.*node_modules).*\/dist\/.*/]), + blockList: exclusionList([/^(?!.*node_modules).*\\/dist\\/.*/]), unstable_enableSymlinks: true, unstable_enablePackageExports: true, },