@@ -2433,31 +2433,23 @@ const makeScssWorker = (
2433
2433
return unquotedUrl . startsWith ( '#{' )
2434
2434
}
2435
2435
2436
- const createInternalImporter = (
2437
- isForRelative : boolean ,
2438
- ) : Sass . Importer < 'async' > => ( {
2436
+ const internalImporter : Sass . Importer < 'async' > = {
2439
2437
async canonicalize ( url , context ) {
2440
- if ( isForRelative ) {
2441
- // sass passes resolved paths for importer passed to `importer` option
2442
- const resolved = new URL ( url , context . containingUrl ?? undefined )
2443
- if ( fs . existsSync ( resolved ) ) return resolved
2444
- } else {
2445
- const importer = context . containingUrl
2446
- ? fileURLToPath ( context . containingUrl )
2447
- : options . filename
2448
- const resolved = await resolvers . sass (
2449
- environment ,
2450
- url ,
2451
- cleanScssBugUrl ( importer ) ,
2452
- )
2453
- if (
2454
- resolved &&
2455
- ( resolved . endsWith ( '.css' ) ||
2456
- resolved . endsWith ( '.scss' ) ||
2457
- resolved . endsWith ( '.sass' ) )
2458
- ) {
2459
- return pathToFileURL ( resolved )
2460
- }
2438
+ const importer = context . containingUrl
2439
+ ? fileURLToPath ( context . containingUrl )
2440
+ : options . filename
2441
+ const resolved = await resolvers . sass (
2442
+ environment ,
2443
+ url ,
2444
+ cleanScssBugUrl ( importer ) ,
2445
+ )
2446
+ if (
2447
+ resolved &&
2448
+ ( resolved . endsWith ( '.css' ) ||
2449
+ resolved . endsWith ( '.scss' ) ||
2450
+ resolved . endsWith ( '.sass' ) )
2451
+ ) {
2452
+ return pathToFileURL ( resolved )
2461
2453
}
2462
2454
return null
2463
2455
} ,
@@ -2480,13 +2472,12 @@ const makeScssWorker = (
2480
2472
result . contents ?? ( await fsp . readFile ( result . file , 'utf-8' ) )
2481
2473
return { contents, syntax, sourceMapUrl : canonicalUrl }
2482
2474
} ,
2483
- } )
2484
-
2475
+ }
2485
2476
sassOptions . importers = [
2486
2477
...( sassOptions . importers ?? [ ] ) ,
2487
- createInternalImporter ( false ) ,
2478
+ internalImporter ,
2488
2479
]
2489
- sassOptions . importer ??= createInternalImporter ( true )
2480
+ sassOptions . importer ??= internalImporter
2490
2481
2491
2482
const result = await compiler . compileStringAsync ( data , sassOptions )
2492
2483
return {
0 commit comments