From 7cbfd2a166f71afedab9622b634944bce1972643 Mon Sep 17 00:00:00 2001
From: Brad Cornes <bradlc41@gmail.com>
Date: Sun, 9 May 2021 19:42:03 +0100
Subject: [PATCH] avoid re-loading modules when not necessary

---
 src/server.ts | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/server.ts b/src/server.ts
index 8ff0e72..0a928f5 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -317,8 +317,6 @@ async function createProjectService(
       throw new SilentError('No config file found.')
     }
 
-    console.log(`Found Tailwind CSS config file: ${configPath}`)
-
     const pnpPath = findUp.sync(
       (dir) => {
         let pnpFile = path.join(dir, '.pnp.js')
@@ -359,7 +357,6 @@ async function createProjectService(
     try {
       const tailwindcssPath = resolveFrom(configDir, 'tailwindcss')
       const tailwindcssPkgPath = resolveFrom(configDir, 'tailwindcss/package.json')
-      const tailwindcssPkg = __non_webpack_require__(tailwindcssPkgPath)
       const tailwindDir = path.dirname(tailwindcssPkgPath)
 
       const postcssPath = resolveFrom(tailwindDir, 'postcss')
@@ -367,13 +364,8 @@ async function createProjectService(
       const postcssDir = path.dirname(postcssPkgPath)
       const postcssSelectorParserPath = resolveFrom(tailwindDir, 'postcss-selector-parser')
 
-      postcss = __non_webpack_require__(postcssPath)
       postcssVersion = __non_webpack_require__(postcssPkgPath).version
-      postcssSelectorParser = __non_webpack_require__(postcssSelectorParserPath)
-      console.log(`Loaded postcss v${postcssVersion}: ${postcssDir}`)
-      tailwindcss = __non_webpack_require__(tailwindcssPath)
-      tailwindcssVersion = tailwindcssPkg.version
-      console.log(`Loaded tailwindcss v${tailwindcssVersion}: ${tailwindDir}`)
+      tailwindcssVersion = __non_webpack_require__(tailwindcssPkgPath).version
 
       if (
         state.enabled &&
@@ -385,6 +377,15 @@ async function createProjectService(
         return
       }
 
+      console.log(`Found Tailwind CSS config file: ${configPath}`)
+
+      postcss = __non_webpack_require__(postcssPath)
+      postcssSelectorParser = __non_webpack_require__(postcssSelectorParserPath)
+      console.log(`Loaded postcss v${postcssVersion}: ${postcssDir}`)
+
+      tailwindcss = __non_webpack_require__(tailwindcssPath)
+      console.log(`Loaded tailwindcss v${tailwindcssVersion}: ${tailwindDir}`)
+
       try {
         resolveConfigFn = __non_webpack_require__(resolveFrom(tailwindDir, './resolveConfig.js'))
       } catch (_) {