🤖 Pick PR microsoft#58831 (Disable microsoft#57896 (Respect package.jso...) into release-5.5 (microsoft#58848)

Co-authored-by: Andrew Branch <[email protected]>
Co-authored-by: Andrew Branch <[email protected]>

Author: TypeScript Bot

src/compiler/program.ts

@@ -1389,10 +1389,16 @@ export function getImpliedNodeFormatForFileWorker(
     host: ModuleResolutionHost,
     options: CompilerOptions,
 ) {
-    return fileExtensionIsOneOf(fileName, [Extension.Dmts, Extension.Mts, Extension.Mjs]) ? ModuleKind.ESNext :
-        fileExtensionIsOneOf(fileName, [Extension.Dcts, Extension.Cts, Extension.Cjs]) ? ModuleKind.CommonJS :
-        fileExtensionIsOneOf(fileName, [Extension.Dts, Extension.Ts, Extension.Tsx, Extension.Js, Extension.Jsx]) ? lookupFromPackageJson() :
-        undefined; // other extensions, like `json` or `tsbuildinfo`, are set as `undefined` here but they should never be fed through the transformer pipeline
+    switch (getEmitModuleResolutionKind(options)) {
+        case ModuleResolutionKind.Node16:
+        case ModuleResolutionKind.NodeNext:
+            return fileExtensionIsOneOf(fileName, [Extension.Dmts, Extension.Mts, Extension.Mjs]) ? ModuleKind.ESNext :
+                fileExtensionIsOneOf(fileName, [Extension.Dcts, Extension.Cts, Extension.Cjs]) ? ModuleKind.CommonJS :
+                fileExtensionIsOneOf(fileName, [Extension.Dts, Extension.Ts, Extension.Tsx, Extension.Js, Extension.Jsx]) ? lookupFromPackageJson() :
+                undefined; // other extensions, like `json` or `tsbuildinfo`, are set as `undefined` here but they should never be fed through the transformer pipeline
+        default:
+            return undefined;
+    }
 
     function lookupFromPackageJson(): Partial<CreateSourceFileOptions> {
         const state = getTemporaryModuleResolutionState(packageJsonInfoCache, host, options);

src/testRunner/unittests/tscWatch/incremental.ts

@@ -178,19 +178,19 @@ describe("unittests:: tsc-watch:: emit file --incremental", () => {
                     version: system.createHash(libFile.content),
                     signature: system.createHash(libFile.content),
                     affectsGlobalScope: true,
-                    impliedFormat: ts.ModuleKind.CommonJS,
+                    impliedFormat: undefined,
                 });
                 assert.deepEqual(state.fileInfos.get(file1.path as ts.Path), {
                     version: system.createHash(file1.content),
                     signature: system.createHash(file1.content),
                     affectsGlobalScope: undefined,
-                    impliedFormat: ts.ModuleKind.CommonJS,
+                    impliedFormat: undefined,
                 });
                 assert.deepEqual(state.fileInfos.get(file2.path as ts.Path), {
                     version: system.createHash(fileModified.content),
                     signature: system.createHash(fileModified.content),
                     affectsGlobalScope: undefined,
-                    impliedFormat: ts.ModuleKind.CommonJS,
+                    impliedFormat: undefined,
                 });
 
                 assert.deepEqual(state.compilerOptions, {

tests/baselines/reference/allowJsCrossMonorepoPackage.trace.json

@@ -1,9 +1,8 @@
 [
-    "Found 'package.json' at '/packages/main/package.json'.",
     "======== Resolving module 'shared' from '/packages/main/index.ts'. ========",
     "Explicitly specified module resolution kind: 'Bundler'.",
     "Resolving in CJS mode with conditions 'import', 'types'.",
-    "File '/packages/main/package.json' exists according to earlier cached lookups.",
+    "Found 'package.json' at '/packages/main/package.json'.",
     "Loading module 'shared' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.",
     "Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
     "Found 'package.json' at '/packages/main/node_modules/shared/package.json'.",
@@ -47,7 +46,6 @@
     "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
     "Resolving real path for '/packages/main/node_modules/shared/index.js', result '/packages/shared/index.js'.",
     "======== Module name 'shared' was successfully resolved to '/packages/shared/index.js' with Package ID 'shared/[email protected]'. ========",
-    "Found 'package.json' at '/packages/shared/package.json'.",
     "======== Resolving module './utils.js' from '/packages/shared/index.js'. ========",
     "Explicitly specified module resolution kind: 'Bundler'.",
     "Resolving in CJS mode with conditions 'import', 'types'.",
@@ -58,11 +56,10 @@
     "File '/packages/shared/utils.d.ts' does not exist.",
     "File '/packages/shared/utils.js' exists - use it as a name resolution result.",
     "======== Module name './utils.js' was successfully resolved to '/packages/shared/utils.js'. ========",
-    "File '/packages/shared/package.json' exists according to earlier cached lookups.",
     "======== Resolving module 'pkg' from '/packages/shared/utils.js'. ========",
     "Explicitly specified module resolution kind: 'Bundler'.",
     "Resolving in CJS mode with conditions 'import', 'types'.",
-    "File '/packages/shared/package.json' exists according to earlier cached lookups.",
+    "Found 'package.json' at '/packages/shared/package.json'.",
     "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.",
     "Directory '/packages/shared/node_modules' does not exist, skipping all lookups in it.",
@@ -76,11 +73,6 @@
     "File '/node_modules/pkg/index.d.ts' exists - use it as a name resolution result.",
     "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'. ========",
-    "File '/node_modules/pkg/package.json' does not exist according to earlier cached lookups.",
-    "File '/node_modules/package.json' does not exist.",
-    "File '/package.json' does not exist.",
-    "File '/.ts/package.json' does not exist.",
-    "File '/package.json' does not exist according to earlier cached lookups.",
     "======== Resolving module '@typescript/lib-es5' from '/packages/main/__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.",
@@ -95,8 +87,6 @@
     "Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
     "Directory '/packages/node_modules' does not exist, skipping all lookups in it.",
     "======== Module name '@typescript/lib-es5' was not resolved. ========",
-    "File '/.ts/package.json' does not exist according to earlier cached lookups.",
-    "File '/package.json' does not exist according to earlier cached lookups.",
     "======== Resolving module '@typescript/lib-decorators' from '/packages/main/__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.",
@@ -111,8 +101,6 @@
     "Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
     "Directory '/packages/node_modules' does not exist, skipping all lookups in it.",
     "======== Module name '@typescript/lib-decorators' was not resolved. ========",
-    "File '/.ts/package.json' does not exist according to earlier cached lookups.",
-    "File '/package.json' does not exist according to earlier cached lookups.",
     "======== Resolving module '@typescript/lib-decorators/legacy' from '/packages/main/__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.",
@@ -127,8 +115,6 @@
     "Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
     "Directory '/packages/node_modules' does not exist, skipping all lookups in it.",
     "======== Module name '@typescript/lib-decorators/legacy' was not resolved. ========",
-    "File '/.ts/package.json' does not exist according to earlier cached lookups.",
-    "File '/package.json' does not exist according to earlier cached lookups.",
     "======== Resolving module '@typescript/lib-dom' from '/packages/main/__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.",
@@ -143,8 +129,6 @@
     "Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
     "Directory '/packages/node_modules' does not exist, skipping all lookups in it.",
     "======== Module name '@typescript/lib-dom' was not resolved. ========",
-    "File '/.ts/package.json' does not exist according to earlier cached lookups.",
-    "File '/package.json' does not exist according to earlier cached lookups.",
     "======== Resolving module '@typescript/lib-webworker/importscripts' from '/packages/main/__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.",
@@ -159,8 +143,6 @@
     "Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
     "Directory '/packages/node_modules' does not exist, skipping all lookups in it.",
     "======== Module name '@typescript/lib-webworker/importscripts' was not resolved. ========",
-    "File '/.ts/package.json' does not exist according to earlier cached lookups.",
-    "File '/package.json' does not exist according to earlier cached lookups.",
     "======== Resolving module '@typescript/lib-scripthost' from '/packages/main/__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.",
@@ -174,7 +156,5 @@
     "Loading module '@typescript/lib-scripthost' from 'node_modules' folder, target file types: JavaScript.",
     "Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
     "Directory '/packages/node_modules' does not exist, skipping all lookups in it.",
-    "======== Module name '@typescript/lib-scripthost' was not resolved. ========",
-    "File '/.ts/package.json' does not exist according to earlier cached lookups.",
-    "File '/package.json' does not exist according to earlier cached lookups."
+    "======== Module name '@typescript/lib-scripthost' was not resolved. ========"
 ]

tests/baselines/reference/bundlerConditionsExcludesNode(module=esnext).trace.json

@@ -1,14 +1,11 @@
 [
-    "Found 'package.json' at '/node_modules/conditions/package.json'.",
-    "File '/node_modules/conditions/package.json' exists according to earlier cached lookups.",
-    "File '/package.json' does not exist.",
     "======== Resolving module 'conditions' from '/main.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.",
+    "File '/package.json' does not exist.",
     "Loading module 'conditions' 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/conditions/package.json' exists according to earlier cached lookups.",
+    "Found 'package.json' at '/node_modules/conditions/package.json'.",
     "Entering conditional exports.",
     "Saw non-matching condition 'node'.",
     "Matched 'exports' condition 'default'.",
@@ -22,8 +19,6 @@
     "Exiting conditional exports.",
     "Resolving real path for '/node_modules/conditions/index.web.d.ts', result '/node_modules/conditions/index.web.d.ts'.",
     "======== Module name 'conditions' was successfully resolved to '/node_modules/conditions/index.web.d.ts' with Package ID 'conditions/[email protected]'. ========",
-    "File '/.ts/package.json' does not exist.",
-    "File '/package.json' does not exist according to earlier cached lookups.",
     "======== 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.",
@@ -36,8 +31,6 @@
     "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. ========",
-    "File '/.ts/package.json' does not exist according to earlier cached lookups.",
-    "File '/package.json' does not exist according to earlier cached lookups.",
     "======== 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.",
@@ -50,8 +43,6 @@
     "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. ========",
-    "File '/.ts/package.json' does not exist according to earlier cached lookups.",
-    "File '/package.json' does not exist according to earlier cached lookups.",
     "======== 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.",
@@ -64,8 +55,6 @@
     "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. ========",
-    "File '/.ts/package.json' does not exist according to earlier cached lookups.",
-    "File '/package.json' does not exist according to earlier cached lookups.",
     "======== 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.",
@@ -78,8 +67,6 @@
     "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. ========",
-    "File '/.ts/package.json' does not exist according to earlier cached lookups.",
-    "File '/package.json' does not exist according to earlier cached lookups.",
     "======== 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.",
@@ -92,8 +79,6 @@
     "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. ========",
-    "File '/.ts/package.json' does not exist according to earlier cached lookups.",
-    "File '/package.json' does not exist according to earlier cached lookups.",
     "======== 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.",
@@ -105,7 +90,5 @@
     "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. ========",
-    "File '/.ts/package.json' does not exist according to earlier cached lookups.",
-    "File '/package.json' does not exist according to earlier cached lookups."
+    "======== Module name '@typescript/lib-scripthost' was not resolved. ========"
 ]