fix: include matchResource in entry request

Author: jquense

package-lock.json

@@ -57,7 +57,7 @@
     "babel-jest": "^26.6.3",
     "bootstrap": "^4.6.0",
     "cross-env": "^7.0.3",
-    "css-loader": "^5.0.2",
+    "css-loader": "^5.1.3",
     "del": "^6.0.0",
     "del-cli": "^3.0.1",
     "es-check": "5.2.0",

package.json

@@ -92,6 +92,11 @@ export function pitch(request) {
 
   const { EntryOptionPlugin } = webpack;
 
+  let entryRequest = `!!${request}`;
+  if (typeof this._module.matchResource !== 'undefined') {
+    entryRequest = `${this._module.matchResource}!=!${entryRequest}`;
+  }
+
   if (EntryOptionPlugin) {
     const {
       library: { EnableLibraryPlugin },
@@ -104,14 +109,14 @@ export function pitch(request) {
         library: {
           type: 'commonjs2',
         },
-        import: [`!!${request}`],
+        import: [entryRequest],
       },
     });
   } else {
     const { LibraryTemplatePlugin, SingleEntryPlugin } = webpack;
 
     new LibraryTemplatePlugin(null, 'commonjs2').apply(childCompiler);
-    new SingleEntryPlugin(this.context, `!!${request}`, pluginName).apply(
+    new SingleEntryPlugin(this.context, entryRequest, pluginName).apply(
       childCompiler
     );
   }

src/loader.js

@@ -0,0 +1,3 @@
+module.exports = function base64Loader() {
+  return Buffer.from(this.query.slice(1), 'base64').toString('ascii');
+};

test/cases/inline-match-resource/base64-loader.js

@@ -0,0 +1,2 @@
+.index__foo__3o8gA { color: red; }
+.index__foo__3wlgf { color: red; }

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

@@ -0,0 +1,4 @@
+/* eslint-disable */
+
+import styles from './foo.module.css!=!./base64-loader?LmZvbyB7IGNvbG9yOiByZWQ7IH0=!./index.js?foo';
+import styles2 from './baz.module.css!=!./base64-loader?LmZvbyB7IGNvbG9yOiByZWQ7IH0=!./index.js?bar';

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

@@ -0,0 +1,29 @@
+import Self from '../../../src';
+
+module.exports = {
+  entry: './index.js',
+  module: {
+    rules: [
+      {
+        test: /\.css$/,
+        use: [
+          Self.loader,
+          {
+            loader: 'css-loader',
+            options: {
+              modules: {
+                auto: true,
+                localIdentName: '[name]__[local]__[hash:base64:5]',
+              },
+            },
+          },
+        ],
+      },
+    ],
+  },
+  plugins: [
+    new Self({
+      filename: '[name].css',
+    }),
+  ],
+};