From 0313f02e2c312732c0c40788d3b81473c1905bae Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Mon, 16 May 2022 10:10:40 -0400
Subject: [PATCH] Move some config error checking out of resolveConfig (#8362)

---
 src/cli.js                      |  6 +++++-
 src/lib/setupTrackingContext.js |  4 ++++
 src/util/normalizeConfig.js     |  8 --------
 src/util/validateConfig.js      | 13 +++++++++++++
 4 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 src/util/validateConfig.js

diff --git a/src/cli.js b/src/cli.js
index 88e6f134c..92de66a77 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -17,6 +17,7 @@ import getModuleDependencies from './lib/getModuleDependencies'
 import log from './util/log'
 import packageJson from '../package.json'
 import normalizePath from 'normalize-path'
+import { validateConfig } from './util/validateConfig.js'
 
 let env = {
   DEBUG: process.env.DEBUG !== undefined && process.env.DEBUG !== '0',
@@ -490,10 +491,13 @@ async function build() {
       let files = args['--content'].split(/(?<!{[^}]+),/)
       let resolvedConfig = resolveConfigInternal(config, { content: { files } })
       resolvedConfig.content.files = files
+      resolvedConfig = validateConfig(resolvedConfig)
       return resolvedConfig
     }
 
-    return resolveConfigInternal(config)
+    let resolvedConfig = resolveConfigInternal(config)
+    resolvedConfig = validateConfig(resolvedConfig)
+    return resolvedConfig
   }
 
   function extractFileGlobs(config) {
diff --git a/src/lib/setupTrackingContext.js b/src/lib/setupTrackingContext.js
index 3716b0ff6..a3d7ae492 100644
--- a/src/lib/setupTrackingContext.js
+++ b/src/lib/setupTrackingContext.js
@@ -16,6 +16,7 @@ import { env } from './sharedState'
 
 import { getContext, getFileModifiedMap } from './setupContextUtils'
 import parseDependency from '../util/parseDependency'
+import { validateConfig } from '../util/validateConfig.js'
 
 let configPathCache = new LRU({ maxSize: 100 })
 
@@ -63,6 +64,7 @@ function getTailwindConfig(configOrPath) {
       delete require.cache[file]
     }
     let newConfig = resolveConfig(require(userConfigPath))
+    newConfig = validateConfig(newConfig)
     let newHash = hash(newConfig)
     configPathCache.set(userConfigPath, [newConfig, newHash, newDeps, newModified])
     return [newConfig, userConfigPath, newHash, newDeps]
@@ -73,6 +75,8 @@ function getTailwindConfig(configOrPath) {
     configOrPath.config === undefined ? configOrPath : configOrPath.config
   )
 
+  newConfig = validateConfig(newConfig)
+
   return [newConfig, null, hash(newConfig), []]
 }
 
diff --git a/src/util/normalizeConfig.js b/src/util/normalizeConfig.js
index 31518a4d0..2d23a864d 100644
--- a/src/util/normalizeConfig.js
+++ b/src/util/normalizeConfig.js
@@ -258,13 +258,5 @@ export function normalizeConfig(config) {
     }
   }
 
-  if (config.content.files.length === 0) {
-    log.warn('content-problems', [
-      'The `content` option in your Tailwind CSS configuration is missing or empty.',
-      'Configure your content sources or your generated CSS will be missing styles.',
-      'https://tailwindcss.com/docs/content-configuration',
-    ])
-  }
-
   return config
 }
diff --git a/src/util/validateConfig.js b/src/util/validateConfig.js
new file mode 100644
index 000000000..23b4627fb
--- /dev/null
+++ b/src/util/validateConfig.js
@@ -0,0 +1,13 @@
+import log from './log'
+
+export function validateConfig(config) {
+  if (config.content.files.length === 0) {
+    log.warn('content-problems', [
+      'The `content` option in your Tailwind CSS configuration is missing or empty.',
+      'Configure your content sources or your generated CSS will be missing styles.',
+      'https://tailwindcss.com/docs/content-configuration',
+    ])
+  }
+
+  return config
+}