Merge ac0432e into 1d8c318

package.json

@@ -93,7 +93,7 @@
     "semver": "^7.3.4",
     "standard-version": "^9.1.0",
     "style-loader": "^2.0.0",
-    "webpack": "^5.20.0"
+    "webpack": "^5.20.2"
   },
   "keywords": [
     "sass",

src/utils.js

@@ -369,6 +369,7 @@ function getWebpackResolver(
   );
   const webpackResolve = promiseResolve(
     resolverFactory({
+      dependencyType: "sass",
       conditionNames: ["sass", "style"],
       mainFields: ["sass", "style", "main", "..."],
       mainFiles: ["_index", "index", "..."],

test/__snapshots__/loader.test.js.snap

@@ -167371,3 +167371,57 @@ exports[`loader should work with the "material-components-web" package without t
 exports[`loader should work with the "material-components-web" package without the "includePaths" option (dart-sass) (scss): warnings 1`] = `Array []`;
 
 exports[`loader should work with the "material-components-web" package without the "includePaths" option (dart-sass) (scss): warnings 2`] = `Array []`;
+
+exports[`loader should work with the 'resolve.byDependecy.sass' option (dart-sass) (sass): css 1`] = `
+".a {
+  color: red;
+}
+
+.b {
+  color: red;
+}"
+`;
+
+exports[`loader should work with the 'resolve.byDependecy.sass' option (dart-sass) (sass): errors 1`] = `Array []`;
+
+exports[`loader should work with the 'resolve.byDependecy.sass' option (dart-sass) (sass): warnings 1`] = `Array []`;
+
+exports[`loader should work with the 'resolve.byDependecy.sass' option (dart-sass) (scss): css 1`] = `
+".a {
+  color: red;
+}
+
+.b {
+  color: red;
+}"
+`;
+
+exports[`loader should work with the 'resolve.byDependecy.sass' option (dart-sass) (scss): errors 1`] = `Array []`;
+
+exports[`loader should work with the 'resolve.byDependecy.sass' option (dart-sass) (scss): warnings 1`] = `Array []`;
+
+exports[`loader should work with the 'resolve.byDependecy.sass' option (node-sass) (sass): css 1`] = `
+".a {
+  color: red; }
+
+.b {
+  color: red; }
+"
+`;
+
+exports[`loader should work with the 'resolve.byDependecy.sass' option (node-sass) (sass): errors 1`] = `Array []`;
+
+exports[`loader should work with the 'resolve.byDependecy.sass' option (node-sass) (sass): warnings 1`] = `Array []`;
+
+exports[`loader should work with the 'resolve.byDependecy.sass' option (node-sass) (scss): css 1`] = `
+".a {
+  color: red; }
+
+.b {
+  color: red; }
+"
+`;
+
+exports[`loader should work with the 'resolve.byDependecy.sass' option (node-sass) (scss): errors 1`] = `Array []`;
+
+exports[`loader should work with the 'resolve.byDependecy.sass' option (node-sass) (scss): warnings 1`] = `Array []`;

test/helpers/getCodeFromSass.js

@@ -281,6 +281,9 @@ function getCodeFromSass(testId, options) {
     __dirname,
     "../../node_modules/@material"
   );
+  const pathToCustomMainFiles = isSass
+    ? path.resolve(testFolder, "sass/custom-main-files/custom.sass")
+    : path.resolve(testFolder, "scss/custom-main-files/custom.scss");
 
   // Pseudo importer for tests
   function testImporter(url) {
@@ -754,6 +757,7 @@ function getCodeFromSass(testId, options) {
           pathToPackageWithSameImport
         )
         .replace(/@material/, pathToMaterial)
+        .replace(/custom-main-files/, pathToCustomMainFiles)
         .replace(/^~/, testNodeModules);
     }
 

test/loader.test.js

@@ -972,6 +972,31 @@ describe("loader", () => {
         expect(getErrors(stats)).toMatchSnapshot("errors");
       });
 
+      it(`should work with the 'resolve.byDependecy.sass' option (${implementationName}) (${syntax})`, async () => {
+        const testId = getTestId("by-dependency", syntax);
+        const options = {
+          implementation: getImplementationByName(implementationName),
+        };
+        const compiler = getCompiler(testId, {
+          loader: { options },
+          resolve: {
+            byDependency: {
+              sass: {
+                mainFiles: ["custom"],
+              },
+            },
+          },
+        });
+        const stats = await compile(compiler);
+        const codeFromBundle = getCodeFromBundle(stats, compiler);
+        const codeFromSass = getCodeFromSass(testId, options);
+
+        expect(codeFromBundle.css).toBe(codeFromSass.css);
+        expect(codeFromBundle.css).toMatchSnapshot("css");
+        expect(getWarnings(stats)).toMatchSnapshot("warnings");
+        expect(getErrors(stats)).toMatchSnapshot("errors");
+      });
+
       if (implementation === dartSass) {
         it(`should output an understandable error with a problem in "@use" (${implementationName}) (${syntax})`, async () => {
           const testId = getTestId("error-use", syntax);

test/sass/by-dependency.sass

@@ -0,0 +1,4 @@
+@import "custom-main-files"
+
+.b
+  color: red

test/sass/custom-main-files/custom.sass

@@ -0,0 +1,2 @@
+.a
+  color: red

test/scss/by-dependency.scss

@@ -0,0 +1,5 @@
+@import "custom-main-files";
+
+.b {
+  color: red;
+}

test/scss/custom-main-files/custom.scss

@@ -0,0 +1,3 @@
+.a {
+  color: red
+}