fix: genCacheConfig return different result because linebreak (#3372)

This commit is contained in:
WilsonLiu95
2019-01-28 11:23:19 +08:00
committed by Haoqun Jiang
parent 5d1ab5fe9c
commit ab13dfef80
+11 -3
View File
@@ -135,14 +135,22 @@ class PluginAPI {
const fs = require('fs')
const cacheDirectory = this.resolve(`node_modules/.cache/${id}`)
// replace \r\n to \n generate consistent hash
const fmtFunc = conf => {
if (typeof conf === 'function') {
return conf.toString().replace(/\r\n?/g, '\n')
}
return conf
}
const variables = {
partialIdentifier,
'cli-service': require('../package.json').version,
'cache-loader': require('cache-loader/package.json').version,
env: process.env,
config: [
this.service.projectOptions.chainWebpack,
this.service.projectOptions.configureWebpack
fmtFunc(this.service.projectOptions.chainWebpack),
fmtFunc(this.service.projectOptions.configureWebpack)
]
}
@@ -159,7 +167,7 @@ class PluginAPI {
for (const file of configFiles) {
const content = readConfig(file)
if (content) {
variables.configFiles = content
variables.configFiles = content.replace(/\r\n?/g, '\n')
break
}
}