chore(h5): optimization.moduleIds = 'hashed'

# Conflicts:
#	packages/uni-cli-shared/lib/cache.js

packages/uni-cli-shared/lib/cache.js

@@ -82,11 +82,14 @@ function updateComponentJson (name, jsonObj, usingComponents = true, type = 'Com
 
   const oldJsonStr = getJsonFile(name)
   if (oldJsonStr) { // update
-    if (usingComponents) { // merge usingComponents
+    if (usingComponents) { // merge usingComponents
       // 其实直接拿新的 merge 到旧的应该就行
       const oldJsonObj = JSON.parse(oldJsonStr)
-      jsonObj.usingComponents = oldJsonObj.usingComponents || {}
+      jsonObj.usingComponents = oldJsonObj.usingComponents || {}
       jsonObj.usingAutoImportComponents = oldJsonObj.usingAutoImportComponents || {}
+      if (oldJsonObj.genericComponents) {
+        jsonObj.genericComponents = oldJsonObj.genericComponents
+      }
       if (oldJsonObj.usingGlobalComponents) { // 复制 global components(针对不支持全局 usingComponents 的平台)
         jsonObj.usingGlobalComponents = oldJsonObj.usingGlobalComponents
       }
@@ -351,4 +354,4 @@ module.exports = {
   updateGenericComponents,
   getChangedJsonFileMap,
   getSpecialMethods
-}
+}

packages/vue-cli-plugin-uni/lib/h5/index.js

@@ -155,6 +155,9 @@ module.exports = {
         }
       },
       plugins,
+      optimization: {
+        moduleIds: 'hashed'
+      },
       devServer: {
         watchOptions: require('../util').getWatchOptions()
       }