From 6ed835cb71a9f682164cab011998ea9a327407ff Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Tue, 6 Apr 2021 00:12:52 +0200 Subject: [PATCH] Fix invalid arg type (#3978) * default to `tailwind.css` file when no input is given * skip undefined files * update forgotten test fixtures --- __tests__/fixtures/tailwind-output-flagged.css | 2 +- __tests__/fixtures/tailwind-output-important.css | 2 +- .../fixtures/tailwind-output-no-color-opacity.css | 2 +- __tests__/fixtures/tailwind-output.css | 2 +- jit/lib/setupContext.js | 2 ++ src/cli/compile.js | 11 ++++++----- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/__tests__/fixtures/tailwind-output-flagged.css b/__tests__/fixtures/tailwind-output-flagged.css index cba1a803d9ed..6ac84315c9a8 100644 --- a/__tests__/fixtures/tailwind-output-flagged.css +++ b/__tests__/fixtures/tailwind-output-flagged.css @@ -1,4 +1,4 @@ -/*! tailwindcss v2.0.4 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v2.1.0 | MIT License | https://tailwindcss.com */ /*! modern-normalize v1.0.0 | MIT License | https://github.com/sindresorhus/modern-normalize */ diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 9b6b8932016f..e928fcbfbabf 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -1,4 +1,4 @@ -/*! tailwindcss v2.0.4 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v2.1.0 | MIT License | https://tailwindcss.com */ /*! modern-normalize v1.0.0 | MIT License | https://github.com/sindresorhus/modern-normalize */ diff --git a/__tests__/fixtures/tailwind-output-no-color-opacity.css b/__tests__/fixtures/tailwind-output-no-color-opacity.css index d34dc526fae1..a4b1147fd3e3 100644 --- a/__tests__/fixtures/tailwind-output-no-color-opacity.css +++ b/__tests__/fixtures/tailwind-output-no-color-opacity.css @@ -1,4 +1,4 @@ -/*! tailwindcss v2.0.4 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v2.1.0 | MIT License | https://tailwindcss.com */ /*! modern-normalize v1.0.0 | MIT License | https://github.com/sindresorhus/modern-normalize */ diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index cba1a803d9ed..6ac84315c9a8 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -1,4 +1,4 @@ -/*! tailwindcss v2.0.4 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v2.1.0 | MIT License | https://tailwindcss.com */ /*! modern-normalize v1.0.0 | MIT License | https://github.com/sindresorhus/modern-normalize */ diff --git a/jit/lib/setupContext.js b/jit/lib/setupContext.js index 9b2e5d2dfa4e..aeb32cc75c3d 100644 --- a/jit/lib/setupContext.js +++ b/jit/lib/setupContext.js @@ -227,6 +227,8 @@ function trackModified(files) { let changed = false for (let file of files) { + if (!file) continue + let pathname = url.parse(file).pathname let newModified = fs.statSync(decodeURIComponent(pathname)).mtimeMs diff --git a/src/cli/compile.js b/src/cli/compile.js index dcfc64086820..a98dac2cfb12 100644 --- a/src/cli/compile.js +++ b/src/cli/compile.js @@ -1,3 +1,4 @@ +import path from 'path' import postcss from 'postcss' import * as utils from './utils' @@ -29,15 +30,15 @@ export default function compile(options = {}) { const css = config.inputFile ? utils.readFile(config.inputFile) : ` - @tailwind base; - @tailwind components; - @tailwind utilities; - ` + @tailwind base; + @tailwind components; + @tailwind utilities; + ` return new Promise((resolve, reject) => { postcss(config.plugins) .process(css, { - from: config.inputFile, + from: config.inputFile || path.resolve(__dirname, '../../tailwind.css'), to: config.outputFile, }) .then(resolve)