Merge branch 'jabaile/bump-tsgo-port-2' into jabaile/node20

Author: jakebailey

_submodules/TypeScript

@@ -1,29 +1,12 @@
-error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
-index.cjs(2,22): error TS2307: Cannot find module 'package/cjs' or its corresponding type declarations.
-index.cjs(3,22): error TS2307: Cannot find module 'package/mjs' or its corresponding type declarations.
-index.cjs(4,23): error TS2307: Cannot find module 'package' or its corresponding type declarations.
-index.js(2,22): error TS2307: Cannot find module 'package/cjs' or its corresponding type declarations.
-index.js(3,22): error TS2307: Cannot find module 'package/mjs' or its corresponding type declarations.
-index.js(4,23): error TS2307: Cannot find module 'package' or its corresponding type declarations.
-index.mjs(2,22): error TS2307: Cannot find module 'package/cjs' or its corresponding type declarations.
-index.mjs(3,22): error TS2307: Cannot find module 'package/mjs' or its corresponding type declarations.
-index.mjs(4,23): error TS2307: Cannot find module 'package' or its corresponding type declarations.
-node_modules/inner/index.d.mts(2,13): error TS2303: Circular definition of import alias 'cjs'.
-node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
+index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
 
 
-!!! error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
-==== index.js (3 errors) ====
+==== index.js (0 errors) ====
     // esm format file
     import * as cjs from "package/cjs";
-                         ~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'package/cjs' or its corresponding type declarations.
     import * as mjs from "package/mjs";
-                         ~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'package/mjs' or its corresponding type declarations.
     import * as type from "package";
-                          ~~~~~~~~~
-!!! error TS2307: Cannot find module 'package' or its corresponding type declarations.
     cjs;
     mjs;
     type;
@@ -35,17 +18,11 @@ node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import
     mjsi.mjsSource;
     typei.mjsSource;
     ts.mjsSource;
-==== index.mjs (3 errors) ====
+==== index.mjs (0 errors) ====
     // esm format file
     import * as cjs from "package/cjs";
-                         ~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'package/cjs' or its corresponding type declarations.
     import * as mjs from "package/mjs";
-                         ~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'package/mjs' or its corresponding type declarations.
     import * as type from "package";
-                          ~~~~~~~~~
-!!! error TS2307: Cannot find module 'package' or its corresponding type declarations.
     cjs;
     mjs;
     type;
@@ -57,17 +34,15 @@ node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import
     mjsi.mjsSource;
     typei.mjsSource;
     ts.mjsSource;
-==== index.cjs (3 errors) ====
+==== index.cjs (2 errors) ====
     // cjs format file
     import * as cjs from "package/cjs";
-                         ~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'package/cjs' or its corresponding type declarations.
     import * as mjs from "package/mjs";
                          ~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'package/mjs' or its corresponding type declarations.
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
     import * as type from "package";
                           ~~~~~~~~~
-!!! error TS2307: Cannot find module 'package' or its corresponding type declarations.
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
     cjs;
     mjs;
     type;
@@ -79,33 +54,36 @@ node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import
     mjsi.cjsSource;
     typei.implicitCjsSource;
     ts.cjsSource;
-==== node_modules/inner/index.d.ts (1 errors) ====
+==== node_modules/inner/index.d.ts (0 errors) ====
+    // cjs format file
+    export const implicitCjsSource = true;
+==== node_modules/inner/test.d.ts (0 errors) ====
     // cjs format file
     import * as cjs from "inner/a";
-                ~~~
-!!! error TS2303: Circular definition of import alias 'cjs'.
     import * as mjs from "inner/b";
     import * as type from "inner";
     import * as ts from "inner/types";
     export { cjs };
     export { mjs };
     export { type };
     export { ts };
-    export const implicitCjsSource = true;
-==== node_modules/inner/index.d.mts (1 errors) ====
+==== node_modules/inner/index.d.mts (0 errors) ====
+    // esm format file
+    export const mjsSource = true;
+==== node_modules/inner/test.d.mts (0 errors) ====
     // esm format file
     import * as cjs from "inner/a";
-                ~~~
-!!! error TS2303: Circular definition of import alias 'cjs'.
     import * as mjs from "inner/b";
     import * as type from "inner";
     import * as ts from "inner/types";
     export { cjs };
     export { mjs };
     export { type };
     export { ts };
-    export const mjsSource = true;
 ==== node_modules/inner/index.d.cts (0 errors) ====
+    // cjs format file
+    export const cjsSource = true;
+==== node_modules/inner/test.d.cts (0 errors) ====
     // cjs format file
     import * as cjs from "inner/a";
     import * as mjs from "inner/b";
@@ -115,7 +93,6 @@ node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import
     export { mjs };
     export { type };
     export { ts };
-    export const cjsSource = true;
 ==== package.json (0 errors) ====
     {
         "name": "package",

testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=node16).errors.txt

@@ -50,37 +50,43 @@ typei.implicitCjsSource;
 ts.cjsSource;
 //// [index.d.ts]
 // cjs format file
+export const implicitCjsSource = true;
+//// [test.d.ts]
+// cjs format file
 import * as cjs from "inner/a";
 import * as mjs from "inner/b";
 import * as type from "inner";
 import * as ts from "inner/types";
 export { cjs };
 export { mjs };
 export { type };
-export { ts };
-export const implicitCjsSource = true;
+export { ts };
 //// [index.d.mts]
 // esm format file
+export const mjsSource = true;
+//// [test.d.mts]
+// esm format file
 import * as cjs from "inner/a";
 import * as mjs from "inner/b";
 import * as type from "inner";
 import * as ts from "inner/types";
 export { cjs };
 export { mjs };
 export { type };
-export { ts };
-export const mjsSource = true;
+export { ts };
 //// [index.d.cts]
 // cjs format file
+export const cjsSource = true;
+//// [test.d.cts]
+// cjs format file
 import * as cjs from "inner/a";
 import * as mjs from "inner/b";
 import * as type from "inner";
 import * as ts from "inner/types";
 export { cjs };
 export { mjs };
 export { type };
-export { ts };
-export const cjsSource = true;
+export { ts };
 //// [package.json]
 {
     "name": "package",
@@ -123,22 +129,6 @@ export const cjsSource = true;
 }
 
 
-//// [index.js]
-// esm format file
-import * as cjs from "package/cjs";
-import * as mjs from "package/mjs";
-import * as type from "package";
-cjs;
-mjs;
-type;
-import * as cjsi from "inner/a";
-import * as mjsi from "inner/b";
-import * as typei from "inner";
-import * as ts from "inner/types";
-cjsi.mjsSource;
-mjsi.mjsSource;
-typei.mjsSource;
-ts.mjsSource;
 //// [index.mjs]
 // esm format file
 import * as cjs from "package/cjs";
@@ -206,11 +196,27 @@ cjsi.cjsSource;
 mjsi.cjsSource;
 typei.implicitCjsSource;
 ts.cjsSource;
+//// [index.js]
+// esm format file
+import * as cjs from "package/cjs";
+import * as mjs from "package/mjs";
+import * as type from "package";
+cjs;
+mjs;
+type;
+import * as cjsi from "inner/a";
+import * as mjsi from "inner/b";
+import * as typei from "inner";
+import * as ts from "inner/types";
+cjsi.mjsSource;
+mjsi.mjsSource;
+typei.mjsSource;
+ts.mjsSource;
 
 
-//// [index.d.ts]
-export {};
 //// [index.d.mts]
 export {};
 //// [index.d.cts]
 export {};
+//// [index.d.ts]
+export {};