@nx/detox 16.0.0-beta.6 → 16.0.0-beta.7

package/migrations.json

@@ -23,6 +23,12 @@
       "version": "16.0.0-beta.1",
       "description": "Replace @nrwl/detox with @nx/detox",
       "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
+    },
+    "update-16-0-0-update-detoxrc": {
+      "cli": "nx",
+      "version": "16.0.0-beta.3",
+      "description": "Update .detoxrc.json and jest.config.json for detox 20",
+      "implementation": "./src/migrations/update-16-0-0/update-detoxrc-json"
     }
   },
   "packageJsonUpdates": {
@@ -207,6 +213,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "16.0.0": {
+      "version": "16.0.0-beta.3",
+      "packages": {
+        "detox": {
+          "version": "~20.7.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/detox",
-  "version": "16.0.0-beta.6",
+  "version": "16.0.0-beta.7",
   "private": false,
   "description": "The Nx Plugin for Detox contains executors and generators for allowing your workspace to use the powerful Detox integration testing capabilities.",
   "keywords": [
@@ -25,15 +25,15 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nrwl/detox": "16.0.0-beta.6",
-    "@nx/devkit": "16.0.0-beta.6",
-    "@nx/jest": "16.0.0-beta.6",
-    "@nx/js": "16.0.0-beta.6",
-    "@nx/linter": "16.0.0-beta.6",
-    "@nx/react": "16.0.0-beta.6"
+    "@nrwl/detox": "16.0.0-beta.7",
+    "@nx/devkit": "16.0.0-beta.7",
+    "@nx/jest": "16.0.0-beta.7",
+    "@nx/js": "16.0.0-beta.7",
+    "@nx/linter": "16.0.0-beta.7",
+    "@nx/react": "16.0.0-beta.7"
   },
   "peerDependencies": {
-    "detox": "~20.5.0"
+    "detox": "~20.7.0"
   },
   "builders": "./executors.json",
   "ng-update": {
@@ -44,5 +44,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b719222d42a4e11bcdd537ef818c2bea130112f8"
+  "gitHead": "eb477479bf73bca940323a66e486221f00006c0f"
 }

package/src/generators/application/files/app/.detoxrc.json.template

@@ -1,6 +1,13 @@
 {
-  "testRunner": "jest",
-  "runnerConfig": "jest.config.json",
+  "testRunner": {
+    "args": {
+      "$0": "jest",
+      "config": "./jest.config.json"
+    },
+    "jest": {
+      "setupTimeout": 120000
+    }
+  },
   "apps": {
     "ios.debug": {
       "type": "ios.app",

package/src/generators/application/files/app/jest.config.json.template

@@ -1,5 +1,10 @@
 {
   "preset": "<%= offsetFromRoot %>jest.preset",
+  "rootDir": ".",
+  "testMatch": [
+    "<rootDir>/src/**/*.test.ts?(x)",
+    "<rootDir>/src/**/*.spec.ts?(x)"
+  ],
   "testTimeout": 120000,
   "maxWorkers": 1,
   "globalSetup": "detox/runners/jest/globalSetup",
@@ -7,9 +12,5 @@
   "reporters": ["detox/runners/jest/reporter"],
   "testEnvironment": "detox/runners/jest/testEnvironment",
   "verbose": true,
-  "setupFilesAfterEnv": ["<rootDir>/test-setup.ts"],
-  "transform": {
-    "^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "@nx/react/plugins/jest",
-    "^.+\\.[tj]sx?$": "babel-jest"
-  }
+  "setupFilesAfterEnv": ["<rootDir>/test-setup.ts"]
 }

package/src/migrations/update-16-0-0/update-detoxrc-json.d.ts

@@ -0,0 +1,10 @@
+import { Tree } from '@nx/devkit';
+/**
+ * Update .detoxrc.json under detox project:
+ * - remove deprecated keys: testRunner
+ * - update keys: runnerConfig
+ * Update jest.config.json under detox project:
+ * - remove key: transform
+ * - add key: rootDir, testMatch
+ */
+export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0/update-detoxrc-json.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+/**
+ * Update .detoxrc.json under detox project:
+ * - remove deprecated keys: testRunner
+ * - update keys: runnerConfig
+ * Update jest.config.json under detox project:
+ * - remove key: transform
+ * - add key: rootDir, testMatch
+ */
+function update(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projects = (0, devkit_1.getProjects)(tree);
+        projects.forEach((project) => {
+            var _a, _b;
+            if (((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a['test-ios']) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/detox:test')
+                return;
+            updateDetoxrcJson(tree, project);
+            updateJestConfigJson(tree, project);
+        });
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = update;
+function updateDetoxrcJson(host, project) {
+    const detoxConfigPath = `${project.root}/.detoxrc.json`;
+    if (!host.exists(detoxConfigPath))
+        return;
+    (0, devkit_1.updateJson)(host, detoxConfigPath, (json) => {
+        json.testRunner = {
+            args: {
+                $0: 'jest',
+                config: './jest.config.json',
+            },
+            jest: {
+                setupTimeout: 120000,
+            },
+        };
+        if (json.runnerConfig) {
+            delete json.runnerConfig;
+        }
+        return json;
+    });
+}
+function updateJestConfigJson(host, project) {
+    const jestConfigPath = `${project.root}/jest.config.json`;
+    if (!host.exists(jestConfigPath))
+        return;
+    (0, devkit_1.updateJson)(host, jestConfigPath, (json) => {
+        if (json.transform) {
+            delete json.transform;
+        }
+        if (!json.rootDir) {
+            json.rootDir = '.';
+        }
+        if (!json.testMatch) {
+            json.testMatch = [
+                '<rootDir>/src/**/*.test.ts?(x)',
+                '<rootDir>/src/**/*.spec.ts?(x)',
+            ];
+        }
+        return json;
+    });
+}
+//# sourceMappingURL=update-detoxrc-json.js.map

package/src/migrations/update-16-0-0/update-detoxrc-json.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-detoxrc-json.js","sourceRoot":"","sources":["../../../../../../packages/detox/src/migrations/update-16-0-0/update-detoxrc-json.ts"],"names":[],"mappings":";;;AAAA,uCAMoB;AAEpB;;;;;;;GAOG;AACH,SAA8B,MAAM,CAAC,IAAU;;QAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;;YAC3B,IAAI,CAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAG,UAAU,CAAC,0CAAE,QAAQ,MAAK,kBAAkB;gBAAE,OAAO;YAC3E,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACjC,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAVD,yBAUC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,OAA6B;IAClE,MAAM,eAAe,GAAG,GAAG,OAAO,CAAC,IAAI,gBAAgB,CAAC;IACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;QAAE,OAAO;IAC1C,IAAA,mBAAU,EAAC,IAAI,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;QACzC,IAAI,CAAC,UAAU,GAAG;YAChB,IAAI,EAAE;gBACJ,EAAE,EAAE,MAAM;gBACV,MAAM,EAAE,oBAAoB;aAC7B;YACD,IAAI,EAAE;gBACJ,YAAY,EAAE,MAAM;aACrB;SACF,CAAC;QACF,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,IAAI,CAAC,YAAY,CAAC;SAC1B;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,OAA6B;IACrE,MAAM,cAAc,GAAG,GAAG,OAAO,CAAC,IAAI,mBAAmB,CAAC;IAC1D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;QAAE,OAAO;IACzC,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;QACxC,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,OAAO,IAAI,CAAC,SAAS,CAAC;SACvB;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;SACpB;QACD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG;gBACf,gCAAgC;gBAChC,gCAAgC;aACjC,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC"}

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
 function replacePackage(tree) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/detox', '@nx/detox');
+        (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/detox', '@nx/detox');
         yield (0, devkit_1.formatFiles)(tree);
     });
 }

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-16-0-0-add-nx-packages.js","sourceRoot":"","sources":["../../../../../../packages/detox/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts"],"names":[],"mappings":";;;AAAA,uCAA+C;AAC/C,0EAAuF;AAEvF,SAA8B,cAAc,CAAC,IAAU;;QACrD,MAAM,IAAA,iDAA+B,EAAC,IAAI,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QAExE,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAJD,iCAIC"}
+{"version":3,"file":"update-16-0-0-add-nx-packages.js","sourceRoot":"","sources":["../../../../../../packages/detox/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts"],"names":[],"mappings":";;;AAAA,uCAA+C;AAC/C,0EAAuF;AAEvF,SAA8B,cAAc,CAAC,IAAU;;QACrD,IAAA,iDAA+B,EAAC,IAAI,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QAElE,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAJD,iCAIC"}

package/src/utils/versions.d.ts

@@ -1,3 +1,3 @@
 export declare const nxVersion: any;
-export declare const detoxVersion = "~20.5.0";
+export declare const detoxVersion = "~20.7.0";
 export declare const testingLibraryJestDom = "5.16.5";

package/src/utils/versions.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.testingLibraryJestDom = exports.detoxVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.detoxVersion = '~20.5.0';
+exports.detoxVersion = '~20.7.0';
 exports.testingLibraryJestDom = '5.16.5';
 //# sourceMappingURL=versions.js.map