miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(misc): fix normalizing e2e project name and root (#18757)

Browse Source
This commit is contained in:
Leosvel Pérez Espinosa 2023-08-22 15:33:41 +01:00 committed by GitHub
parent 1440f5c095
commit b3a0c0efed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/angular/src/generators/application/lib/normalize-options.ts
View File

@ -26,20 +26,8 @@ export async function normalizeOptions(
options.rootProject = appProjectRoot === '.'; options.rootProject = appProjectRoot === '.';
options.projectNameAndRootFormat = projectNameAndRootFormat; options.projectNameAndRootFormat = projectNameAndRootFormat;
let e2eProjectName = 'e2e'; const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
let e2eProjectRoot = 'e2e'; const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
if (!options.rootProject) {
const projectNameAndRoot = await determineProjectNameAndRootOptions(host, {
name: `${options.name}-e2e`,
projectType: 'application',
directory: options.directory,
projectNameAndRootFormat: options.projectNameAndRootFormat,
rootProject: options.rootProject,
callingGenerator: '@nx/angular:application',
});
e2eProjectName = projectNameAndRoot.projectName;
e2eProjectRoot = projectNameAndRoot.projectRoot;
}
const parsedTags = options.tags const parsedTags = options.tags
? options.tags.split(',').map((s) => s.trim()) ? options.tags.split(',').map((s) => s.trim())

16
packages/next/src/generators/application/lib/normalize-options.ts
View File

@ -35,20 +35,8 @@ export async function normalizeOptions(
options.rootProject = appProjectRoot === '.'; options.rootProject = appProjectRoot === '.';
options.projectNameAndRootFormat = projectNameAndRootFormat; options.projectNameAndRootFormat = projectNameAndRootFormat;
let e2eProjectName = 'e2e'; const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
let e2eProjectRoot = 'e2e'; const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
if (!options.rootProject) {
const projectNameAndRoot = await determineProjectNameAndRootOptions(host, {
name: `${options.name}-e2e`,
projectType: 'application',
directory: options.directory,
projectNameAndRootFormat: options.projectNameAndRootFormat,
rootProject: options.rootProject,
callingGenerator: '@nx/next:application',
});
e2eProjectName = projectNameAndRoot.projectName;
e2eProjectRoot = projectNameAndRoot.projectRoot;
}
const name = names(options.name).fileName; const name = names(options.name).fileName;

16
packages/react/src/generators/application/lib/normalize-options.ts
View File

@ -36,20 +36,8 @@ export async function normalizeOptions<T extends Schema = Schema>(
options.rootProject = appProjectRoot === '.'; options.rootProject = appProjectRoot === '.';
options.projectNameAndRootFormat = projectNameAndRootFormat; options.projectNameAndRootFormat = projectNameAndRootFormat;
let e2eProjectName = 'e2e'; const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
let e2eProjectRoot = 'e2e'; const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
if (!options.rootProject) {
const projectNameAndRoot = await determineProjectNameAndRootOptions(host, {
name: `${options.name}-e2e`,
projectType: 'application',
directory: options.directory,
projectNameAndRootFormat: options.projectNameAndRootFormat,
rootProject: options.rootProject,
callingGenerator,
});
e2eProjectName = projectNameAndRoot.projectName;
e2eProjectRoot = projectNameAndRoot.projectRoot;
}
const parsedTags = options.tags const parsedTags = options.tags
? options.tags.split(',').map((s) => s.trim()) ? options.tags.split(',').map((s) => s.trim())