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

fix(react): fix creating a react library with cwd (#19721)

Browse Source
This commit is contained in:
Emily Xiong 2023-10-19 13:10:01 -04:00 committed by GitHub
parent f619c80151
commit 85bda9ab8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/devkit/src/generators/artifact-name-and-directory-utils.ts
View File

@ -404,7 +404,7 @@ function isTTY(): boolean {
return !!process.stdout.isTTY && process.env['CI'] !== 'true'; return !!process.stdout.isTTY && process.env['CI'] !== 'true';
} }
function getRelativeCwd(): string { export function getRelativeCwd(): string {
return normalizePath(relative(workspaceRoot, getCwd())); return normalizePath(relative(workspaceRoot, getCwd()));
} }

10
packages/react/src/generators/library/library.ts
View File

@ -8,6 +8,7 @@ import {
Tree, Tree,
updateJson, updateJson,
} from '@nx/devkit'; } from '@nx/devkit';
import { getRelativeCwd } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
import { addTsConfigPath } from '@nx/js'; import { addTsConfigPath } from '@nx/js';
@ -24,6 +25,7 @@ import { createFiles } from './lib/create-files';
import { extractTsConfigBase } from '../../utils/create-ts-config'; import { extractTsConfigBase } from '../../utils/create-ts-config';
import { installCommonDependencies } from './lib/install-common-dependencies'; import { installCommonDependencies } from './lib/install-common-dependencies';
import { setDefaults } from './lib/set-defaults'; import { setDefaults } from './lib/set-defaults';
import { relative } from 'path';
export async function libraryGenerator(host: Tree, schema: Schema) { export async function libraryGenerator(host: Tree, schema: Schema) {
return await libraryGeneratorInternal(host, { return await libraryGeneratorInternal(host, {
@ -171,9 +173,15 @@ export async function libraryGeneratorInternal(host: Tree, schema: Schema) {
} }
if (options.component) { if (options.component) {
const relativeCwd = getRelativeCwd();
const name = joinPathFragments(
options.projectRoot,
'src/lib',
options.fileName
);
const componentTask = await componentGenerator(host, { const componentTask = await componentGenerator(host, {
nameAndDirectoryFormat: 'as-provided', nameAndDirectoryFormat: 'as-provided',
name: joinPathFragments(options.projectRoot, 'src/lib', options.fileName), name: relativeCwd ? relative(relativeCwd, name) : name,
project: options.name, project: options.name,
flat: true, flat: true,
style: options.style, style: options.style,