Skip to content

Commit

Permalink
Fix importing scoped packages on windows
Browse files Browse the repository at this point in the history
Fixes #182
  • Loading branch information
maoberlehner committed Dec 31, 2018
1 parent 31c0da5 commit 732a80d
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions packages/node-sass-magic-importer/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,15 @@ export = function magicImporter(userOptions?: IMagicImporterOptions) {
const packageName = cleanedUrl.charAt(0) === `@`
? cleanedUrl.split(DIRECTORY_SEPARATOR).slice(0, 2).join(DIRECTORY_SEPARATOR)
: cleanedUrl.split(DIRECTORY_SEPARATOR)[0];
const packageSearchPath = path.join('node_modules', packageName, `package.json`);
const normalizedPackageName = path.normalize(packageName);
const packageSearchPath = path.join('node_modules', normalizedPackageName, `package.json`);
const packagePath = path.dirname(findupSync(packageSearchPath, { cwd: options.cwd }));

cleanedUrl = path.resolve(packagePath.replace(new RegExp(`${packageName}$`), ``), cleanedUrl);
const escapedNormalizedPackageName = normalizedPackageName.replace(`\\`, `\\\\`);
cleanedUrl = path.resolve(
packagePath.replace(new RegExp(`${escapedNormalizedPackageName}$`), ``),
path.normalize(cleanedUrl),
);

resolvedUrl = resolvePackageUrl(
cleanedUrl,
Expand Down

0 comments on commit 732a80d

Please sign in to comment.