Improve the imports regex. Rebuild the project

Amphiluke · Jun 29, 2019 · c815671 · c815671
1 parent 6dc05a7
commit c815671
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 => {