Skip to content

Commit 322ff8f

Browse files
BrooooooklynBrooooooklyn
committed
fix(tools): merge exports field correctly
1 parent e83602f commit 322ff8f

5 files changed

Lines changed: 218 additions & 135 deletions

File tree

‎justfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ alias r := ready
1010

1111
init:
1212
cargo binstall watchexec-cli cargo-insta typos-cli cargo-shear dprint taplo-cli -y
13+
pnpm tool sync-remote
1314
pnpm run bootstrap-cli
1415

1516
build:

‎packages/cli/package.json‎

Lines changed: 80 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -14,66 +14,39 @@
1414
"./bin": {
1515
"import": "./dist/bin.js"
1616
},
17-
"./test": {
18-
"import": "./dist/test.js",
19-
"types": "./dist/test.d.ts"
17+
"./browser": {
18+
"types": "./dist/vitest/browser/context.d.ts",
19+
"default": "./dist/vitest/browser/context.js"
2020
},
2121
"./client": {
2222
"types": "./dist/client.d.ts"
2323
},
24-
"./tsdown/run": {
25-
"default": "./dist/tsdown/run.js"
26-
},
27-
"./vitepress": {
28-
"types": "./dist/vitepress/types/index.d.ts",
29-
"default": "./dist/vitepress/node/index.js"
30-
},
31-
"./vitepress/dist/*": "./dist/vitepress/*",
32-
"./vitepress/client": {
33-
"types": "./dist/vitepress/client.d.ts",
34-
"default": "./dist/vitepress/client/index.js"
35-
},
36-
"./vitepress/theme": {
37-
"types": "./dist/vitepress/theme.d.ts",
38-
"default": "./dist/vitepress/client/theme-default/index.js"
39-
},
40-
"./vitepress/theme-without-fonts": {
41-
"types": "./dist/vitepress/theme-without-fonts.d.ts",
42-
"default": "./dist/vitepress/client/theme-default/without-fonts.js"
43-
},
44-
"./vitest": {
45-
"import": {
46-
"types": "./dist/vitest/dist/index.d.ts",
47-
"default": "./dist/vitest/dist/index.js"
48-
},
49-
"require": {
50-
"types": "./dist/vitest/index.d.cts",
51-
"default": "./dist/vitest/index.cjs"
52-
}
24+
"./config": {
25+
"types": "./dist/vitest/config.d.ts",
26+
"require": "./dist/vitest/dist/config.cjs",
27+
"default": "./dist/vitest/dist/config.js"
5328
},
54-
"./browser": {
55-
"types": "./dist/vitest/browser/context.d.ts",
56-
"default": "./dist/vitest/browser/context.js"
29+
"./coverage": {
30+
"types": "./dist/vitest/coverage.d.ts",
31+
"default": "./dist/vitest/dist/coverage.js"
5732
},
58-
"./optional-types.js": {
59-
"types": "./dist/vitest/optional-types.d.ts"
33+
"./dist/client/*": "./dist/vite/client/*",
34+
"./environments": {
35+
"types": "./dist/vitest/dist/environments.d.ts",
36+
"default": "./dist/vitest/dist/environments.js"
6037
},
61-
"./src/*": "./dist/vitest/src/*",
6238
"./globals": {
6339
"types": "./dist/vitest/globals.d.ts"
6440
},
65-
"./jsdom": {
66-
"types": "./dist/vitest/jsdom.d.ts"
41+
"./import-meta": {
42+
"types": "./dist/vitest/import-meta.d.ts"
6743
},
6844
"./importMeta": {
6945
"types": "./dist/vitest/importMeta.d.ts"
7046
},
71-
"./import-meta": {
72-
"types": "./dist/vitest/import-meta.d.ts"
73-
},
74-
"./node": {
75-
"types": "./dist/vitest/dist/node.d.ts",
76-
"default": "./dist/vitest/dist/node.js"
47+
"./internal": {
48+
"import": "./dist/vite/node/internal.js",
49+
"types": "./dist/vite/node/internal.d.ts"
7750
},
7851
"./internal/browser": {
7952
"types": "./dist/vitest/dist/browser.d.ts",
@@ -83,43 +56,28 @@
8356
"types": "./dist/vitest/dist/module-runner.d.ts",
8457
"default": "./dist/vitest/dist/module-runner.js"
8558
},
86-
"./runners": {
87-
"types": "./dist/vitest/dist/runners.d.ts",
88-
"default": "./dist/vitest/dist/runners.js"
59+
"./jsdom": {
60+
"types": "./dist/vitest/jsdom.d.ts"
8961
},
90-
"./suite": {
91-
"types": "./dist/vitest/dist/suite.d.ts",
92-
"default": "./dist/vitest/dist/suite.js"
62+
"./mocker": {
63+
"types": "./dist/vitest/dist/mocker.d.ts",
64+
"default": "./dist/vitest/dist/mocker.js"
9365
},
94-
"./environments": {
95-
"types": "./dist/vitest/dist/environments.d.ts",
96-
"default": "./dist/vitest/dist/environments.js"
66+
"./module-runner": {
67+
"import": "./dist/vite/node/module-runner.js",
68+
"types": "./dist/vite/node/module-runner.d.ts"
9769
},
98-
"./config": {
99-
"types": "./dist/vitest/config.d.ts",
100-
"require": "./dist/vitest/dist/config.cjs",
101-
"default": "./dist/vitest/dist/config.js"
70+
"./node": {
71+
"types": "./dist/vitest/dist/node.d.ts",
72+
"default": "./dist/vitest/dist/node.js"
10273
},
103-
"./coverage": {
104-
"types": "./dist/vitest/coverage.d.ts",
105-
"default": "./dist/vitest/dist/coverage.js"
74+
"./optional-types.js": {
75+
"types": "./dist/vitest/optional-types.d.ts"
10676
},
10777
"./reporters": {
10878
"types": "./dist/vitest/dist/reporters.d.ts",
10979
"default": "./dist/vitest/dist/reporters.js"
11080
},
111-
"./snapshot": {
112-
"types": "./dist/vitest/dist/snapshot.d.ts",
113-
"default": "./dist/vitest/dist/snapshot.js"
114-
},
115-
"./mocker": {
116-
"types": "./dist/vitest/dist/mocker.d.ts",
117-
"default": "./dist/vitest/dist/mocker.js"
118-
},
119-
"./worker": {
120-
"types": "./dist/vitest/worker.d.ts",
121-
"default": "./dist/vitest/dist/worker.js"
122-
},
12381
"./rolldown": {
12482
"default": "./dist/rolldown/index.mjs",
12583
"types": "./dist/rolldown/index.d.mts"
@@ -151,19 +109,57 @@
151109
"default": "./dist/pluginutils/index.js",
152110
"types": "./dist/pluginutils/index.d.ts"
153111
},
154-
"./vite": {
155-
"import": "./dist/vite/node/index.js",
156-
"types": "./dist/vite/node/index.d.ts"
112+
"./runners": {
113+
"types": "./dist/vitest/dist/runners.d.ts",
114+
"default": "./dist/vitest/dist/runners.js"
157115
},
158-
"./module-runner": {
159-
"import": "./dist/vite/node/module-runner.js",
160-
"types": "./dist/vite/node/module-runner.d.ts"
116+
"./snapshot": {
117+
"types": "./dist/vitest/dist/snapshot.d.ts",
118+
"default": "./dist/vitest/dist/snapshot.js"
161119
},
162-
"./internal": {
163-
"import": "./dist/vite/node/internal.js",
164-
"types": "./dist/vite/node/internal.d.ts"
120+
"./src/*": "./dist/vitest/src/*",
121+
"./suite": {
122+
"types": "./dist/vitest/dist/suite.d.ts",
123+
"default": "./dist/vitest/dist/suite.js"
124+
},
125+
"./test": {
126+
"import": "./dist/test.js",
127+
"types": "./dist/test.d.ts"
128+
},
129+
"./tsdown/run": {
130+
"default": "./dist/tsdown/run.js"
131+
},
132+
"./vitepress": {
133+
"types": "./dist/vitepress/types/index.d.ts",
134+
"default": "./dist/vitepress/node/index.js"
135+
},
136+
"./vitepress/client": {
137+
"types": "./dist/vitepress/client.d.ts",
138+
"default": "./dist/vitepress/client/index.js"
165139
},
166-
"./dist/client/*": "./dist/vite/client/*"
140+
"./vitepress/dist/*": "./dist/vitepress/*",
141+
"./vitepress/theme": {
142+
"types": "./dist/vitepress/theme.d.ts",
143+
"default": "./dist/vitepress/client/theme-default/index.js"
144+
},
145+
"./vitepress/theme-without-fonts": {
146+
"types": "./dist/vitepress/theme-without-fonts.d.ts",
147+
"default": "./dist/vitepress/client/theme-default/without-fonts.js"
148+
},
149+
"./vitest": {
150+
"import": {
151+
"types": "./dist/vitest/dist/index.d.ts",
152+
"default": "./dist/vitest/dist/index.js"
153+
},
154+
"require": {
155+
"types": "./dist/vitest/index.d.cts",
156+
"default": "./dist/vitest/index.cjs"
157+
}
158+
},
159+
"./worker": {
160+
"types": "./dist/vitest/worker.d.ts",
161+
"default": "./dist/vitest/dist/worker.js"
162+
}
167163
},
168164
"imports": {
169165
"#module-sync-enabled": {

‎packages/tools/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ switch (subcommand) {
1111
break;
1212
case 'sync-remote':
1313
const { syncRemote } = await import('./sync-remote-deps');
14-
syncRemote();
14+
await syncRemote();
1515
break;
1616
case 'json-sort':
1717
const { jsonSort } = await import('./json-sort');

0 commit comments

Comments
 (0)