Skip to content

Commit ea10cb3

Browse files
sxzzsxzz
committed
refactor!: drop cjs format for all packages
1 parent 77fc29f commit ea10cb3

39 files changed

+205
-264
lines changed

‎monoman.config.ts‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@ export default defineConfig([
4848
const pkgSrc = path.resolve(pkgRoot, 'src')
4949
const pkgName = getPkgName(filePath)
5050

51-
data.type = pkgName === 'volar' ? 'commonjs' : 'module'
52-
const isESM = data.type === 'module'
53-
const cjsPrefix = isESM ? 'c' : ''
54-
const esmPrefix = isESM ? '' : 'm'
51+
data.type = 'module'
5552
const hasRootDts = (await readdir(pkgRoot)).some((file) =>
5653
file.endsWith('.d.ts'),
5754
)
@@ -126,9 +123,6 @@ export default unplugin.${entry} as typeof unplugin.${entry}\n`,
126123
loader: 'bundle-require',
127124
})
128125
).default
129-
const format = tsupConfig.format || []
130-
const hasCJS = format.includes('cjs')
131-
const hasESM = format.includes('esm')
132126

133127
const entries = (
134128
await fg(tsupConfig.entry as string[], {
@@ -147,8 +141,7 @@ export default unplugin.${entry} as typeof unplugin.${entry}\n`,
147141
const mainExport = exports['.']
148142
if (mainExport) {
149143
data.main = stripCurrentDir(mainExport.require || mainExport)
150-
if (hasESM)
151-
data.module = stripCurrentDir(mainExport.import || mainExport)
144+
data.module = stripCurrentDir(mainExport.import || mainExport)
152145
}
153146

154147
const onlyIndex = entries.length === 1 && entries[0] === 'index'
@@ -174,12 +167,7 @@ export default unplugin.${entry} as typeof unplugin.${entry}\n`,
174167
map.types = `./volar.d.ts`
175168
map.default = `./volar.cjs`
176169
} else {
177-
if (hasCJS)
178-
map[hasESM ? 'require' : 'default'] =
179-
`./dist/${entry}.${cjsPrefix}js`
180-
if (hasESM)
181-
map[hasCJS ? 'import' : 'default'] =
182-
`./dist/${entry}.${esmPrefix}js`
170+
map.default = `./dist/${entry}.js`
183171
}
184172

185173
if (Object.keys(map).length === 1) {

‎packages/boolean-prop/package.json‎

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,29 @@
2626
"files": [
2727
"dist"
2828
],
29-
"main": "dist/index.cjs",
29+
"main": "dist/index.js",
3030
"module": "dist/index.js",
3131
"types": "dist/index.d.ts",
3232
"exports": {
3333
".": {
3434
"dev": "./src/index.ts",
35-
"require": "./dist/index.cjs",
36-
"import": "./dist/index.js"
35+
"default": "./dist/index.js"
3736
},
3837
"./api": {
3938
"dev": "./src/api.ts",
40-
"require": "./dist/api.cjs",
41-
"import": "./dist/api.js"
39+
"default": "./dist/api.js"
4240
},
4341
"./rolldown": {
4442
"dev": "./src/rolldown.ts",
45-
"require": "./dist/rolldown.cjs",
46-
"import": "./dist/rolldown.js"
43+
"default": "./dist/rolldown.js"
4744
},
4845
"./rollup": {
4946
"dev": "./src/rollup.ts",
50-
"require": "./dist/rollup.cjs",
51-
"import": "./dist/rollup.js"
47+
"default": "./dist/rollup.js"
5248
},
5349
"./vite": {
5450
"dev": "./src/vite.ts",
55-
"require": "./dist/vite.cjs",
56-
"import": "./dist/vite.js"
51+
"default": "./dist/vite.js"
5752
},
5853
"./*": "./*"
5954
},
@@ -68,26 +63,11 @@
6863
"publishConfig": {
6964
"access": "public",
7065
"exports": {
71-
".": {
72-
"require": "./dist/index.cjs",
73-
"import": "./dist/index.js"
74-
},
75-
"./api": {
76-
"require": "./dist/api.cjs",
77-
"import": "./dist/api.js"
78-
},
79-
"./rolldown": {
80-
"require": "./dist/rolldown.cjs",
81-
"import": "./dist/rolldown.js"
82-
},
83-
"./rollup": {
84-
"require": "./dist/rollup.cjs",
85-
"import": "./dist/rollup.js"
86-
},
87-
"./vite": {
88-
"require": "./dist/vite.cjs",
89-
"import": "./dist/vite.js"
90-
},
66+
".": "./dist/index.js",
67+
"./api": "./dist/api.js",
68+
"./rolldown": "./dist/rolldown.js",
69+
"./rollup": "./dist/rollup.js",
70+
"./vite": "./dist/vite.js",
9171
"./*": "./*"
9272
},
9373
"tag": "next"

‎packages/boolean-prop/tsup.config.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
import { config } from '../../tsup.config.js'
22

3-
export default config({
4-
cjs: true,
5-
})
3+
export default config()

‎packages/common/package.json‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,20 @@
2626
"files": [
2727
"dist"
2828
],
29-
"main": "dist/index.cjs",
29+
"main": "dist/index.js",
3030
"module": "dist/index.js",
3131
"types": "./dist/index.d.ts",
3232
"exports": {
3333
".": {
3434
"dev": "./src/index.ts",
35-
"require": "./dist/index.cjs",
36-
"import": "./dist/index.js"
35+
"default": "./dist/index.js"
3736
},
3837
"./*": "./*"
3938
},
4039
"publishConfig": {
4140
"access": "public",
4241
"exports": {
43-
".": {
44-
"require": "./dist/index.cjs",
45-
"import": "./dist/index.js"
46-
},
42+
".": "./dist/index.js",
4743
"./*": "./*"
4844
},
4945
"tag": "next"

‎packages/common/tsup.config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ export default config({
44
onlyIndex: true,
55
shims: true,
66
external: ['node:module'],
7-
cjs: true,
87
})

‎packages/config/package.json‎

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,29 @@
2626
"files": [
2727
"dist"
2828
],
29-
"main": "dist/index.cjs",
29+
"main": "dist/index.js",
3030
"module": "dist/index.js",
3131
"types": "./dist/index.d.ts",
3232
"exports": {
3333
".": {
3434
"dev": "./src/index.ts",
35-
"require": "./dist/index.cjs",
36-
"import": "./dist/index.js"
35+
"default": "./dist/index.js"
3736
},
3837
"./config": {
3938
"dev": "./src/config.ts",
40-
"require": "./dist/config.cjs",
41-
"import": "./dist/config.js"
39+
"default": "./dist/config.js"
4240
},
4341
"./config-worker": {
4442
"dev": "./src/config-worker.ts",
45-
"require": "./dist/config-worker.cjs",
46-
"import": "./dist/config-worker.js"
43+
"default": "./dist/config-worker.js"
4744
},
4845
"./define": {
4946
"dev": "./src/define.ts",
50-
"require": "./dist/define.cjs",
51-
"import": "./dist/define.js"
47+
"default": "./dist/define.js"
5248
},
5349
"./options": {
5450
"dev": "./src/options.ts",
55-
"require": "./dist/options.cjs",
56-
"import": "./dist/options.js"
51+
"default": "./dist/options.js"
5752
},
5853
"./*": "./*"
5954
},
@@ -68,26 +63,11 @@
6863
"publishConfig": {
6964
"access": "public",
7065
"exports": {
71-
".": {
72-
"require": "./dist/index.cjs",
73-
"import": "./dist/index.js"
74-
},
75-
"./config": {
76-
"require": "./dist/config.cjs",
77-
"import": "./dist/config.js"
78-
},
79-
"./config-worker": {
80-
"require": "./dist/config-worker.cjs",
81-
"import": "./dist/config-worker.js"
82-
},
83-
"./define": {
84-
"require": "./dist/define.cjs",
85-
"import": "./dist/define.js"
86-
},
87-
"./options": {
88-
"require": "./dist/options.cjs",
89-
"import": "./dist/options.js"
90-
},
66+
".": "./dist/index.js",
67+
"./config": "./dist/config.js",
68+
"./config-worker": "./dist/config-worker.js",
69+
"./define": "./dist/define.js",
70+
"./options": "./dist/options.js",
9171
"./*": "./*"
9272
},
9373
"tag": "next"

‎packages/config/tsup.config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ import { config } from '../../tsup.config.js'
33
export default config({
44
shims: true,
55
platform: 'node',
6-
cjs: true,
76
})

‎packages/short-bind/package.json‎

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,29 @@
2626
"files": [
2727
"dist"
2828
],
29-
"main": "dist/index.cjs",
29+
"main": "dist/index.js",
3030
"module": "dist/index.js",
3131
"types": "dist/index.d.ts",
3232
"exports": {
3333
".": {
3434
"dev": "./src/index.ts",
35-
"require": "./dist/index.cjs",
36-
"import": "./dist/index.js"
35+
"default": "./dist/index.js"
3736
},
3837
"./api": {
3938
"dev": "./src/api.ts",
40-
"require": "./dist/api.cjs",
41-
"import": "./dist/api.js"
39+
"default": "./dist/api.js"
4240
},
4341
"./rolldown": {
4442
"dev": "./src/rolldown.ts",
45-
"require": "./dist/rolldown.cjs",
46-
"import": "./dist/rolldown.js"
43+
"default": "./dist/rolldown.js"
4744
},
4845
"./rollup": {
4946
"dev": "./src/rollup.ts",
50-
"require": "./dist/rollup.cjs",
51-
"import": "./dist/rollup.js"
47+
"default": "./dist/rollup.js"
5248
},
5349
"./vite": {
5450
"dev": "./src/vite.ts",
55-
"require": "./dist/vite.cjs",
56-
"import": "./dist/vite.js"
51+
"default": "./dist/vite.js"
5752
},
5853
"./*": "./*"
5954
},
@@ -68,26 +63,11 @@
6863
"publishConfig": {
6964
"access": "public",
7065
"exports": {
71-
".": {
72-
"require": "./dist/index.cjs",
73-
"import": "./dist/index.js"
74-
},
75-
"./api": {
76-
"require": "./dist/api.cjs",
77-
"import": "./dist/api.js"
78-
},
79-
"./rolldown": {
80-
"require": "./dist/rolldown.cjs",
81-
"import": "./dist/rolldown.js"
82-
},
83-
"./rollup": {
84-
"require": "./dist/rollup.cjs",
85-
"import": "./dist/rollup.js"
86-
},
87-
"./vite": {
88-
"require": "./dist/vite.cjs",
89-
"import": "./dist/vite.js"
90-
},
66+
".": "./dist/index.js",
67+
"./api": "./dist/api.js",
68+
"./rolldown": "./dist/rolldown.js",
69+
"./rollup": "./dist/rollup.js",
70+
"./vite": "./dist/vite.js",
9171
"./*": "./*"
9272
},
9373
"tag": "next"

‎packages/short-bind/tsup.config.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
import { config } from '../../tsup.config.js'
22

3-
export default config({
4-
cjs: true,
5-
})
3+
export default config({})

‎packages/short-vmodel/package.json‎

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,29 @@
2626
"files": [
2727
"dist"
2828
],
29-
"main": "dist/index.cjs",
29+
"main": "dist/index.js",
3030
"module": "dist/index.js",
3131
"types": "dist/index.d.ts",
3232
"exports": {
3333
".": {
3434
"dev": "./src/index.ts",
35-
"require": "./dist/index.cjs",
36-
"import": "./dist/index.js"
35+
"default": "./dist/index.js"
3736
},
3837
"./api": {
3938
"dev": "./src/api.ts",
40-
"require": "./dist/api.cjs",
41-
"import": "./dist/api.js"
39+
"default": "./dist/api.js"
4240
},
4341
"./rolldown": {
4442
"dev": "./src/rolldown.ts",
45-
"require": "./dist/rolldown.cjs",
46-
"import": "./dist/rolldown.js"
43+
"default": "./dist/rolldown.js"
4744
},
4845
"./rollup": {
4946
"dev": "./src/rollup.ts",
50-
"require": "./dist/rollup.cjs",
51-
"import": "./dist/rollup.js"
47+
"default": "./dist/rollup.js"
5248
},
5349
"./vite": {
5450
"dev": "./src/vite.ts",
55-
"require": "./dist/vite.cjs",
56-
"import": "./dist/vite.js"
51+
"default": "./dist/vite.js"
5752
},
5853
"./*": "./*"
5954
},
@@ -68,26 +63,11 @@
6863
"publishConfig": {
6964
"access": "public",
7065
"exports": {
71-
".": {
72-
"require": "./dist/index.cjs",
73-
"import": "./dist/index.js"
74-
},
75-
"./api": {
76-
"require": "./dist/api.cjs",
77-
"import": "./dist/api.js"
78-
},
79-
"./rolldown": {
80-
"require": "./dist/rolldown.cjs",
81-
"import": "./dist/rolldown.js"
82-
},
83-
"./rollup": {
84-
"require": "./dist/rollup.cjs",
85-
"import": "./dist/rollup.js"
86-
},
87-
"./vite": {
88-
"require": "./dist/vite.cjs",
89-
"import": "./dist/vite.js"
90-
},
66+
".": "./dist/index.js",
67+
"./api": "./dist/api.js",
68+
"./rolldown": "./dist/rolldown.js",
69+
"./rollup": "./dist/rollup.js",
70+
"./vite": "./dist/vite.js",
9171
"./*": "./*"
9272
},
9373
"tag": "next"

0 commit comments

Comments
 (0)