feat!: include dual cjs/esm in package exports (#330)

unplugin · Nov 29, 2023 · 67642e2 · 67642e2
1 parent 091fec6
commit 67642e2
Show file tree

Hide file tree

Showing 5 changed files with 140 additions and 58 deletions.
diff --git a/package.json b/package.json
@@ -15,40 +15,75 @@
   "bugs": "https://github.com/unplugin/unplugin-icons/issues",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
     },
     "./*": "./*",
     "./esbuild": {
-      "types": "./dist/esbuild.d.ts",
-      "import": "./dist/esbuild.mjs",
-      "require": "./dist/esbuild.cjs"
+      "import": {
+        "types": "./dist/esbuild.d.ts",
+        "default": "./dist/esbuild.js"
+      },
+      "require": {
+        "types": "./dist/esbuild.d.cts",
+        "default": "./dist/esbuild.cjs"
+      }
     },
     "./loaders": {
-      "types": "./dist/loaders.d.ts",
-      "import": "./dist/loaders.mjs",
-      "require": "./dist/loaders.cjs"
+      "import": {
+        "types": "./dist/loaders.d.ts",
+        "default": "./dist/loaders.js"
+      },
+      "require": {
+        "types": "./dist/loaders.d.cts",
+        "default": "./dist/loaders.cjs"
+      }
     },
     "./nuxt": {
-      "types": "./dist/nuxt.d.ts",
-      "import": "./dist/nuxt.mjs",
-      "require": "./dist/nuxt.cjs"
+      "import": {
+        "types": "./dist/nuxt.d.ts",
+        "default": "./dist/nuxt.js"
+      },
+      "require": {
+        "types": "./dist/nuxt.d.cts",
+        "default": "./dist/nuxt.cjs"
+      }
     },
     "./resolver": {
-      "types": "./dist/resolver.d.ts",
-      "import": "./dist/resolver.mjs",
-      "require": "./dist/resolver.cjs"
+      "import": {
+        "types": "./dist/resolver.d.ts",
+        "default": "./dist/resolver.js"
+      },
+      "require": {
+        "types": "./dist/resolver.d.cts",
+        "default": "./dist/resolver.cjs"
+      }
     },
     "./rollup": {
-      "types": "./dist/rollup.d.ts",
-      "import": "./dist/rollup.mjs",
-      "require": "./dist/rollup.cjs"
+      "import": {
+        "types": "./dist/rollup.d.ts",
+        "default": "./dist/rollup.js"
+      },
+      "require": {
+        "types": "./dist/rollup.d.cts",
+        "default": "./dist/rollup.cjs"
+      }
     },
     "./types": {
-      "types": "./dist/types.d.ts",
-      "import": "./dist/types.mjs",
-      "require": "./dist/types.cjs"
+      "import": {
+        "types": "./dist/types.d.ts",
+        "default": "./dist/types.js"
+      },
+      "require": {
+        "types": "./dist/types.d.cts",
+        "default": "./dist/types.cjs"
+      }
     },
     "./types/astro": {
       "types": "./types/astro.d.ts"
@@ -84,18 +119,28 @@
       "types": "./types/web-components.d.ts"
     },
     "./vite": {
-      "types": "./dist/vite.d.ts",
-      "import": "./dist/vite.mjs",
-      "require": "./dist/vite.cjs"
+      "import": {
+        "types": "./dist/vite.d.ts",
+        "default": "./dist/vite.js"
+      },
+      "require": {
+        "types": "./dist/vite.d.cts",
+        "default": "./dist/vite.cjs"
+      }
     },
     "./webpack": {
-      "types": "./dist/webpack.d.ts",
-      "import": "./dist/webpack.mjs",
-      "require": "./dist/webpack.cjs"
+      "import": {
+        "types": "./dist/webpack.d.ts",
+        "default": "./dist/webpack.js"
+      },
+      "require": {
+        "types": "./dist/webpack.d.cts",
+        "default": "./dist/webpack.cjs"
+      }
     }
   },
   "main": "dist/index.cjs",
-  "module": "dist/index.mjs",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "typesVersions": {
     "*": {
@@ -111,7 +156,7 @@
     "types"
   ],
   "scripts": {
-    "build": "esno scripts/prebuild.ts && tsup && esno scripts/postbuild.ts",
+    "build": "esno scripts/prebuild.ts && tsup",
     "dev": "esno scripts/prebuild.ts && tsup --watch src",
     "example:build": "npm -C examples/vite-vue3 run build",
     "example:dev": "npm -C examples/vite-vue3 run dev",
@@ -170,6 +215,7 @@
     "eslint": "^8.53.0",
     "esno": "^4.0.0",
     "fast-glob": "^3.3.2",
+    "publint": "^0.2.5",
     "rollup": "^4.4.0",
     "tsup": "^7.2.0",
     "typescript": "^5.2.2",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/postbuild.ts b/scripts/postbuild.ts
diff --git a/src/core/icon-sets.json b/src/core/icon-sets.json
@@ -90,6 +90,7 @@
   "iwwa",
   "jam",
   "la",
+  "lets-icons",
   "line-md",
   "logos",
   "ls",
@@ -98,6 +99,7 @@
   "maki",
   "map",
   "material-symbols",
+  "material-symbols-light",
   "mdi",
   "mdi-light",
   "medical-icon",
@@ -106,6 +108,7 @@
   "mi",
   "mingcute",
   "mono-icons",
+  "mynaui",
   "nimbus",
   "nonicons",
   "noto",

diff --git a/tsup.config.ts b/tsup.config.ts
@@ -4,7 +4,7 @@ export const tsup: Options = {
   splitting: true,
   clean: true,
   dts: true,
-  entryPoints: [
+  entry: [
     'src/*.ts',
   ],
   format: [
@@ -15,9 +15,4 @@ export const tsup: Options = {
     'vue',
     '@iconify/json/package.json',
   ],
-  outExtension({ format }) {
-    return {
-      js: format === 'cjs' ? '.cjs' : '.mjs',
-    }
-  },
 }