refactor: loader and plugin

Author: alexander-akait

lib/loader.js

@@ -41,9 +41,9 @@ module.exports = function(content, map, meta) {
 
   const plugins = [
     plugin({
+      loaderContext: this,
       url: options.url !== false,
       import: options.import !== false,
-      loaderContext: this,
       importLoaders: options.importLoaders
     })
   ];
@@ -98,7 +98,7 @@ module.exports = function(content, map, meta) {
       }
 
       // Todo need save backward compatibility with old `style-loader` and exports.locals
-      let newContent = {
+      let newContentObj = {
         imports: "",
         runtime: `module.exports = exports = require(${loaderUtils.stringifyRequest(
           this,
@@ -111,31 +111,29 @@ module.exports = function(content, map, meta) {
       };
 
       if (result.messages && result.messages.length > 0) {
-        newContent = result.messages
+        result.messages
           .filter(
             message =>
-              message.type === "modify-runtime-code" ? message : false
+              message.type === "modify-generated-code" ? message : false
           )
-          .reduce((initialValue, message) => {
+          .forEach((message) => {
             try {
-              initialValue = message.modifyRuntimeCode(this, initialValue);
+              newContentObj = message.modifyGeneratedCode(this, newContentObj);
             } catch (err) {
               this.emitError(err);
             }
-
-            return initialValue;
-          }, newContent);
+          });
       }
 
-      const { imports, runtime, module, exports } = newContent;
+      const { imports, runtime, module, exports } = newContentObj;
 
       cb(
         null,
         [
           imports ? `// CSS imports\n${imports}` : "",
           runtime ? `// CSS runtime\n${runtime}` : "",
-          module ? `// CSS module\n${newContent.module}` : "",
-          exports ? `// CSS exports\n${newContent.exports}` : ""
+          module ? `// CSS module\n${module}` : "",
+          exports ? `// CSS exports\n${exports}` : ""
         ].join("\n")
       );
 

lib/plugin.js

@@ -81,11 +81,11 @@ module.exports = postcss.plugin(pluginName, function(options) {
         if (!alreadyImported[url]) {
           result.messages.push({
             pluginName,
-            type: "modify-runtime-code",
-            modifyRuntimeCode: (loaderContext, content) => {
-              content.runtime = `${content.runtime}${runtimeCode}\n`;
+            type: "modify-generated-code",
+            modifyGeneratedCode: (loaderContext, contentObj) => {
+              contentObj.runtime = `${contentObj.runtime}${runtimeCode}\n`;
 
-              return content;
+              return contentObj;
             }
           });
 
@@ -148,32 +148,32 @@ module.exports = postcss.plugin(pluginName, function(options) {
 
             result.messages.push({
               pluginName,
-              type: "modify-runtime-code",
-              modifyRuntimeCode: (loaderContext, content) => {
+              type: "modify-generated-code",
+              modifyGeneratedCode: (loaderContext, contentObj) => {
                 if (!hasURLEscapeRuntimeCode) {
-                  content.imports = `var runtimeEscape = require(${loaderUtils.stringifyRequest(
+                  contentObj.imports = `var runtimeEscape = require(${loaderUtils.stringifyRequest(
                     loaderContext,
                     require.resolve("./runtimeEscape.js")
-                  )});\n${content.imports}`;
+                  )});\n${contentObj.imports}`;
 
                   hasURLEscapeRuntimeCode = true;
                 }
 
-                content.imports = `${
-                  content.imports
+                contentObj.imports = `${
+                  contentObj.imports
                 }var ${placeholder} = require(${loaderUtils.stringifyRequest(
                   loaderContext,
                   requestedURL
                 )});\n`;
 
-                content.module = content.module.replace(
+                contentObj.module = contentObj.module.replace(
                   placeholder,
                   `" + runtimeEscape(${placeholder}) + "${
                     splittedURL[1] ? splittedURL[1] : ""
                   }${splittedURL[2] ? `#${splittedURL[2]}` : ""}`
                 );
 
-                return content;
+                return contentObj;
               }
             });