-
Notifications
You must be signed in to change notification settings - Fork 12.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix ESM/CJS resolution cache collision in non-nodenext resolution modes #60910
Open
andrewbranch
wants to merge
2
commits into
microsoft:main
Choose a base branch
from
andrewbranch:bug/60243
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+578
−1
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /index.ts(3,1): error TS1361: 'pkgRequire' cannot be used as a value because it was imported using 'import type'. | ||
| /index.ts(4,1): error TS1361: 'pkgImport' cannot be used as a value because it was imported using 'import type'. | ||
|
|
||
|
|
||
| ==== /node_modules/pkg/package.json (0 errors) ==== | ||
| { | ||
| "name": "pkg", | ||
| "version": "1.0.0", | ||
| "exports": { | ||
| ".": { | ||
| "import": "./index.mjs", | ||
| "require": "./index.js" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| ==== /node_modules/pkg/index.d.mts (0 errors) ==== | ||
| declare const _default: "esm"; | ||
| export default _default; | ||
|
|
||
| ==== /node_modules/pkg/index.d.ts (0 errors) ==== | ||
| declare const _exports: "cjs"; | ||
| export = _exports; | ||
|
|
||
| ==== /index.ts (2 errors) ==== | ||
| import type pkgRequire from "pkg" with { "resolution-mode": "require" }; | ||
| import type pkgImport from "pkg" with { "resolution-mode": "import" }; | ||
| pkgRequire; | ||
| ~~~~~~~~~~ | ||
| !!! error TS1361: 'pkgRequire' cannot be used as a value because it was imported using 'import type'. | ||
| !!! related TS1376 /index.ts:1:8: 'pkgRequire' was imported here. | ||
| pkgImport; | ||
| ~~~~~~~~~ | ||
| !!! error TS1361: 'pkgImport' cannot be used as a value because it was imported using 'import type'. | ||
| !!! related TS1376 /index.ts:2:8: 'pkgImport' was imported here. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| //// [tests/cases/conformance/moduleResolution/resolutionModeCache.ts] //// | ||
|
|
||
| === /node_modules/pkg/index.d.mts === | ||
| declare const _default: "esm"; | ||
| >_default : Symbol(_default, Decl(index.d.mts, 0, 13)) | ||
|
|
||
| export default _default; | ||
| >_default : Symbol(_default, Decl(index.d.mts, 0, 13)) | ||
|
|
||
| === /node_modules/pkg/index.d.ts === | ||
| declare const _exports: "cjs"; | ||
| >_exports : Symbol(_exports, Decl(index.d.ts, 0, 13)) | ||
|
|
||
| export = _exports; | ||
| >_exports : Symbol(_exports, Decl(index.d.ts, 0, 13)) | ||
|
|
||
| === /index.ts === | ||
| import type pkgRequire from "pkg" with { "resolution-mode": "require" }; | ||
| >pkgRequire : Symbol(pkgRequire, Decl(index.ts, 0, 6)) | ||
|
|
||
| import type pkgImport from "pkg" with { "resolution-mode": "import" }; | ||
| >pkgImport : Symbol(pkgImport, Decl(index.ts, 1, 6)) | ||
|
|
||
| pkgRequire; | ||
| >pkgRequire : Symbol(pkgRequire, Decl(index.ts, 0, 6)) | ||
|
|
||
| pkgImport; | ||
| >pkgImport : Symbol(pkgImport, Decl(index.ts, 1, 6)) | ||
|
|
112 changes: 112 additions & 0 deletions
112
tests/baselines/reference/resolutionModeCache.trace.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| [ | ||
| "Found 'package.json' at '/node_modules/pkg/package.json'.", | ||
| "======== Resolving module 'pkg' from '/index.ts'. ========", | ||
| "Explicitly specified module resolution kind: 'Bundler'.", | ||
| "Resolving in CJS mode with conditions 'require', 'types'.", | ||
| "File '/package.json' does not exist.", | ||
| "Loading module 'pkg' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.", | ||
| "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", | ||
| "File '/node_modules/pkg/package.json' exists according to earlier cached lookups.", | ||
| "Entering conditional exports.", | ||
| "Saw non-matching condition 'import'.", | ||
| "Matched 'exports' condition 'require'.", | ||
| "Using 'exports' subpath '.' with target './index.js'.", | ||
| "File name '/node_modules/pkg/index.js' has a '.js' extension - stripping it.", | ||
| "File '/node_modules/pkg/index.ts' does not exist.", | ||
| "File '/node_modules/pkg/index.tsx' does not exist.", | ||
| "File '/node_modules/pkg/index.d.ts' exists - use it as a name resolution result.", | ||
| "'package.json' does not have a 'peerDependencies' field.", | ||
| "Resolved under condition 'require'.", | ||
| "Exiting conditional exports.", | ||
| "Resolving real path for '/node_modules/pkg/index.d.ts', result '/node_modules/pkg/index.d.ts'.", | ||
| "======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/index.d.ts' with Package ID 'pkg/[email protected]'. ========", | ||
| "======== Resolving module 'pkg' from '/index.ts'. ========", | ||
| "Explicitly specified module resolution kind: 'Bundler'.", | ||
| "Resolving in CJS mode with conditions 'import', 'types'.", | ||
| "File '/package.json' does not exist according to earlier cached lookups.", | ||
| "Loading module 'pkg' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.", | ||
| "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", | ||
| "File '/node_modules/pkg/package.json' exists according to earlier cached lookups.", | ||
| "Entering conditional exports.", | ||
| "Matched 'exports' condition 'import'.", | ||
| "Using 'exports' subpath '.' with target './index.mjs'.", | ||
| "File name '/node_modules/pkg/index.mjs' has a '.mjs' extension - stripping it.", | ||
| "File '/node_modules/pkg/index.mts' does not exist.", | ||
| "File '/node_modules/pkg/index.d.mts' exists - use it as a name resolution result.", | ||
| "Resolved under condition 'import'.", | ||
| "Exiting conditional exports.", | ||
| "Resolving real path for '/node_modules/pkg/index.d.mts', result '/node_modules/pkg/index.d.mts'.", | ||
| "======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/index.d.mts' with Package ID 'pkg/[email protected]'. ========", | ||
| "======== Resolving module '@typescript/lib-es5' from '/.src/__lib_node_modules_lookup_lib.es5.d.ts__.ts'. ========", | ||
| "Explicitly specified module resolution kind: 'Node10'.", | ||
| "Loading module '@typescript/lib-es5' from 'node_modules' folder, target file types: TypeScript, Declaration.", | ||
| "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", | ||
| "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", | ||
| "Scoped package detected, looking in 'typescript__lib-es5'", | ||
| "Directory '/node_modules/@types' does not exist, skipping all lookups in it.", | ||
| "Scoped package detected, looking in 'typescript__lib-es5'", | ||
| "Loading module '@typescript/lib-es5' from 'node_modules' folder, target file types: JavaScript.", | ||
| "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", | ||
| "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", | ||
| "======== Module name '@typescript/lib-es5' was not resolved. ========", | ||
| "======== Resolving module '@typescript/lib-decorators' from '/.src/__lib_node_modules_lookup_lib.decorators.d.ts__.ts'. ========", | ||
| "Explicitly specified module resolution kind: 'Node10'.", | ||
| "Loading module '@typescript/lib-decorators' from 'node_modules' folder, target file types: TypeScript, Declaration.", | ||
| "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", | ||
| "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", | ||
| "Scoped package detected, looking in 'typescript__lib-decorators'", | ||
| "Directory '/node_modules/@types' does not exist, skipping all lookups in it.", | ||
| "Scoped package detected, looking in 'typescript__lib-decorators'", | ||
| "Loading module '@typescript/lib-decorators' from 'node_modules' folder, target file types: JavaScript.", | ||
| "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", | ||
| "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", | ||
| "======== Module name '@typescript/lib-decorators' was not resolved. ========", | ||
| "======== Resolving module '@typescript/lib-decorators/legacy' from '/.src/__lib_node_modules_lookup_lib.decorators.legacy.d.ts__.ts'. ========", | ||
| "Explicitly specified module resolution kind: 'Node10'.", | ||
| "Loading module '@typescript/lib-decorators/legacy' from 'node_modules' folder, target file types: TypeScript, Declaration.", | ||
| "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", | ||
| "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", | ||
| "Scoped package detected, looking in 'typescript__lib-decorators/legacy'", | ||
| "Directory '/node_modules/@types' does not exist, skipping all lookups in it.", | ||
| "Scoped package detected, looking in 'typescript__lib-decorators/legacy'", | ||
| "Loading module '@typescript/lib-decorators/legacy' from 'node_modules' folder, target file types: JavaScript.", | ||
| "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", | ||
| "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", | ||
| "======== Module name '@typescript/lib-decorators/legacy' was not resolved. ========", | ||
| "======== Resolving module '@typescript/lib-dom' from '/.src/__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========", | ||
| "Explicitly specified module resolution kind: 'Node10'.", | ||
| "Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: TypeScript, Declaration.", | ||
| "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", | ||
| "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", | ||
| "Scoped package detected, looking in 'typescript__lib-dom'", | ||
| "Directory '/node_modules/@types' does not exist, skipping all lookups in it.", | ||
| "Scoped package detected, looking in 'typescript__lib-dom'", | ||
| "Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: JavaScript.", | ||
| "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", | ||
| "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", | ||
| "======== Module name '@typescript/lib-dom' was not resolved. ========", | ||
| "======== Resolving module '@typescript/lib-webworker/importscripts' from '/.src/__lib_node_modules_lookup_lib.webworker.importscripts.d.ts__.ts'. ========", | ||
| "Explicitly specified module resolution kind: 'Node10'.", | ||
| "Loading module '@typescript/lib-webworker/importscripts' from 'node_modules' folder, target file types: TypeScript, Declaration.", | ||
| "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", | ||
| "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", | ||
| "Scoped package detected, looking in 'typescript__lib-webworker/importscripts'", | ||
| "Directory '/node_modules/@types' does not exist, skipping all lookups in it.", | ||
| "Scoped package detected, looking in 'typescript__lib-webworker/importscripts'", | ||
| "Loading module '@typescript/lib-webworker/importscripts' from 'node_modules' folder, target file types: JavaScript.", | ||
| "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", | ||
| "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", | ||
| "======== Module name '@typescript/lib-webworker/importscripts' was not resolved. ========", | ||
| "======== Resolving module '@typescript/lib-scripthost' from '/.src/__lib_node_modules_lookup_lib.scripthost.d.ts__.ts'. ========", | ||
| "Explicitly specified module resolution kind: 'Node10'.", | ||
| "Loading module '@typescript/lib-scripthost' from 'node_modules' folder, target file types: TypeScript, Declaration.", | ||
| "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.", | ||
| "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", | ||
| "Scoped package detected, looking in 'typescript__lib-scripthost'", | ||
| "Directory '/node_modules/@types' does not exist, skipping all lookups in it.", | ||
| "Scoped package detected, looking in 'typescript__lib-scripthost'", | ||
| "Loading module '@typescript/lib-scripthost' from 'node_modules' folder, target file types: JavaScript.", | ||
| "Searching all ancestor node_modules directories for fallback extensions: JavaScript.", | ||
| "Directory '/.src/node_modules' does not exist, skipping all lookups in it.", | ||
| "======== Module name '@typescript/lib-scripthost' was not resolved. ========" | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| //// [tests/cases/conformance/moduleResolution/resolutionModeCache.ts] //// | ||
|
|
||
| === /node_modules/pkg/index.d.mts === | ||
| declare const _default: "esm"; | ||
| >_default : "esm" | ||
| > : ^^^^^ | ||
|
|
||
| export default _default; | ||
| >_default : "esm" | ||
| > : ^^^^^ | ||
|
|
||
| === /node_modules/pkg/index.d.ts === | ||
| declare const _exports: "cjs"; | ||
| >_exports : "cjs" | ||
| > : ^^^^^ | ||
|
|
||
| export = _exports; | ||
| >_exports : "cjs" | ||
| > : ^^^^^ | ||
|
|
||
| === /index.ts === | ||
| import type pkgRequire from "pkg" with { "resolution-mode": "require" }; | ||
| >pkgRequire : any | ||
| > : ^^^ | ||
|
|
||
| import type pkgImport from "pkg" with { "resolution-mode": "import" }; | ||
| >pkgImport : any | ||
| > : ^^^ | ||
|
|
||
| pkgRequire; | ||
| >pkgRequire : "cjs" | ||
| > : ^^^^^ | ||
|
|
||
| pkgImport; | ||
| >pkgImport : "esm" | ||
| > : ^^^^^ | ||
|
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should possibly just plumb
resolutionModethrough from the top, but this should work too.EsmModeis never set outside ofnode16–nodenext; it’s only used to disable directory lookups and extension searching.conditionsis where we see the actual difference in different import modes in--moduleResolution bundler.