Merge pull request #169 from webpack-contrib/feat/new-resolver

Feat/new resolver

Author: jhnns

src/createWebpackLessPlugin.js

@@ -2,7 +2,9 @@ const less = require('less');
 const loaderUtils = require('loader-utils');
 const pify = require('pify');
 
+const stringifyLoader = require.resolve('./stringifyLoader.js');
 const trailingSlash = /[\\/]$/;
+const isLessCompatible = /\.(le|c)ss$/;
 
 /**
  * Creates a Less plugin that uses webpack's resolving engine that is provided by the loaderContext.
@@ -11,9 +13,11 @@ const trailingSlash = /[\\/]$/;
  * @param {string=} root
  * @returns {LessPlugin}
  */
-function createWebpackLessPlugin(loaderContext, root) {
+function createWebpackLessPlugin(loaderContext) {
+  const { fs } = loaderContext;
   const resolve = pify(loaderContext.resolve.bind(loaderContext));
   const loadModule = pify(loaderContext.loadModule.bind(loaderContext));
+  const readFile = pify(fs.readFile.bind(fs));
 
   class WebpackFileManager extends less.FileManager {
     supports(/* filename, currentDirectory, options, environment */) { // eslint-disable-line class-methods-use-this
@@ -22,7 +26,7 @@ function createWebpackLessPlugin(loaderContext, root) {
     }
 
     loadFile(filename, currentDirectory /* , options, environment */) { // eslint-disable-line class-methods-use-this
-      const moduleRequest = loaderUtils.urlToRequest(filename, root);
+      const moduleRequest = loaderUtils.urlToRequest(filename);
       // Less is giving us trailing slashes, but the context should have no trailing slash
       const context = currentDirectory.replace(trailingSlash, '');
       let resolvedFilename;
@@ -32,11 +36,17 @@ function createWebpackLessPlugin(loaderContext, root) {
           resolvedFilename = f;
           loaderContext.addDependency(resolvedFilename);
 
-          return loadModule(`-!${__dirname}/stringify.loader.js!${resolvedFilename}`);
+          if (isLessCompatible.test(resolvedFilename)) {
+            return readFile(resolvedFilename)
+              .then(contents => contents.toString('utf8'));
+          }
+
+          return loadModule([stringifyLoader, resolvedFilename].join('!'))
+            .then(JSON.parse);
         })
         .then((contents) => {
           return {
-            contents: JSON.parse(contents),
+            contents,
             filename: resolvedFilename,
           };
         });

src/getOptions.js

@@ -18,8 +18,11 @@ function getOptions(loaderContext) {
   // We need to set the filename because otherwise our WebpackFileManager will receive an undefined path for the entry
   options.filename = loaderContext.resource;
 
-  // It's safe to mutate the array now because it has already been cloned
-  options.plugins.push(createWebpackLessPlugin(loaderContext, options.root));
+  // When no paths are given, we use the webpack resolver
+  if ('paths' in options === false) {
+    // It's safe to mutate the array now because it has already been cloned
+    options.plugins.push(createWebpackLessPlugin(loaderContext));
+  }
 
   return options;
 }

src/stringify.loader.js

@@ -0,0 +1,12 @@
+/**
+ * The stringifyLoader turns any content into a valid JavaScript string. This allows us to load any content
+ * with loaderContext.loadModule() without webpack complaining about non-JS modules.
+ *
+ * @param {string} content
+ * @return {string}
+ */
+function stringifyLoader(content) {
+  return JSON.stringify(content);
+}
+
+module.exports = stringifyLoader;

src/stringifyLoader.js

@@ -0,0 +1,3 @@
+// You can't use include paths and webpack's resolver simulatenously.
+@import "some/module.less";
+@import "~some/module.less";

test/fixtures/less/error.less renamed to test/fixtures/less/error-import-not-existing.less

@@ -0,0 +1 @@
+@import "folder/some.file";

test/fixtures/less/error-mixed-resolvers.less

@@ -0,0 +1,3 @@
+// some/module.less is intended to be loaded from node_modules if the folder is configured as include path.
+// webpack would expect this import to be prepended with a ~ character.
+@import "some/module.less";