github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-06 03:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Include user data in cache calculation

Browse Source
This commit is contained in:
Michelle Tilley
2016-10-29 21:56:54 -07:00
parent 57e36562df
commit 07d13c1855
1 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/package-transpilation-registry.js
View File

@@ -96,30 +96,30 @@ Object.assign(PackageTranspilationRegistry.prototype, {
},
getCachePath: function (sourceCode, filePath, spec) {
var transpilerPath = path.join(spec._config.path, spec.transpiler)
var transpilerPath = this.getTranspilerPath(spec)
var transpilerSource = spec._transpilerSource || fs.readFileSync(transpilerPath, 'utf8')
spec._transpilerSource = transpilerSource
return path.join(
'package-transpile',
crypto
.createHash('sha1')
.update(JSON.stringify(spec.options || {}))
.update(transpilerSource, 'utf8')
.update(sourceCode, 'utf8')
.digest('hex')
)
var transpiler = this.getTranspiler(spec)
var hash = crypto
.createHash('sha1')
.update(JSON.stringify(spec.options || {}))
.update(transpilerSource, 'utf8')
.update(sourceCode, 'utf8')
var additionalCacheData
if (transpiler && transpiler.getCacheKeyData) {
additionalCacheData = transpiler.getCacheKeyData(sourceCode, filePath, spec.options)
hash.update(additionalCacheData, 'utf8')
}
return path.join('package-transpile', hash.digest('hex'))
},
transpileWithPackageTranspiler: function (sourceCode, filePath, spec) {
Resolve = Resolve || require('resolve')
var transpilerPath = Resolve.sync(spec.transpiler, {
basedir: spec._config.path,
extensions: Object.keys(require.extensions)
})
var transpiler = this.getTranspiler(spec)
if (transpilerPath) {
this.transpilerPaths[transpilerPath] = true
var transpiler = require(transpilerPath)
if (transpiler) {
var result = transpiler.compile(sourceCode, filePath, spec.options || {})
if (result === undefined) {
return sourceCode
@@ -130,6 +130,23 @@ Object.assign(PackageTranspilationRegistry.prototype, {
var err = new Error("Could not resolve transpiler '" + spec.transpiler + "' from '" + spec._config.path + "'")
console.error(err)
}
},
getTranspilerPath: function (spec) {
Resolve = Resolve || require('resolve')
return Resolve.sync(spec.transpiler, {
basedir: spec._config.path,
extensions: Object.keys(require.extensions)
})
},
getTranspiler: function (spec) {
var transpilerPath = this.getTranspilerPath(spec)
if (transpilerPath) {
var transpiler = require(transpilerPath)
this.transpilerPaths[transpilerPath] = true
return transpiler
}
}
})