Skip to content

Commit 5905657

Browse files
authored
Merge pull request #193 from arethetypeswrong/typescript-5.6-rc
Update TypeScript and @types/node
2 parents 4c35b4c + 80ffb12 commit 5905657

36 files changed

+2122
-1292
lines changed

.changeset/dry-crews-raise.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@arethetypeswrong/core": patch
3+
---
4+
5+
Update TypeScript and @types/node

package.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,10 @@
1818
"devDependencies": {
1919
"@changesets/cli": "^2.27.1",
2020
"prettier": "^3.0.3",
21-
"typescript": "5.3.3"
21+
"typescript": "5.6.1-rc"
2222
},
2323
"engines": {
2424
"node": ">=18",
2525
"pnpm": ">=8"
26-
},
27-
"pnpm": {
28-
"overrides": {
29-
"ts-expose-internals-conditionally": "$typescript"
30-
}
3126
}
3227
}

packages/cli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
"devDependencies": {
4848
"@types/marked": "^5.0.0",
4949
"@types/marked-terminal": "^3.1.3",
50-
"@types/node": "^20.2.5",
50+
"@types/node": "^22.5.0",
5151
"@types/semver": "^7.5.3",
52-
"ts-expose-internals-conditionally": "1.0.0-empty.0",
52+
"ts-expose-internals": "5.6.1-rc",
5353
"typescript": "5.3.3"
5454
},
5555
"dependencies": {

packages/cli/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"compilerOptions": {
44
"module": "nodenext",
55
"rootDir": "src",
6-
"types": ["ts-expose-internals-conditionally", "node"],
6+
"types": ["node", "ts-expose-internals"],
77
"outDir": "./dist",
88
"sourceMap": true
99
},

packages/core/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@
5353
"@andrewbranch/untar.js": "^1.0.3",
5454
"fflate": "^0.8.2",
5555
"semver": "^7.5.4",
56-
"ts-expose-internals-conditionally": "1.0.0-empty.0",
57-
"typescript": "5.3.3",
56+
"typescript": "5.6.1-rc",
5857
"validate-npm-package-name": "^5.0.0"
5958
},
6059
"devDependencies": {
61-
"@types/node": "^20.8.6",
60+
"@types/node": "^22.5.0",
6261
"@types/semver": "^7.5.0",
63-
"@types/validate-npm-package-name": "^4.0.0"
62+
"@types/validate-npm-package-name": "^4.0.0",
63+
"ts-expose-internals": "5.6.1-rc"
6464
},
6565
"engines": {
6666
"node": ">=18"

packages/core/src/internal/checks/internalResolutionError.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default defineCheck({
2727
// graph for now.
2828
continue;
2929
}
30-
const resolutionMode = ts.getModeForUsageLocation(sourceFile, moduleSpecifier);
30+
const resolutionMode = ts.getModeForUsageLocation(sourceFile, moduleSpecifier, host.getCompilerOptions());
3131
const resolution = host.getResolvedModule(sourceFile, moduleSpecifier.text, resolutionMode);
3232
if (!resolution) {
3333
throw new Error(`Expected resolution for '${moduleSpecifier.text}' in ${fileName}`);

packages/core/src/internal/multiCompilerHost.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ export class CompilerHostWrapper {
7070
this.compilerHost = this.createCompilerHost(fs, this.sourceFileCache);
7171
}
7272

73+
getCompilerOptions() {
74+
return this.compilerOptions;
75+
}
76+
7377
getSourceFile(fileName: string): ts.SourceFile | undefined {
7478
return this.compilerHost.getSourceFile(fileName, this.languageVersion);
7579
}
@@ -255,7 +259,7 @@ export class CompilerHostWrapper {
255259
this.resolveModuleName(
256260
literal.text,
257261
containingFile,
258-
ts.getModeForUsageLocation(containingSourceFile, literal),
262+
ts.getModeForUsageLocation(containingSourceFile, literal, this.compilerOptions),
259263
options.noDtsResolution,
260264
).resolution,
261265
);

packages/core/test/snapshots/@apollo__client-3.7.16.tgz.json

+381-1,000
Large diffs are not rendered by default.

packages/core/test/snapshots/@[email protected]

+40-9
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
"'package.json' does not have a 'typings' field.",
3333
"'package.json' does not have a 'types' field.",
3434
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/esm/index.js'.",
35-
"File '/node_modules/@ice/app/esm/index.js' exists - use it as a name resolution result.",
36-
"File '/node_modules/@ice/app/esm/index.js' has an unsupported extension, so skipping it.",
37-
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/esm/index.js', target file types: TypeScript, Declaration.",
3835
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
3936
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
4037
"File '/node_modules/@ice/app/esm/index.tsx' does not exist.",
4138
"File '/node_modules/@ice/app/esm/index.d.ts' exists - use it as a name resolution result.",
39+
"'package.json' has a 'peerDependencies' field.",
40+
"Failed to find peerDependency 'react'.",
41+
"Failed to find peerDependency 'react-dom'.",
4242
"======== Module name '@ice/app' was successfully resolved to '/node_modules/@ice/app/esm/index.d.ts' with Package ID '@ice/app/esm/[email protected]'. ========"
4343
]
4444
},
@@ -56,8 +56,9 @@
5656
"File '/node_modules/@ice/app.tsx' does not exist.",
5757
"'package.json' does not have a 'typesVersions' field.",
5858
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/esm/index.js'.",
59-
"File '/node_modules/@ice/app/esm/index.js' exists - use it as a name resolution result.",
60-
"File '/node_modules/@ice/app/esm/index.js' has an unsupported extension, so skipping it.",
59+
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
60+
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
61+
"File '/node_modules/@ice/app/esm/index.tsx' does not exist.",
6162
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/esm/index.js', target file types: TypeScript.",
6263
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
6364
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
@@ -73,7 +74,19 @@
7374
"File '/node_modules/@ice/app.js' does not exist.",
7475
"File '/node_modules/@ice/app.jsx' does not exist.",
7576
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/esm/index.js'.",
77+
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
7678
"File '/node_modules/@ice/app/esm/index.js' exists - use it as a name resolution result.",
79+
"'package.json' has a 'peerDependencies' field.",
80+
"Failed to find peerDependency 'react'.",
81+
"Failed to find peerDependency 'react-dom'.",
82+
"Resolution of non-relative name failed; trying with '--moduleResolution bundler' to see if project may need configuration update.",
83+
"Loading module '@ice/app' from 'node_modules' folder, target file types: TypeScript.",
84+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript.",
85+
"File '/node_modules/@ice/app/package.json' exists according to earlier cached lookups.",
86+
"Using 'exports' subpath '.' with target './esm/index.js'.",
87+
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
88+
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
89+
"File '/node_modules/@ice/app/esm/index.tsx' does not exist.",
7790
"======== Module name '@ice/app' was successfully resolved to '/node_modules/@ice/app/esm/index.js' with Package ID '@ice/app/esm/[email protected]'. ========"
7891
]
7992
},
@@ -113,6 +126,9 @@
113126
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
114127
"File '/node_modules/@ice/app/esm/index.tsx' does not exist.",
115128
"File '/node_modules/@ice/app/esm/index.d.ts' exists - use it as a name resolution result.",
129+
"'package.json' has a 'peerDependencies' field.",
130+
"Failed to find peerDependency 'react'.",
131+
"Failed to find peerDependency 'react-dom'.",
116132
"======== Module name '@ice/app' was successfully resolved to '/node_modules/@ice/app/esm/index.d.ts' with Package ID '@ice/app/esm/[email protected]'. ========"
117133
]
118134
},
@@ -137,6 +153,9 @@
137153
"Using 'exports' subpath '.' with target './esm/index.js'.",
138154
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
139155
"File '/node_modules/@ice/app/esm/index.js' exists - use it as a name resolution result.",
156+
"'package.json' has a 'peerDependencies' field.",
157+
"Failed to find peerDependency 'react'.",
158+
"Failed to find peerDependency 'react-dom'.",
140159
"======== Module name '@ice/app' was successfully resolved to '/node_modules/@ice/app/esm/index.js' with Package ID '@ice/app/esm/[email protected]'. ========"
141160
]
142161
},
@@ -207,8 +226,9 @@
207226
"File '/node_modules/@ice/app/package.json' exists according to earlier cached lookups.",
208227
"'package.json' does not have a 'typesVersions' field.",
209228
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/esm/index.js'.",
210-
"File '/node_modules/@ice/app/esm/index.js' exists - use it as a name resolution result.",
211-
"File '/node_modules/@ice/app/esm/index.js' has an unsupported extension, so skipping it.",
229+
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
230+
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
231+
"File '/node_modules/@ice/app/esm/index.tsx' does not exist.",
212232
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/esm/index.js', target file types: TypeScript.",
213233
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
214234
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
@@ -252,6 +272,9 @@
252272
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
253273
"File '/node_modules/@ice/app/esm/index.tsx' does not exist.",
254274
"File '/node_modules/@ice/app/esm/index.d.ts' exists - use it as a name resolution result.",
275+
"'package.json' has a 'peerDependencies' field.",
276+
"Failed to find peerDependency 'react'.",
277+
"Failed to find peerDependency 'react-dom'.",
255278
"======== Module name '@ice/app' was successfully resolved to '/node_modules/@ice/app/esm/index.d.ts' with Package ID '@ice/app/esm/[email protected]'. ========"
256279
]
257280
},
@@ -276,6 +299,9 @@
276299
"Using 'exports' subpath '.' with target './esm/index.js'.",
277300
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
278301
"File '/node_modules/@ice/app/esm/index.js' exists - use it as a name resolution result.",
302+
"'package.json' has a 'peerDependencies' field.",
303+
"Failed to find peerDependency 'react'.",
304+
"Failed to find peerDependency 'react-dom'.",
279305
"Resolution of non-relative name failed; trying with modern Node resolution features disabled to see if npm library needs configuration update.",
280306
"File '/package.json' does not exist according to earlier cached lookups.",
281307
"Loading module '@ice/app' from 'node_modules' folder, target file types: TypeScript.",
@@ -285,8 +311,9 @@
285311
"File '/node_modules/@ice/app.tsx' does not exist.",
286312
"'package.json' does not have a 'typesVersions' field.",
287313
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/esm/index.js'.",
288-
"File '/node_modules/@ice/app/esm/index.js' exists - use it as a name resolution result.",
289-
"File '/node_modules/@ice/app/esm/index.js' has an unsupported extension, so skipping it.",
314+
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
315+
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
316+
"File '/node_modules/@ice/app/esm/index.tsx' does not exist.",
290317
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/esm/index.js', target file types: TypeScript.",
291318
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
292319
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
@@ -466,6 +493,7 @@
466493
"Searching all ancestor node_modules directories for preferred extensions: TypeScript.",
467494
"File '/node_modules/@ice/app/package.json' exists according to earlier cached lookups.",
468495
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/types/esm/index.js'.",
496+
"File name '/node_modules/@ice/app/types/esm/index.js' has a '.js' extension - stripping it.",
469497
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/types/esm/index.js', target file types: TypeScript.",
470498
"File name '/node_modules/@ice/app/types/esm/index.js' has a '.js' extension - stripping it.",
471499
"======== Module name '@ice/app/types' was successfully resolved to '/node_modules/@ice/app/esm/types/index.js' with Package ID '@ice/app/esm/types/[email protected]'. ========"
@@ -537,6 +565,7 @@
537565
"File '/node_modules/@ice/app/types.ts' does not exist.",
538566
"File '/node_modules/@ice/app/types.tsx' does not exist.",
539567
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/types/esm/index.js'.",
568+
"File name '/node_modules/@ice/app/types/esm/index.js' has a '.js' extension - stripping it.",
540569
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/types/esm/index.js', target file types: TypeScript.",
541570
"File name '/node_modules/@ice/app/types/esm/index.js' has a '.js' extension - stripping it.",
542571
"======== Module name '@ice/app/types' was successfully resolved to '/node_modules/@ice/app/esm/types/index.js' with Package ID '@ice/app/esm/types/[email protected]'. ========"
@@ -675,6 +704,7 @@
675704
"Searching all ancestor node_modules directories for preferred extensions: TypeScript.",
676705
"File '/node_modules/@ice/app/package.json' exists according to earlier cached lookups.",
677706
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/analyze/esm/index.js'.",
707+
"File name '/node_modules/@ice/app/analyze/esm/index.js' has a '.js' extension - stripping it.",
678708
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/analyze/esm/index.js', target file types: TypeScript.",
679709
"File name '/node_modules/@ice/app/analyze/esm/index.js' has a '.js' extension - stripping it.",
680710
"======== Module name '@ice/app/analyze' was successfully resolved to '/node_modules/@ice/app/esm/service/analyze.js' with Package ID '@ice/app/esm/service/[email protected]'. ========"
@@ -740,6 +770,7 @@
740770
"File '/node_modules/@ice/app/analyze.ts' does not exist.",
741771
"File '/node_modules/@ice/app/analyze.tsx' does not exist.",
742772
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/analyze/esm/index.js'.",
773+
"File name '/node_modules/@ice/app/analyze/esm/index.js' has a '.js' extension - stripping it.",
743774
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/analyze/esm/index.js', target file types: TypeScript.",
744775
"File name '/node_modules/@ice/app/analyze/esm/index.js' has a '.js' extension - stripping it.",
745776
"======== Module name '@ice/app/analyze' was successfully resolved to '/node_modules/@ice/app/esm/service/analyze.js' with Package ID '@ice/app/esm/service/[email protected]'. ========"

0 commit comments

Comments
 (0)