Cherry-pick PR #50673 into release-4.8 (#50742)

Component commits: 3d0e834 Remove error message in node16 Co-authored-by: Wesley Wigham <[email protected]>
microsoft · Sep 22, 2022 · 39576e6 · 39576e6
1 parent 5773723
commit 39576e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -45658,7 +45658,7 @@ namespace ts {
             }
 
             const nodeArguments = node.arguments;
-            if (moduleKind !== ModuleKind.ESNext && moduleKind !== ModuleKind.NodeNext) {
+            if (moduleKind !== ModuleKind.ESNext && moduleKind !== ModuleKind.NodeNext && moduleKind !== ModuleKind.Node16) {
                 // We are allowed trailing comma after proposal-import-assertions.
                 checkGrammarForDisallowedTrailingComma(nodeArguments);
 

diff --git a/tests/baselines/reference/nodeModulesImportAssertions(module=node16).errors.txt b/tests/baselines/reference/nodeModulesImportAssertions(module=node16).errors.txt
@@ -1,19 +1,16 @@
 tests/cases/conformance/node/index.ts(1,35): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext' or 'nodenext'.
 tests/cases/conformance/node/otherc.cts(1,35): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext' or 'nodenext'.
-tests/cases/conformance/node/otherc.cts(2,40): error TS1324: Dynamic imports only support a second argument when the '--module' option is set to 'esnext', 'node16', or 'nodenext'.
 
 
 ==== tests/cases/conformance/node/index.ts (1 errors) ====
     import json from "./package.json" assert { type: "json" };
                                       ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext' or 'nodenext'.
-==== tests/cases/conformance/node/otherc.cts (2 errors) ====
+==== tests/cases/conformance/node/otherc.cts (1 errors) ====
     import json from "./package.json" assert { type: "json" }; // should error, cjs mode imports don't support assertions
                                       ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext' or 'nodenext'.
     const json2 = import("./package.json", { assert: { type: "json" } }); // should be fine
-                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1324: Dynamic imports only support a second argument when the '--module' option is set to 'esnext', 'node16', or 'nodenext'.
 ==== tests/cases/conformance/node/package.json (0 errors) ====
     {
         "name": "pkg",