File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1+ ---
2+ ' @css-modules-kit/core ' : patch
3+ ---
4+
5+ fix(core): fix the issue where ` *.css ` import resolution fails
Original file line number Diff line number Diff line change @@ -19,6 +19,7 @@ describe('createResolver', async () => {
1919 const iff = await createIFF ( {
2020 'request.module.css' : '' ,
2121 'a.module.css' : '' ,
22+ 'a.css' : '' ,
2223 'dir/a.module.css' : '' ,
2324 'paths1/a.module.css' : '' ,
2425 'paths2/b.module.css' : '' ,
@@ -31,6 +32,7 @@ describe('createResolver', async () => {
3132 test ( 'resolves relative path' , ( ) => {
3233 const resolve = createResolver ( normalizeCompilerOptions ( { } , iff . rootDir ) , undefined ) ;
3334 expect ( resolve ( './a.module.css' , { request } ) ) . toBe ( iff . paths [ 'a.module.css' ] ) ;
35+ expect ( resolve ( './a.css' , { request } ) ) . toBe ( iff . paths [ 'a.css' ] ) ;
3436 expect ( resolve ( './dir/a.module.css' , { request } ) ) . toBe ( iff . paths [ 'dir/a.module.css' ] ) ;
3537 expect ( resolve ( './non-existent.module.css' , { request } ) ) . toBe ( undefined ) ;
3638 } ) ;
Original file line number Diff line number Diff line change @@ -12,8 +12,8 @@ export function createResolver(
1212 const host : ts . ModuleResolutionHost = {
1313 ...ts . sys ,
1414 fileExists : ( fileName ) => {
15- if ( fileName . endsWith ( '.module. d.css.ts' ) ) {
16- return ts . sys . fileExists ( fileName . replace ( / \. m o d u l e \. d \. c s s \. t s $ / u, '.module .css' ) ) ;
15+ if ( fileName . endsWith ( '.d.css.ts' ) ) {
16+ return ts . sys . fileExists ( fileName . replace ( / \. d \. c s s \. t s $ / u, '.css' ) ) ;
1717 }
1818 return ts . sys . fileExists ( fileName ) ;
1919 } ,
@@ -26,8 +26,7 @@ export function createResolver(
2626 moduleResolutionCache ,
2727 ) ;
2828 if ( resolvedModule ) {
29- // TODO: Logging that the paths is used.
30- return resolvedModule . resolvedFileName . replace ( / \. m o d u l e \. d \. c s s \. t s $ / u, '.module.css' ) ;
29+ return resolvedModule . resolvedFileName . replace ( / \. d \. c s s \. t s $ / u, '.css' ) ;
3130 }
3231 return undefined ;
3332 } ;
You can’t perform that action at this time.
0 commit comments