From 3c73a66ba70baa710cf0de15ca0fa8ced6e09f26 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <t-weswig@microsoft.com>
Date: Fri, 2 Oct 2015 17:51:59 -0700
Subject: [PATCH] removed umd as allowed, accepted new baselines

---
 .../baselines/reference/out-flag2.errors.txt  |   4 +-
 .../baselines/reference/out-flag3.errors.txt  |   4 +-
 .../baselines/reference/outModuleConcatAmd.js |  69 ++++
 .../reference/outModuleConcatAmd.js.map       |   4 +
 .../outModuleConcatAmd.sourcemap.txt          | 333 +++++++++++++++++
 .../reference/outModuleConcatAmd.symbols      |  13 +
 .../reference/outModuleConcatAmd.types        |  13 +
 .../outModuleConcatCommonjs.errors.txt        |  13 +
 .../reference/outModuleConcatCommonjs.js      |  52 +++
 .../reference/outModuleConcatCommonjs.js.map  |   4 +
 .../outModuleConcatCommonjs.sourcemap.txt     | 220 +++++++++++
 .../reference/outModuleConcatES6.errors.txt   |  13 +
 .../baselines/reference/outModuleConcatES6.js |  32 ++
 .../reference/outModuleConcatES6.js.map       |   4 +
 .../outModuleConcatES6.sourcemap.txt          | 118 ++++++
 .../reference/outModuleConcatSystem.js        | 101 +++++
 .../reference/outModuleConcatSystem.js.map    |   4 +
 .../outModuleConcatSystem.sourcemap.txt       | 353 ++++++++++++++++++
 .../reference/outModuleConcatSystem.symbols   |  13 +
 .../reference/outModuleConcatSystem.types     |  13 +
 .../reference/outModuleConcatUmd.errors.txt   |  13 +
 .../baselines/reference/outModuleConcatUmd.js |  70 ++++
 .../reference/outModuleConcatUmd.js.map       |   4 +
 .../outModuleConcatUmd.sourcemap.txt          | 237 ++++++++++++
 .../amd/bin/test.d.ts                         |  13 +
 .../node/bin/test.d.ts                        |  13 +
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/outAndOutDirFile.d.ts             |  13 +
 .../node/bin/outAndOutDirFile.d.ts            |  13 +
 ...ifyOutputFileAndOutputDirectory.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...uleMultifolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...thModuleSimpleSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   4 +-
 ...athMultifolderSpecifyOutputFile.errors.txt |   4 +-
 ...lutePathSimpleSpecifyOutputFile.errors.txt |   4 +-
 ...PathSingleFileSpecifyOutputFile.errors.txt |   4 +-
 ...ePathSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |  13 +
 .../node/bin/test.d.ts                        |  13 +
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/outAndOutDirFile.d.ts             |  13 +
 .../node/bin/outAndOutDirFile.d.ts            |  13 +
 ...ifyOutputFileAndOutputDirectory.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...uleMultifolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...thModuleSimpleSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |  18 +
 .../node/bin/test.d.ts                        |  18 +
 ...athMultifolderSpecifyOutputFile.errors.txt |   4 +-
 ...tivePathSimpleSpecifyOutputFile.errors.txt |   4 +-
 ...PathSingleFileSpecifyOutputFile.errors.txt |   4 +-
 ...ePathSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |  13 +
 .../node/bin/test.d.ts                        |  13 +
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/outAndOutDirFile.d.ts             |  13 +
 .../node/bin/outAndOutDirFile.d.ts            |  13 +
 ...ifyOutputFileAndOutputDirectory.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...uleMultifolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...rlModuleSimpleSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   4 +-
 ...UrlMultifolderSpecifyOutputFile.errors.txt |   4 +-
 ...prootUrlSimpleSpecifyOutputFile.errors.txt |   4 +-
 ...tUrlSingleFileSpecifyOutputFile.errors.txt |   4 +-
 ...otUrlSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |  13 +
 .../node/bin/test.d.ts                        |  13 +
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/outAndOutDirFile.d.ts             |  13 +
 .../node/bin/outAndOutDirFile.d.ts            |  13 +
 ...ifyOutputFileAndOutputDirectory.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...uleMultifolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...rlModuleSimpleSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   4 +-
 ...UrlMultifolderSpecifyOutputFile.errors.txt |   4 +-
 ...erootUrlSimpleSpecifyOutputFile.errors.txt |   4 +-
 ...tUrlSingleFileSpecifyOutputFile.errors.txt |   4 +-
 ...otUrlSubfolderSpecifyOutputFile.errors.txt |   4 +-
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   4 +-
 ...ifyOutputFileAndOutputDirectory.errors.txt |   4 +-
 ...uleMultifolderSpecifyOutputFile.errors.txt |   4 +-
 ...utModuleSimpleSpecifyOutputFile.errors.txt |   4 +-
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   4 +-
 ...outMultifolderSpecifyOutputFile.errors.txt |   4 +-
 .../outSimpleSpecifyOutputFile.errors.txt     |   4 +-
 .../outSingleFileSpecifyOutputFile.errors.txt |   4 +-
 .../outSubfolderSpecifyOutputFile.errors.txt  |   4 +-
 .../prologueEmit/node/prologueEmit.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |  13 +
 .../node/bin/test.d.ts                        |  13 +
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/outAndOutDirFile.d.ts             |  13 +
 .../node/bin/outAndOutDirFile.d.ts            |  13 +
 ...ifyOutputFileAndOutputDirectory.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...uleMultifolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...thModuleSimpleSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   4 +-
 ...athMultifolderSpecifyOutputFile.errors.txt |   4 +-
 ...lutePathSimpleSpecifyOutputFile.errors.txt |   4 +-
 ...PathSingleFileSpecifyOutputFile.errors.txt |   4 +-
 ...ePathSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |  13 +
 .../node/bin/test.d.ts                        |  13 +
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/outAndOutDirFile.d.ts             |  13 +
 .../node/bin/outAndOutDirFile.d.ts            |  13 +
 ...ifyOutputFileAndOutputDirectory.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...uleMultifolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...thModuleSimpleSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   4 +-
 ...athMultifolderSpecifyOutputFile.errors.txt |   4 +-
 ...tivePathSimpleSpecifyOutputFile.errors.txt |   4 +-
 ...PathSingleFileSpecifyOutputFile.errors.txt |   4 +-
 ...ePathSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |  13 +
 .../node/bin/test.d.ts                        |  13 +
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/outAndOutDirFile.d.ts             |  13 +
 .../node/bin/outAndOutDirFile.d.ts            |  13 +
 ...ifyOutputFileAndOutputDirectory.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...uleMultifolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...apModuleSimpleSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   4 +-
 ...mapMultifolderSpecifyOutputFile.errors.txt |   4 +-
 ...ourcemapSimpleSpecifyOutputFile.errors.txt |   4 +-
 ...emapSingleFileSpecifyOutputFile.errors.txt |   4 +-
 ...cemapSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |  13 +
 .../node/bin/test.d.ts                        |  13 +
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/outAndOutDirFile.d.ts             |  13 +
 .../node/bin/outAndOutDirFile.d.ts            |  13 +
 ...ifyOutputFileAndOutputDirectory.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...uleMultifolderSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...rlModuleSimpleSpecifyOutputFile.errors.txt |   4 +-
 .../amd/bin/test.d.ts                         |   0
 .../node/bin/test.d.ts                        |   0
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   4 +-
 ...UrlMultifolderSpecifyOutputFile.errors.txt |   4 +-
 ...erootUrlSimpleSpecifyOutputFile.errors.txt |   4 +-
 ...tUrlSingleFileSpecifyOutputFile.errors.txt |   4 +-
 ...otUrlSubfolderSpecifyOutputFile.errors.txt |   4 +-
 188 files changed, 2316 insertions(+), 168 deletions(-)
 create mode 100644 tests/baselines/reference/outModuleConcatAmd.js
 create mode 100644 tests/baselines/reference/outModuleConcatAmd.js.map
 create mode 100644 tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
 create mode 100644 tests/baselines/reference/outModuleConcatAmd.symbols
 create mode 100644 tests/baselines/reference/outModuleConcatAmd.types
 create mode 100644 tests/baselines/reference/outModuleConcatCommonjs.errors.txt
 create mode 100644 tests/baselines/reference/outModuleConcatCommonjs.js
 create mode 100644 tests/baselines/reference/outModuleConcatCommonjs.js.map
 create mode 100644 tests/baselines/reference/outModuleConcatCommonjs.sourcemap.txt
 create mode 100644 tests/baselines/reference/outModuleConcatES6.errors.txt
 create mode 100644 tests/baselines/reference/outModuleConcatES6.js
 create mode 100644 tests/baselines/reference/outModuleConcatES6.js.map
 create mode 100644 tests/baselines/reference/outModuleConcatES6.sourcemap.txt
 create mode 100644 tests/baselines/reference/outModuleConcatSystem.js
 create mode 100644 tests/baselines/reference/outModuleConcatSystem.js.map
 create mode 100644 tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
 create mode 100644 tests/baselines/reference/outModuleConcatSystem.symbols
 create mode 100644 tests/baselines/reference/outModuleConcatSystem.types
 create mode 100644 tests/baselines/reference/outModuleConcatUmd.errors.txt
 create mode 100644 tests/baselines/reference/outModuleConcatUmd.js
 create mode 100644 tests/baselines/reference/outModuleConcatUmd.js.map
 create mode 100644 tests/baselines/reference/outModuleConcatUmd.sourcemap.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts

diff --git a/tests/baselines/reference/out-flag2.errors.txt b/tests/baselines/reference/out-flag2.errors.txt
index 755019b52b0..ea6fed45bd0 100644
--- a/tests/baselines/reference/out-flag2.errors.txt
+++ b/tests/baselines/reference/out-flag2.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== tests/cases/compiler/a.ts (0 errors) ====
     
     class A { }
diff --git a/tests/baselines/reference/out-flag3.errors.txt b/tests/baselines/reference/out-flag3.errors.txt
index ab44f4e94fd..c01cef151f3 100644
--- a/tests/baselines/reference/out-flag3.errors.txt
+++ b/tests/baselines/reference/out-flag3.errors.txt
@@ -1,9 +1,9 @@
 error TS5053: Option 'out' cannot be specified with option 'outFile'.
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
 
 
 !!! error TS5053: Option 'out' cannot be specified with option 'outFile'.
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
 ==== tests/cases/compiler/a.ts (0 errors) ====
     
     // --out and --outFile error
diff --git a/tests/baselines/reference/outModuleConcatAmd.js b/tests/baselines/reference/outModuleConcatAmd.js
new file mode 100644
index 00000000000..f6af61005e9
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatAmd.js
@@ -0,0 +1,69 @@
+//// [tests/cases/compiler/outModuleConcatAmd.ts] ////
+
+//// [a.ts]
+
+export class A { }
+
+//// [b.ts]
+import {A} from "./ref/a";
+export class B extends A { }
+
+//// [a.js]
+define(["require", "exports"], function (require, exports) {
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    })();
+    exports.A = A;
+});
+//# sourceMappingURL=a.js.map//// [b.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+define(["require", "exports", "./ref/a"], function (require, exports, a_1) {
+    var B = (function (_super) {
+        __extends(B, _super);
+        function B() {
+            _super.apply(this, arguments);
+        }
+        return B;
+    })(a_1.A);
+    exports.B = B;
+});
+//# sourceMappingURL=b.js.map//// [all.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+define("tests/cases/compiler/ref/a", ["require", "exports"], function (require, exports) {
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    })();
+    exports.A = A;
+});
+define("tests/cases/compiler/b", ["require", "exports", "tests/cases/compiler/ref/a"], function (require, exports, a_1) {
+    var B = (function (_super) {
+        __extends(B, _super);
+        function B() {
+            _super.apply(this, arguments);
+        }
+        return B;
+    })(a_1.A);
+    exports.B = B;
+});
+//# sourceMappingURL=all.js.map
+
+//// [a.d.ts]
+export declare class A {
+}
+//// [b.d.ts]
+import { A } from "./ref/a";
+export declare class B extends A {
+}
+//// [all.d.ts]
diff --git a/tests/baselines/reference/outModuleConcatAmd.js.map b/tests/baselines/reference/outModuleConcatAmd.js.map
new file mode 100644
index 00000000000..88e6fa81885
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatAmd.js.map
@@ -0,0 +1,4 @@
+//// [a.js.map]
+{"version":3,"file":"a.js","sourceRoot":"","sources":["a.ts"],"names":["A","A.constructor"],"mappings":";IACA;QAAAA;QAAiBC,CAACA;QAADD,QAACA;IAADA,CAACA,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA"}//// [b.js.map]
+{"version":3,"file":"b.js","sourceRoot":"","sources":["b.ts"],"names":["B","B.constructor"],"mappings":";;;;;;IACA;QAAuBA,qBAACA;QAAxBA;YAAuBC,8BAACA;QAAGA,CAACA;QAADD,QAACA;IAADA,CAACA,AAA5B,EAAuB,KAAC,EAAI;IAAf,SAAC,IAAc,CAAA"}//// [all.js.map]
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":["A","A.constructor","B","B.constructor"],"mappings":";;;;;;IACA;QAAAA;QAAiBC,CAACA;QAADD,QAACA;IAADA,CAACA,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;;;ICAlB;QAAuBE,qBAACA;QAAxBA;YAAuBC,8BAACA;QAAGA,CAACA;QAADD,QAACA;IAADA,CAACA,AAA5B,EAAuB,KAAC,EAAI;IAAf,SAAC,IAAc,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
new file mode 100644
index 00000000000..4ec8e34e8e1
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
@@ -0,0 +1,333 @@
+===================================================================
+JsFile: a.js
+mapUrl: a.js.map
+sourceRoot: 
+sources: a.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/ref/a.js
+sourceFile:a.ts
+-------------------------------------------------------------------
+>>>define(["require", "exports"], function (require, exports) {
+>>>    var A = (function () {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(2, 5) Source(2, 1) + SourceIndex(0)
+---
+>>>        function A() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(3, 9) Source(2, 1) + SourceIndex(0) name (A)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^->
+1->export class A { 
+2 >        }
+1->Emitted(4, 9) Source(2, 18) + SourceIndex(0) name (A.constructor)
+2 >Emitted(4, 10) Source(2, 19) + SourceIndex(0) name (A.constructor)
+---
+>>>        return A;
+1->^^^^^^^^
+2 >        ^^^^^^^^
+1->
+2 >        }
+1->Emitted(5, 9) Source(2, 18) + SourceIndex(0) name (A)
+2 >Emitted(5, 17) Source(2, 19) + SourceIndex(0) name (A)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class A { }
+1 >Emitted(6, 5) Source(2, 18) + SourceIndex(0) name (A)
+2 >Emitted(6, 6) Source(2, 19) + SourceIndex(0) name (A)
+3 >Emitted(6, 6) Source(2, 1) + SourceIndex(0)
+4 >Emitted(6, 10) Source(2, 19) + SourceIndex(0)
+---
+>>>    exports.A = A;
+1->^^^^
+2 >    ^^^^^^^^^
+3 >             ^^^^
+4 >                 ^
+1->
+2 >    A
+3 >              { }
+4 >                 
+1->Emitted(7, 5) Source(2, 14) + SourceIndex(0)
+2 >Emitted(7, 14) Source(2, 15) + SourceIndex(0)
+3 >Emitted(7, 18) Source(2, 19) + SourceIndex(0)
+4 >Emitted(7, 19) Source(2, 19) + SourceIndex(0)
+---
+>>>});
+>>>//# sourceMappingURL=a.js.map===================================================================
+JsFile: b.js
+mapUrl: b.js.map
+sourceRoot: 
+sources: b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/b.js
+sourceFile:b.ts
+-------------------------------------------------------------------
+>>>var __extends = (this && this.__extends) || function (d, b) {
+>>>    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+>>>    function __() { this.constructor = d; }
+>>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+>>>};
+>>>define(["require", "exports", "./ref/a"], function (require, exports, a_1) {
+>>>    var B = (function (_super) {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >import {A} from "./ref/a";
+  >
+1 >Emitted(7, 5) Source(2, 1) + SourceIndex(0)
+---
+>>>        __extends(B, _super);
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >        A
+1->Emitted(8, 9) Source(2, 24) + SourceIndex(0) name (B)
+2 >Emitted(8, 30) Source(2, 25) + SourceIndex(0) name (B)
+---
+>>>        function B() {
+1 >^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(9, 9) Source(2, 1) + SourceIndex(0) name (B)
+---
+>>>            _super.apply(this, arguments);
+1->^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >            A
+1->Emitted(10, 13) Source(2, 24) + SourceIndex(0) name (B.constructor)
+2 >Emitted(10, 43) Source(2, 25) + SourceIndex(0) name (B.constructor)
+---
+>>>        }
+1 >^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^->
+1 > { 
+2 >        }
+1 >Emitted(11, 9) Source(2, 28) + SourceIndex(0) name (B.constructor)
+2 >Emitted(11, 10) Source(2, 29) + SourceIndex(0) name (B.constructor)
+---
+>>>        return B;
+1->^^^^^^^^
+2 >        ^^^^^^^^
+1->
+2 >        }
+1->Emitted(12, 9) Source(2, 28) + SourceIndex(0) name (B)
+2 >Emitted(12, 17) Source(2, 29) + SourceIndex(0) name (B)
+---
+>>>    })(a_1.A);
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^
+5 >       ^^^^^
+6 >            ^^
+7 >              ^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class B extends 
+5 >       A
+6 >             { }
+1 >Emitted(13, 5) Source(2, 28) + SourceIndex(0) name (B)
+2 >Emitted(13, 6) Source(2, 29) + SourceIndex(0) name (B)
+3 >Emitted(13, 6) Source(2, 1) + SourceIndex(0)
+4 >Emitted(13, 8) Source(2, 24) + SourceIndex(0)
+5 >Emitted(13, 13) Source(2, 25) + SourceIndex(0)
+6 >Emitted(13, 15) Source(2, 29) + SourceIndex(0)
+---
+>>>    exports.B = B;
+1->^^^^
+2 >    ^^^^^^^^^
+3 >             ^^^^
+4 >                 ^
+1->
+2 >    B
+3 >              extends A { }
+4 >                 
+1->Emitted(14, 5) Source(2, 14) + SourceIndex(0)
+2 >Emitted(14, 14) Source(2, 15) + SourceIndex(0)
+3 >Emitted(14, 18) Source(2, 29) + SourceIndex(0)
+4 >Emitted(14, 19) Source(2, 29) + SourceIndex(0)
+---
+>>>});
+>>>//# sourceMappingURL=b.js.map===================================================================
+JsFile: all.js
+mapUrl: all.js.map
+sourceRoot: 
+sources: tests/cases/compiler/ref/a.ts,tests/cases/compiler/b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/ref/a.ts
+-------------------------------------------------------------------
+>>>var __extends = (this && this.__extends) || function (d, b) {
+>>>    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+>>>    function __() { this.constructor = d; }
+>>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+>>>};
+>>>define("tests/cases/compiler/ref/a", ["require", "exports"], function (require, exports) {
+>>>    var A = (function () {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(7, 5) Source(2, 1) + SourceIndex(0)
+---
+>>>        function A() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(8, 9) Source(2, 1) + SourceIndex(0) name (A)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^->
+1->export class A { 
+2 >        }
+1->Emitted(9, 9) Source(2, 18) + SourceIndex(0) name (A.constructor)
+2 >Emitted(9, 10) Source(2, 19) + SourceIndex(0) name (A.constructor)
+---
+>>>        return A;
+1->^^^^^^^^
+2 >        ^^^^^^^^
+1->
+2 >        }
+1->Emitted(10, 9) Source(2, 18) + SourceIndex(0) name (A)
+2 >Emitted(10, 17) Source(2, 19) + SourceIndex(0) name (A)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class A { }
+1 >Emitted(11, 5) Source(2, 18) + SourceIndex(0) name (A)
+2 >Emitted(11, 6) Source(2, 19) + SourceIndex(0) name (A)
+3 >Emitted(11, 6) Source(2, 1) + SourceIndex(0)
+4 >Emitted(11, 10) Source(2, 19) + SourceIndex(0)
+---
+>>>    exports.A = A;
+1->^^^^
+2 >    ^^^^^^^^^
+3 >             ^^^^
+4 >                 ^
+1->
+2 >    A
+3 >              { }
+4 >                 
+1->Emitted(12, 5) Source(2, 14) + SourceIndex(0)
+2 >Emitted(12, 14) Source(2, 15) + SourceIndex(0)
+3 >Emitted(12, 18) Source(2, 19) + SourceIndex(0)
+4 >Emitted(12, 19) Source(2, 19) + SourceIndex(0)
+---
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/b.ts
+-------------------------------------------------------------------
+>>>});
+>>>define("tests/cases/compiler/b", ["require", "exports", "tests/cases/compiler/ref/a"], function (require, exports, a_1) {
+>>>    var B = (function (_super) {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >import {A} from "./ref/a";
+  >
+1 >Emitted(15, 5) Source(2, 1) + SourceIndex(1)
+---
+>>>        __extends(B, _super);
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >        A
+1->Emitted(16, 9) Source(2, 24) + SourceIndex(1) name (B)
+2 >Emitted(16, 30) Source(2, 25) + SourceIndex(1) name (B)
+---
+>>>        function B() {
+1 >^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(17, 9) Source(2, 1) + SourceIndex(1) name (B)
+---
+>>>            _super.apply(this, arguments);
+1->^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >            A
+1->Emitted(18, 13) Source(2, 24) + SourceIndex(1) name (B.constructor)
+2 >Emitted(18, 43) Source(2, 25) + SourceIndex(1) name (B.constructor)
+---
+>>>        }
+1 >^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^->
+1 > { 
+2 >        }
+1 >Emitted(19, 9) Source(2, 28) + SourceIndex(1) name (B.constructor)
+2 >Emitted(19, 10) Source(2, 29) + SourceIndex(1) name (B.constructor)
+---
+>>>        return B;
+1->^^^^^^^^
+2 >        ^^^^^^^^
+1->
+2 >        }
+1->Emitted(20, 9) Source(2, 28) + SourceIndex(1) name (B)
+2 >Emitted(20, 17) Source(2, 29) + SourceIndex(1) name (B)
+---
+>>>    })(a_1.A);
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^
+5 >       ^^^^^
+6 >            ^^
+7 >              ^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class B extends 
+5 >       A
+6 >             { }
+1 >Emitted(21, 5) Source(2, 28) + SourceIndex(1) name (B)
+2 >Emitted(21, 6) Source(2, 29) + SourceIndex(1) name (B)
+3 >Emitted(21, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(21, 8) Source(2, 24) + SourceIndex(1)
+5 >Emitted(21, 13) Source(2, 25) + SourceIndex(1)
+6 >Emitted(21, 15) Source(2, 29) + SourceIndex(1)
+---
+>>>    exports.B = B;
+1->^^^^
+2 >    ^^^^^^^^^
+3 >             ^^^^
+4 >                 ^
+1->
+2 >    B
+3 >              extends A { }
+4 >                 
+1->Emitted(22, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(22, 14) Source(2, 15) + SourceIndex(1)
+3 >Emitted(22, 18) Source(2, 29) + SourceIndex(1)
+4 >Emitted(22, 19) Source(2, 29) + SourceIndex(1)
+---
+>>>});
+>>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatAmd.symbols b/tests/baselines/reference/outModuleConcatAmd.symbols
new file mode 100644
index 00000000000..349de40815a
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatAmd.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/ref/a.ts ===
+
+export class A { }
+>A : Symbol(A, Decl(a.ts, 0, 0))
+
+=== tests/cases/compiler/b.ts ===
+import {A} from "./ref/a";
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
+export class B extends A { }
+>B : Symbol(B, Decl(b.ts, 0, 26))
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
diff --git a/tests/baselines/reference/outModuleConcatAmd.types b/tests/baselines/reference/outModuleConcatAmd.types
new file mode 100644
index 00000000000..6e0d9398853
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatAmd.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/ref/a.ts ===
+
+export class A { }
+>A : A
+
+=== tests/cases/compiler/b.ts ===
+import {A} from "./ref/a";
+>A : typeof A
+
+export class B extends A { }
+>B : B
+>A : A
+
diff --git a/tests/baselines/reference/outModuleConcatCommonjs.errors.txt b/tests/baselines/reference/outModuleConcatCommonjs.errors.txt
new file mode 100644
index 00000000000..d1a2adbc93f
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatCommonjs.errors.txt
@@ -0,0 +1,13 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== tests/cases/compiler/ref/a.ts (0 errors) ====
+    
+    // This should be an error
+    
+    export class A { }
+    
+==== tests/cases/compiler/b.ts (0 errors) ====
+    import {A} from "./ref/a";
+    export class B extends A { }
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatCommonjs.js b/tests/baselines/reference/outModuleConcatCommonjs.js
new file mode 100644
index 00000000000..ed19f93f702
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatCommonjs.js
@@ -0,0 +1,52 @@
+//// [tests/cases/compiler/outModuleConcatCommonjs.ts] ////
+
+//// [a.ts]
+
+// This should be an error
+
+export class A { }
+
+//// [b.ts]
+import {A} from "./ref/a";
+export class B extends A { }
+
+//// [a.js]
+// This should be an error
+var A = (function () {
+    function A() {
+    }
+    return A;
+})();
+exports.A = A;
+//# sourceMappingURL=a.js.map//// [b.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var a_1 = require("./ref/a");
+var B = (function (_super) {
+    __extends(B, _super);
+    function B() {
+        _super.apply(this, arguments);
+    }
+    return B;
+})(a_1.A);
+exports.B = B;
+//# sourceMappingURL=b.js.map//// [all.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+// This should be an error
+//# sourceMappingURL=all.js.map
+
+//// [a.d.ts]
+export declare class A {
+}
+//// [b.d.ts]
+import { A } from "./ref/a";
+export declare class B extends A {
+}
+//// [all.d.ts]
diff --git a/tests/baselines/reference/outModuleConcatCommonjs.js.map b/tests/baselines/reference/outModuleConcatCommonjs.js.map
new file mode 100644
index 00000000000..babde662bc1
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatCommonjs.js.map
@@ -0,0 +1,4 @@
+//// [a.js.map]
+{"version":3,"file":"a.js","sourceRoot":"","sources":["a.ts"],"names":["A","A.constructor"],"mappings":"AACA,0BAA0B;AAE1B;IAAAA;IAAiBC,CAACA;IAADD,QAACA;AAADA,CAACA,AAAlB,IAAkB;AAAL,SAAC,IAAI,CAAA"}//// [b.js.map]
+{"version":3,"file":"b.js","sourceRoot":"","sources":["b.ts"],"names":["B","B.constructor"],"mappings":";;;;;AAAA,kBAAgB,SAAS,CAAC,CAAA;AAC1B;IAAuBA,qBAACA;IAAxBA;QAAuBC,8BAACA;IAAGA,CAACA;IAADD,QAACA;AAADA,CAACA,AAA5B,EAAuB,KAAC,EAAI;AAAf,SAAC,IAAc,CAAA"}//// [all.js.map]
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;AACA,0BAA0B"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatCommonjs.sourcemap.txt b/tests/baselines/reference/outModuleConcatCommonjs.sourcemap.txt
new file mode 100644
index 00000000000..22dda7ae4bf
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatCommonjs.sourcemap.txt
@@ -0,0 +1,220 @@
+===================================================================
+JsFile: a.js
+mapUrl: a.js.map
+sourceRoot: 
+sources: a.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/ref/a.js
+sourceFile:a.ts
+-------------------------------------------------------------------
+>>>// This should be an error
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+  >
+2 >// This should be an error
+1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(1, 27) Source(2, 27) + SourceIndex(0)
+---
+>>>var A = (function () {
+1 >
+2 >^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+  >
+1 >Emitted(2, 1) Source(4, 1) + SourceIndex(0)
+---
+>>>    function A() {
+1->^^^^
+2 >    ^^->
+1->
+1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) name (A)
+---
+>>>    }
+1->^^^^
+2 >    ^
+3 >     ^^^^^^^^^->
+1->export class A { 
+2 >    }
+1->Emitted(4, 5) Source(4, 18) + SourceIndex(0) name (A.constructor)
+2 >Emitted(4, 6) Source(4, 19) + SourceIndex(0) name (A.constructor)
+---
+>>>    return A;
+1->^^^^
+2 >    ^^^^^^^^
+1->
+2 >    }
+1->Emitted(5, 5) Source(4, 18) + SourceIndex(0) name (A)
+2 >Emitted(5, 13) Source(4, 19) + SourceIndex(0) name (A)
+---
+>>>})();
+1 >
+2 >^
+3 > 
+4 > ^^^^
+5 >     ^^^^^^^^^^->
+1 >
+2 >}
+3 > 
+4 > export class A { }
+1 >Emitted(6, 1) Source(4, 18) + SourceIndex(0) name (A)
+2 >Emitted(6, 2) Source(4, 19) + SourceIndex(0) name (A)
+3 >Emitted(6, 2) Source(4, 1) + SourceIndex(0)
+4 >Emitted(6, 6) Source(4, 19) + SourceIndex(0)
+---
+>>>exports.A = A;
+1->
+2 >^^^^^^^^^
+3 >         ^^^^
+4 >             ^
+5 >              ^^^^^^^^^^^^^^->
+1->
+2 >A
+3 >          { }
+4 >             
+1->Emitted(7, 1) Source(4, 14) + SourceIndex(0)
+2 >Emitted(7, 10) Source(4, 15) + SourceIndex(0)
+3 >Emitted(7, 14) Source(4, 19) + SourceIndex(0)
+4 >Emitted(7, 15) Source(4, 19) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=a.js.map===================================================================
+JsFile: b.js
+mapUrl: b.js.map
+sourceRoot: 
+sources: b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/b.js
+sourceFile:b.ts
+-------------------------------------------------------------------
+>>>var __extends = (this && this.__extends) || function (d, b) {
+>>>    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+>>>    function __() { this.constructor = d; }
+>>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+>>>};
+>>>var a_1 = require("./ref/a");
+1 >
+2 >^^^^^^^^^^^^^^^^^^
+3 >                  ^^^^^^^^^
+4 >                           ^
+5 >                            ^
+1 >
+2 >import {A} from 
+3 >                  "./ref/a"
+4 >                           ;
+5 >                            
+1 >Emitted(6, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(6, 19) Source(1, 17) + SourceIndex(0)
+3 >Emitted(6, 28) Source(1, 26) + SourceIndex(0)
+4 >Emitted(6, 29) Source(1, 27) + SourceIndex(0)
+5 >Emitted(6, 30) Source(1, 27) + SourceIndex(0)
+---
+>>>var B = (function (_super) {
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(7, 1) Source(2, 1) + SourceIndex(0)
+---
+>>>    __extends(B, _super);
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >    A
+1->Emitted(8, 5) Source(2, 24) + SourceIndex(0) name (B)
+2 >Emitted(8, 26) Source(2, 25) + SourceIndex(0) name (B)
+---
+>>>    function B() {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(9, 5) Source(2, 1) + SourceIndex(0) name (B)
+---
+>>>        _super.apply(this, arguments);
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >        A
+1->Emitted(10, 9) Source(2, 24) + SourceIndex(0) name (B.constructor)
+2 >Emitted(10, 39) Source(2, 25) + SourceIndex(0) name (B.constructor)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^->
+1 > { 
+2 >    }
+1 >Emitted(11, 5) Source(2, 28) + SourceIndex(0) name (B.constructor)
+2 >Emitted(11, 6) Source(2, 29) + SourceIndex(0) name (B.constructor)
+---
+>>>    return B;
+1->^^^^
+2 >    ^^^^^^^^
+1->
+2 >    }
+1->Emitted(12, 5) Source(2, 28) + SourceIndex(0) name (B)
+2 >Emitted(12, 13) Source(2, 29) + SourceIndex(0) name (B)
+---
+>>>})(a_1.A);
+1 >
+2 >^
+3 > 
+4 > ^^
+5 >   ^^^^^
+6 >        ^^
+7 >          ^^^^^->
+1 >
+2 >}
+3 > 
+4 > export class B extends 
+5 >   A
+6 >         { }
+1 >Emitted(13, 1) Source(2, 28) + SourceIndex(0) name (B)
+2 >Emitted(13, 2) Source(2, 29) + SourceIndex(0) name (B)
+3 >Emitted(13, 2) Source(2, 1) + SourceIndex(0)
+4 >Emitted(13, 4) Source(2, 24) + SourceIndex(0)
+5 >Emitted(13, 9) Source(2, 25) + SourceIndex(0)
+6 >Emitted(13, 11) Source(2, 29) + SourceIndex(0)
+---
+>>>exports.B = B;
+1->
+2 >^^^^^^^^^
+3 >         ^^^^
+4 >             ^
+5 >              ^^^^^^^^^^^^^^->
+1->
+2 >B
+3 >          extends A { }
+4 >             
+1->Emitted(14, 1) Source(2, 14) + SourceIndex(0)
+2 >Emitted(14, 10) Source(2, 15) + SourceIndex(0)
+3 >Emitted(14, 14) Source(2, 29) + SourceIndex(0)
+4 >Emitted(14, 15) Source(2, 29) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=b.js.map===================================================================
+JsFile: all.js
+mapUrl: all.js.map
+sourceRoot: 
+sources: tests/cases/compiler/ref/a.ts,tests/cases/compiler/b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/ref/a.ts
+-------------------------------------------------------------------
+>>>var __extends = (this && this.__extends) || function (d, b) {
+>>>    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+>>>    function __() { this.constructor = d; }
+>>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+>>>};
+>>>// This should be an error
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^^^^->
+1 >
+  >
+2 >// This should be an error
+1 >Emitted(6, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(6, 27) Source(2, 27) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatES6.errors.txt b/tests/baselines/reference/outModuleConcatES6.errors.txt
new file mode 100644
index 00000000000..d1a2adbc93f
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatES6.errors.txt
@@ -0,0 +1,13 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== tests/cases/compiler/ref/a.ts (0 errors) ====
+    
+    // This should be an error
+    
+    export class A { }
+    
+==== tests/cases/compiler/b.ts (0 errors) ====
+    import {A} from "./ref/a";
+    export class B extends A { }
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatES6.js b/tests/baselines/reference/outModuleConcatES6.js
new file mode 100644
index 00000000000..91aa1bb90e4
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatES6.js
@@ -0,0 +1,32 @@
+//// [tests/cases/compiler/outModuleConcatES6.ts] ////
+
+//// [a.ts]
+
+// This should be an error
+
+export class A { }
+
+//// [b.ts]
+import {A} from "./ref/a";
+export class B extends A { }
+
+//// [a.js]
+// This should be an error
+export class A {
+}
+//# sourceMappingURL=a.js.map//// [b.js]
+import { A } from "./ref/a";
+export class B extends A {
+}
+//# sourceMappingURL=b.js.map//// [all.js]
+// This should be an error
+//# sourceMappingURL=all.js.map
+
+//// [a.d.ts]
+export declare class A {
+}
+//// [b.d.ts]
+import { A } from "./ref/a";
+export declare class B extends A {
+}
+//// [all.d.ts]
diff --git a/tests/baselines/reference/outModuleConcatES6.js.map b/tests/baselines/reference/outModuleConcatES6.js.map
new file mode 100644
index 00000000000..347b15b38f3
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatES6.js.map
@@ -0,0 +1,4 @@
+//// [a.js.map]
+{"version":3,"file":"a.js","sourceRoot":"","sources":["a.ts"],"names":["A"],"mappings":"AACA,0BAA0B;AAE1B;AAAiBA,CAACA;AAAA"}//// [b.js.map]
+{"version":3,"file":"b.js","sourceRoot":"","sources":["b.ts"],"names":["B"],"mappings":"OAAO,EAAC,CAAC,EAAC,MAAM,SAAS;AACzB,uBAAuB,CAAC;AAAGA,CAACA;AAAA"}//// [all.js.map]
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":"AACA,0BAA0B"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatES6.sourcemap.txt b/tests/baselines/reference/outModuleConcatES6.sourcemap.txt
new file mode 100644
index 00000000000..239dff14456
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatES6.sourcemap.txt
@@ -0,0 +1,118 @@
+===================================================================
+JsFile: a.js
+mapUrl: a.js.map
+sourceRoot: 
+sources: a.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/ref/a.js
+sourceFile:a.ts
+-------------------------------------------------------------------
+>>>// This should be an error
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+  >
+2 >// This should be an error
+1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(1, 27) Source(2, 27) + SourceIndex(0)
+---
+>>>export class A {
+1 >
+2 >^^->
+1 >
+  >
+  >
+1 >Emitted(2, 1) Source(4, 1) + SourceIndex(0)
+---
+>>>}
+1->
+2 >^
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->export class A { 
+2 >}
+1->Emitted(3, 1) Source(4, 18) + SourceIndex(0) name (A)
+2 >Emitted(3, 2) Source(4, 19) + SourceIndex(0) name (A)
+---
+>>>//# sourceMappingURL=a.js.map1->
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+1->Emitted(4, 1) Source(4, 19) + SourceIndex(0)
+---
+===================================================================
+JsFile: b.js
+mapUrl: b.js.map
+sourceRoot: 
+sources: b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/b.js
+sourceFile:b.ts
+-------------------------------------------------------------------
+>>>import { A } from "./ref/a";
+1 >^^^^^^^
+2 >       ^^
+3 >         ^
+4 >          ^^
+5 >            ^^^^^^
+6 >                  ^^^^^^^^^
+1 >import 
+2 >       {
+3 >         A
+4 >          }
+5 >             from 
+6 >                  "./ref/a"
+1 >Emitted(1, 8) Source(1, 8) + SourceIndex(0)
+2 >Emitted(1, 10) Source(1, 9) + SourceIndex(0)
+3 >Emitted(1, 11) Source(1, 10) + SourceIndex(0)
+4 >Emitted(1, 13) Source(1, 11) + SourceIndex(0)
+5 >Emitted(1, 19) Source(1, 17) + SourceIndex(0)
+6 >Emitted(1, 28) Source(1, 26) + SourceIndex(0)
+---
+>>>export class B extends A {
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^
+3 >                       ^
+1 >;
+  >
+2 >export class B extends 
+3 >                       A
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 24) Source(2, 24) + SourceIndex(0)
+3 >Emitted(2, 25) Source(2, 25) + SourceIndex(0)
+---
+>>>}
+1 >
+2 >^
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > { 
+2 >}
+1 >Emitted(3, 1) Source(2, 28) + SourceIndex(0) name (B)
+2 >Emitted(3, 2) Source(2, 29) + SourceIndex(0) name (B)
+---
+>>>//# sourceMappingURL=b.js.map1->
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+1->Emitted(4, 1) Source(2, 29) + SourceIndex(0)
+---
+===================================================================
+JsFile: all.js
+mapUrl: all.js.map
+sourceRoot: 
+sources: tests/cases/compiler/ref/a.ts,tests/cases/compiler/b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/ref/a.ts
+-------------------------------------------------------------------
+>>>// This should be an error
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^^^^->
+1 >
+  >
+2 >// This should be an error
+1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(1, 27) Source(2, 27) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatSystem.js b/tests/baselines/reference/outModuleConcatSystem.js
new file mode 100644
index 00000000000..92c8772378f
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatSystem.js
@@ -0,0 +1,101 @@
+//// [tests/cases/compiler/outModuleConcatSystem.ts] ////
+
+//// [a.ts]
+
+export class A { }
+
+//// [b.ts]
+import {A} from "./ref/a";
+export class B extends A { }
+
+//// [a.js]
+System.register([], function(exports_1) {
+    var A;
+    return {
+        setters:[],
+        execute: function() {
+            A = (function () {
+                function A() {
+                }
+                return A;
+            })();
+            exports_1("A", A);
+        }
+    }
+});
+//# sourceMappingURL=a.js.map//// [b.js]
+System.register(["./ref/a"], function(exports_1) {
+    var __extends = (this && this.__extends) || function (d, b) {
+        for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+    var a_1;
+    var B;
+    return {
+        setters:[
+            function (a_1_1) {
+                a_1 = a_1_1;
+            }],
+        execute: function() {
+            B = (function (_super) {
+                __extends(B, _super);
+                function B() {
+                    _super.apply(this, arguments);
+                }
+                return B;
+            })(a_1.A);
+            exports_1("B", B);
+        }
+    }
+});
+//# sourceMappingURL=b.js.map//// [all.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+System.register("tests/cases/compiler/ref/a", [], function(exports_1) {
+    var A;
+    return {
+        setters:[],
+        execute: function() {
+            A = (function () {
+                function A() {
+                }
+                return A;
+            })();
+            exports_1("A", A);
+        }
+    }
+});
+System.register("tests/cases/compiler/b", ["tests/cases/compiler/ref/a"], function(exports_2) {
+    var a_1;
+    var B;
+    return {
+        setters:[
+            function (a_1_1) {
+                a_1 = a_1_1;
+            }],
+        execute: function() {
+            B = (function (_super) {
+                __extends(B, _super);
+                function B() {
+                    _super.apply(this, arguments);
+                }
+                return B;
+            })(a_1.A);
+            exports_2("B", B);
+        }
+    }
+});
+//# sourceMappingURL=all.js.map
+
+//// [a.d.ts]
+export declare class A {
+}
+//// [b.d.ts]
+import { A } from "./ref/a";
+export declare class B extends A {
+}
+//// [all.d.ts]
diff --git a/tests/baselines/reference/outModuleConcatSystem.js.map b/tests/baselines/reference/outModuleConcatSystem.js.map
new file mode 100644
index 00000000000..a74b131da99
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatSystem.js.map
@@ -0,0 +1,4 @@
+//// [a.js.map]
+{"version":3,"file":"a.js","sourceRoot":"","sources":["a.ts"],"names":["A","A.constructor"],"mappings":";;;;;YACA;gBAAAA;gBAAiBC,CAACA;gBAADD,QAACA;YAADA,CAACA,AAAlB,IAAkB;YAAlB,iBAAkB,CAAA"}//// [b.js.map]
+{"version":3,"file":"b.js","sourceRoot":"","sources":["b.ts"],"names":["B","B.constructor"],"mappings":";;;;;;;;;;;;;;YACA;gBAAuBA,qBAACA;gBAAxBA;oBAAuBC,8BAACA;gBAAGA,CAACA;gBAADD,QAACA;YAADA,CAACA,AAA5B,EAAuB,KAAC,EAAI;YAA5B,iBAA4B,CAAA"}//// [all.js.map]
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":["A","A.constructor","B","B.constructor"],"mappings":";;;;;;;;;;YACA;gBAAAA;gBAAiBC,CAACA;gBAADD,QAACA;YAADA,CAACA,AAAlB,IAAkB;YAAlB,iBAAkB,CAAA;;;;;;;;;;;;;YCAlB;gBAAuBE,qBAACA;gBAAxBA;oBAAuBC,8BAACA;gBAAGA,CAACA;gBAADD,QAACA;YAADA,CAACA,AAA5B,EAAuB,KAAC,EAAI;YAA5B,iBAA4B,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
new file mode 100644
index 00000000000..e717c3f677b
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
@@ -0,0 +1,353 @@
+===================================================================
+JsFile: a.js
+mapUrl: a.js.map
+sourceRoot: 
+sources: a.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/ref/a.js
+sourceFile:a.ts
+-------------------------------------------------------------------
+>>>System.register([], function(exports_1) {
+>>>    var A;
+>>>    return {
+>>>        setters:[],
+>>>        execute: function() {
+>>>            A = (function () {
+1 >^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(6, 13) Source(2, 1) + SourceIndex(0)
+---
+>>>                function A() {
+1->^^^^^^^^^^^^^^^^
+2 >                ^^->
+1->
+1->Emitted(7, 17) Source(2, 1) + SourceIndex(0) name (A)
+---
+>>>                }
+1->^^^^^^^^^^^^^^^^
+2 >                ^
+3 >                 ^^^^^^^^^->
+1->export class A { 
+2 >                }
+1->Emitted(8, 17) Source(2, 18) + SourceIndex(0) name (A.constructor)
+2 >Emitted(8, 18) Source(2, 19) + SourceIndex(0) name (A.constructor)
+---
+>>>                return A;
+1->^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^
+1->
+2 >                }
+1->Emitted(9, 17) Source(2, 18) + SourceIndex(0) name (A)
+2 >Emitted(9, 25) Source(2, 19) + SourceIndex(0) name (A)
+---
+>>>            })();
+1 >^^^^^^^^^^^^
+2 >            ^
+3 >             
+4 >             ^^^^
+5 >                 ^^^^^^^^^^^^^^->
+1 >
+2 >            }
+3 >             
+4 >             export class A { }
+1 >Emitted(10, 13) Source(2, 18) + SourceIndex(0) name (A)
+2 >Emitted(10, 14) Source(2, 19) + SourceIndex(0) name (A)
+3 >Emitted(10, 14) Source(2, 1) + SourceIndex(0)
+4 >Emitted(10, 18) Source(2, 19) + SourceIndex(0)
+---
+>>>            exports_1("A", A);
+1->^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^
+3 >                             ^
+1->
+2 >            export class A { }
+3 >                             
+1->Emitted(11, 13) Source(2, 1) + SourceIndex(0)
+2 >Emitted(11, 30) Source(2, 19) + SourceIndex(0)
+3 >Emitted(11, 31) Source(2, 19) + SourceIndex(0)
+---
+>>>        }
+>>>    }
+>>>});
+>>>//# sourceMappingURL=a.js.map===================================================================
+JsFile: b.js
+mapUrl: b.js.map
+sourceRoot: 
+sources: b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/b.js
+sourceFile:b.ts
+-------------------------------------------------------------------
+>>>System.register(["./ref/a"], function(exports_1) {
+>>>    var __extends = (this && this.__extends) || function (d, b) {
+>>>        for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+>>>        function __() { this.constructor = d; }
+>>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+>>>    };
+>>>    var a_1;
+>>>    var B;
+>>>    return {
+>>>        setters:[
+>>>            function (a_1_1) {
+>>>                a_1 = a_1_1;
+>>>            }],
+>>>        execute: function() {
+>>>            B = (function (_super) {
+1 >^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >import {A} from "./ref/a";
+  >
+1 >Emitted(15, 13) Source(2, 1) + SourceIndex(0)
+---
+>>>                __extends(B, _super);
+1->^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >                A
+1->Emitted(16, 17) Source(2, 24) + SourceIndex(0) name (B)
+2 >Emitted(16, 38) Source(2, 25) + SourceIndex(0) name (B)
+---
+>>>                function B() {
+1 >^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(17, 17) Source(2, 1) + SourceIndex(0) name (B)
+---
+>>>                    _super.apply(this, arguments);
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >                    A
+1->Emitted(18, 21) Source(2, 24) + SourceIndex(0) name (B.constructor)
+2 >Emitted(18, 51) Source(2, 25) + SourceIndex(0) name (B.constructor)
+---
+>>>                }
+1 >^^^^^^^^^^^^^^^^
+2 >                ^
+3 >                 ^^^^^^^^^->
+1 > { 
+2 >                }
+1 >Emitted(19, 17) Source(2, 28) + SourceIndex(0) name (B.constructor)
+2 >Emitted(19, 18) Source(2, 29) + SourceIndex(0) name (B.constructor)
+---
+>>>                return B;
+1->^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^
+1->
+2 >                }
+1->Emitted(20, 17) Source(2, 28) + SourceIndex(0) name (B)
+2 >Emitted(20, 25) Source(2, 29) + SourceIndex(0) name (B)
+---
+>>>            })(a_1.A);
+1 >^^^^^^^^^^^^
+2 >            ^
+3 >             
+4 >             ^^
+5 >               ^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^->
+1 >
+2 >            }
+3 >             
+4 >             export class B extends 
+5 >               A
+6 >                     { }
+1 >Emitted(21, 13) Source(2, 28) + SourceIndex(0) name (B)
+2 >Emitted(21, 14) Source(2, 29) + SourceIndex(0) name (B)
+3 >Emitted(21, 14) Source(2, 1) + SourceIndex(0)
+4 >Emitted(21, 16) Source(2, 24) + SourceIndex(0)
+5 >Emitted(21, 21) Source(2, 25) + SourceIndex(0)
+6 >Emitted(21, 23) Source(2, 29) + SourceIndex(0)
+---
+>>>            exports_1("B", B);
+1->^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^
+3 >                             ^
+1->
+2 >            export class B extends A { }
+3 >                             
+1->Emitted(22, 13) Source(2, 1) + SourceIndex(0)
+2 >Emitted(22, 30) Source(2, 29) + SourceIndex(0)
+3 >Emitted(22, 31) Source(2, 29) + SourceIndex(0)
+---
+>>>        }
+>>>    }
+>>>});
+>>>//# sourceMappingURL=b.js.map===================================================================
+JsFile: all.js
+mapUrl: all.js.map
+sourceRoot: 
+sources: tests/cases/compiler/ref/a.ts,tests/cases/compiler/b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/ref/a.ts
+-------------------------------------------------------------------
+>>>var __extends = (this && this.__extends) || function (d, b) {
+>>>    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+>>>    function __() { this.constructor = d; }
+>>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+>>>};
+>>>System.register("tests/cases/compiler/ref/a", [], function(exports_1) {
+>>>    var A;
+>>>    return {
+>>>        setters:[],
+>>>        execute: function() {
+>>>            A = (function () {
+1 >^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(11, 13) Source(2, 1) + SourceIndex(0)
+---
+>>>                function A() {
+1->^^^^^^^^^^^^^^^^
+2 >                ^^->
+1->
+1->Emitted(12, 17) Source(2, 1) + SourceIndex(0) name (A)
+---
+>>>                }
+1->^^^^^^^^^^^^^^^^
+2 >                ^
+3 >                 ^^^^^^^^^->
+1->export class A { 
+2 >                }
+1->Emitted(13, 17) Source(2, 18) + SourceIndex(0) name (A.constructor)
+2 >Emitted(13, 18) Source(2, 19) + SourceIndex(0) name (A.constructor)
+---
+>>>                return A;
+1->^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^
+1->
+2 >                }
+1->Emitted(14, 17) Source(2, 18) + SourceIndex(0) name (A)
+2 >Emitted(14, 25) Source(2, 19) + SourceIndex(0) name (A)
+---
+>>>            })();
+1 >^^^^^^^^^^^^
+2 >            ^
+3 >             
+4 >             ^^^^
+5 >                 ^^^^^^^^^^^^^^->
+1 >
+2 >            }
+3 >             
+4 >             export class A { }
+1 >Emitted(15, 13) Source(2, 18) + SourceIndex(0) name (A)
+2 >Emitted(15, 14) Source(2, 19) + SourceIndex(0) name (A)
+3 >Emitted(15, 14) Source(2, 1) + SourceIndex(0)
+4 >Emitted(15, 18) Source(2, 19) + SourceIndex(0)
+---
+>>>            exports_1("A", A);
+1->^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^
+3 >                             ^
+1->
+2 >            export class A { }
+3 >                             
+1->Emitted(16, 13) Source(2, 1) + SourceIndex(0)
+2 >Emitted(16, 30) Source(2, 19) + SourceIndex(0)
+3 >Emitted(16, 31) Source(2, 19) + SourceIndex(0)
+---
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/b.ts
+-------------------------------------------------------------------
+>>>        }
+>>>    }
+>>>});
+>>>System.register("tests/cases/compiler/b", ["tests/cases/compiler/ref/a"], function(exports_2) {
+>>>    var a_1;
+>>>    var B;
+>>>    return {
+>>>        setters:[
+>>>            function (a_1_1) {
+>>>                a_1 = a_1_1;
+>>>            }],
+>>>        execute: function() {
+>>>            B = (function (_super) {
+1 >^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >import {A} from "./ref/a";
+  >
+1 >Emitted(29, 13) Source(2, 1) + SourceIndex(1)
+---
+>>>                __extends(B, _super);
+1->^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >                A
+1->Emitted(30, 17) Source(2, 24) + SourceIndex(1) name (B)
+2 >Emitted(30, 38) Source(2, 25) + SourceIndex(1) name (B)
+---
+>>>                function B() {
+1 >^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(31, 17) Source(2, 1) + SourceIndex(1) name (B)
+---
+>>>                    _super.apply(this, arguments);
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >                    A
+1->Emitted(32, 21) Source(2, 24) + SourceIndex(1) name (B.constructor)
+2 >Emitted(32, 51) Source(2, 25) + SourceIndex(1) name (B.constructor)
+---
+>>>                }
+1 >^^^^^^^^^^^^^^^^
+2 >                ^
+3 >                 ^^^^^^^^^->
+1 > { 
+2 >                }
+1 >Emitted(33, 17) Source(2, 28) + SourceIndex(1) name (B.constructor)
+2 >Emitted(33, 18) Source(2, 29) + SourceIndex(1) name (B.constructor)
+---
+>>>                return B;
+1->^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^
+1->
+2 >                }
+1->Emitted(34, 17) Source(2, 28) + SourceIndex(1) name (B)
+2 >Emitted(34, 25) Source(2, 29) + SourceIndex(1) name (B)
+---
+>>>            })(a_1.A);
+1 >^^^^^^^^^^^^
+2 >            ^
+3 >             
+4 >             ^^
+5 >               ^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^->
+1 >
+2 >            }
+3 >             
+4 >             export class B extends 
+5 >               A
+6 >                     { }
+1 >Emitted(35, 13) Source(2, 28) + SourceIndex(1) name (B)
+2 >Emitted(35, 14) Source(2, 29) + SourceIndex(1) name (B)
+3 >Emitted(35, 14) Source(2, 1) + SourceIndex(1)
+4 >Emitted(35, 16) Source(2, 24) + SourceIndex(1)
+5 >Emitted(35, 21) Source(2, 25) + SourceIndex(1)
+6 >Emitted(35, 23) Source(2, 29) + SourceIndex(1)
+---
+>>>            exports_2("B", B);
+1->^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^
+3 >                             ^
+1->
+2 >            export class B extends A { }
+3 >                             
+1->Emitted(36, 13) Source(2, 1) + SourceIndex(1)
+2 >Emitted(36, 30) Source(2, 29) + SourceIndex(1)
+3 >Emitted(36, 31) Source(2, 29) + SourceIndex(1)
+---
+>>>        }
+>>>    }
+>>>});
+>>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatSystem.symbols b/tests/baselines/reference/outModuleConcatSystem.symbols
new file mode 100644
index 00000000000..349de40815a
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatSystem.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/ref/a.ts ===
+
+export class A { }
+>A : Symbol(A, Decl(a.ts, 0, 0))
+
+=== tests/cases/compiler/b.ts ===
+import {A} from "./ref/a";
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
+export class B extends A { }
+>B : Symbol(B, Decl(b.ts, 0, 26))
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
diff --git a/tests/baselines/reference/outModuleConcatSystem.types b/tests/baselines/reference/outModuleConcatSystem.types
new file mode 100644
index 00000000000..6e0d9398853
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatSystem.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/ref/a.ts ===
+
+export class A { }
+>A : A
+
+=== tests/cases/compiler/b.ts ===
+import {A} from "./ref/a";
+>A : typeof A
+
+export class B extends A { }
+>B : B
+>A : A
+
diff --git a/tests/baselines/reference/outModuleConcatUmd.errors.txt b/tests/baselines/reference/outModuleConcatUmd.errors.txt
new file mode 100644
index 00000000000..8695199c7eb
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatUmd.errors.txt
@@ -0,0 +1,13 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+==== tests/cases/compiler/ref/a.ts (0 errors) ====
+    
+    // This should error
+    
+    export class A { }
+    
+==== tests/cases/compiler/b.ts (0 errors) ====
+    import {A} from "./ref/a";
+    export class B extends A { }
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatUmd.js b/tests/baselines/reference/outModuleConcatUmd.js
new file mode 100644
index 00000000000..6ff5e848aa2
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatUmd.js
@@ -0,0 +1,70 @@
+//// [tests/cases/compiler/outModuleConcatUmd.ts] ////
+
+//// [a.ts]
+
+// This should error
+
+export class A { }
+
+//// [b.ts]
+import {A} from "./ref/a";
+export class B extends A { }
+
+//// [a.js]
+// This should error
+(function (factory) {
+    if (typeof module === 'object' && typeof module.exports === 'object') {
+        var v = factory(require, exports); if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === 'function' && define.amd) {
+        define(["require", "exports"], factory);
+    }
+})(function (require, exports) {
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    })();
+    exports.A = A;
+});
+//# sourceMappingURL=a.js.map//// [b.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+(function (factory) {
+    if (typeof module === 'object' && typeof module.exports === 'object') {
+        var v = factory(require, exports); if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === 'function' && define.amd) {
+        define(["require", "exports", "./ref/a"], factory);
+    }
+})(function (require, exports) {
+    var a_1 = require("./ref/a");
+    var B = (function (_super) {
+        __extends(B, _super);
+        function B() {
+            _super.apply(this, arguments);
+        }
+        return B;
+    })(a_1.A);
+    exports.B = B;
+});
+//# sourceMappingURL=b.js.map//// [all.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+// This should error
+//# sourceMappingURL=all.js.map
+
+//// [a.d.ts]
+export declare class A {
+}
+//// [b.d.ts]
+import { A } from "./ref/a";
+export declare class B extends A {
+}
+//// [all.d.ts]
diff --git a/tests/baselines/reference/outModuleConcatUmd.js.map b/tests/baselines/reference/outModuleConcatUmd.js.map
new file mode 100644
index 00000000000..b00a2c1c187
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatUmd.js.map
@@ -0,0 +1,4 @@
+//// [a.js.map]
+{"version":3,"file":"a.js","sourceRoot":"","sources":["a.ts"],"names":["A","A.constructor"],"mappings":"AACA,oBAAoB;;;;;;;;;IAEpB;QAAAA;QAAiBC,CAACA;QAADD,QAACA;IAADA,CAACA,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA"}//// [b.js.map]
+{"version":3,"file":"b.js","sourceRoot":"","sources":["b.ts"],"names":["B","B.constructor"],"mappings":";;;;;;;;;;;;;IAAA,kBAAgB,SAAS,CAAC,CAAA;IAC1B;QAAuBA,qBAACA;QAAxBA;YAAuBC,8BAACA;QAAGA,CAACA;QAADD,QAACA;IAADA,CAACA,AAA5B,EAAuB,KAAC,EAAI;IAAf,SAAC,IAAc,CAAA"}//// [all.js.map]
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;AACA,oBAAoB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatUmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatUmd.sourcemap.txt
new file mode 100644
index 00000000000..9749e38cc40
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatUmd.sourcemap.txt
@@ -0,0 +1,237 @@
+===================================================================
+JsFile: a.js
+mapUrl: a.js.map
+sourceRoot: 
+sources: a.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/ref/a.js
+sourceFile:a.ts
+-------------------------------------------------------------------
+>>>// This should error
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^
+3 >                    ^^->
+1 >
+  >
+2 >// This should error
+1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(1, 21) Source(2, 21) + SourceIndex(0)
+---
+>>>(function (factory) {
+>>>    if (typeof module === 'object' && typeof module.exports === 'object') {
+>>>        var v = factory(require, exports); if (v !== undefined) module.exports = v;
+>>>    }
+>>>    else if (typeof define === 'function' && define.amd) {
+>>>        define(["require", "exports"], factory);
+>>>    }
+>>>})(function (require, exports) {
+>>>    var A = (function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+  >
+1->Emitted(10, 5) Source(4, 1) + SourceIndex(0)
+---
+>>>        function A() {
+1->^^^^^^^^
+2 >        ^^->
+1->
+1->Emitted(11, 9) Source(4, 1) + SourceIndex(0) name (A)
+---
+>>>        }
+1->^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^->
+1->export class A { 
+2 >        }
+1->Emitted(12, 9) Source(4, 18) + SourceIndex(0) name (A.constructor)
+2 >Emitted(12, 10) Source(4, 19) + SourceIndex(0) name (A.constructor)
+---
+>>>        return A;
+1->^^^^^^^^
+2 >        ^^^^^^^^
+1->
+2 >        }
+1->Emitted(13, 9) Source(4, 18) + SourceIndex(0) name (A)
+2 >Emitted(13, 17) Source(4, 19) + SourceIndex(0) name (A)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class A { }
+1 >Emitted(14, 5) Source(4, 18) + SourceIndex(0) name (A)
+2 >Emitted(14, 6) Source(4, 19) + SourceIndex(0) name (A)
+3 >Emitted(14, 6) Source(4, 1) + SourceIndex(0)
+4 >Emitted(14, 10) Source(4, 19) + SourceIndex(0)
+---
+>>>    exports.A = A;
+1->^^^^
+2 >    ^^^^^^^^^
+3 >             ^^^^
+4 >                 ^
+1->
+2 >    A
+3 >              { }
+4 >                 
+1->Emitted(15, 5) Source(4, 14) + SourceIndex(0)
+2 >Emitted(15, 14) Source(4, 15) + SourceIndex(0)
+3 >Emitted(15, 18) Source(4, 19) + SourceIndex(0)
+4 >Emitted(15, 19) Source(4, 19) + SourceIndex(0)
+---
+>>>});
+>>>//# sourceMappingURL=a.js.map===================================================================
+JsFile: b.js
+mapUrl: b.js.map
+sourceRoot: 
+sources: b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/b.js
+sourceFile:b.ts
+-------------------------------------------------------------------
+>>>var __extends = (this && this.__extends) || function (d, b) {
+>>>    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+>>>    function __() { this.constructor = d; }
+>>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+>>>};
+>>>(function (factory) {
+>>>    if (typeof module === 'object' && typeof module.exports === 'object') {
+>>>        var v = factory(require, exports); if (v !== undefined) module.exports = v;
+>>>    }
+>>>    else if (typeof define === 'function' && define.amd) {
+>>>        define(["require", "exports", "./ref/a"], factory);
+>>>    }
+>>>})(function (require, exports) {
+>>>    var a_1 = require("./ref/a");
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^
+3 >                      ^^^^^^^^^
+4 >                               ^
+5 >                                ^
+1 >
+2 >    import {A} from 
+3 >                      "./ref/a"
+4 >                               ;
+5 >                                
+1 >Emitted(14, 5) Source(1, 1) + SourceIndex(0)
+2 >Emitted(14, 23) Source(1, 17) + SourceIndex(0)
+3 >Emitted(14, 32) Source(1, 26) + SourceIndex(0)
+4 >Emitted(14, 33) Source(1, 27) + SourceIndex(0)
+5 >Emitted(14, 34) Source(1, 27) + SourceIndex(0)
+---
+>>>    var B = (function (_super) {
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+1 >Emitted(15, 5) Source(2, 1) + SourceIndex(0)
+---
+>>>        __extends(B, _super);
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >        A
+1->Emitted(16, 9) Source(2, 24) + SourceIndex(0) name (B)
+2 >Emitted(16, 30) Source(2, 25) + SourceIndex(0) name (B)
+---
+>>>        function B() {
+1 >^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(17, 9) Source(2, 1) + SourceIndex(0) name (B)
+---
+>>>            _super.apply(this, arguments);
+1->^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->export class B extends 
+2 >            A
+1->Emitted(18, 13) Source(2, 24) + SourceIndex(0) name (B.constructor)
+2 >Emitted(18, 43) Source(2, 25) + SourceIndex(0) name (B.constructor)
+---
+>>>        }
+1 >^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^->
+1 > { 
+2 >        }
+1 >Emitted(19, 9) Source(2, 28) + SourceIndex(0) name (B.constructor)
+2 >Emitted(19, 10) Source(2, 29) + SourceIndex(0) name (B.constructor)
+---
+>>>        return B;
+1->^^^^^^^^
+2 >        ^^^^^^^^
+1->
+2 >        }
+1->Emitted(20, 9) Source(2, 28) + SourceIndex(0) name (B)
+2 >Emitted(20, 17) Source(2, 29) + SourceIndex(0) name (B)
+---
+>>>    })(a_1.A);
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^
+5 >       ^^^^^
+6 >            ^^
+7 >              ^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class B extends 
+5 >       A
+6 >             { }
+1 >Emitted(21, 5) Source(2, 28) + SourceIndex(0) name (B)
+2 >Emitted(21, 6) Source(2, 29) + SourceIndex(0) name (B)
+3 >Emitted(21, 6) Source(2, 1) + SourceIndex(0)
+4 >Emitted(21, 8) Source(2, 24) + SourceIndex(0)
+5 >Emitted(21, 13) Source(2, 25) + SourceIndex(0)
+6 >Emitted(21, 15) Source(2, 29) + SourceIndex(0)
+---
+>>>    exports.B = B;
+1->^^^^
+2 >    ^^^^^^^^^
+3 >             ^^^^
+4 >                 ^
+1->
+2 >    B
+3 >              extends A { }
+4 >                 
+1->Emitted(22, 5) Source(2, 14) + SourceIndex(0)
+2 >Emitted(22, 14) Source(2, 15) + SourceIndex(0)
+3 >Emitted(22, 18) Source(2, 29) + SourceIndex(0)
+4 >Emitted(22, 19) Source(2, 29) + SourceIndex(0)
+---
+>>>});
+>>>//# sourceMappingURL=b.js.map===================================================================
+JsFile: all.js
+mapUrl: all.js.map
+sourceRoot: 
+sources: tests/cases/compiler/ref/a.ts,tests/cases/compiler/b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:all.js
+sourceFile:tests/cases/compiler/ref/a.ts
+-------------------------------------------------------------------
+>>>var __extends = (this && this.__extends) || function (d, b) {
+>>>    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+>>>    function __() { this.constructor = d; }
+>>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+>>>};
+>>>// This should error
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^
+3 >                    ^^^^^^^^^^->
+1 >
+  >
+2 >// This should error
+1 >Emitted(6, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(6, 21) Source(2, 21) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
index ea8c2e58ae5..20fc9c39de5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
index 0d918d5b2a0..12592331fb5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
index 2468ab068e2..bbe6b1772ae 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
index 8deca814d80..664beb97bc2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
index edf8d0637e2..53fc18f86c7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
index 3413d4675e7..eb358c3b79d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
index 3a508fede30..110e3849820 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
index ea8c2e58ae5..20fc9c39de5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
index 0d918d5b2a0..12592331fb5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
index 2468ab068e2..bbe6b1772ae 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..d75277ac607
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var m2_a1: number;
+declare class m2_c1 {
+    m2_c1_p1: number;
+}
+declare var m2_instance1: m2_c1;
+declare function m2_f1(): m2_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..d75277ac607
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var m2_a1: number;
+declare class m2_c1 {
+    m2_c1_p1: number;
+}
+declare var m2_instance1: m2_c1;
+declare function m2_f1(): m2_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
index 8deca814d80..664beb97bc2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
index edf8d0637e2..53fc18f86c7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
index 3413d4675e7..eb358c3b79d 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
index 3a508fede30..110e3849820 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index ea8c2e58ae5..20fc9c39de5 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
index 0d918d5b2a0..12592331fb5 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index 2468ab068e2..bbe6b1772ae 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
index 8deca814d80..664beb97bc2 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
index edf8d0637e2..53fc18f86c7 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
index 3413d4675e7..eb358c3b79d 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
index 3a508fede30..110e3849820 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index ea8c2e58ae5..20fc9c39de5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
index 0d918d5b2a0..12592331fb5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index 2468ab068e2..bbe6b1772ae 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
index 8deca814d80..664beb97bc2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
index edf8d0637e2..53fc18f86c7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
index 3413d4675e7..eb358c3b79d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
index 3a508fede30..110e3849820 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
index ea8c2e58ae5..20fc9c39de5 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
index 0d918d5b2a0..12592331fb5 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
index 2468ab068e2..bbe6b1772ae 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
index 8deca814d80..664beb97bc2 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
index edf8d0637e2..53fc18f86c7 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
index 3413d4675e7..eb358c3b79d 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
index 3a508fede30..110e3849820 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
index 5225c47ee97..ef77af7372e 100644
--- a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
+++ b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== globalThisCapture.ts (0 errors) ====
     // Add a lambda to ensure global 'this' capture is triggered
     (()=>this.window);
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
index ea8c2e58ae5..20fc9c39de5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
index 0d918d5b2a0..12592331fb5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
index 2468ab068e2..bbe6b1772ae 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
index 8deca814d80..664beb97bc2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
index edf8d0637e2..53fc18f86c7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
index 3413d4675e7..eb358c3b79d 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
index 3a508fede30..110e3849820 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
index ea8c2e58ae5..20fc9c39de5 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
index 0d918d5b2a0..12592331fb5 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
index 2468ab068e2..bbe6b1772ae 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
index 8deca814d80..664beb97bc2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
index edf8d0637e2..53fc18f86c7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
index 3413d4675e7..eb358c3b79d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
index 3a508fede30..110e3849820 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
index ea8c2e58ae5..20fc9c39de5 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
index 0d918d5b2a0..12592331fb5 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
index 2468ab068e2..bbe6b1772ae 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
index 8deca814d80..664beb97bc2 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
index edf8d0637e2..53fc18f86c7 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
index 3413d4675e7..eb358c3b79d 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
index 3a508fede30..110e3849820 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..d61b4c3b876
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..9b9cdd4a214
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,13 @@
+/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 9674c11863f..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index ea8c2e58ae5..20fc9c39de5 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
index 0d918d5b2a0..12592331fb5 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index 2468ab068e2..bbe6b1772ae 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
index 8deca814d80..664beb97bc2 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
index edf8d0637e2..53fc18f86c7 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
index 3413d4675e7..eb358c3b79d 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
index 3a508fede30..110e3849820 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS6082: Only 'amd', 'umd', and 'system' modules are supported alongside --outFile.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {