@nx/detox 16.8.0-beta.0 → 16.8.0-beta.2

package/generators.json

@@ -25,7 +25,7 @@
       "hidden": true
     },
     "application": {
-      "factory": "./src/generators/application/application#detoxApplicationGenerator",
+      "factory": "./src/generators/application/application#detoxApplicationGeneratorInternal",
       "schema": "./src/generators/application/schema.json",
       "aliases": ["app"],
       "x-type": "application",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/detox",
-  "version": "16.8.0-beta.0",
+  "version": "16.8.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,12 +25,12 @@
   "main": "./index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "@nrwl/detox": "16.8.0-beta.0",
-    "@nx/devkit": "16.8.0-beta.0",
-    "@nx/jest": "16.8.0-beta.0",
-    "@nx/js": "16.8.0-beta.0",
-    "@nx/linter": "16.8.0-beta.0",
-    "@nx/react": "16.8.0-beta.0",
+    "@nrwl/detox": "16.8.0-beta.2",
+    "@nx/devkit": "16.8.0-beta.2",
+    "@nx/jest": "16.8.0-beta.2",
+    "@nx/js": "16.8.0-beta.2",
+    "@nx/linter": "16.8.0-beta.2",
+    "@nx/react": "16.8.0-beta.2",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {
@@ -46,5 +46,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "818352404283c1d34ab303d91b3bd16474f54916"
+  "gitHead": "9bcc04742f9e1516d8c1ddbfb1907770c347876f"
 }

package/src/generators/application/application.d.ts

@@ -1,5 +1,6 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function detoxApplicationGenerator(host: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function detoxApplicationGeneratorInternal(host: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default detoxApplicationGenerator;
 export declare const detoxApplicationSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/application/application.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detoxApplicationSchematic = exports.detoxApplicationGenerator = void 0;
+exports.detoxApplicationSchematic = exports.detoxApplicationGeneratorInternal = exports.detoxApplicationGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
@@ -11,7 +11,13 @@ const create_files_1 = require("./lib/create-files");
 const normalize_options_1 = require("./lib/normalize-options");
 function detoxApplicationGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, normalize_options_1.normalizeOptions)(host, schema);
+        return yield detoxApplicationGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+    });
+}
+exports.detoxApplicationGenerator = detoxApplicationGenerator;
+function detoxApplicationGeneratorInternal(host, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = yield (0, normalize_options_1.normalizeOptions)(host, schema);
         const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
         (0, create_files_1.createFiles)(host, options);
         (0, add_project_1.addProject)(host, options);
@@ -23,6 +29,6 @@ function detoxApplicationGenerator(host, schema) {
         return (0, devkit_1.runTasksInSerial)(initTask, lintingTask);
     });
 }
-exports.detoxApplicationGenerator = detoxApplicationGenerator;
+exports.detoxApplicationGeneratorInternal = detoxApplicationGeneratorInternal;
 exports.default = detoxApplicationGenerator;
 exports.detoxApplicationSchematic = (0, devkit_1.convertNxGenerator)(detoxApplicationGenerator);

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

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const linter_1 = require("@nx/linter");
 const devkit_1 = require("@nx/devkit");
 const react_1 = require("@nx/react");
+const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
 function addLinting(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (options.linter === linter_1.Linter.None) {
@@ -19,7 +20,9 @@ function addLinting(host, options) {
             eslintFilePatterns: [`${options.e2eProjectRoot}/**/*.{ts,tsx,js,jsx}`],
             skipFormat: true,
         });
-        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, '.eslintrc.json'), react_1.extendReactEslintJson);
+        if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
+            (0, eslint_file_1.addExtendsToLintConfig)(host, options.e2eProjectRoot, 'plugin:@nx/react');
+        }
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, react_1.extraEslintDependencies.dependencies, react_1.extraEslintDependencies.devDependencies);
         return (0, devkit_1.runTasksInSerial)(lintTask, installTask);
     });

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

@@ -20,13 +20,13 @@ function getTargets(options) {
         ? (0, get_targets_1.reactNativeBuildTarget)('ios.sim')
         : (0, get_targets_1.expoBuildTarget)('ios.sim')));
     targets['test-ios'] = Object.assign({ executor: '@nx/detox:test' }, (options.framework === 'react-native'
-        ? (0, get_targets_1.reactNativeTestTarget)('ios.sim', options.e2eName)
-        : (0, get_targets_1.expoTestTarget)('ios.sim', options.e2eName)));
+        ? (0, get_targets_1.reactNativeTestTarget)('ios.sim', options.e2eProjectName)
+        : (0, get_targets_1.expoTestTarget)('ios.sim', options.e2eProjectName)));
     targets['build-android'] = Object.assign({ executor: '@nx/detox:build' }, (options.framework === 'react-native'
         ? (0, get_targets_1.reactNativeBuildTarget)('android.emu')
         : (0, get_targets_1.expoBuildTarget)('android.emu')));
     targets['test-android'] = Object.assign({ executor: '@nx/detox:test' }, (options.framework === 'react-native'
-        ? (0, get_targets_1.reactNativeTestTarget)('android.emu', options.e2eName)
-        : (0, get_targets_1.expoTestTarget)('android.emu', options.e2eName)));
+        ? (0, get_targets_1.reactNativeTestTarget)('android.emu', options.e2eProjectName)
+        : (0, get_targets_1.expoTestTarget)('android.emu', options.e2eProjectName)));
     return targets;
 }

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

@@ -6,13 +6,6 @@ export interface NormalizedSchema extends Schema {
     appExpoName: string;
     appRoot: string;
     e2eProjectName: string;
-    e2eProjectDirectory: string;
     e2eProjectRoot: string;
 }
-/**
- * if options.e2eName = 'my-app-e2e' with no options.directory
- * e2eProjectName = 'my-app', e2eProjectRoot = 'apps/my-app'
- * if options.e2eName = 'my-app' with options.e2eDirectory = 'my-dir'
- * e2eProjectName = 'my-dir-my-app', e2eProjectRoot = 'apps/my-dir/my-apps'
- */
-export declare function normalizeOptions(host: Tree, options: Schema): NormalizedSchema;
+export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -1,33 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-/**
- * if options.e2eName = 'my-app-e2e' with no options.directory
- * e2eProjectName = 'my-app', e2eProjectRoot = 'apps/my-app'
- * if options.e2eName = 'my-app' with options.e2eDirectory = 'my-dir'
- * e2eProjectName = 'my-dir-my-app', e2eProjectRoot = 'apps/my-dir/my-apps'
- */
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 function normalizeOptions(host, options) {
     var _a;
-    const { appsDir } = (0, devkit_1.getWorkspaceLayout)(host);
-    const e2eFileName = (0, devkit_1.names)(options.e2eName).fileName;
-    const e2eDirectoryFileName = options.e2eDirectory
-        ? (0, devkit_1.names)(options.e2eDirectory).fileName
-        : '';
-    const e2eProjectName = (e2eDirectoryFileName
-        ? `${e2eDirectoryFileName}-${e2eFileName}`
-        : e2eFileName).replace(/\//g, '-');
-    const e2eProjectDirectory = e2eDirectoryFileName
-        ? (0, devkit_1.joinPathFragments)(appsDir, e2eDirectoryFileName)
-        : appsDir;
-    const e2eProjectRoot = (0, devkit_1.joinPathFragments)(e2eProjectDirectory, e2eFileName);
-    const { fileName: appFileName, className: appClassName } = (0, devkit_1.names)(options.appName || options.appProject);
-    const project = (0, devkit_1.getProjects)(host).get(options.appProject);
-    const appRoot = (project === null || project === void 0 ? void 0 : project.root) || (0, devkit_1.joinPathFragments)(e2eProjectDirectory, appFileName);
-    return Object.assign(Object.assign({}, options), { appFileName,
-        appClassName, appDisplayName: options.appDisplayName || appClassName, appExpoName: ((_a = options.appDisplayName) === null || _a === void 0 ? void 0 : _a.replace(/\s/g, '')) || appClassName, appRoot, e2eName: e2eFileName, e2eProjectName,
-        e2eProjectDirectory,
-        e2eProjectRoot });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectName: e2eProjectName, projectRoot: e2eProjectRoot } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+            name: options.e2eName,
+            projectType: 'application',
+            directory: options.e2eDirectory,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            callingGenerator: '@nx/detox:application',
+        });
+        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 Object.assign(Object.assign({}, options), { appFileName,
+            appClassName, appDisplayName: options.appDisplayName || appClassName, appExpoName: ((_a = options.appDisplayName) === null || _a === void 0 ? void 0 : _a.replace(/\s/g, '')) || appClassName, appRoot, e2eName: e2eProjectName, e2eProjectName,
+            e2eProjectRoot });
+    });
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/application/schema.json

@@ -19,7 +19,8 @@
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the E2E project?"
+      "x-prompt": "What name would you like to use for the E2E project?",
+      "pattern": "^[a-zA-Z][^:]*$"
     },
     "appName": {
       "type": "string",
@@ -39,6 +40,11 @@
       "type": "string",
       "description": "A directory where the project is placed relative to apps directory."
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",