Skip to content

Commit 83dfa3e

Browse files
fathybJasper De Moor
authored andcommitted
Use async modules when possibles (#1433)
* Use async version of `resolve` for `localRequire` * Use async version of `glob` for `GlobAsset`
1 parent 1cb05e0 commit 83dfa3e

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/assets/GlobAsset.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const Asset = require('../Asset');
2-
const glob = require('glob');
2+
const promisify = require('../utils/promisify');
3+
const glob = promisify(require('glob'));
34
const micromatch = require('micromatch');
45
const path = require('path');
56

@@ -14,7 +15,7 @@ class GlobAsset extends Asset {
1415
if (process.platform === 'win32')
1516
regularExpressionSafeName = regularExpressionSafeName.replace(/\\/g, '/');
1617

17-
let files = glob.sync(regularExpressionSafeName, {
18+
let files = await glob(regularExpressionSafeName, {
1819
strict: true,
1920
nodir: true
2021
});

src/utils/localRequire.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const {dirname} = require('path');
2-
const resolve = require('resolve');
2+
const promisify = require('../utils/promisify');
3+
const resolve = promisify(require('resolve'));
34
const worker = require('../worker');
45

56
const cache = new Map();
@@ -10,7 +11,7 @@ async function localRequire(name, path, triedInstall = false) {
1011
let resolved = cache.get(key);
1112
if (!resolved) {
1213
try {
13-
resolved = resolve.sync(name, {basedir});
14+
resolved = await resolve(name, {basedir}).then(([name]) => name);
1415
} catch (e) {
1516
if (e.code === 'MODULE_NOT_FOUND' && !triedInstall) {
1617
await worker.addCall({

0 commit comments

Comments
 (0)