feat: support sass field in package.json (#647)

webpack-contrib · Dec 14, 2018 · a8709c9 · a8709c9
1 parent ff90dd6
commit a8709c9
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 0 deletions.
diff --git a/lib/loader.js b/lib/loader.js
@@ -40,6 +40,7 @@ function sassLoader(content) {
   // Supported since v4.27.0
   if (this.getResolve) {
     resolve = this.getResolve({
+      mainFields: ['sass', 'main'],
       extensions: ['.scss', '.sass', '.css'],
     });
   }

diff --git a/test/index.test.js b/test/index.test.js
@@ -169,6 +169,8 @@ implementations.forEach((implementation) => {
                 },
               }
             ));
+          it('should resolve sass field correctly', () =>
+            execTest(`import-sass-field`));
         });
         describe('custom importers', () => {
           it('should use custom importer', () =>

diff --git a/test/node_modules/sass-sass-field/nested/style.sass b/test/node_modules/sass-sass-field/nested/style.sass
diff --git a/test/node_modules/sass-sass-field/package.json b/test/node_modules/sass-sass-field/package.json
diff --git a/test/node_modules/scss-sass-field/nested/style.scss b/test/node_modules/scss-sass-field/nested/style.scss
diff --git a/test/node_modules/scss-sass-field/package.json b/test/node_modules/scss-sass-field/package.json
diff --git a/test/sass/import-sass-field.sass b/test/sass/import-sass-field.sass
@@ -0,0 +1 @@
+@import "~sass-sass-field"
diff --git a/test/scss/import-sass-field.scss b/test/scss/import-sass-field.scss
@@ -0,0 +1 @@
+@import "~scss-sass-field";
diff --git a/test/tools/createSpec.js b/test/tools/createSpec.js
@@ -38,6 +38,26 @@ function createSpec(ext) {
     basePath,
     path.resolve(testFolder, ext, 'another', `alias.${ext}`)
   );
+  const pathToScssSassField = path.relative(
+    basePath,
+    path.resolve(
+      testFolder,
+      'node_modules',
+      'scss-sass-field',
+      'nested',
+      'style.scss'
+    )
+  );
+  const pathToSASSSassField = path.relative(
+    basePath,
+    path.resolve(
+      testFolder,
+      'node_modules',
+      'sass-sass-field',
+      'nested',
+      'style.sass'
+    )
+  );
 
   fs.readdirSync(path.join(testFolder, ext))
     .filter(
@@ -57,6 +77,8 @@ function createSpec(ext) {
           if (/\.css$/.test(url) === false) {
             // eslint-disable-next-line no-param-reassign
             url = url
+              .replace(/^~scss-sass-field/, pathToScssSassField)
+              .replace(/^~sass-sass-field/, pathToSASSSassField)
               .replace(/^~bootstrap-sass/, pathToBootstrap)
               .replace(/^~@org\/pkg/, pathToScopedNpmPkg)
               .replace(/^~module/, pathToModule)