Merge branch 'dev' of https://github.com/dcloudio/uni-app into v3

packages/vue-cli-plugin-uni/lib/cache-loader.js

@@ -62,14 +62,14 @@ function read (key, callback) {
 }
 
 module.exports = {
-  createTemplateCacheLoader: function (api) {
+  createTemplateCacheLoader: function (api, id = 'uni-template-compiler') {
     return {
       resourceQuery: /type=uni-cache-loader-template/,
       use: [{
         loader: 'cache-loader',
         ident: 'uni-cache-loader-template-options',
         options: Object.assign(api.genCacheConfig(
-          'uni-template-compiler/' + process.env.UNI_PLATFORM,
+          id + '/' + process.env.UNI_PLATFORM,
           getPartialIdentifier()
         ), {
           read,

packages/vue-cli-plugin-uni/lib/util.js

@@ -16,17 +16,16 @@ module.exports = {
     'link,meta,param,source,track,wbr'
   ),
   getPartialIdentifier () {
-    if (partialIdentifier) {
-      return partialIdentifier
-    }
-    partialIdentifier = {
-      'UNI_COMPILER_VERSION': require('../package.json').version
-    }
-    Object.keys(process.env).forEach(name => {
-      if (name.indexOf('UNI_') === 0) {
-        partialIdentifier[name] = process.env[name]
+    if (!partialIdentifier) {
+      partialIdentifier = {
+        'UNI_COMPILER_VERSION': require('../package.json').version
       }
-    })
+      Object.keys(process.env).forEach(name => {
+        if (name.indexOf('UNI_') === 0) {
+          partialIdentifier[name] = process.env[name]
+        }
+      })
+    }
     return partialIdentifier
   }
 }