feat: modules options now accepts object config (#937)

BREAKING CHANGE:
- `localIdentName` option was removed in favor `modules.localIdentName` option
- `context` option was remove in favor `modules.context` option
- `hashPrefix` option was removed in favor `modules.hashPrefix` option
- `getLocalIdent` option was removed in favor `modules.getLocalIdent` option
- `localIdentRegExp` option was removed in favor `modules.localIdentRegExp` option

src/options.json

@@ -29,35 +29,45 @@
         {
           "type": "string",
           "enum": ["local", "global"]
-        }
-      ]
-    },
-    "localIdentName": {
-      "type": "string"
-    },
-    "localIdentRegExp": {
-      "anyOf": [
-        {
-          "type": "string"
         },
         {
-          "instanceof": "RegExp"
-        }
-      ]
-    },
-    "context": {
-      "type": "string"
-    },
-    "hashPrefix": {
-      "type": "string"
-    },
-    "getLocalIdent": {
-      "anyOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "instanceof": "Function"
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "mode": {
+              "type": "string",
+              "enum": ["local", "global"]
+            },
+            "localIdentName": {
+              "type": "string"
+            },
+            "localIdentRegExp": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "instanceof": "RegExp"
+                }
+              ]
+            },
+            "context": {
+              "type": "string"
+            },
+            "hashPrefix": {
+              "type": "string"
+            },
+            "getLocalIdent": {
+              "anyOf": [
+                {
+                  "type": "boolean"
+                },
+                {
+                  "instanceof": "Function"
+                }
+              ]
+            }
+          }
         }
       ]
     },

src/utils.js

@@ -267,22 +267,41 @@ function getImports(messages, importUrlPrefix, loaderContext, callback) {
 }
 
 function getModulesPlugins(options, loaderContext) {
-  const mode = typeof options.modules === 'boolean' ? 'local' : options.modules;
+  let modulesOptions = {
+    mode: 'local',
+    localIdentName: '[hash:base64]',
+    getLocalIdent,
+    context: null,
+    hashPrefix: '',
+    localIdentRegExp: null,
+  };
+
+  if (
+    typeof options.modules === 'boolean' ||
+    typeof options.modules === 'string'
+  ) {
+    modulesOptions.mode =
+      typeof options.modules === 'string' ? options.modules : 'local';
+  } else {
+    modulesOptions = Object.assign({}, modulesOptions, options.modules);
+  }
 
   return [
     modulesValues,
-    localByDefault({ mode }),
+    localByDefault({ mode: modulesOptions.mode }),
     extractImports(),
     modulesScope({
       generateScopedName: function generateScopedName(exportName) {
-        const localIdentName = options.localIdentName || '[hash:base64]';
-        const customGetLocalIdent = options.getLocalIdent || getLocalIdent;
-
-        return customGetLocalIdent(loaderContext, localIdentName, exportName, {
-          regExp: options.localIdentRegExp,
-          hashPrefix: options.hashPrefix || '',
-          context: options.context,
-        });
+        return modulesOptions.getLocalIdent(
+          loaderContext,
+          modulesOptions.localIdentName,
+          exportName,
+          {
+            context: modulesOptions.context,
+            hashPrefix: modulesOptions.hashPrefix,
+            regExp: modulesOptions.localIdentRegExp,
+          }
+        );
       },
     }),
   ];