Merge branch 'feature/glob-empty-dir'

maoberlehner · Jan 13, 2018 · fe3c0b8 · fe3c0b8
2 parents 4bfa6a2 + 53bf377
commit fe3c0b8
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 5 deletions.
diff --git a/packages/node-sass-glob-importer/src/index.ts b/packages/node-sass-glob-importer/src/index.ts
@@ -13,7 +13,7 @@ export = function globImporter() {
 
     const filePaths = resolveGlobUrl(url, includePaths);
 
-    if (filePaths.length) {
+    if (filePaths) {
       const contents = filePaths
         .map((x: string) => `@import '${x}';`)
         .join(`\n`);

diff --git a/packages/node-sass-magic-importer/src/functions/resolve-glob-url.spec.ts b/packages/node-sass-magic-importer/src/functions/resolve-glob-url.spec.ts
@@ -25,7 +25,7 @@ describe(`resolveGlobUrl()`, () => {
     const result = resolveGlobUrl(`test/url`);
 
     expect(globMock.hasMagic).toBeCalled();
-    expect(result).toEqual([]);
+    expect(result).toEqual(null);
   });
 
   test(`It should return found glob file paths.`, () => {

diff --git a/packages/node-sass-magic-importer/src/functions/resolve-glob-url.ts b/packages/node-sass-magic-importer/src/functions/resolve-glob-url.ts
@@ -19,8 +19,10 @@ export function resolveGlobUrlFactory(
           .split(`\\`).join(`/`));
         });
       });
+
+      return [...filePaths];
     }
 
-    return [...filePaths];
+    return null;
   };
 }
diff --git a/packages/node-sass-magic-importer/src/index.ts b/packages/node-sass-magic-importer/src/index.ts
@@ -119,7 +119,7 @@ export = function magicImporter(userOptions?: IMagicImporterOptions) {
       filterPrefix = `${url.split(` from `)[0]} from `;
     }
 
-    if (globFilePaths.length) {
+    if (globFilePaths) {
       const contents = globFilePaths
         .filter((x) => !store.has(getStoreId(x, selectorFilters, nodeFilters)))
         .map((x) => `@import '${filterPrefix}${x}';`)

diff --git a/packages/node-sass-magic-importer/src/interfaces/IResolveGlobUrl.ts b/packages/node-sass-magic-importer/src/interfaces/IResolveGlobUrl.ts
@@ -1,4 +1,4 @@
 export type IResolveGlobUrl = (
   url: string,
   includePaths?: string[],
-) => string[];
+) => string[]|null;
diff --git a/test/files/empty-dir/.gitkeep b/test/files/empty-dir/.gitkeep
diff --git a/test/files/glob-import-empty-dir.scss b/test/files/glob-import-empty-dir.scss
@@ -0,0 +1 @@
+@import 'empty-dir/*.scss';
diff --git a/test/glob-importer.test.ts b/test/glob-importer.test.ts
@@ -19,6 +19,17 @@ describe(`globImporter()`, () => {
     expect(result).toBe(expectedResult);
   });
 
+  test(`Should not fail when dir is empty.`, () => {
+    const expectedResult = ``;
+
+    const result = sass.renderSync({
+      file: `test/files/glob-import-empty-dir.scss`,
+      importer: globImporter(),
+    }).css.toString();
+
+    expect(result).toBe(expectedResult);
+  });
+
   test(`It should import glob files via CLI.`, async () => {
     // tslint:disable-next-line max-line-length
     const cmd = `node node_modules/.bin/node-sass --importer packages/node-sass-glob-importer/dist/cli.js test/files/glob-import.scss`;