8000 feat!(volar): remove cjs build · vue-macros/vue-macros@03bc217 · GitHub
[go: up one dir, main page]
Skip to content

Commit 03bc217

Browse files
sxzzsxzz
committed
feat!(volar): remove cjs build
1 parent 378813a commit 03bc217

File tree

11 files changed

+86
-158
lines changed

11 files changed

+86
-158
lines changed

‎monoman.config.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ export default defineConfig([
8484

8585
data.files = ['dist']
8686
if (hasRootDts) data.files.push('*.d.ts')
87-
if (pkgName === 'macros') data.files.push('volar.cjs')
8887
data.files.sort()
8988

9089
if (
@@ -130,10 +129,6 @@ export default unplugin.${entry} as typeof unplugin.${entry}\n`,
130129
})
131130
).map((file) => path.basename(path.relative(pkgSrc, file), '.ts'))
132131

133-
if (pkgName === 'macros') {
134-
entries.push('volar')
135-
}
136-
137132
data.exports = buildExports(true)
138133
const exports = (data.publishConfig.exports = buildExports())
139134

@@ -162,12 +157,7 @@ export default unplugin.${entry} as typeof unplugin.${entry}\n`,
162157

163158
const map: Record<string, any> = {}
164159
if (withDev) map.dev = `./src/${entry}.ts`
165-
if (entry === 'volar') {
166-
map.types = `./volar.d.ts`
167-
map.default = `./volar.cjs`
168-
} else {
169-
map.default = `./dist/${entry}.js`
170-
}
160+
map.default = `./dist/${entry}.js`
171161

172162
if (Object.keys(map).length === 1) {
173163
return [key, Object.values(map)[0]]

‎packages/macros/package.json

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
"funding": "https://github.com/sponsors/vue-macros",
2828
"files": [
2929
"*.d.ts",
30-
"dist",
31-
"volar.cjs"
30+
"dist"
3231
],
3332
"main": "dist/index.js",
3433
"module": "dist/index.js",
@@ -64,8 +63,7 @@
6463
},
6564
"./volar": {
6665
"dev": "./src/volar.ts",
67-
"types": "./volar.d.ts",
68-
"default": "./volar.cjs"
66+
"default": "./dist/volar.js"
6967
},
7068
"./webpack": {
7169
"dev": "./src/webpack.ts",
@@ -94,10 +92,7 @@
9492
"./rspack": "./dist/rspack.js",
9593
"./runtime": "./dist/runtime.js",
9694
"./vite": "./dist/vite.js",
97-
"./volar": {
98-
"types": "./volar.d.ts",
99-
"default": "./volar.cjs"
100-
},
95+
"./volar": "./dist/volar.js",
10196
"./webpack": "./dist/webpack.js",
10297
"./*": [
10398
"./*",

‎packages/macros/src/volar.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import plugin from '@vue-macros/volar'
2+
3+
// eslint-disable-next-line import/no-default-export
4+
export default plugin
5+
export { plugin as 'module.exports' }

‎packages/macros/tsup.config.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import { config } from '../../tsup.config.js'
22

33
export default config({
44
ignoreDeps: [
5-
'@vue-macros/volar',
6-
75
// Used in dts
86
'@vue-macros/common',
97
],

‎packages/macros/volar.cjs

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎packages/macros/volar.d.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎packages/volar/loader.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎packages/volar/package.json

Lines changed: 75 additions & 93 deletions
< 10000 tbody>
Original file line numberDiff line numberDiff line change
@@ -28,138 +28,96 @@
2828
"*.d.ts",
2929
"dist"
3030
],
31+
"main": "dist/index.js",
32+
"module": "dist/index.js",
3133
"exports": {
3234
".": {
33-
"types": "./dist/index.d.ts",
34-
"module-sync": "./dist/index.js",
35-
"import": "./dist/index.js",
36-
"default": "./dist/loader/index.cjs"
35+
"dev": "./src/index.ts",
36+
"default": "./dist/index.js"
3737
},
3838
"./boolean-prop": {
39-
"types": "./dist/boolean-prop.d.ts",
40-
"module-sync": "./dist/boolean-prop.js",
41-
"import": "./dist/boolean-prop.js",
42-
"default": "./dist/loader/boolean-prop.cjs"
39+
"dev": "./src/boolean-prop.ts",
40+
"default": "./dist/boolean-prop.js"
4341
},
4442
"./common": {
45-
"types": "./dist/common.d.ts",
46-
"module-sync": "./dist/common.js",
47-
"import": "./dist/common.js",
48-
"default": "./dist/loader/common.cjs"
43+
"dev": "./src/common.ts",
44+
"default": "./dist/common.js"
4945
},
5046
"./define-emit": {
51-
"types": "./dist/define-emit.d.ts",
52-
"module-sync": "./dist/define-emit.js",
53-
"import": "./dist/define-emit.js",
54-
"default": "./dist/loader/define-emit.cjs"
47+
"dev": "./src/define-emit.ts",
48+
"default": "./dist/define-emit.js"
5549
},
5650
"./define-generic": {
57-
"types": "./dist/define-generic.d.ts",
58-
"module-sync": "./dist/define-generic.js",
59-
"import": "./dist/define-generic.js",
60-
"default": "./dist/loader/define-generic.cjs"
51< 10000 /code>+
"dev": "./src/define-generic.ts",
52+
"default": "./dist/define-generic.js"
6153
},
6254
"./define-models": {
63-
"types": "./dist/define-models.d.ts",
64-
"module-sync": "./dist/define-models.js",
65-
"import": "./dist/define-models.js",
66-
"default": "./dist/loader/define-models.cjs"
55+
"dev": "./src/define-models.ts",
56+
"default": "./dist/define-models.js"
6757
},
6858
"./define-options": {
69-
"types": "./dist/define-options.d.ts",
70-
"module-sync": "./dist/define-options.js",
71-
"import": "./dist/define-options.js",
72-
"default": "./dist/loader/define-options.cjs"
59+
"dev": "./src/define-options.ts",
60+
"default": "./dist/define-options.js"
7361
},
7462
"./define-prop": {
75-
"types": "./dist/define-prop.d.ts",
76-
"module-sync": "./dist/define-prop.js",
77-
"import": "./dist/define-prop.js",
78-
"default": "./dist/loader/define-prop.cjs"
63+
"dev": "./src/define-prop.ts",
64+
"default": "./dist/define-prop.js"
7965
},
8066
"./define-props": {
81-
"types": "./dist/define-props.d.ts",
82-
"module-sync": "./dist/define-props.js",
83-
"import": "./dist/define-props.js",
84-
"default": "./dist/loader/define-props.cjs"
67+
"dev": "./src/define-props.ts",
68+
"default": "./dist/define-props.js"
8569
},
8670
"./define-props-refs": {
87-
"types": "./dist/define-props-refs.d.ts",
88-
"module-sync": "./dist/define-props-refs.js",
89-
"import": "./dist/define-props-refs.js",
90-
"default": "./dist/loader/define-props-refs.cjs"
71+
"dev": "./src/define-props-refs.ts",
72+
"default": "./dist/define-props-refs.js"
9173
},
9274
"./define-slots": {
93-
"types": "./dist/define-slots.d.ts",
94-
"module-sync": "./dist/define-slots.js",
95-
"import": "./dist/define-slots.js",
96-
"default": "./dist/loader/define-slots.cjs"
75+
"dev": "./src/define-slots.ts",
76+
"default": "./dist/define-slots.js"
9777
},
9878
"./export-expose": {
99-
"types": "./dist/export-expose.d.ts",
100-
"module-sync": "./dist/export-expose.js",
101-
"import": "./dist/export-expose.js",
102-
"default": "./dist/loader/export-expose.cjs"
79+
"dev": "./src/export-expose.ts",
80+
"default": "./dist/export-expose.js"
10381
},
10482
"./export-props": {
105-
"types": "./dist/export-props.d.ts",
106-
"module-sync": "./dist/export-props.js",
107-
"import": "./dist/export-props.js",
108-
"default": "./dist/loader/export-props.cjs"
83+
"dev": "./src/export-props.ts",
84+
"default": "./dist/export-props.js"
10985
},
11086
"./export-render": {
111-
"types": "./dist/export-render.d.ts",
112-
"module-sync": "./dist/export-render.js",
113-
"import": "./dist/export-render.js",
114-
"default": "./dist/loader/export-render.cjs"
87+
"dev": "./src/export-render.ts",
88+
"default": "./dist/export-render.js"
11589
},
11690
"./jsx-directive": {
117-
"types": "./dist/jsx-directive.d.ts",
118-
"module-sync": "./dist/jsx-directive.js",
119-
"import": "./dist/jsx-directive.js",
120-
"default": "./dist/loader/jsx-directive.cjs"
91+
"dev": "./src/jsx-directive.ts",
92+
"default": "./dist/jsx-directive.js"
12193
},
12294
"./jsx-ref": {
123-
"types": "./dist/jsx-ref.d.ts",
124-
"module-sync": "./dist/jsx-ref.js",
125-
"import": "./dist/jsx-ref.js",
126-
"default": "./dist/loader/jsx-ref.cjs"
95+
"dev": "./src/jsx-ref.ts",
96+
"default": "./dist/jsx-ref.js"
12797
},
12898
"./script-lang": {
129-
"types": "./dist/script-lang.d.ts",
130-
"module-sync": "./dist/script-lang.js",
131-
"import": "./dist/script-lang.js",
132-
"default": "./dist/loader/script-lang.cjs"
99+
"dev": "./src/script-lang.ts",
100+
"default": "./dist/script-lang.js"
133101
},
134102
"./script-sfc": {
135-
"types": "./dist/script-sfc.d.ts",
136-
"module-sync": "./dist/script-sfc.js",
137-
"import": "./dist/script-sfc.js",
138-
"default": "./dist/loader/script-sfc.cjs"
103+
"dev": "./src/script-sfc.ts",
104+
"default": "./dist/script-sfc.js"
139105
},
140106
"./setup-jsdoc": {
141-
"types": "./dist/setup-jsdoc.d.ts",
142-
"module-sync": "./dist/setup-jsdoc.js",
143-
"import": "./dist/setup-jsdoc.js",
144-
"default": "./dist/loader/setup-jsdoc.cjs"
107+
"dev": "./src/setup-jsdoc.ts",
108+
"default": "./dist/setup-jsdoc.js"
145109
},
146110
"./setup-sfc": {
147-
"types": "./dist/setup-sfc.d.ts",
148-
"module-sync": "./dist/setup-sfc.js",
149-
"import": "./dist/setup-sfc.js",
150-
"default": "./dist/loader/setup-sfc.cjs"
111+
"dev": "./src/setup-sfc.ts",
112+
"default": "./dist/setup-sfc.js"
151113
},
152114
"./short-bind": {
153-
"types": "./dist/short-bind.d.ts",
154-
"module-sync": "./dist/short-bind.js",
155-
"import": "./dist/short-bind.js",
156-
"default": "./dist/loader/short-bind.cjs"
115+
"dev": "./src/short-bind.ts",
116+
"default": "./dist/short-bind.js"
157117
},
158118
"./short-vmodel": {
159-
"types": "./dist/short-vmodel.d.ts",
160-
"module-sync": "./dist/short-vmodel.js",
161-
"import": "./dist/short-vmodel.js",
162-
"default": "./dist/loader/short-vmodel.cjs"
119+
"dev": "./src/short-vmodel.ts",
120+
"default": "./dist/short-vmodel.js"
163121
},
164122
"./*": [
165123
"./*",
@@ -176,7 +134,35 @@
176134
},
177135
"publishConfig": {
178136
"access": "public",
179-
"tag": "next"
137+
"tag": "next",
138+
"exports": {
139+
".": "./dist/index.js",
140+
"./boolean-prop": "./dist/boolean-prop.js",
141+
"./common": "./dist/common.js",
142+
"./define-emit": "./dist/define-emit.js",
143+
"./define-generic": "./dist/define-generic.js",
144+
"./define-models": "./dist/define-models.js",
145+
"./define-options": "./dist/define-options.js",
146+
"./define-prop": "./dist/define-prop.js",
147+
"./define-props": "./dist/define-props.js",
148+
"./define-props-refs": "./dist/define-props-refs.js",
149+
"./define-slots": "./dist/define-slots.js",
150+
"./export-expose": "./dist/export-expose.js",
151+
"./export-props": "./dist/export-props.js",
152+
"./export-render": "./dist/export-render.js",
153+
"./jsx-directive": "./dist/jsx-directive.js",
154+
"./jsx-ref": "./dist/jsx-ref.js",
155+
"./script-lang": "./dist/script-lang.js",
156+
"./script-sfc": "./dist/script-sfc.js",
157+
"./setup-jsdoc": "./dist/setup-jsdoc.js",
158+
"./setup-sfc": "./dist/setup-sfc.js",
159+
"./short-bind": "./dist/short-bind.js",
160+
"./short-vmodel": "./dist/short-vmodel.js",
161+
"./*": [
162+
"./*",
163+
"./*.d.ts"
164+
]
165+
}
180166
},
181167
"scripts": {
182168
"build": "tsup",
@@ -197,7 +183,6 @@
197183
"@vue-macros/short-bind": "workspace:*",
198184
"@vue-macros/short-vmodel": "workspace:*",
199185
"@vue/language-core": "catalog:",
200-
"jiti": "catalog:",
201186
"muggle-string": "catalog:",
202187
"ts-macro": "catalog:"
203188
},
@@ -208,8 +193,5 @@
208193
},
209194
"engines": {
210195
"node": ">=20.18.0"
211-
},
212-
"meta": {
213-
"skipExports": true
214196
}
215197
}

‎packages/volar/tsup.config.ts

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,6 @@
1-
import { mkdir, readFile, writeFile } from 'node:fs/promises'
2-
import path from 'node:path'
3-
import { transform } from 'esbuild'
41
import { config } from '../../tsup.config.js'
52

63
export default config({
7-
ignoreDeps: ['vue-tsc', 'jiti'],
4+
ignoreDeps: ['vue-tsc'],
85
platform: 'node',
9-
async onSuccess(entries) {
10-
const files = entries.map((file) => path.basename(file, '.ts'))
11-
12-
const contents = await readFile('./loader.ts')
13-
const transformed = await transform(contents, {
14-
loader: 'ts',
15-
format: 'cjs',
16-
target: 'node20',
17-
minifySyntax: true,
18-
})
19-
await mkdir('./dist/loader', { recursive: true })
20-
await Promise.all(
21-
files.map((< 7A1E /span>file) =>
22-
writeFile(
23-
`./dist/loader/${file}.cjs`,
24-
transformed.code.replace('__FILE__', `../${file}.js`),
25-
),
26-
),
27-
)
28-
},
296
})

‎pnpm-lock.yaml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
0