GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-06 15:31:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into tech/tsup-core-server-v2

Browse Source
This commit is contained in:
Norbert de Langen 2022-12-20 13:24:18 +01:00
commit b2545ee43b
No known key found for this signature in database
GPG Key ID: FD0E78AF9A837762
2 changed files with 72 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
code/frameworks/angular/src/builders/utils/run-compodoc.spec.ts
View File

@ -79,4 +79,73 @@ describe('runCompodoc', () => {
}
);
});
it('should run compodoc with default output folder.', async () => {
runCompodoc(
{
compodocArgs: [],
tsconfig: 'path/to/tsconfig.json',
},
{
workspaceRoot: 'path/to/project',
logger: builderContextLoggerMock,
} as BuilderContext
)
.pipe(take(1))
.subscribe();
expect(cpSpawnMock.spawn).toHaveBeenCalledWith(
'npx',
['compodoc', '-p', 'path/to/tsconfig.json', '-d', 'path/to/project'],
{
cwd: 'path/to/project',
}
);
});
it('should run with custom output folder specified with --output compodocArgs', async () => {
runCompodoc(
{
compodocArgs: ['--output', 'path/to/customFolder'],
tsconfig: 'path/to/tsconfig.json',
},
{
workspaceRoot: 'path/to/project',
logger: builderContextLoggerMock,
} as BuilderContext
)
.pipe(take(1))
.subscribe();
expect(cpSpawnMock.spawn).toHaveBeenCalledWith(
'npx',
['compodoc', '-p', 'path/to/tsconfig.json', '--output', 'path/to/customFolder'],
{
cwd: 'path/to/project',
}
);
});
it('should run with custom output folder specified with -d compodocArgs', async () => {
runCompodoc(
{
compodocArgs: ['-d', 'path/to/customFolder'],
tsconfig: 'path/to/tsconfig.json',
},
{
workspaceRoot: 'path/to/project',
logger: builderContextLoggerMock,
} as BuilderContext
)
.pipe(take(1))
.subscribe();
expect(cpSpawnMock.spawn).toHaveBeenCalledWith(
'npx',
['compodoc', '-p', 'path/to/tsconfig.json', '-d', 'path/to/customFolder'],
{
cwd: 'path/to/project',
}
);
});
});

5
code/frameworks/angular/src/builders/utils/run-compodoc.ts
View File

@ -4,6 +4,8 @@ import { Observable } from 'rxjs';
import * as path from 'path';
const hasTsConfigArg = (args: string[]) => args.indexOf('-p') !== -1;
const hasOutputArg = (args: string[]) =>
args.indexOf('-d') !== -1 || args.indexOf('--output') !== -1;
// path.relative is necessary to workaround a compodoc issue with
// absolute paths on windows machines
@ -21,8 +23,7 @@ export const runCompodoc = (
'compodoc',
// Default options
...(hasTsConfigArg(compodocArgs) ? [] : ['-p', tsConfigPath]),
'-d',
`${context.workspaceRoot}`,
...(hasOutputArg(compodocArgs) ? [] : ['-d', `${context.workspaceRoot}`]),
...compodocArgs,
];