diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 58affcfdb13ee..3cc1633da66a8 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -2884,9 +2884,9 @@ namespace ts { } function pathForLibFile(libFileName: string): string { - // Support resolving to lib.dom.d.ts -> @typescript/dom, and - // lib.dom.iterable.d.ts -> @typescript/dom/iterable - // lib.es2015.symbol.wellknown.d.ts -> @typescript/es2015/symbol-wellknown + // Support resolving to lib.dom.d.ts -> @typescript/lib-dom, and + // lib.dom.iterable.d.ts -> @typescript/lib-dom/iterable + // lib.es2015.symbol.wellknown.d.ts -> @typescript/lib-es2015/symbol-wellknown const components = libFileName.split("."); let path = components[1]; let i = 2; @@ -2895,7 +2895,7 @@ namespace ts { i++; } const resolveFrom = combinePaths(currentDirectory, `__lib_node_modules_lookup_${libFileName}__.ts`); - const localOverrideModuleResult = resolveModuleName("@typescript/" + path, resolveFrom, { moduleResolution: ModuleResolutionKind.NodeJs }, host, moduleResolutionCache); + const localOverrideModuleResult = resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: ModuleResolutionKind.NodeJs }, host, moduleResolutionCache); if (localOverrideModuleResult?.resolvedModule) { return localOverrideModuleResult.resolvedModule.resolvedFileName; } diff --git a/tests/baselines/reference/libTypeScriptOverrideSimple.errors.txt b/tests/baselines/reference/libTypeScriptOverrideSimple.errors.txt index cf5912eb2769d..d3df9a12384ea 100644 --- a/tests/baselines/reference/libTypeScriptOverrideSimple.errors.txt +++ b/tests/baselines/reference/libTypeScriptOverrideSimple.errors.txt @@ -1,7 +1,7 @@ tests/cases/compiler/index.ts(6,1): error TS2304: Cannot find name 'window'. -==== /node_modules/@typescript/dom/index.d.ts (0 errors) ==== +==== /node_modules/@typescript/lib-dom/index.d.ts (0 errors) ==== interface ABC { abc: string } ==== tests/cases/compiler/index.ts (1 errors) ==== /// diff --git a/tests/baselines/reference/libTypeScriptOverrideSimple.symbols b/tests/baselines/reference/libTypeScriptOverrideSimple.symbols index 37c7ca70cbe8d..55dc71991e377 100644 --- a/tests/baselines/reference/libTypeScriptOverrideSimple.symbols +++ b/tests/baselines/reference/libTypeScriptOverrideSimple.symbols @@ -1,4 +1,4 @@ -=== /node_modules/@typescript/dom/index.d.ts === +=== /node_modules/@typescript/lib-dom/index.d.ts === interface ABC { abc: string } >ABC : Symbol(ABC, Decl(index.d.ts, 0, 0)) >abc : Symbol(ABC.abc, Decl(index.d.ts, 0, 15)) diff --git a/tests/baselines/reference/libTypeScriptOverrideSimple.types b/tests/baselines/reference/libTypeScriptOverrideSimple.types index 65a28d7093d1d..6f219d1babbab 100644 --- a/tests/baselines/reference/libTypeScriptOverrideSimple.types +++ b/tests/baselines/reference/libTypeScriptOverrideSimple.types @@ -1,4 +1,4 @@ -=== /node_modules/@typescript/dom/index.d.ts === +=== /node_modules/@typescript/lib-dom/index.d.ts === interface ABC { abc: string } >abc : string diff --git a/tests/baselines/reference/libTypeScriptSubfileResolving.errors.txt b/tests/baselines/reference/libTypeScriptSubfileResolving.errors.txt index b2f731e2897da..cd4b7867174c1 100644 --- a/tests/baselines/reference/libTypeScriptSubfileResolving.errors.txt +++ b/tests/baselines/reference/libTypeScriptSubfileResolving.errors.txt @@ -1,9 +1,9 @@ tests/cases/compiler/index.ts(6,1): error TS2304: Cannot find name 'window'. -==== /node_modules/@typescript/dom/index.d.ts (0 errors) ==== +==== /node_modules/@typescript/lib-dom/index.d.ts (0 errors) ==== // NOOP -==== /node_modules/@typescript/dom/iterable.d.ts (0 errors) ==== +==== /node_modules/@typescript/lib-dom/iterable.d.ts (0 errors) ==== interface DOMIterable { abc: string } ==== tests/cases/compiler/index.ts (1 errors) ==== /// diff --git a/tests/baselines/reference/libTypeScriptSubfileResolving.symbols b/tests/baselines/reference/libTypeScriptSubfileResolving.symbols index 3bde25ae5b7e2..dce0e21d6a371 100644 --- a/tests/baselines/reference/libTypeScriptSubfileResolving.symbols +++ b/tests/baselines/reference/libTypeScriptSubfileResolving.symbols @@ -1,6 +1,6 @@ -=== /node_modules/@typescript/dom/index.d.ts === +=== /node_modules/@typescript/lib-dom/index.d.ts === // NOOP -No type information for this code.=== /node_modules/@typescript/dom/iterable.d.ts === +No type information for this code.=== /node_modules/@typescript/lib-dom/iterable.d.ts === interface DOMIterable { abc: string } >DOMIterable : Symbol(DOMIterable, Decl(iterable.d.ts, 0, 0)) >abc : Symbol(DOMIterable.abc, Decl(iterable.d.ts, 0, 23)) diff --git a/tests/baselines/reference/libTypeScriptSubfileResolving.types b/tests/baselines/reference/libTypeScriptSubfileResolving.types index 7fe3c02924cbc..73bd9f87814d1 100644 --- a/tests/baselines/reference/libTypeScriptSubfileResolving.types +++ b/tests/baselines/reference/libTypeScriptSubfileResolving.types @@ -1,6 +1,6 @@ -=== /node_modules/@typescript/dom/index.d.ts === +=== /node_modules/@typescript/lib-dom/index.d.ts === // NOOP -No type information for this code.=== /node_modules/@typescript/dom/iterable.d.ts === +No type information for this code.=== /node_modules/@typescript/lib-dom/iterable.d.ts === interface DOMIterable { abc: string } >abc : string diff --git a/tests/cases/compiler/libTypeScriptOverrideSimple.ts b/tests/cases/compiler/libTypeScriptOverrideSimple.ts index 4ba67cd0c0181..6b6ec82573aa8 100644 --- a/tests/cases/compiler/libTypeScriptOverrideSimple.ts +++ b/tests/cases/compiler/libTypeScriptOverrideSimple.ts @@ -1,4 +1,4 @@ -// @Filename: /node_modules/@typescript/dom/index.d.ts +// @Filename: /node_modules/@typescript/lib-dom/index.d.ts interface ABC { abc: string } // @Filename: index.ts /// diff --git a/tests/cases/compiler/libTypeScriptSubfileResolving.ts b/tests/cases/compiler/libTypeScriptSubfileResolving.ts index 901d86a236aba..6fe8f95b10774 100644 --- a/tests/cases/compiler/libTypeScriptSubfileResolving.ts +++ b/tests/cases/compiler/libTypeScriptSubfileResolving.ts @@ -1,6 +1,6 @@ -// @Filename: /node_modules/@typescript/dom/index.d.ts +// @Filename: /node_modules/@typescript/lib-dom/index.d.ts // NOOP -// @Filename: /node_modules/@typescript/dom/iterable.d.ts +// @Filename: /node_modules/@typescript/lib-dom/iterable.d.ts interface DOMIterable { abc: string } // @Filename: index.ts ///