From 85d6da4884528f74db094cfafef43fea8637553a Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Fri, 23 Aug 2024 14:15:25 -0400
Subject: [PATCH] Make the ESM cache hook ESM-only

---
 packages/@tailwindcss-cli/src/commands/build/index.ts | 4 ++--
 packages/@tailwindcss-node/src/esm-cache.hook.cts     | 4 ----
 packages/@tailwindcss-node/tsup.config.ts             | 2 +-
 packages/@tailwindcss-postcss/src/index.ts            | 3 ++-
 packages/@tailwindcss-vite/src/index.ts               | 3 ++-
 5 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 100644 packages/@tailwindcss-node/src/esm-cache.hook.cts

diff --git a/packages/@tailwindcss-cli/src/commands/build/index.ts b/packages/@tailwindcss-cli/src/commands/build/index.ts
index c07028e43..1261d0fdf 100644
--- a/packages/@tailwindcss-cli/src/commands/build/index.ts
+++ b/packages/@tailwindcss-cli/src/commands/build/index.ts
@@ -1,5 +1,3 @@
-import '@tailwindcss/node/esm-cache-hook'
-
 import watcher from '@parcel/watcher'
 import { getModuleDependencies } from '@tailwindcss/node'
 import { clearRequireCache } from '@tailwindcss/node/require-cache'
@@ -63,6 +61,8 @@ export function options() {
 }
 
 export async function handle(args: Result<ReturnType<typeof options>>) {
+  await import('@tailwindcss/node/esm-cache-hook')
+
   let base = path.resolve(args['--cwd'])
 
   // Resolve the output as an absolute path.
diff --git a/packages/@tailwindcss-node/src/esm-cache.hook.cts b/packages/@tailwindcss-node/src/esm-cache.hook.cts
deleted file mode 100644
index 62f446d53..000000000
--- a/packages/@tailwindcss-node/src/esm-cache.hook.cts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { register } from 'node:module'
-import { pathToFileURL } from 'node:url'
-
-register(pathToFileURL(require.resolve('@tailwindcss/node/esm-cache-loader')))
diff --git a/packages/@tailwindcss-node/tsup.config.ts b/packages/@tailwindcss-node/tsup.config.ts
index 793f5abc7..5eda42401 100644
--- a/packages/@tailwindcss-node/tsup.config.ts
+++ b/packages/@tailwindcss-node/tsup.config.ts
@@ -17,6 +17,6 @@ export default defineConfig([
     format: ['cjs'],
     minify: true,
     dts: true,
-    entry: ['src/esm-cache.hook.cts', 'src/require-cache.cts'],
+    entry: ['src/require-cache.cts'],
   },
 ])
diff --git a/packages/@tailwindcss-postcss/src/index.ts b/packages/@tailwindcss-postcss/src/index.ts
index 7047c78e8..4fdf96175 100644
--- a/packages/@tailwindcss-postcss/src/index.ts
+++ b/packages/@tailwindcss-postcss/src/index.ts
@@ -1,5 +1,4 @@
 import { getModuleDependencies } from '@tailwindcss/node'
-import '@tailwindcss/node/esm-cache-hook'
 import { clearRequireCache } from '@tailwindcss/node/require-cache'
 import { Scanner } from '@tailwindcss/oxide'
 import fs from 'fs'
@@ -79,6 +78,8 @@ function tailwindcss(opts: PluginOptions = {}): AcceptedPlugin {
           }
         },
         async OnceExit(root, { result }) {
+          await import('@tailwindcss/node/esm-cache-hook')
+
           let inputFile = result.opts.from ?? ''
           let context = cache.get(inputFile)
           let inputBasePath = path.dirname(path.resolve(inputFile))
diff --git a/packages/@tailwindcss-vite/src/index.ts b/packages/@tailwindcss-vite/src/index.ts
index d6d63bcc4..ad7db1306 100644
--- a/packages/@tailwindcss-vite/src/index.ts
+++ b/packages/@tailwindcss-vite/src/index.ts
@@ -1,5 +1,4 @@
 import { getModuleDependencies } from '@tailwindcss/node'
-import '@tailwindcss/node/esm-cache-hook'
 import { clearRequireCache } from '@tailwindcss/node/require-cache'
 
 import { Scanner } from '@tailwindcss/oxide'
@@ -84,6 +83,8 @@ export default function tailwindcss(): Plugin[] {
   }
 
   async function generateCss(css: string, inputPath: string, addWatchFile: (file: string) => void) {
+    await import('@tailwindcss/node/esm-cache-hook')
+
     let inputBasePath = path.dirname(path.resolve(inputPath))
     clearRequireCache(fullRebuildPaths)
     fullRebuildPaths = []