refactor: improve resolving (webpack#1327)

Author: alexander-akait

.gitignore

@@ -8,6 +8,7 @@ npm-debug.log*
 /local
 /reports
 /node_modules
+/test/outputs
 /test/fixtures/import/import-absolute.css
 /test/fixtures/url/url-absolute.css
 /test/fixtures/modules/composes/composes-absolute.css

src/index.js

@@ -86,12 +86,7 @@ export default async function loader(content, map, meta) {
   const urlPluginImports = [];
 
   if (shouldUseURLPlugin(options)) {
-    const urlResolver = this.getResolve({
-      conditionNames: ["asset"],
-      mainFields: ["asset"],
-      mainFiles: [],
-      extensions: [],
-    });
+    const needToResolveURL = !options.esModule;
 
     plugins.push(
       urlParser({
@@ -100,7 +95,11 @@ export default async function loader(content, map, meta) {
         context: this.context,
         rootContext: this.rootContext,
         filter: getFilter(options.url.filter, this.resourcePath),
-        resolver: urlResolver,
+        needToResolveURL,
+        resolver: needToResolveURL
+          ? this.getResolve({ mainFiles: [], extensions: [] })
+          : // eslint-disable-next-line no-undefined
+            undefined,
         urlHandler: (url) => stringifyRequest(this, url),
       })
     );

src/plugins/postcss-url-parser.js

@@ -1,9 +1,9 @@
 import valueParser from "postcss-value-parser";
 
 import {
+  resolveRequests,
   normalizeUrl,
   requestify,
-  resolveRequests,
   isUrlRequestable,
   WEBPACK_IGNORE_COMMENT_REGEXP,
 } from "../utils";
@@ -302,7 +302,17 @@ const plugin = (options = {}) => {
               let hash = query ? "?" : "";
               hash += hashOrQuery ? `#${hashOrQuery}` : "";
 
-              const request = requestify(pathname, options.rootContext);
+              const { needToResolveURL, rootContext } = options;
+              const request = requestify(
+                pathname,
+                rootContext,
+                needToResolveURL
+              );
+
+              if (!needToResolveURL) {
+                // eslint-disable-next-line consistent-return
+                return { ...parsedDeclaration, url: request, hash };
+              }
 
               const { resolver, context } = options;
               const resolvedUrl = await resolveRequests(resolver, context, [
@@ -359,7 +369,9 @@ const plugin = (options = {}) => {
               options.imports.push({
                 type: "url",
                 importName,
-                url: options.urlHandler(newUrl),
+                url: options.needToResolveURL
+                  ? options.urlHandler(newUrl)
+                  : JSON.stringify(newUrl),
                 index,
               });
             }

src/utils.js

@@ -56,14 +56,14 @@ function stringifyRequest(loaderContext, request) {
   );
 }
 
-// we can't use path.win32.isAbsolute because it also matches paths starting with a forward slash
-const matchNativeWin32Path = /^[A-Z]:[/\\]|^\\\\/i;
+// We can't use path.win32.isAbsolute because it also matches paths starting with a forward slash
+const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
+const IS_MODULE_REQUEST = /^[^?]*~/;
 
 function urlToRequest(url, root) {
-  const moduleRequestRegex = /^[^?]*~/;
   let request;
 
-  if (matchNativeWin32Path.test(url)) {
+  if (IS_NATIVE_WIN32_PATH.test(url)) {
     // absolute windows path, keep it
     request = url;
   } else if (typeof root !== "undefined" && /^\//.test(url)) {
@@ -77,8 +77,8 @@ function urlToRequest(url, root) {
   }
 
   // A `~` makes the url an module
-  if (moduleRequestRegex.test(request)) {
-    request = request.replace(moduleRequestRegex, "");
+  if (IS_MODULE_REQUEST.test(request)) {
+    request = request.replace(IS_MODULE_REQUEST, "");
   }
 
   return request;
@@ -459,14 +459,27 @@ function normalizeUrl(url, isStringValue) {
   return normalizedUrl;
 }
 
-function requestify(url, rootContext) {
-  if (/^file:/i.test(url)) {
-    return fileURLToPath(url);
+function requestify(url, rootContext, needToResolveURL = true) {
+  if (needToResolveURL) {
+    if (/^file:/i.test(url)) {
+      return fileURLToPath(url);
+    }
+
+    return url.charAt(0) === "/"
+      ? urlToRequest(url, rootContext)
+      : urlToRequest(url);
+  }
+
+  if (url.charAt(0) === "/" || /^file:/i.test(url)) {
+    return url;
   }
 
-  return url.charAt(0) === "/"
-    ? urlToRequest(url, rootContext)
-    : urlToRequest(url);
+  // A `~` makes the url an module
+  if (IS_MODULE_REQUEST.test(url)) {
+    return url.replace(IS_MODULE_REQUEST, "");
+  }
+
+  return url;
 }
 
 function getFilter(filter, resourcePath) {
@@ -744,7 +757,6 @@ function getModulesPlugins(options, loaderContext) {
   return plugins;
 }
 
-const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
 const ABSOLUTE_SCHEME = /^[a-z0-9+\-.]+:/i;
 
 function getURLType(source) {