From 5cad3910fd0461fe209c2bee55c19b2753522b76 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 2 Aug 2019 08:14:07 -0400 Subject: [PATCH] Support passing empty object to signal 'use default config path' --- __tests__/customConfig.test.js | 39 ++++++++++++++++++++++++++++++++++ src/index.js | 4 ++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/__tests__/customConfig.test.js b/__tests__/customConfig.test.js index 27ea05487..2d674713d 100644 --- a/__tests__/customConfig.test.js +++ b/__tests__/customConfig.test.js @@ -133,3 +133,42 @@ test('tailwind.config.js is picked up by default', () => { }) }) }) + +test('tailwind.config.js is picked up by default when passing an empty object', () => { + return inTempDirectory(() => { + fs.writeFileSync( + path.resolve(defaultConfigFile), + `module.exports = { + theme: { + screens: { + mobile: '400px', + }, + }, + }` + ) + + return postcss([tailwind({})]) + .process( + ` + @responsive { + .foo { + color: blue; + } + } + `, + { from: undefined } + ) + .then(result => { + expect(result.css).toMatchCss(` + .foo { + color: blue; + } + @media (min-width: 400px) { + .mobile\\:foo { + color: blue; + } + } + `) + }) + }) +}) diff --git a/src/index.js b/src/index.js index d80ab8c2b..95af61861 100644 --- a/src/index.js +++ b/src/index.js @@ -13,7 +13,7 @@ import { defaultConfigFile } from './constants' import defaultConfig from '../stubs/defaultConfig.stub.js' function resolveConfigPath(filePath) { - if (_.isObject(filePath) && !_.has(filePath, 'config')) { + if (_.isObject(filePath) && !_.has(filePath, 'config') && !_.isEmpty(filePath)) { return undefined } @@ -21,7 +21,7 @@ function resolveConfigPath(filePath) { return path.resolve(filePath.config) } - if (!_.isUndefined(filePath)) { + if (_.isString(filePath)) { return path.resolve(filePath) }