Merge branch 'master' into config-inheritance-through-modules

microsoft · weswigham · Oct 25, 2018 · Sep 25, 2018 · Sep 25, 2018 · Sep 27, 2018
commit 19c3859c9bc53ca159ad276a47a9d1e646243656
diff --git a/src/testRunner/unittests/configurationExtension.ts b/src/testRunner/unittests/configurationExtension.ts
@@ -321,6 +321,15 @@ namespace ts {
                     combinePaths(basePath, "main.ts")
                 ]);
 
+                testSuccess("can overwrite top-level files using extended []", "configs/fifth.json", {
+                    allowJs: true,
+                    noImplicitAny: true,
+                    strictNullChecks: true,
+                    module: ModuleKind.System
+                }, [
+                    combinePaths(basePath, "tests/utils.ts")
+                ]);
+
                 describe("finding extended configs from node_modules", () => {
                     testSuccess("can lookup via tsconfig field", "tsconfig.extendsBox.json", { strict: true }, [combinePaths(basePath, "main.ts")]);
                     testSuccess("can lookup via package-relative path", "tsconfig.extendsStrict.json", { strict: true }, [combinePaths(basePath, "main.ts")]);