Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FS caching improvements #375

Merged
merged 2 commits into from Feb 12, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/fs-cache.js
Expand Up @@ -15,6 +15,8 @@ const os = require("os");
const path = require("path");
const zlib = require("zlib");

let defaultCacheDirectory = null; // Lazily instantiated when needed

/**
* Read the contents from the compressed file.
*
Expand Down Expand Up @@ -161,13 +163,17 @@ const handleCache = function(directory, params, callback) {
*
* });
*/

module.exports = function(params, callback) {
let directory;

if (typeof params.directory === "string") {
directory = params.directory;
} else {
directory = findCacheDir({ name: "babel-loader" }) || os.tmpdir();
if (defaultCacheDirectory === null) {
defaultCacheDirectory = findCacheDir({ name: "babel-loader" }) || os.tmpdir();
}
directory = defaultCacheDirectory;
}

handleCache(directory, params, callback);
Expand Down
9 changes: 7 additions & 2 deletions src/resolve-rc.js
Expand Up @@ -10,6 +10,8 @@ const path = require("path");
const exists = require("./utils/exists")({});
const read = require("./utils/read")({});

const cache = {};

const find = function find(start, rel) {
const file = path.join(start, rel);

Expand All @@ -27,6 +29,9 @@ const find = function find(start, rel) {

module.exports = function(loc, rel) {
rel = rel || ".babelrc";

return find(loc, rel);
const cacheKey = `${loc}/${rel}`;
if (!(cacheKey in cache)) {
cache[cacheKey] = find(loc, rel);
}
return cache[cacheKey];
};