@nx/detox 20.3.2 → 20.4.0-beta.1

package/package.json

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

package/src/generators/application/application.js

@@ -11,6 +11,8 @@ const add_project_1 = require("./lib/add-project");
 const create_files_1 = require("./lib/create-files");
 const normalize_options_1 = require("./lib/normalize-options");
 const ensure_dependencies_1 = require("./lib/ensure-dependencies");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function detoxApplicationGenerator(host, schema) {
     return await detoxApplicationGeneratorInternal(host, {
         addPlugin: false,
@@ -31,6 +33,19 @@ async function detoxApplicationGeneratorInternal(host, schema) {
     (0, add_git_ignore_entry_1.addGitIgnoreEntry)(host, options);
     const lintingTask = await (0, add_linting_1.addLinting)(host, options);
     const depsTask = (0, ensure_dependencies_1.ensureDependencies)(host, options);
+    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.e2eProjectRoot, 'tsconfig.json', {
+        module: 'esnext',
+        moduleResolution: 'bundler',
+        outDir: 'out-tsc/detox',
+        allowJs: true,
+        types: ['node', 'jest', 'detox'],
+    }, options.linter === 'eslint'
+        ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+        : undefined);
+    if (options.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.e2eProjectRoot);
+    }
+    (0, sort_fields_1.sortPackageJsonFields)(host, options.e2eProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/application/lib/create-files.js

@@ -5,12 +5,34 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const path_1 = require("path");
 function createFiles(host, options) {
+    const offsetFromRoot = (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot);
+    const rootTsConfigPath = (0, js_1.getRelativePathToRootTsConfig)(host, options.e2eProjectRoot);
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app'), options.e2eProjectRoot, {
         ...options,
         exec: (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(host.root)).exec,
-        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
-        rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.e2eProjectRoot),
+        offsetFromRoot,
+        rootTsConfigPath,
     });
+    if (options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'tsconfig.json'), {
+            extends: `${offsetFromRoot}tsconfig.base.json`,
+            compilerOptions: {
+                sourceMap: false,
+                outDir: 'out-tsc/detox',
+                allowJs: true,
+                types: ['node', 'jest', 'detox'],
+            },
+            include: ['src/**/*.ts', 'src/**/*.js'],
+            exclude: ['out-tsc', 'test-output'],
+        });
+    }
+    else {
+        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/non-ts-solution'), options.e2eProjectRoot, {
+            ...options,
+            offsetFromRoot,
+            rootTsConfigPath,
+        });
+    }
     if (options.js) {
         (0, devkit_1.toJS)(host);
     }

package/src/generators/application/lib/normalize-options.d.ts

@@ -7,5 +7,6 @@ export interface NormalizedSchema extends Schema {
     appRoot: string;
     e2eProjectName: string;
     e2eProjectRoot: string;
+    isUsingTsSolutionConfig?: boolean;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(host, options) {
     const { projectName: e2eProjectName, projectRoot: e2eProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.e2eName,
@@ -25,5 +26,6 @@ async function normalizeOptions(host, options) {
         e2eName: e2eProjectName,
         e2eProjectName,
         e2eProjectRoot,
+        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
     };
 }

package/src/generators/init/init.js

@@ -25,6 +25,16 @@ async function detoxInitGeneratorInternal(host, schema) {
             buildTargetName: ['build', 'detox:build', 'detox-build'],
             startTargetName: ['start', 'detox:start', 'detox-start'],
             testTargetName: ['test', 'detox:test', 'detox-test'],
+            buildDepsTargetName: [
+                'build-deps',
+                'detox:build-deps',
+                'detox-build-deps',
+            ],
+            watchDepsTargetName: [
+                'watch-deps',
+                'detox:watch-deps',
+                'detox-watch-deps',
+            ],
         }, schema.updatePackageScripts);
     }
     if (!schema.skipFormat) {

package/src/plugins/plugin.d.ts

@@ -3,6 +3,8 @@ export interface DetoxPluginOptions {
     buildTargetName?: string;
     startTargetName?: string;
     testTargetName?: string;
+    buildDepsTargetName?: string;
+    watchDepsTargetName?: string;
 }
 export declare const createNodesV2: CreateNodesV2<DetoxPluginOptions>;
 export declare const createNodes: CreateNodes<DetoxPluginOptions>;

package/src/plugins/plugin.js

@@ -9,6 +9,8 @@ const fs_1 = require("fs");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const devkit_internals_1 = require("nx/src/devkit-internals");
+const util_1 = require("@nx/js/src/plugins/typescript/util");
+const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
@@ -77,6 +79,7 @@ function buildDetoxTargets(projectRoot, options, context) {
             inputs: getInputs(namedInputs),
         },
     };
+    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return targets;
 }
 function getInputs(namedInputs) {