Fix path import, legacy importer options.

sass · Dec 20, 2023 · a55acff · a55acff
1 parent 8964f75
commit a55acff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/lib/src/importer-registry.ts b/lib/src/importer-registry.ts
@@ -12,7 +12,6 @@ import {legacyImporterProtocol} from './legacy/utils';
 import {FileImporter, Importer, Options} from './vendor/sass';
 import * as proto from './vendor/embedded_sass_pb';
 import {catchOr, thenOr, PromiseOr} from './utils';
-import path = require('path');
 
 export class NodePackageImporter {
   entryPointPath?: string;
@@ -58,14 +57,10 @@ export class ImporterRegistry<sync extends 'sync' | 'async'> {
     const message = new proto.InboundMessage_CompileRequest_Importer();
     if (importer instanceof NodePackageImporter) {
       const importerMessage = new proto.NodePackageImporter();
-      let entryPointPath = importer.entryPointPath
-        ? path.resolve(process.cwd(), importer.entryPointPath)
+      const entryPointPath = importer.entryPointPath
+        ? p.resolve(process.cwd(), importer.entryPointPath)
         : require.main?.filename;
 
-      if (entryPointPath === legacyImporterProtocol) {
-        entryPointPath = require.main?.filename;
-      }
-
       if (!entryPointPath) {
         throw new Error(
           'Node Package Importer requires access to a filesystem.'

diff --git a/lib/src/legacy/index.ts b/lib/src/legacy/index.ts
@@ -192,7 +192,7 @@ function convertStringOptions<sync extends 'sync' | 'async'>(
   // Find the first non-NodePackageImporter to pass as legacy `importer` option.
   // NodePackageImporter will be passed in `modernOptions.importers`.
   const importer = modernOptions.importers?.find(
-    _importer => _importer instanceof NodePackageImporter
+    _importer => !(_importer instanceof NodePackageImporter)
   ) as Importer<sync> | FileImporter<sync>;
 
   return {