feat: allow to extend conditionNames (#488)

webpack-contrib · Oct 6, 2022 · 43cd20c · 43cd20c
1 parent c1aa4f5
commit 43cd20c
Show file tree

Hide file tree

Showing 11 changed files with 131 additions and 5 deletions.
diff --git a/src/utils.js b/src/utils.js
@@ -34,7 +34,7 @@ const MODULE_REQUEST_REGEX = /^[^?]*~/;
 function createWebpackLessPlugin(loaderContext, implementation) {
   const resolve = loaderContext.getResolve({
     dependencyType: "less",
-    conditionNames: ["less", "style"],
+    conditionNames: ["less", "style", "..."],
     mainFields: ["less", "style", "main", "..."],
     mainFiles: ["index", "..."],
     extensions: [".less", ".css"],

diff --git a/test/__snapshots__/loader.test.js.snap b/test/__snapshots__/loader.test.js.snap
@@ -583,6 +583,28 @@ exports[`loader should work third-party plugins as fileLoader: errors 1`] = `[]`
 
 exports[`loader should work third-party plugins as fileLoader: warnings 1`] = `[]`;
 
+exports[`loader should work with a package with "sass" and "exports" fields and a custom condition (theme1): css 1`] = `
+".load-me {
+  color: red;
+}
+"
+`;
+
+exports[`loader should work with a package with "sass" and "exports" fields and a custom condition (theme1): errors 1`] = `[]`;
+
+exports[`loader should work with a package with "sass" and "exports" fields and a custom condition (theme1): warnings 1`] = `[]`;
+
+exports[`loader should work with a package with "sass" and "exports" fields and a custom condition (theme2): css 1`] = `
+".load-me {
+  color: blue;
+}
+"
+`;
+
+exports[`loader should work with a package with "sass" and "exports" fields and a custom condition (theme2): errors 1`] = `[]`;
+
+exports[`loader should work with a package with "sass" and "exports" fields and a custom condition (theme2): warnings 1`] = `[]`;
+
 exports[`loader should work: css 1`] = `
 ".box {
   color: #fe33ac;

diff --git a/test/fixtures/import-package-with-exports-and-custom-condition.less b/test/fixtures/import-package-with-exports-and-custom-condition.less
@@ -0,0 +1 @@
+@import 'package-with-exports-and-custom-condition';
diff --git a/test/fixtures/node_modules/package-with-exports-and-custom-condition/index.cjs b/test/fixtures/node_modules/package-with-exports-and-custom-condition/index.cjs
diff --git a/test/fixtures/node_modules/package-with-exports-and-custom-condition/index.js b/test/fixtures/node_modules/package-with-exports-and-custom-condition/index.js
diff --git a/test/fixtures/node_modules/package-with-exports-and-custom-condition/package.json b/test/fixtures/node_modules/package-with-exports-and-custom-condition/package.json
diff --git a/test/fixtures/node_modules/package-with-exports-and-custom-condition/style-1.less b/test/fixtures/node_modules/package-with-exports-and-custom-condition/style-1.less
diff --git a/test/fixtures/node_modules/package-with-exports-and-custom-condition/style-2.less b/test/fixtures/node_modules/package-with-exports-and-custom-condition/style-2.less
diff --git a/test/fixtures/node_modules/package-with-exports/package.json b/test/fixtures/node_modules/package-with-exports/package.json
diff --git a/test/helpers/getCodeFromLess.js b/test/helpers/getCodeFromLess.js
@@ -150,8 +150,27 @@ class CustomImportPlugin {
   }
 }
 
-async function getCodeFromLess(testId, options = {}) {
-  const pathToFile = path.resolve(__dirname, "..", "fixtures", testId);
+async function getCodeFromLess(testId, options = {}, context = {}) {
+  let pathToFile;
+
+  if (context.packageExportsCustomConditionTestVariant === 1) {
+    pathToFile = path.resolve(
+      __dirname,
+      "..",
+      "fixtures",
+      "node_modules/package-with-exports-and-custom-condition/style-1.less"
+    );
+  } else if (context.packageExportsCustomConditionTestVariant === 2) {
+    pathToFile = path.resolve(
+      __dirname,
+      "..",
+      "fixtures",
+      "node_modules/package-with-exports-and-custom-condition/style-2.less"
+    );
+  } else {
+    pathToFile = path.resolve(__dirname, "..", "fixtures", testId);
+  }
+
   const defaultOptions = {
     plugins: [],
     relativeUrls: true,

diff --git a/test/loader.test.js b/test/loader.test.js
@@ -937,4 +937,58 @@ describe("loader", () => {
     expect(getWarnings(stats)).toMatchSnapshot("warnings");
     expect(getErrors(stats)).toMatchSnapshot("errors");
   });
+
+  it(`should work with a package with "sass" and "exports" fields and a custom condition (theme1)`, async () => {
+    const testId = "./import-package-with-exports-and-custom-condition.less";
+    const compiler = getCompiler(
+      testId,
+      {},
+      {
+        resolve: {
+          conditionNames: ["theme1", "..."],
+        },
+      }
+    );
+    const stats = await compile(compiler);
+    const codeFromBundle = getCodeFromBundle(stats, compiler);
+    const codeFromLess = await getCodeFromLess(
+      testId,
+      {},
+      {
+        packageExportsCustomConditionTestVariant: 1,
+      }
+    );
+
+    expect(codeFromBundle.css).toBe(codeFromLess.css);
+    expect(codeFromBundle.css).toMatchSnapshot("css");
+    expect(getWarnings(stats)).toMatchSnapshot("warnings");
+    expect(getErrors(stats)).toMatchSnapshot("errors");
+  });
+
+  it(`should work with a package with "sass" and "exports" fields and a custom condition (theme2)`, async () => {
+    const testId = "./import-package-with-exports-and-custom-condition.less";
+    const compiler = getCompiler(
+      testId,
+      {},
+      {
+        resolve: {
+          conditionNames: ["theme2", "..."],
+        },
+      }
+    );
+    const stats = await compile(compiler);
+    const codeFromBundle = getCodeFromBundle(stats, compiler);
+    const codeFromLess = await getCodeFromLess(
+      testId,
+      {},
+      {
+        packageExportsCustomConditionTestVariant: 2,
+      }
+    );
+
+    expect(codeFromBundle.css).toBe(codeFromLess.css);
+    expect(codeFromBundle.css).toMatchSnapshot("css");
+    expect(getWarnings(stats)).toMatchSnapshot("warnings");
+    expect(getErrors(stats)).toMatchSnapshot("errors");
+  });
 });
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		@import 'package-with-exports-and-custom-condition';