From 9c91a22c9fa410910c471cb9ca73e5912730d0d8 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Wed, 20 Nov 2019 19:51:23 +0800 Subject: [PATCH] feat(cli): createTemplateCacheLoader --- .../vue-cli-plugin-uni/lib/cache-loader.js | 4 ++-- packages/vue-cli-plugin-uni/lib/util.js | 19 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/vue-cli-plugin-uni/lib/cache-loader.js b/packages/vue-cli-plugin-uni/lib/cache-loader.js index 0b659b2a..af1941c8 100644 --- a/packages/vue-cli-plugin-uni/lib/cache-loader.js +++ b/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, diff --git a/packages/vue-cli-plugin-uni/lib/util.js b/packages/vue-cli-plugin-uni/lib/util.js index b0112047..fd85fa57 100644 --- a/packages/vue-cli-plugin-uni/lib/util.js +++ b/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 } } -- GitLab