Skip to content

fix(typescript): add composite to validation checks #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NotWoods merged 5 commits into from
Oct 23, 2020
Merged

fix(typescript): add composite to validation checks #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e16db19
fix(typescript) add composite to validation checks
dummdidumm Oct 23, 2020
9331d0e
tests
dummdidumm Oct 23, 2020
eec1a58
fix tests
dummdidumm Oct 23, 2020
5690df3
added missing parameter
dummdidumm Oct 23, 2020
64c4abf
remove declarationMap test
dummdidumm Oct 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/typescript/src/options/validate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export function validatePaths(
}
}

if (compilerOptions.declaration || compilerOptions.declarationMap) {
if (compilerOptions.declaration || compilerOptions.declarationMap || compilerOptions.composite) {
if (DIRECTORY_PROPS.every((dirProperty) => !compilerOptions[dirProperty])) {
context.error(
`@rollup/plugin-typescript: 'outDir' or 'declarationDir' must be specified to generate declaration files.`
Expand Down
12 changes: 10 additions & 2 deletions packages/typescript/test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,13 @@ test.serial('supports creating declaration files in declarationDir', async (t) =
t.true(output[1].source.includes('declare const answer = 42;'), output[1].source);
});

test.serial('ensures outDir is set when creating declaration files', async (t) => {
async function ensureOutDirWhenCreatingDeclarationFiles(t, compilerOptionName) {
const bundle = await rollup({
input: 'fixtures/basic/main.ts',
plugins: [
typescript({
tsconfig: 'fixtures/basic/tsconfig.json',
declaration: true
[compilerOptionName]: true
})
],
onwarn
Expand All @@ -183,6 +183,14 @@ test.serial('ensures outDir is set when creating declaration files', async (t) =
),
`Unexpected error message: ${caughtError.message}`
);
}

test.serial('ensures outDir is set when creating declaration files (declaration)', async (t) => {
await ensureOutDirWhenCreatingDeclarationFiles(t, 'declaration');
});

test.serial('ensures outDir is set when creating declaration files (composite)', async (t) => {
await ensureOutDirWhenCreatingDeclarationFiles(t, 'composite');
});

test.serial('ensures outDir is located in Rollup output dir', async (t) => {
Expand Down