fix: resolution logic

webpack-contrib · Jun 22, 2020 · 2c3a23a · 2c3a23a
1 parent 3d01b82
commit 2c3a23a
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 0 deletions.
diff --git a/src/utils.js b/src/utils.js
@@ -24,6 +24,7 @@ function createWebpackLessPlugin(loaderContext) {
     mainFields: ['less', 'style', 'main', '...'],
     mainFiles: ['index', '...'],
     extensions: ['.less', '.css'],
+    restrictions: [/\.(le|c)ss$/i],
   });
 
   class WebpackFileManager extends less.FileManager {

diff --git a/test/__snapshots__/loader.test.js.snap b/test/__snapshots__/loader.test.js.snap
@@ -139,6 +139,15 @@ exports[`loader should not alter the original options object: errors 1`] = `Arra
 
 exports[`loader should not alter the original options object: warnings 1`] = `Array []`;
 
+exports[`loader should not resolve when resolve.restrictions no passed: errors 1`] = `
+Array [
+  "ModuleBuildError: Module build failed (from \`replaced original path\`):
+",
+]
+`;
+
+exports[`loader should not resolve when resolve.restrictions no passed: warnings 1`] = `Array []`;
+
 exports[`loader should not to disable webpack's resolver by passing an empty paths array: css 1`] = `
 ".img {
   background: url(some/img.jpg);
@@ -179,6 +188,20 @@ exports[`loader should not try to resolve CSS imports with URLs: errors 1`] = `A
 
 exports[`loader should not try to resolve CSS imports with URLs: warnings 1`] = `Array []`;
 
+exports[`loader should prefer a main file with "less" extension over main field with js file: css 1`] = `
+".modules-dir-some-module {
+  color: hotpink;
+}
+.some-class {
+  background: hotpink;
+}
+"
+`;
+
+exports[`loader should prefer a main file with "less" extension over main field with js file: errors 1`] = `Array []`;
+
+exports[`loader should prefer a main file with "less" extension over main field with js file: warnings 1`] = `Array []`;
+
 exports[`loader should provide a useful error message if the import could not be found: errors 1`] = `
 Array [
   "ModuleBuildError: Module build failed (from \`replaced original path\`):

diff --git a/test/fixtures/import-webpack-js-package-2.less b/test/fixtures/import-webpack-js-package-2.less
@@ -0,0 +1,5 @@
+@import "~some-illegal-2";
+
+.some-class {
+  background: hotpink;
+}
diff --git a/test/fixtures/import-webpack-js-package.less b/test/fixtures/import-webpack-js-package.less
@@ -0,0 +1,5 @@
+@import "~some-illegal";
+
+.some-class {
+  background: hotpink;
+}
diff --git a/test/fixtures/node_modules/some-illegal-2/index.js b/test/fixtures/node_modules/some-illegal-2/index.js
diff --git a/test/fixtures/node_modules/some-illegal-2/index.less b/test/fixtures/node_modules/some-illegal-2/index.less
diff --git a/test/fixtures/node_modules/some-illegal-2/package.json b/test/fixtures/node_modules/some-illegal-2/package.json
diff --git a/test/fixtures/node_modules/some-illegal/module.js b/test/fixtures/node_modules/some-illegal/module.js
diff --git a/test/fixtures/node_modules/some-illegal/module.less b/test/fixtures/node_modules/some-illegal/module.less
diff --git a/test/fixtures/node_modules/some-illegal/package.json b/test/fixtures/node_modules/some-illegal/package.json
diff --git a/test/loader.test.js b/test/loader.test.js
@@ -596,4 +596,24 @@ describe('loader', () => {
     expect(getWarnings(stats)).toMatchSnapshot('warnings');
     expect(getErrors(stats)).toMatchSnapshot('errors');
   });
+
+  it('should not resolve when resolve.restrictions no passed', async () => {
+    const testId = './import-webpack-js-package.less';
+    const compiler = getCompiler(testId);
+    const stats = await compile(compiler);
+
+    expect(getWarnings(stats)).toMatchSnapshot('warnings');
+    expect(getErrors(stats)).toMatchSnapshot('errors');
+  });
+
+  it('should prefer a main file with "less" extension over main field with js file', async () => {
+    const testId = './import-webpack-js-package-2.less';
+    const compiler = getCompiler(testId);
+    const stats = await compile(compiler);
+    const codeFromBundle = getCodeFromBundle(stats, compiler);
+
+    expect(codeFromBundle.css).toMatchSnapshot('css');
+    expect(getWarnings(stats)).toMatchSnapshot('warnings');
+    expect(getErrors(stats)).toMatchSnapshot('errors');
+  });
 });