@nx/detox 18.0.0-beta.1 → 18.0.0-beta.2

package/generators.json

@@ -4,7 +4,7 @@
   "extends": ["@nx/workspace"],
   "generators": {
     "init": {
-      "factory": "./src/generators/init/init#detoxInitGenerator",
+      "factory": "./src/generators/init/init#detoxInitGeneratorInternal",
       "schema": "./src/generators/init/schema.json",
       "description": "Initialize the `@nrwl/detox` plugin.",
       "hidden": true

package/migrations.json

@@ -99,6 +99,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "18.0.0": {
+      "version": "18.0.0-beta.0",
+      "packages": {
+        "detox": {
+          "version": "^20.16.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/detox",
-  "version": "18.0.0-beta.1",
+  "version": "18.0.0-beta.2",
   "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,13 +25,13 @@
   "main": "./index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "18.0.0-beta.1",
-    "@nx/jest": "18.0.0-beta.1",
-    "@nx/js": "18.0.0-beta.1",
-    "@nx/eslint": "18.0.0-beta.1",
-    "@nx/react": "18.0.0-beta.1",
+    "@nx/devkit": "18.0.0-beta.2",
+    "@nx/jest": "18.0.0-beta.2",
+    "@nx/js": "18.0.0-beta.2",
+    "@nx/eslint": "18.0.0-beta.2",
+    "@nx/react": "18.0.0-beta.2",
     "tslib": "^2.3.0",
-    "@nrwl/detox": "18.0.0-beta.1"
+    "@nrwl/detox": "18.0.0-beta.2"
   },
   "peerDependencies": {
     "detox": "^20.9.0"

package/src/generators/application/application.js

@@ -11,6 +11,7 @@ const normalize_options_1 = require("./lib/normalize-options");
 const ensure_dependencies_1 = require("./lib/ensure-dependencies");
 async function detoxApplicationGenerator(host, schema) {
     return await detoxApplicationGeneratorInternal(host, {
+        addPlugin: false,
         projectNameAndRootFormat: 'derived',
         ...schema,
     });

package/src/generators/application/lib/add-linting.js

@@ -16,6 +16,7 @@ async function addLinting(host, options) {
             (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'tsconfig.app.json'),
         ],
         skipFormat: true,
+        addPlugin: options.addPlugin,
     });
     if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
         (0, eslint_file_1.addExtendsToLintConfig)(host, options.e2eProjectRoot, 'plugin:@nx/react');

package/src/generators/application/lib/normalize-options.js

@@ -11,6 +11,7 @@ async function normalizeOptions(host, options) {
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         callingGenerator: '@nx/detox:application',
     });
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const { fileName: appFileName, className: appClassName } = (0, devkit_1.names)(options.appName || options.appProject);
     const { root: appRoot } = (0, devkit_1.readProjectConfiguration)(host, (0, devkit_1.names)(options.appProject).fileName);
     return {

package/src/generators/init/init.d.ts

@@ -1,5 +1,6 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function detoxInitGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
+export declare function detoxInitGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export declare function updateDependencies(host: Tree, schema: Schema): GeneratorCallback;
 export default detoxInitGenerator;

package/src/generators/init/init.js

@@ -1,17 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateDependencies = exports.detoxInitGenerator = void 0;
+exports.updateDependencies = exports.detoxInitGeneratorInternal = exports.detoxInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
-async function detoxInitGenerator(host, schema) {
+function detoxInitGenerator(host, schema) {
+    return detoxInitGeneratorInternal(host, { addPlugin: false, ...schema });
+}
+exports.detoxInitGenerator = detoxInitGenerator;
+async function detoxInitGeneratorInternal(host, schema) {
     const tasks = [];
+    schema.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     if (!schema.skipPackageJson) {
         tasks.push(moveDependency(host));
         tasks.push(updateDependencies(host, schema));
     }
-    if (process.env.NX_PCV3 === 'true') {
+    if (schema.addPlugin) {
         addPlugin(host);
     }
     if (schema.updatePackageScripts) {
@@ -22,7 +27,7 @@ async function detoxInitGenerator(host, schema) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.detoxInitGenerator = detoxInitGenerator;
+exports.detoxInitGeneratorInternal = detoxInitGeneratorInternal;
 function updateDependencies(host, schema) {
     return (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
         '@nx/detox': versions_1.nxVersion,

package/src/utils/versions.d.ts

@@ -1,4 +1,4 @@
 export declare const nxVersion: any;
-export declare const detoxVersion = "^20.11.1";
-export declare const testingLibraryJestDom = "5.16.5";
+export declare const detoxVersion = "^20.16.0";
+export declare const testingLibraryJestDom = "6.2.0";
 export declare const configPluginsDetoxVersion = "~6.0.0";

package/src/utils/versions.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configPluginsDetoxVersion = exports.testingLibraryJestDom = exports.detoxVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.detoxVersion = '^20.11.1';
-exports.testingLibraryJestDom = '5.16.5';
+exports.detoxVersion = '^20.16.0';
+exports.testingLibraryJestDom = '6.2.0';
 exports.configPluginsDetoxVersion = '~6.0.0'; // only required for expo