use to merge cssModules configuration with (vuejs#446)

JounQin · yyx990803 · commit 0aa8a6ebf396 · 2016-11-06T09:05:04.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@ npm-debug.log
 test/output
 docs/_book
 .DS_Store
+.idea
+*.iml
diff --git a/lib/loader.js b/lib/loader.js
@@ -102,13 +102,18 @@ module.exports = function (content) {
   function addCssModulesToLoader (loader, part, index) {
     if (!part.module) return loader
     var option = options.cssModules || {}
+    var DEFAULT_OPTIONS = {
+      modules: true,
+      importLoaders: true
+    }
+    var OPTIONS = {
+      localIdentName: '[hash:base64]'
+    }
     return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, function (m, $1, $2) {
       // $1: !css-loader
       // $2: ?a=b
       var query = loaderUtils.parseQuery($2)
-      query.modules = true
-      query.importLoaders = true
-      query.localIdentName = option.localIdentName || '[hash:base64]'
+      Object.assign(query, OPTIONS, option, DEFAULT_OPTIONS)
       if (index !== -1) {
         // Note:
         //   Class name is generated according to its filename.
diff --git a/test/test.js b/test/test.js
@@ -383,7 +383,7 @@ describe('vue-loader', function () {
       test({
         entry: './test/fixtures/css-modules.vue',
         vue: {
-          cssModules: {
+          cssModules: localIdentName && {
             localIdentName: localIdentName
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ describe('vue-loader', function () {`
`383`	`383`	`test({`
`384`	`384`	`entry: './test/fixtures/css-modules.vue',`
`385`	`385`	`vue: {`
`386`		`- cssModules: {`
	`386`	`+ cssModules: localIdentName && {`
`387`	`387`	`localIdentName: localIdentName`
`388`	`388`	`}`
`389`	`389`	`}`