@nx/detox 20.5.0 → 20.6.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/detox",
-  "version": "20.5.0",
+  "version": "20.6.0-beta.0",
   "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.5.0",
-    "@nx/jest": "20.5.0",
-    "@nx/js": "20.5.0",
-    "@nx/eslint": "20.5.0",
-    "@nx/react": "20.5.0",
+    "@nx/devkit": "20.6.0-beta.0",
+    "@nx/jest": "20.6.0-beta.0",
+    "@nx/js": "20.6.0-beta.0",
+    "@nx/eslint": "20.6.0-beta.0",
+    "@nx/react": "20.6.0-beta.0",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {

package/src/generators/application/application.js

@@ -16,6 +16,7 @@ const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function detoxApplicationGenerator(host, schema) {
     return await detoxApplicationGeneratorInternal(host, {
         addPlugin: false,
+        useProjectJson: true,
         ...schema,
     });
 }
@@ -43,7 +44,7 @@ async function detoxApplicationGeneratorInternal(host, schema) {
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
     if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.e2eProjectRoot);
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.e2eProjectRoot);
     }
     (0, sort_fields_1.sortPackageJsonFields)(host, options.e2eProjectRoot);
     if (!options.skipFormat) {

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

@@ -3,25 +3,24 @@ 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');
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
-            name: options.importPath,
-            version: '0.0.1',
-            private: true,
-            nx: {
-                name: options.e2eProjectName !== options.importPath
-                    ? options.e2eProjectName
-                    : undefined,
-                targets: hasPlugin ? undefined : getTargets(options),
-                implicitDependencies: [options.appProject],
-            },
-        });
+    const packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+        private: true,
+    };
+    if (!options.useProjectJson) {
+        packageJson.nx = {
+            name: options.e2eProjectName !== options.importPath
+                ? options.e2eProjectName
+                : undefined,
+            targets: hasPlugin ? undefined : getTargets(options),
+            implicitDependencies: [options.appProject],
+        };
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
@@ -33,6 +32,9 @@ function addProject(host, options) {
             implicitDependencies: [options.appProject],
         });
     }
+    if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+    }
 }
 function getTargets(options) {
     const targets = {};

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

@@ -18,6 +18,8 @@ async function normalizeOptions(host, options) {
     const { root: appRoot } = (0, devkit_1.readProjectConfiguration)(host, options.appProject);
     const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     const e2eProjectName = !isUsingTsSolutionConfig || options.e2eName ? projectName : importPath;
+    // We default to generate a project.json file if the new setup is not being used
+    const useProjectJson = options.useProjectJson ?? !isUsingTsSolutionConfig;
     return {
         ...options,
         appFileName,
@@ -30,5 +32,6 @@ async function normalizeOptions(host, options) {
         importPath,
         isUsingTsSolutionConfig,
         js: options.js ?? false,
+        useProjectJson,
     };
 }

package/src/generators/application/schema.json

@@ -60,6 +60,10 @@
       "type": "boolean",
       "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
       "default": false
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["e2eDirectory", "appProject", "framework"]