Skip to content

Commit 25f1beb

Browse files
li-jia-nanGerrit0
andauthored
Bump typescript to 5.3.2 (TypeStrong#2445)
* chore(deps): bump typescript to 5.3.2 * Update package-lock.json * Update package.json * Update package-lock.json * Add tests for resolution-mode * Disable formatting on prettier-unsupported files Resolves TypeStrong#2446 --------- Co-authored-by: Gerrit Birkeland <[email protected]>
1 parent aba0ef8 commit 25f1beb

File tree

14 files changed

+57
-20
lines changed

14 files changed

+57
-20
lines changed

.config/.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@
1212
../example/docs/
1313
**/tmp
1414
**/.vs
15+
16+
# Remove once Prettier has support
17+
../src/test/converter2/behavior/resolutionMode.ts

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ yarn-error.log
1212
/src/test/renderer/*/doc
1313
/src/test/renderer/testProject/json.json
1414
**/node_modules/
15+
!src/test/converter2/behavior/node_modules/
1516
/coverage/
1617
/dist/
1718
/docs

example/package-lock.json

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

example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
"react-dom": "^17.0.2"
2020
},
2121
"devDependencies": {
22-
"typescript": "^5.1.3"
22+
"typescript": "^5.3.2"
2323
}
2424
}

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"shiki": "^0.14.1"
3131
},
3232
"peerDependencies": {
33-
"typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x"
33+
"typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x"
3434
},
3535
"devDependencies": {
3636
"@types/lunr": "^2.3.5",
@@ -47,7 +47,7 @@
4747
"prettier": "3.0.3",
4848
"puppeteer": "^13.5.2",
4949
"ts-node": "^10.9.1",
50-
"typescript": "5.2.2"
50+
"typescript": "5.3.2"
5151
},
5252
"files": [
5353
"/bin",

src/test/behavior.c2.test.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -970,4 +970,10 @@ describe("Behavior Tests", () => {
970970
"asConstEnum",
971971
]);
972972
});
973+
974+
it("Respects resolution-mode when resolving types", () => {
975+
app.options.setValue("excludeExternals", false);
976+
const MergedType = query(convert("resolutionMode"), "MergedType");
977+
equal(MergedType.children?.map((child) => child.name), ["cjs", "esm"]);
978+
});
973979
});

src/test/converter2/behavior/node_modules/dual/cjs.d.ts

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

src/test/converter2/behavior/node_modules/dual/esm.d.ts

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

src/test/converter2/behavior/node_modules/dual/package.json

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

0 commit comments

Comments
 (0)