Skip to content

Commit

Permalink
Merge pull request #193 from arethetypeswrong/typescript-5.6-rc
Browse files Browse the repository at this point in the history 
Update TypeScript and @types/node
  • Loading branch information
@andrewbranch
andrewbranch authored Aug 26, 2024
2 parents 4c35b4c + 80ffb12 commit 5905657
Show file tree
Hide file tree
Showing 36 changed files with 2,122 additions and 1,292 deletions.
5 changes: 5 additions & 0 deletions .changeset/dry-crews-raise.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@arethetypeswrong/core": patch
---

Update TypeScript and @types/node
7 changes: 1 addition & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,10 @@
"devDependencies": {
"@changesets/cli": "^2.27.1",
"prettier": "^3.0.3",
"typescript": "5.3.3"
"typescript": "5.6.1-rc"
},
"engines": {
"node": ">=18",
"pnpm": ">=8"
},
"pnpm": {
"overrides": {
"ts-expose-internals-conditionally": "$typescript"
}
}
}
4 changes: 2 additions & 2 deletions packages/cli/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
"devDependencies": {
"@types/marked": "^5.0.0",
"@types/marked-terminal": "^3.1.3",
"@types/node": "^20.2.5",
"@types/node": "^22.5.0",
"@types/semver": "^7.5.3",
"ts-expose-internals-conditionally": "1.0.0-empty.0",
"ts-expose-internals": "5.6.1-rc",
"typescript": "5.3.3"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"compilerOptions": {
"module": "nodenext",
"rootDir": "src",
"types": ["ts-expose-internals-conditionally", "node"],
"types": ["node", "ts-expose-internals"],
"outDir": "./dist",
"sourceMap": true
},
Expand Down
8 changes: 4 additions & 4 deletions packages/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@
"@andrewbranch/untar.js": "^1.0.3",
"fflate": "^0.8.2",
"semver": "^7.5.4",
"ts-expose-internals-conditionally": "1.0.0-empty.0",
"typescript": "5.3.3",
"typescript": "5.6.1-rc",
"validate-npm-package-name": "^5.0.0"
},
"devDependencies": {
"@types/node": "^20.8.6",
"@types/node": "^22.5.0",
"@types/semver": "^7.5.0",
"@types/validate-npm-package-name": "^4.0.0"
"@types/validate-npm-package-name": "^4.0.0",
"ts-expose-internals": "5.6.1-rc"
},
"engines": {
"node": ">=18"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/internal/checks/internalResolutionError.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default defineCheck({
// graph for now.
continue;
}
const resolutionMode = ts.getModeForUsageLocation(sourceFile, moduleSpecifier);
const resolutionMode = ts.getModeForUsageLocation(sourceFile, moduleSpecifier, host.getCompilerOptions());
const resolution = host.getResolvedModule(sourceFile, moduleSpecifier.text, resolutionMode);
if (!resolution) {
throw new Error(`Expected resolution for '${moduleSpecifier.text}' in ${fileName}`);
Expand Down
6 changes: 5 additions & 1 deletion packages/core/src/internal/multiCompilerHost.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ export class CompilerHostWrapper {
this.compilerHost = this.createCompilerHost(fs, this.sourceFileCache);
}

getCompilerOptions() {
return this.compilerOptions;
}

getSourceFile(fileName: string): ts.SourceFile | undefined {
return this.compilerHost.getSourceFile(fileName, this.languageVersion);
}
Expand Down Expand Up @@ -255,7 +259,7 @@ export class CompilerHostWrapper {
this.resolveModuleName(
literal.text,
containingFile,
ts.getModeForUsageLocation(containingSourceFile, literal),
ts.getModeForUsageLocation(containingSourceFile, literal, this.compilerOptions),
options.noDtsResolution,
).resolution,
);
Expand Down
1,381 changes: 381 additions & 1,000 deletions packages/core/test/snapshots/@apollo__client-3.7.16.tgz.json
View file

Large diffs are not rendered by default.

49 changes: 40 additions & 9 deletions packages/core/test/snapshots/@ice__app@3.2.6.tgz.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
"'package.json' does not have a 'typings' field.",
"'package.json' does not have a 'types' field.",
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/esm/index.js'.",
"File '/node_modules/@ice/app/esm/index.js' exists - use it as a name resolution result.",
"File '/node_modules/@ice/app/esm/index.js' has an unsupported extension, so skipping it.",
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/esm/index.js', target file types: TypeScript, Declaration.",
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
"File '/node_modules/@ice/app/esm/index.tsx' does not exist.",
"File '/node_modules/@ice/app/esm/index.d.ts' exists - use it as a name resolution result.",
"'package.json' has a 'peerDependencies' field.",
"Failed to find peerDependency 'react'.",
"Failed to find peerDependency 'react-dom'.",
"======== Module name '@ice/app' was successfully resolved to '/node_modules/@ice/app/esm/index.d.ts' with Package ID '@ice/app/esm/index.d.ts@3.2.6'. ========"
]
},
Expand All @@ -56,8 +56,9 @@
"File '/node_modules/@ice/app.tsx' does not exist.",
"'package.json' does not have a 'typesVersions' field.",
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/esm/index.js'.",
"File '/node_modules/@ice/app/esm/index.js' exists - use it as a name resolution result.",
"File '/node_modules/@ice/app/esm/index.js' has an unsupported extension, so skipping it.",
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
"File '/node_modules/@ice/app/esm/index.tsx' does not exist.",
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/esm/index.js', target file types: TypeScript.",
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
Expand All @@ -73,7 +74,19 @@
"File '/node_modules/@ice/app.js' does not exist.",
"File '/node_modules/@ice/app.jsx' does not exist.",
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/esm/index.js'.",
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
"File '/node_modules/@ice/app/esm/index.js' exists - use it as a name resolution result.",
"'package.json' has a 'peerDependencies' field.",
"Failed to find peerDependency 'react'.",
"Failed to find peerDependency 'react-dom'.",
"Resolution of non-relative name failed; trying with '--moduleResolution bundler' to see if project may need configuration update.",
"Loading module '@ice/app' from 'node_modules' folder, target file types: TypeScript.",
"Searching all ancestor node_modules directories for preferred extensions: TypeScript.",
"File '/node_modules/@ice/app/package.json' exists according to earlier cached lookups.",
"Using 'exports' subpath '.' with target './esm/index.js'.",
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
"File '/node_modules/@ice/app/esm/index.tsx' does not exist.",
"======== Module name '@ice/app' was successfully resolved to '/node_modules/@ice/app/esm/index.js' with Package ID '@ice/app/esm/index.js@3.2.6'. ========"
]
},
Expand Down Expand Up @@ -113,6 +126,9 @@
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
"File '/node_modules/@ice/app/esm/index.tsx' does not exist.",
"File '/node_modules/@ice/app/esm/index.d.ts' exists - use it as a name resolution result.",
"'package.json' has a 'peerDependencies' field.",
"Failed to find peerDependency 'react'.",
"Failed to find peerDependency 'react-dom'.",
"======== Module name '@ice/app' was successfully resolved to '/node_modules/@ice/app/esm/index.d.ts' with Package ID '@ice/app/esm/index.d.ts@3.2.6'. ========"
]
},
Expand All @@ -137,6 +153,9 @@
"Using 'exports' subpath '.' with target './esm/index.js'.",
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
"File '/node_modules/@ice/app/esm/index.js' exists - use it as a name resolution result.",
"'package.json' has a 'peerDependencies' field.",
"Failed to find peerDependency 'react'.",
"Failed to find peerDependency 'react-dom'.",
"======== Module name '@ice/app' was successfully resolved to '/node_modules/@ice/app/esm/index.js' with Package ID '@ice/app/esm/index.js@3.2.6'. ========"
]
},
Expand Down Expand Up @@ -207,8 +226,9 @@
"File '/node_modules/@ice/app/package.json' exists according to earlier cached lookups.",
"'package.json' does not have a 'typesVersions' field.",
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/esm/index.js'.",
"File '/node_modules/@ice/app/esm/index.js' exists - use it as a name resolution result.",
"File '/node_modules/@ice/app/esm/index.js' has an unsupported extension, so skipping it.",
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
"File '/node_modules/@ice/app/esm/index.tsx' does not exist.",
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/esm/index.js', target file types: TypeScript.",
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
Expand Down Expand Up @@ -252,6 +272,9 @@
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
"File '/node_modules/@ice/app/esm/index.tsx' does not exist.",
"File '/node_modules/@ice/app/esm/index.d.ts' exists - use it as a name resolution result.",
"'package.json' has a 'peerDependencies' field.",
"Failed to find peerDependency 'react'.",
"Failed to find peerDependency 'react-dom'.",
"======== Module name '@ice/app' was successfully resolved to '/node_modules/@ice/app/esm/index.d.ts' with Package ID '@ice/app/esm/index.d.ts@3.2.6'. ========"
]
},
Expand All @@ -276,6 +299,9 @@
"Using 'exports' subpath '.' with target './esm/index.js'.",
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
"File '/node_modules/@ice/app/esm/index.js' exists - use it as a name resolution result.",
"'package.json' has a 'peerDependencies' field.",
"Failed to find peerDependency 'react'.",
"Failed to find peerDependency 'react-dom'.",
"Resolution of non-relative name failed; trying with modern Node resolution features disabled to see if npm library needs configuration update.",
"File '/package.json' does not exist according to earlier cached lookups.",
"Loading module '@ice/app' from 'node_modules' folder, target file types: TypeScript.",
Expand All @@ -285,8 +311,9 @@
"File '/node_modules/@ice/app.tsx' does not exist.",
"'package.json' does not have a 'typesVersions' field.",
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/esm/index.js'.",
"File '/node_modules/@ice/app/esm/index.js' exists - use it as a name resolution result.",
"File '/node_modules/@ice/app/esm/index.js' has an unsupported extension, so skipping it.",
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
"File '/node_modules/@ice/app/esm/index.tsx' does not exist.",
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/esm/index.js', target file types: TypeScript.",
"File name '/node_modules/@ice/app/esm/index.js' has a '.js' extension - stripping it.",
"File '/node_modules/@ice/app/esm/index.ts' does not exist.",
Expand Down Expand Up @@ -466,6 +493,7 @@
"Searching all ancestor node_modules directories for preferred extensions: TypeScript.",
"File '/node_modules/@ice/app/package.json' exists according to earlier cached lookups.",
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/types/esm/index.js'.",
"File name '/node_modules/@ice/app/types/esm/index.js' has a '.js' extension - stripping it.",
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/types/esm/index.js', target file types: TypeScript.",
"File name '/node_modules/@ice/app/types/esm/index.js' has a '.js' extension - stripping it.",
"======== Module name '@ice/app/types' was successfully resolved to '/node_modules/@ice/app/esm/types/index.js' with Package ID '@ice/app/esm/types/index.js@3.2.6'. ========"
Expand Down Expand Up @@ -537,6 +565,7 @@
"File '/node_modules/@ice/app/types.ts' does not exist.",
"File '/node_modules/@ice/app/types.tsx' does not exist.",
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/types/esm/index.js'.",
"File name '/node_modules/@ice/app/types/esm/index.js' has a '.js' extension - stripping it.",
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/types/esm/index.js', target file types: TypeScript.",
"File name '/node_modules/@ice/app/types/esm/index.js' has a '.js' extension - stripping it.",
"======== Module name '@ice/app/types' was successfully resolved to '/node_modules/@ice/app/esm/types/index.js' with Package ID '@ice/app/esm/types/index.js@3.2.6'. ========"
Expand Down Expand Up @@ -675,6 +704,7 @@
"Searching all ancestor node_modules directories for preferred extensions: TypeScript.",
"File '/node_modules/@ice/app/package.json' exists according to earlier cached lookups.",
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/analyze/esm/index.js'.",
"File name '/node_modules/@ice/app/analyze/esm/index.js' has a '.js' extension - stripping it.",
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/analyze/esm/index.js', target file types: TypeScript.",
"File name '/node_modules/@ice/app/analyze/esm/index.js' has a '.js' extension - stripping it.",
"======== Module name '@ice/app/analyze' was successfully resolved to '/node_modules/@ice/app/esm/service/analyze.js' with Package ID '@ice/app/esm/service/analyze.js@3.2.6'. ========"
Expand Down Expand Up @@ -740,6 +770,7 @@
"File '/node_modules/@ice/app/analyze.ts' does not exist.",
"File '/node_modules/@ice/app/analyze.tsx' does not exist.",
"'package.json' has 'main' field './esm/index.js' that references '/node_modules/@ice/app/analyze/esm/index.js'.",
"File name '/node_modules/@ice/app/analyze/esm/index.js' has a '.js' extension - stripping it.",
"Loading module as file / folder, candidate module location '/node_modules/@ice/app/analyze/esm/index.js', target file types: TypeScript.",
"File name '/node_modules/@ice/app/analyze/esm/index.js' has a '.js' extension - stripping it.",
"======== Module name '@ice/app/analyze' was successfully resolved to '/node_modules/@ice/app/esm/service/analyze.js' with Package ID '@ice/app/esm/service/analyze.js@3.2.6'. ========"
Expand Down
Loading

0 comments on commit 5905657

Please sign in to comment.