feat(detox): upgrade @config-plugins/detox to 7

nrwl · Feb 23, 2024 · aa38b3e · aa38b3e
1 parent c2581dc
commit aa38b3e
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 12 deletions.
diff --git a/docs/generated/packages/expo/executors/serve.json b/docs/generated/packages/expo/executors/serve.json
@@ -14,7 +14,7 @@
       "port": {
         "type": "number",
         "description": "Port to start the native Metro bundler on (does not apply to web or tunnel)",
-        "default": 19000,
+        "default": 4200,
         "alias": "p"
       },
       "clear": {

diff --git a/packages/detox/migrations.json b/packages/detox/migrations.json
@@ -108,6 +108,23 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "18.1.0": {
+      "version": "18.1.0-beta.0",
+      "packages": {
+        "detox": {
+          "version": "~20.18.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@config-plugins/detox": {
+          "version": "~7.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/jest-dom": {
+          "version": "~6.4.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }
diff --git a/packages/detox/plugin.ts b/packages/detox/plugin.ts
@@ -1 +1,5 @@
-export { createNodes, DetoxPluginOptions } from './src/plugins/plugin';
+export {
+  createNodes,
+  createDependencies,
+  DetoxPluginOptions,
+} from './src/plugins/plugin';
diff --git 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.16.0';
-export const testingLibraryJestDom = '6.2.0';
-export const configPluginsDetoxVersion = '~6.0.0'; // only required for expo
+export const detoxVersion = '~20.18.1';
+export const testingLibraryJestDom = '~6.4.2';
+export const configPluginsDetoxVersion = '~7.0.0'; // only required for expo
diff --git a/packages/expo/plugin.ts b/packages/expo/plugin.ts
@@ -1 +1,5 @@
-export { createNodes, ExpoPluginOptions } from './plugins/plugin';
+export {
+  createNodes,
+  createDependencies,
+  ExpoPluginOptions,
+} from './plugins/plugin';
diff --git a/packages/expo/src/executors/serve/schema.json b/packages/expo/src/executors/serve/schema.json
@@ -11,7 +11,7 @@
     "port": {
       "type": "number",
       "description": "Port to start the native Metro bundler on (does not apply to web or tunnel)",
-      "default": 19000,
+      "default": 4200,
       "alias": "p"
     },
     "clear": {

diff --git a/packages/expo/src/executors/serve/serve.impl.ts b/packages/expo/src/executors/serve/serve.impl.ts
@@ -84,7 +84,11 @@ function serveAsync(
 
     childProcess.stdout.on('data', (data) => {
       process.stdout.write(data);
-      if (data.toString().includes('Bundling complete')) {
+      if (
+        data
+          .toString()
+          .includes('Bundling complete' || data.toString().includes('Bundled'))
+      ) {
         resolve(childProcess);
       }
     });

diff --git a/packages/expo/src/generators/application/lib/add-e2e.ts b/packages/expo/src/generators/application/lib/add-e2e.ts
@@ -19,8 +19,8 @@ export async function addE2e(
   const port = hasPlugin ? 8081 : 4200;
   switch (options.e2eTestRunner) {
     case 'cypress': {
-      const hasNxExportPlugin = hasExpoPlugin(tree);
-      if (!hasNxExportPlugin) {
+      const hasNxExpoPlugin = hasExpoPlugin(tree);
+      if (!hasNxExpoPlugin) {
         webStaticServeGenerator(tree, {
           buildTarget: `${options.projectName}:export`,
           targetName: 'serve-static',
@@ -50,7 +50,7 @@ export async function addE2e(
         devServerTarget: `${options.projectName}:serve`,
         port,
         baseUrl: `http://localhost:${port}`,
-        ciWebServerCommand: hasNxExportPlugin
+        ciWebServerCommand: hasNxExpoPlugin
           ? `nx run ${options.projectName}:serve-static`
           : undefined,
         jsx: true,

diff --git a/packages/react-native/plugin.ts b/packages/react-native/plugin.ts
@@ -1 +1,5 @@
-export { createNodes, ReactNativePluginOptions } from './plugins/plugin';
+export {
+  createNodes,
+  createDependencies,
+  ReactNativePluginOptions,
+} from './plugins/plugin';