test: more (#1163)

Author: alexander-akait

src/loader.js

@@ -361,7 +361,7 @@ function pitch(request) {
     }
 
     this.importModule(
-      `${this._module.matchResource || this.resourcePath}.webpack[javascript/auto]!=!!!${request}`,
+      `${this._module && this._module.matchResource ? this._module.matchResource : this.resourcePath}.webpack[javascript/auto]!=!!!${request}`,
       {
         layer: options.layer,
         publicPath: /** @type {string} */ (publicPathForExtract),

test/cases/match-resource-url/expected/main.css

@@ -2,3 +2,11 @@ body {
   background-image: url(static/icon.svg);
 }
 
+body {
+  background-image: url(./icon.svg);
+}
+
+body {
+  background-image: url(./icon.svg);
+}
+

test/cases/match-resource-url/expected/static/icon.svg

@@ -1 +1,3 @@
 import "./virtual.css!=!./source.txt";
+import "./virtual.css?=query!=!./source.txt";
+import "./other.css?=query";

test/cases/match-resource-url/index.js

@@ -0,0 +1,3 @@
+body {
+  background-image: url(./icon.svg);
+}

test/cases/match-resource-url/other.css

@@ -6,8 +6,22 @@ module.exports = {
     rules: [
       {
         test: /\.css$/,
+        resourceQuery: { not: /query/ },
         use: [Self.loader, "css-loader"],
       },
+      {
+        test: /\.css$/,
+        resourceQuery: /query/,
+        use: [
+          Self.loader,
+          {
+            loader: "css-loader",
+            options: {
+              url: false,
+            },
+          },
+        ],
+      },
       {
         test: /\.svg$/,
         issuer: /\.css$/,