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.

Sign up for GitHub

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

Reduce disk access in config loading #472

Merged
merged 1 commit into from
Mar 27, 2021
Merged

Reduce disk access in config loading #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/forty-bottles-lick.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'wmr': patch
---

Reduce amount of files to check during config loading
46 changes: 25 additions & 21 deletions packages/wmr/src/lib/normalize-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,35 +65,39 @@ export async function normalizeOptions(options, mode) {
const pkg = fs.readFile(pkgFile, 'utf-8').then(JSON.parse);
options.aliases = (await pkg.catch(() => ({}))).alias || {};

const hasTsConfig = await isFile(resolve(options.root, 'wmr.config.ts'));
const hasMjsConfig = await isFile(resolve(options.root, 'wmr.config.mjs'));
const EXTENSIONS = ['.js', '.ts', '.mjs'];

let custom;
if (hasTsConfig) {
const resolved = resolve(options.root, 'wmr.config.ts');
await compileSingleModule(resolved, { cwd: options.cwd, out: resolve('.'), hmr: false });
const output = resolve('.', 'wmr.config.js');
const fileUrl = url.pathToFileURL(output);
custom = await eval('(x => import(x))')(fileUrl);
fs.unlink(output);
} else if (hasMjsConfig || (await isFile(resolve(options.root, 'wmr.config.js')))) {
let initialConfigFile = hasMjsConfig ? 'wmr.config.mjs' : 'wmr.config.js',
initialError;
try {
const resolved = resolve(options.root, initialConfigFile);
const fileUrl = url.pathToFileURL(resolved);
// Note: the eval() below is to prevent Rollup from transforming import() and require().
// Using the native functions allows us to load ESM and CJS with Node's own semantics.
let initialError;
for (const ext of EXTENSIONS) {
const file = resolve(options.root, `wmr.config${ext}`);
if (await isFile(file)) {
let configFile = file;
if (ext === '.ts') {
// Create a temporary file to write compiled output into
// TODO: Do this in memory
configFile = resolve(options.root, 'wmr.config.js');
await compileSingleModule(file, { cwd: options.cwd, out: resolve('.'), hmr: false });
}

const fileUrl = url.pathToFileURL(configFile);
try {
custom = await eval('(x => import(x))')(fileUrl);
} catch (err) {
console.log(err);
initialError = err;
custom = eval('(x => require(x))')(fileUrl);
try {
custom = eval('(x => require(x))')(fileUrl);
} catch (err2) {
if (ext === '.mjs' || !/import statement/.test(err2)) {
throw Error(`Failed to load wmr.config${ext}\n${initialError}\n${err2}`);
}
}
}
} catch (e) {
if (hasMjsConfig || !/import statement/.test(e)) {
throw Error(`Failed to load ${initialConfigFile}\n${initialError}\n${e}`);

// Remove temporary file
if (ext === '.ts') {
fs.unlink(configFile);
}
}
}
Expand Down