Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/khaki-pillows-change.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@css-modules-kit/core': minor
---

feat: add `extendedSourceFiles` in `CMKConfig`
47 changes: 19 additions & 28 deletions packages/core/src/config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,21 @@ describe('readConfigFile', () => {
});
test('returns the default options even if tsconfig is empty', async () => {
const iff = await createIFF({ 'tsconfig.json': '{}' });
expect(readConfigFile(iff.rootDir)).toStrictEqual<CMKConfig>(
expect.objectContaining({
includes: [iff.join('**/*')],
excludes: [],
dtsOutDir: iff.join('generated'),
arbitraryExtensions: false,
namedExports: false,
prioritizeNamedImports: false,
keyframes: true,
compilerOptions: expect.any(Object),
wildcardDirectories: [{ fileName: iff.rootDir, recursive: true }],
}),
);
expect(readConfigFile(iff.rootDir)).toStrictEqual<CMKConfig>({
includes: [iff.join('**/*')],
excludes: [],
dtsOutDir: iff.join('generated'),
arbitraryExtensions: false,
namedExports: false,
prioritizeNamedImports: false,
keyframes: true,
basePath: iff.rootDir,
configFileName: iff.paths['tsconfig.json'],
compilerOptions: expect.any(Object),
wildcardDirectories: [{ fileName: iff.rootDir, recursive: true }],
extendedSourceFiles: [],
diagnostics: [],
});
});
test('default option values are overridden by config file values', async () => {
const iff = await createIFF({
Expand Down Expand Up @@ -101,6 +103,7 @@ describe('readConfigFile', () => {
module: ts.ModuleKind.ESNext,
}),
wildcardDirectories: [{ fileName: iff.join('src'), recursive: true }],
extendedSourceFiles: [iff.join('tsconfig.base.json')],
}),
);
});
Expand Down Expand Up @@ -134,6 +137,7 @@ describe('readConfigFile', () => {
module: ts.ModuleKind.ES2015,
}),
wildcardDirectories: [{ fileName: iff.join('src2'), recursive: true }],
extendedSourceFiles: [iff.join('tsconfig.base.json')],
}),
);
});
Expand Down Expand Up @@ -161,6 +165,7 @@ describe('readConfigFile', () => {
module: ts.ModuleKind.ESNext,
}),
wildcardDirectories: [{ fileName: iff.join('src'), recursive: true }],
extendedSourceFiles: [iff.join('tsconfig.base2.json'), iff.join('tsconfig.base1.json')],
}),
);
});
Expand All @@ -185,21 +190,6 @@ describe('readConfigFile', () => {
});
expect(readConfigFile(iff.rootDir).dtsOutDir).toBe(iff.join('generated2'));
});
test('inherits from a package', async () => {
const iff = await createIFF({
'node_modules/some-pkg/tsconfig.json': dedent`
{
"cmkOptions": { "dtsOutDir": "generated/cmk" }
}
`,
'tsconfig.json': dedent`
{
"extends": "some-pkg/tsconfig.json"
}
`,
});
expect(readConfigFile(iff.rootDir).dtsOutDir).toBe(iff.join('generated/cmk'));
});
test('inherits from multiple files', async () => {
const iff = await createIFF({
'tsconfig.base1.json': dedent`
Expand All @@ -222,6 +212,7 @@ describe('readConfigFile', () => {
expect.objectContaining({
dtsOutDir: iff.join('generated/cmk'),
arbitraryExtensions: true,
extendedSourceFiles: [iff.join('tsconfig.base1.json'), iff.join('tsconfig.base2.json')],
}),
);
});
Expand Down
5 changes: 4 additions & 1 deletion packages/core/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ export interface CMKConfig {
compilerOptions: ts.CompilerOptions;
/** The directories to watch when watch mode is enabled. */
wildcardDirectories: { fileName: string; recursive: boolean }[];
/** The tsconfig files inherited by `configFileName`. */
extendedSourceFiles: string[];
/** The diagnostics that occurred while reading the config file. */
diagnostics: Diagnostic[];
}
Expand Down Expand Up @@ -246,7 +248,7 @@ export function readConfigFile(project: string): CMKConfig {

const basePath = dirname(configFileName);
return {
// If `include` is not specified, fallback to the default include spec
// If `include` is not specified, fallback to the default include spec.
// ref: https://github.com/microsoft/TypeScript/blob/caf1aee269d1660b4d2a8b555c2d602c97cb28d7/src/compiler/commandLineParser.ts#L3102
includes: (parsedTsConfig.config.includes ?? [DEFAULT_INCLUDE_SPEC]).map((i) => join(basePath, i)),
excludes: (parsedTsConfig.config.excludes ?? []).map((e) => join(basePath, e)),
Expand All @@ -259,6 +261,7 @@ export function readConfigFile(project: string): CMKConfig {
configFileName,
compilerOptions: parsedTsConfig.compilerOptions,
wildcardDirectories: parsedTsConfig.wildcardDirectories,
extendedSourceFiles: parsedTsConfig.extendedSourceFiles ?? [],
diagnostics: parsedTsConfig.diagnostics,
};
}
1 change: 1 addition & 0 deletions packages/core/src/test/faker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export function fakeConfig(args?: Partial<CMKConfig>): CMKConfig {
compilerOptions: {},
wildcardDirectories: [{ fileName: '/app', recursive: true }],
diagnostics: [],
extendedSourceFiles: [],
...args,
};
}
Expand Down