From c8156716c301fed1f6df81ea0f8422101dd93f3e Mon Sep 17 00:00:00 2001 From: Amphiluke Date: Sat, 29 Jun 2019 19:02:59 +0700 Subject: [PATCH] Improve the imports regex. Rebuild the project --- README.md | 2 +- dist/index.js | 5 +++-- src/index.mjs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1d2b497..2d42c3e 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ lessCompileRoots.compileRoots({ } }) .then(rootEntries => { - console.log("Root files compiled are following:"); + console.log("Compiled root files:"); console.log(rootEntries.join("\n")); }) .catch(reason => { diff --git a/dist/index.js b/dist/index.js index 94d7b10..6dfec76 100644 --- a/dist/index.js +++ b/dist/index.js @@ -39,7 +39,7 @@ let flat = Array.prototype.flat ? list => list.flat() : list => [].concat(...lis async function getImports(entries) { let commentRE = /\/\*[\s\S]*?\*\/|\/\/\s*@import[^;]+;/g; - let importRE = /(?<=@import[^"']+["']).+?(?=['"]\s*;)/g; + let importRE = /(?<=@import\s[^"']*["']).+?(?=['"]\s*;)/g; let promises = entries.map(entry => readFile(entry) .then(data => { @@ -87,7 +87,8 @@ async function getRoots({pattern, globOptions = {}}) { async function compileRoots({pattern, lessOptions = {}, globOptions = {}}) { let rootEntries = await getRoots({pattern, globOptions}); - return compile(rootEntries, lessOptions); + await compile(rootEntries, lessOptions); + return rootEntries; } exports.compileRoots = compileRoots; diff --git a/src/index.mjs b/src/index.mjs index d9673ef..3957e82 100644 --- a/src/index.mjs +++ b/src/index.mjs @@ -7,7 +7,7 @@ let flat = Array.prototype.flat ? list => list.flat() : list => [].concat(...lis async function getImports(entries) { let commentRE = /\/\*[\s\S]*?\*\/|\/\/\s*@import[^;]+;/g; - let importRE = /(?<=@import[^"']+["']).+?(?=['"]\s*;)/g; + let importRE = /(?<=@import\s[^"']*["']).+?(?=['"]\s*;)/g; let promises = entries.map(entry => readFile(entry) .then(data => {