Skip to content

Commit 67642e2

Browse files
authoredNov 29, 2023
feat!: include dual cjs/esm in package exports (#330)
1 parent 091fec6 commit 67642e2

File tree

5 files changed

+140
-58
lines changed

5 files changed

+140
-58
lines changed
 

‎package.json

+75-29
Original file line numberDiff line numberDiff line change
@@ -15,40 +15,75 @@
1515
"bugs": "https://github.com/unplugin/unplugin-icons/issues",
1616
"exports": {
1717
".": {
18-
"types": "./dist/index.d.ts",
19-
"import": "./dist/index.mjs",
20-
"require": "./dist/index.cjs"
18+
"import": {
19+
"types": "./dist/index.d.ts",
20+
"default": "./dist/index.js"
21+
},
22+
"require": {
23+
"types": "./dist/index.d.cts",
24+
"default": "./dist/index.cjs"
25+
}
2126
},
2227
"./*": "./*",
2328
"./esbuild": {
24-
"types": "./dist/esbuild.d.ts",
25-
"import": "./dist/esbuild.mjs",
26-
"require": "./dist/esbuild.cjs"
29+
"import": {
30+
"types": "./dist/esbuild.d.ts",
31+
"default": "./dist/esbuild.js"
32+
},
33+
"require": {
34+
"types": "./dist/esbuild.d.cts",
35+
"default": "./dist/esbuild.cjs"
36+
}
2737
},
2838
"./loaders": {
29-
"types": "./dist/loaders.d.ts",
30-
"import": "./dist/loaders.mjs",
31-
"require": "./dist/loaders.cjs"
39+
"import": {
40+
"types": "./dist/loaders.d.ts",
41+
"default": "./dist/loaders.js"
42+
},
43+
"require": {
44+
"types": "./dist/loaders.d.cts",
45+
"default": "./dist/loaders.cjs"
46+
}
3247
},
3348
"./nuxt": {
34-
"types": "./dist/nuxt.d.ts",
35-
"import": "./dist/nuxt.mjs",
36-
"require": "./dist/nuxt.cjs"
49+
"import": {
50+
"types": "./dist/nuxt.d.ts",
51+
"default": "./dist/nuxt.js"
52+
},
53+
"require": {
54+
"types": "./dist/nuxt.d.cts",
55+
"default": "./dist/nuxt.cjs"
56+
}
3757
},
3858
"./resolver": {
39-
"types": "./dist/resolver.d.ts",
40-
"import": "./dist/resolver.mjs",
41-
"require": "./dist/resolver.cjs"
59+
"import": {
60+
"types": "./dist/resolver.d.ts",
61+
"default": "./dist/resolver.js"
62+
},
63+
"require": {
64+
"types": "./dist/resolver.d.cts",
65+
"default": "./dist/resolver.cjs"
66+
}
4267
},
4368
"./rollup": {
44-
"types": "./dist/rollup.d.ts",
45-
"import": "./dist/rollup.mjs",
46-
"require": "./dist/rollup.cjs"
69+
"import": {
70+
"types": "./dist/rollup.d.ts",
71+
"default": "./dist/rollup.js"
72+
},
73+
"require": {
74+
"types": "./dist/rollup.d.cts",
75+
"default": "./dist/rollup.cjs"
76+
}
4777
},
4878
"./types": {
49-
"types": "./dist/types.d.ts",
50-
"import": "./dist/types.mjs",
51-
"require": "./dist/types.cjs"
79+
"import": {
80+
"types": "./dist/types.d.ts",
81+
"default": "./dist/types.js"
82+
},
83+
"require": {
84+
"types": "./dist/types.d.cts",
85+
"default": "./dist/types.cjs"
86+
}
5287
},
5388
"./types/astro": {
5489
"types": "./types/astro.d.ts"
@@ -84,18 +119,28 @@
84119
"types": "./types/web-components.d.ts"
85120
},
86121
"./vite": {
87-
"types": "./dist/vite.d.ts",
88-
"import": "./dist/vite.mjs",
89-
"require": "./dist/vite.cjs"
122+
"import": {
123+
"types": "./dist/vite.d.ts",
124+
"default": "./dist/vite.js"
125+
},
126+
"require": {
127+
"types": "./dist/vite.d.cts",
128+
"default": "./dist/vite.cjs"
129+
}
90130
},
91131
"./webpack": {
92-
"types": "./dist/webpack.d.ts",
93-
"import": "./dist/webpack.mjs",
94-
"require": "./dist/webpack.cjs"
132+
"import": {
133+
"types": "./dist/webpack.d.ts",
134+
"default": "./dist/webpack.js"
135+
},
136+
"require": {
137+
"types": "./dist/webpack.d.cts",
138+
"default": "./dist/webpack.cjs"
139+
}
95140
}
96141
},
97142
"main": "dist/index.cjs",
98-
"module": "dist/index.mjs",
143+
"module": "dist/index.js",
99144
"types": "dist/index.d.ts",
100145
"typesVersions": {
101146
"*": {
@@ -111,7 +156,7 @@
111156
"types"
112157
],
113158
"scripts": {
114-
"build": "esno scripts/prebuild.ts && tsup && esno scripts/postbuild.ts",
159+
"build": "esno scripts/prebuild.ts && tsup",
115160
"dev": "esno scripts/prebuild.ts && tsup --watch src",
116161
"example:build": "npm -C examples/vite-vue3 run build",
117162
"example:dev": "npm -C examples/vite-vue3 run dev",
@@ -170,6 +215,7 @@
170215
"eslint": "^8.53.0",
171216
"esno": "^4.0.0",
172217
"fast-glob": "^3.3.2",
218+
"publint": "^0.2.5",
173219
"rollup": "^4.4.0",
174220
"tsup": "^7.2.0",
175221
"typescript": "^5.2.2",

‎pnpm-lock.yaml

+61
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/postbuild.ts

-23
This file was deleted.

‎src/core/icon-sets.json

+3
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
"iwwa",
9191
"jam",
9292
"la",
93+
"lets-icons",
9394
"line-md",
9495
"logos",
9596
"ls",
@@ -98,6 +99,7 @@
9899
"maki",
99100
"map",
100101
"material-symbols",
102+
"material-symbols-light",
101103
"mdi",
102104
"mdi-light",
103105
"medical-icon",
@@ -106,6 +108,7 @@
106108
"mi",
107109
"mingcute",
108110
"mono-icons",
111+
"mynaui",
109112
"nimbus",
110113
"nonicons",
111114
"noto",

‎tsup.config.ts

+1-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export const tsup: Options = {
44
splitting: true,
55
clean: true,
66
dts: true,
7-
entryPoints: [
7+
entry: [
88
'src/*.ts',
99
],
1010
format: [
@@ -15,9 +15,4 @@ export const tsup: Options = {
1515
'vue',
1616
'@iconify/json/package.json',
1717
],
18-
outExtension({ format }) {
19-
return {
20-
js: format === 'cjs' ? '.cjs' : '.mjs',
21-
}
22-
},
2318
}

0 commit comments

Comments
 (0)
Please sign in to comment.