From 3905be67a974cbae3bb2eb8673c98ceb4a6f5e91 Mon Sep 17 00:00:00 2001
From: Janeene Beeforth <dawnmist@users.noreply.github.com>
Date: Thu, 30 May 2024 00:17:06 +1000
Subject: [PATCH] Fix esm compatibility for @headlessui/tailwindcss plugin
 package (#3051)

* Set @headlessui/tailwindcss module type

The distributed tailwindcss plugin package uses `.js` for esm files, and `.cjs` for commonjs files. This corresponds to `"type": "module"` in the package.json file.

One build script `fix-types.js` was a commonjs script which was breaking this module file naming pattern. Renamed the script to `fix-types.cjs` so that we could then standardise the module type for @headlessui/tailwindcss package as a whole.

* Fix esm import of tailwindcss/plugin

ESM imports need to specify the filename extension when importing individual files.

* update changelog

---------

Co-authored-by: Robin Malfait <malfait.robin@gmail.com>
---
 packages/@headlessui-tailwindcss/CHANGELOG.md                  | 3 ++-
 packages/@headlessui-tailwindcss/package.json                  | 3 ++-
 .../scripts/{fix-types.js => fix-types.cjs}                    | 0
 packages/@headlessui-tailwindcss/src/index.ts                  | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 rename packages/@headlessui-tailwindcss/scripts/{fix-types.js => fix-types.cjs} (100%)

diff --git a/packages/@headlessui-tailwindcss/CHANGELOG.md b/packages/@headlessui-tailwindcss/CHANGELOG.md
index a1ceca3..8a14083 100644
--- a/packages/@headlessui-tailwindcss/CHANGELOG.md
+++ b/packages/@headlessui-tailwindcss/CHANGELOG.md
@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fix ESM types ([#2880](https://github.com/tailwindlabs/headlessui/pull/2880))
+- Improve CJS types ([#2880](https://github.com/tailwindlabs/headlessui/pull/2880))
+- Improve ESM types ([#3051](https://github.com/tailwindlabs/headlessui/pull/3051))
 
 ## [0.2.0] - 2023-07-27
 
diff --git a/packages/@headlessui-tailwindcss/package.json b/packages/@headlessui-tailwindcss/package.json
index c13cc84..07c38a5 100644
--- a/packages/@headlessui-tailwindcss/package.json
+++ b/packages/@headlessui-tailwindcss/package.json
@@ -5,6 +5,7 @@
   "main": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "module": "dist/headlessui.esm.js",
+  "type": "module",
   "license": "MIT",
   "files": [
     "README.md",
@@ -32,7 +33,7 @@
   },
   "scripts": {
     "prepublishOnly": "npm run build",
-    "build": "../../scripts/build.sh --external:tailwindcss && node ./scripts/fix-types.js",
+    "build": "../../scripts/build.sh --external:tailwindcss && node ./scripts/fix-types.cjs",
     "watch": "../../scripts/watch.sh --external:tailwindcss",
     "test": "../../scripts/test.sh",
     "lint": "../../scripts/lint.sh",
diff --git a/packages/@headlessui-tailwindcss/scripts/fix-types.js b/packages/@headlessui-tailwindcss/scripts/fix-types.cjs
similarity index 100%
rename from packages/@headlessui-tailwindcss/scripts/fix-types.js
rename to packages/@headlessui-tailwindcss/scripts/fix-types.cjs
diff --git a/packages/@headlessui-tailwindcss/src/index.ts b/packages/@headlessui-tailwindcss/src/index.ts
index 91d3dde..6a75926 100644
--- a/packages/@headlessui-tailwindcss/src/index.ts
+++ b/packages/@headlessui-tailwindcss/src/index.ts
@@ -1,4 +1,4 @@
-import plugin from 'tailwindcss/plugin'
+import plugin from 'tailwindcss/plugin.js'
 
 interface Options {
   /**