Skip to content

Commit cb579aa

Browse files
hotlonghotlong
authored
Merge pull request #1348 from objectstack-ai/copilot/fix-ci-build-errors-again
2 parents eb00053 + be0086a commit cb579aa

3 files changed

Lines changed: 133 additions & 48 deletions

File tree

‎core‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/tmp/workspace/objectstack-ai/framework/packages/core

‎packages/spec/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## 6.5.0
44

5+
### Patch Changes
6+
7+
- Fix: update `package.json` `exports` to use nested `import`/`require` conditions with per-condition `types` fields (e.g. `import.types → index.d.mts`, `require.types → index.d.ts`). This ensures TypeScript with `moduleResolution: "bundler"` resolves to the ESM declaration file (`.d.mts`) which uses explicit `.mjs` chunk imports — eliminating the intermittent TS2306 "is not a module" error that occurred when tsup's DTS worker processed the CJS declaration chain.
8+
59
## 6.4.0
610

711
### Minor Changes

‎packages/spec/package.json‎

Lines changed: 128 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,84 +7,164 @@
77
"types": "dist/index.d.ts",
88
"exports": {
99
".": {
10-
"types": "./dist/index.d.ts",
11-
"import": "./dist/index.mjs",
12-
"require": "./dist/index.js"
10+
"import": {
11+
"types": "./dist/index.d.mts",
12+
"default": "./dist/index.mjs"
13+
},
14+
"require": {
15+
"types": "./dist/index.d.ts",
16+
"default": "./dist/index.js"
17+
}
1318
},
1419
"./data": {
15-
"types": "./dist/data/index.d.ts",
16-
"import": "./dist/data/index.mjs",
17-
"require": "./dist/data/index.js"
20+
"import": {
21+
"types": "./dist/data/index.d.mts",
22+
"default": "./dist/data/index.mjs"
23+
},
24+
"require": {
25+
"types": "./dist/data/index.d.ts",
26+
"default": "./dist/data/index.js"
27+
}
1828
},
1929
"./system": {
20-
"types": "./dist/system/index.d.ts",
21-
"import": "./dist/system/index.mjs",
22-
"require": "./dist/system/index.js"
30+
"import": {
31+
"types": "./dist/system/index.d.mts",
32+
"default": "./dist/system/index.mjs"
33+
},
34+
"require": {
35+
"types": "./dist/system/index.d.ts",
36+
"default": "./dist/system/index.js"
37+
}
2338
},
2439
"./kernel": {
25-
"types": "./dist/kernel/index.d.ts",
26-
"import": "./dist/kernel/index.mjs",
27-
"require": "./dist/kernel/index.js"
40+
"import": {
41+
"types": "./dist/kernel/index.d.mts",
42+
"default": "./dist/kernel/index.mjs"
43+
},
44+
"require": {
45+
"types": "./dist/kernel/index.d.ts",
46+
"default": "./dist/kernel/index.js"
47+
}
2848
},
2949
"./ai": {
30-
"types": "./dist/ai/index.d.ts",
31-
"import": "./dist/ai/index.mjs",
32-
"require": "./dist/ai/index.js"
50+
"import": {
51+
"types": "./dist/ai/index.d.mts",
52+
"default": "./dist/ai/index.mjs"
53+
},
54+
"require": {
55+
"types": "./dist/ai/index.d.ts",
56+
"default": "./dist/ai/index.js"
57+
}
3358
},
3459
"./automation": {
35-
"types": "./dist/automation/index.d.ts",
36-
"import": "./dist/automation/index.mjs",
37-
"require": "./dist/automation/index.js"
60+
"import": {
61+
"types": "./dist/automation/index.d.mts",
62+
"default": "./dist/automation/index.mjs"
63+
},
64+
"require": {
65+
"types": "./dist/automation/index.d.ts",
66+
"default": "./dist/automation/index.js"
67+
}
3868
},
3969
"./api": {
40-
"types": "./dist/api/index.d.ts",
41-
"import": "./dist/api/index.mjs",
42-
"require": "./dist/api/index.js"
70+
"import": {
71+
"types": "./dist/api/index.d.mts",
72+
"default": "./dist/api/index.mjs"
73+
},
74+
"require": {
75+
"types": "./dist/api/index.d.ts",
76+
"default": "./dist/api/index.js"
77+
}
4378
},
4479
"./ui": {
45-
"types": "./dist/ui/index.d.ts",
46-
"import": "./dist/ui/index.mjs",
47-
"require": "./dist/ui/index.js"
80+
"import": {
81+
"types": "./dist/ui/index.d.mts",
82+
"default": "./dist/ui/index.mjs"
83+
},
84+
"require": {
85+
"types": "./dist/ui/index.d.ts",
86+
"default": "./dist/ui/index.js"
87+
}
4888
},
4989
"./contracts": {
50-
"types": "./dist/contracts/index.d.ts",
51-
"import": "./dist/contracts/index.mjs",
52-
"require": "./dist/contracts/index.js"
90+
"import": {
91+
"types": "./dist/contracts/index.d.mts",
92+
"default": "./dist/contracts/index.mjs"
93+
},
94+
"require": {
95+
"types": "./dist/contracts/index.d.ts",
96+
"default": "./dist/contracts/index.js"
97+
}
5398
},
5499
"./integration": {
55-
"types": "./dist/integration/index.d.ts",
56-
"import": "./dist/integration/index.mjs",
57-
"require": "./dist/integration/index.js"
100+
"import": {
101+
"types": "./dist/integration/index.d.mts",
102+
"default": "./dist/integration/index.mjs"
103+
},
104+
"require": {
105+
"types": "./dist/integration/index.d.ts",
106+
"default": "./dist/integration/index.js"
107+
}
58108
},
59109
"./security": {
60-
"types": "./dist/security/index.d.ts",
61-
"import": "./dist/security/index.mjs",
62-
"require": "./dist/security/index.js"
110+
"import": {
111+
"types": "./dist/security/index.d.mts",
112+
"default": "./dist/security/index.mjs"
113+
},
114+
"require": {
115+
"types": "./dist/security/index.d.ts",
116+
"default": "./dist/security/index.js"
117+
}
63118
},
64119
"./studio": {
65-
"types": "./dist/studio/index.d.ts",
66-
"import": "./dist/studio/index.mjs",
67-
"require": "./dist/studio/index.js"
120+
"import": {
121+
"types": "./dist/studio/index.d.mts",
122+
"default": "./dist/studio/index.mjs"
123+
},
124+
"require": {
125+
"types": "./dist/studio/index.d.ts",
126+
"default": "./dist/studio/index.js"
127+
}
68128
},
69129
"./cloud": {
70-
"types": "./dist/cloud/index.d.ts",
71-
"import": "./dist/cloud/index.mjs",
72-
"require": "./dist/cloud/index.js"
130+
"import": {
131+
"types": "./dist/cloud/index.d.mts",
132+
"default": "./dist/cloud/index.mjs"
133+
},
134+
"require": {
135+
"types": "./dist/cloud/index.d.ts",
136+
"default": "./dist/cloud/index.js"
137+
}
73138
},
74139
"./qa": {
75-
"types": "./dist/qa/index.d.ts",
76-
"import": "./dist/qa/index.mjs",
77-
"require": "./dist/qa/index.js"
140+
"import": {
141+
"types": "./dist/qa/index.d.mts",
142+
"default": "./dist/qa/index.mjs"
143+
},
144+
"require": {
145+
"types": "./dist/qa/index.d.ts",
146+
"default": "./dist/qa/index.js"
147+
}
78148
},
79149
"./identity": {
80-
"types": "./dist/identity/index.d.ts",
81-
"import": "./dist/identity/index.mjs",
82-
"require": "./dist/identity/index.js"
150+
"import": {
151+
"types": "./dist/identity/index.d.mts",
152+
"default": "./dist/identity/index.mjs"
153+
},
154+
"require": {
155+
"types": "./dist/identity/index.d.ts",
156+
"default": "./dist/identity/index.js"
157+
}
83158
},
84159
"./shared": {
85-
"types": "./dist/shared/index.d.ts",
86-
"import": "./dist/shared/index.mjs",
87-
"require": "./dist/shared/index.js"
160+
"import": {
161+
"types": "./dist/shared/index.d.mts",
162+
"default": "./dist/shared/index.mjs"
163+
},
164+
"require": {
165+
"types": "./dist/shared/index.d.ts",
166+
"default": "./dist/shared/index.js"
167+
}
88168
},
89169
"./openapi.json": "./json-schema/openapi.json",
90170
"./package.json": "./package.json"

0 commit comments

Comments
 (0)