@nx/detox 20.2.0-beta.3 → 20.2.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/detox",
-  "version": "20.2.0-beta.3",
+  "version": "20.2.0-beta.4",
   "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": [
@@ -27,11 +27,11 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "20.2.0-beta.3",
-    "@nx/jest": "20.2.0-beta.3",
-    "@nx/js": "20.2.0-beta.3",
-    "@nx/eslint": "20.2.0-beta.3",
-    "@nx/react": "20.2.0-beta.3",
+    "@nx/devkit": "20.2.0-beta.4",
+    "@nx/jest": "20.2.0-beta.4",
+    "@nx/js": "20.2.0-beta.4",
+    "@nx/eslint": "20.2.0-beta.4",
+    "@nx/react": "20.2.0-beta.4",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {

package/src/generators/application/application.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.detoxApplicationGenerator = detoxApplicationGenerator;
 exports.detoxApplicationGeneratorInternal = detoxApplicationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const js_1 = require("@nx/js");
 const init_1 = require("../init/init");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
 const add_linting_1 = require("./lib/add-linting");
@@ -18,7 +18,9 @@ async function detoxApplicationGenerator(host, schema) {
     });
 }
 async function detoxApplicationGeneratorInternal(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'detox', 'application');
+    const jsInitTask = await (0, js_1.initGenerator)(host, {
+        skipFormat: true,
+    });
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     const initTask = await (0, init_1.default)(host, {
         ...options,
@@ -32,6 +34,6 @@ async function detoxApplicationGeneratorInternal(host, schema) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
-    return (0, devkit_1.runTasksInSerial)(initTask, lintingTask, depsTask);
+    return (0, devkit_1.runTasksInSerial)(jsInitTask, initTask, lintingTask, depsTask);
 }
 exports.default = detoxApplicationGenerator;

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

@@ -3,19 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
 const get_targets_1 = require("./get-targets");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function addProject(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
         ? p === '@nx/detox/plugin'
         : p.plugin === '@nx/detox/plugin');
-    (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
-        root: options.e2eProjectRoot,
-        sourceRoot: `${options.e2eProjectRoot}/src`,
-        projectType: 'application',
-        targets: hasPlugin ? {} : getTargets(options),
-        tags: [],
-        implicitDependencies: [options.appProject],
-    });
+    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+            name: options.e2eProjectName,
+            version: '0.0.1',
+            private: true,
+            nx: {
+                sourceRoot: `${options.e2eProjectRoot}/src`,
+                projectType: 'application',
+                targets: hasPlugin ? undefined : getTargets(options),
+                implicitDependencies: [options.appProject],
+            },
+        });
+    }
+    else {
+        (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
+            root: options.e2eProjectRoot,
+            sourceRoot: `${options.e2eProjectRoot}/src`,
+            projectType: 'application',
+            targets: hasPlugin ? {} : getTargets(options),
+            tags: [],
+            implicitDependencies: [options.appProject],
+        });
+    }
 }
 function getTargets(options) {
     const targets = {};

package/src/generators/init/init.js

@@ -5,14 +5,12 @@ exports.detoxInitGeneratorInternal = detoxInitGeneratorInternal;
 exports.updateDependencies = updateDependencies;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 function detoxInitGenerator(host, schema) {
     return detoxInitGeneratorInternal(host, { addPlugin: false, ...schema });
 }
 async function detoxInitGeneratorInternal(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'detox', 'init');
     const tasks = [];
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&