Merge branch 'main' into api

Author: andrewbranch

.github/workflows/codeql.yml

@@ -48,7 +48,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
+        uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
         with:
           config-file: ./.github/codeql/codeql-configuration.yml
         # Override language selection by uncommenting this and choosing your languages
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below).
       - name: Autobuild
-        uses: github/codeql-action/autobuild@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
+        uses: github/codeql-action/autobuild@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -72,4 +72,4 @@ jobs:
       #     make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
+        uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13

internal/testrunner/compiler_runner.go

@@ -341,7 +341,7 @@ func (c *compilerTest) verifyDiagnostics(t *testing.T, suiteName string, isSubmo
 		tsbaseline.DoErrorBaseline(t, c.configuredName, files, c.result.Diagnostics, c.result.Options.Pretty.IsTrue(), baseline.Options{
 			Subfolder:           suiteName,
 			IsSubmodule:         isSubmodule,
-			IsSubmoduleAccepted: len(c.result.Program.UnsupportedExtensions()) != 0, // TODO(jakebailey): read submoduleAccepted.txt
+			IsSubmoduleAccepted: c.containsUnsupportedOptions(),
 		})
 	})
 }
@@ -434,3 +434,21 @@ func (c *compilerTest) verifyUnionOrdering(t *testing.T) {
 		}
 	})
 }
+
+func (c *compilerTest) containsUnsupportedOptions() bool {
+	if len(c.result.Program.UnsupportedExtensions()) != 0 {
+		return true
+	}
+	switch c.options.GetEmitModuleKind() {
+	case core.ModuleKindAMD, core.ModuleKindUMD, core.ModuleKindSystem:
+		return true
+	}
+	if c.options.BaseUrl != "" {
+		return true
+	}
+	if c.options.RootDirs != nil {
+		return true
+	}
+
+	return false
+}

internal/tsoptions/tsconfigparsing.go

@@ -1423,7 +1423,6 @@ func removeWildcardFilesWithLowerPriorityExtension(file string, wildcardFiles co
 // options is the Compiler options.
 // host is the host used to resolve files and directories.
 // extraFileExtensions optionally file extra file extension information from host
-
 func getFileNamesFromConfigSpecs(
 	configFileSpecs configFileSpecs,
 	basePath string, // considering this is the current directory

testdata/baselines/reference/submodule/compiler/aliasesInSystemModule1.errors.txt.diff testdata/baselines/reference/submoduleAccepted/compiler/aliasesInSystemModule1.errors.txt.diff

@@ -1 +1,3 @@
 # Diff files to instead write to submoduleAccepted as "accepted" changes.
+conformance/node10Alternateresult_noTypes.errors.txt.diff
+conformance/node10AlternateResult_noResolution.errors.txt.diff