refactor: move dependency adding function into loader

Author: goganchic

src/CssDependency.js

@@ -0,0 +1,22 @@
+import webpack from 'webpack';
+
+export default class CssDependency extends webpack.Dependency {
+  constructor(
+    { identifier, content, media, sourceMap },
+    context,
+    identifierIndex
+  ) {
+    super();
+
+    this.identifier = identifier;
+    this.identifierIndex = identifierIndex;
+    this.content = content;
+    this.media = media;
+    this.sourceMap = sourceMap;
+    this.context = context;
+  }
+
+  getResourceIdentifier() {
+    return `css-module-${this.identifier}-${this.identifierIndex}`;
+  }
+}

src/index.js

@@ -3,6 +3,8 @@
 import webpack from 'webpack';
 import sources from 'webpack-sources';
 
+import CssDependency from './CssDependency';
+
 const { ConcatSource, SourceMapSource, OriginalSource } = sources;
 const {
   Template,
@@ -19,27 +21,6 @@ const REGEXP_NAME = /\[name\]/i;
 const REGEXP_PLACEHOLDERS = /\[(name|id|chunkhash)\]/g;
 const DEFAULT_FILENAME = '[name].css';
 
-class CssDependency extends webpack.Dependency {
-  constructor(
-    { identifier, content, media, sourceMap },
-    context,
-    identifierIndex
-  ) {
-    super();
-
-    this.identifier = identifier;
-    this.identifierIndex = identifierIndex;
-    this.content = content;
-    this.media = media;
-    this.sourceMap = sourceMap;
-    this.context = context;
-  }
-
-  getResourceIdentifier() {
-    return `css-module-${this.identifier}-${this.identifierIndex}`;
-  }
-}
-
 class CssDependencyTemplate {
   apply() {}
 }
@@ -148,33 +129,6 @@ class MiniCssExtractPlugin {
 
   apply(compiler) {
     compiler.hooks.thisCompilation.tap(pluginName, (compilation) => {
-      compilation.hooks.normalModuleLoader.tap(
-        pluginName,
-        (loaderContext, module) => {
-          // eslint-disable-next-line no-param-reassign
-          loaderContext[MODULE_TYPE] = (content) => {
-            if (!Array.isArray(content) && content != null) {
-              throw new Error(
-                `Exported value was not extracted as an array: ${JSON.stringify(
-                  content
-                )}`
-              );
-            }
-
-            const identifierCountMap = new Map();
-
-            for (const line of content) {
-              const count = identifierCountMap.get(line.identifier) || 0;
-
-              module.addDependency(
-                new CssDependency(line, module.context, count)
-              );
-              identifierCountMap.set(line.identifier, count + 1);
-            }
-          };
-        }
-      );
-
       compilation.dependencyFactories.set(
         CssDependency,
         new CssModuleFactory()

src/loader.js

@@ -10,9 +10,10 @@ import SingleEntryPlugin from 'webpack/lib/SingleEntryPlugin';
 import LimitChunkCountPlugin from 'webpack/lib/optimize/LimitChunkCountPlugin';
 import validateOptions from 'schema-utils';
 
+import CssDependency from './CssDependency';
+
 import schema from './options.json';
 
-const MODULE_TYPE = 'css/mini-extract';
 const pluginName = 'mini-css-extract-plugin';
 
 function hotLoader(content, context) {
@@ -133,6 +134,27 @@ export function pitch(request) {
   const callback = this.async();
 
   childCompiler.runAsChild((err, entries, compilation) => {
+    const addDependencies = (content) => {
+      if (!Array.isArray(content) && content != null) {
+        throw new Error(
+          `Exported value was not extracted as an array: ${JSON.stringify(
+            content
+          )}`
+        );
+      }
+
+      const identifierCountMap = new Map();
+
+      for (const line of content) {
+        const count = identifierCountMap.get(line.identifier) || 0;
+
+        this._module.addDependency(
+          new CssDependency(line, module.context, count)
+        );
+        identifierCountMap.set(line.identifier, count + 1);
+      }
+    };
+
     if (err) {
       return callback(err);
     }
@@ -173,7 +195,7 @@ export function pitch(request) {
           };
         });
       }
-      this[MODULE_TYPE](text);
+      addDependencies(text);
     } catch (e) {
       return callback(e);
     }