Disallow --module with --out

Jakefile.js

@@ -224,7 +224,7 @@ var builtLocalCompiler = path.join(builtLocalDirectory, compilerFilename);
 function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOutFile, generateDeclarations, outDir, preserveConstEnums, keepComments, noResolve, stripInternal, callback) {
     file(outFile, prereqs, function() {
         var compilerPath = useBuiltCompiler ? builtLocalCompiler : LKGCompiler;
-        var options = "--module commonjs --noImplicitAny --noEmitOnError";
+        var options = "--noImplicitAny --noEmitOnError";
 
         // Keep comments when specifically requested
         // or when in debug mode.

src/compiler/diagnosticMessages.json

@@ -2056,6 +2056,10 @@
         "category": "Error",
         "code": 5054
     },
+    "Option '{0}' cannot be utilized alongside --module or with ES6 modules.": {
+        "category": "Error",
+        "code": 5055
+    },
 
     "Concatenate and emit output to single file.": {
         "category": "Message",

src/compiler/program.ts

@@ -862,8 +862,8 @@ namespace ts {
                         const importedFile = findModuleSourceFile(resolution.resolvedFileName, file.imports[i]);
                         if (importedFile && resolution.isExternalLibraryImport) {
                             if (!isExternalModule(importedFile)) {
-                                let start = getTokenPosOfNode(file.imports[i], file)
-                                fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName));
+                                let start = getTokenPosOfNode(file.imports[i], file)
+                                fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName));
                             }
                             else if (!fileExtensionIs(importedFile.fileName, ".d.ts")) {
                                 let start = getTokenPosOfNode(file.imports[i], file)
@@ -1022,6 +1022,10 @@ namespace ts {
                 programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided));
             }
 
+            if (outFile && ((firstExternalModuleSourceFile && languageVersion >= ScriptTarget.ES6) || options.module)) {
+                programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_utilized_alongside_module_or_with_ES6_modules, options.out ? "out" : "outFile"));
+            }
+
             // Cannot specify module gen target of es6 when below es6
             if (options.module === ModuleKind.ES6 && languageVersion < ScriptTarget.ES6) {
                 programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Cannot_compile_modules_into_es6_when_targeting_ES5_or_lower));

src/harness/projectsRunner.ts

@@ -6,7 +6,6 @@ interface ProjectRunnerTestCase {
     scenario: string;
     projectRoot: string; // project where it lives - this also is the current directory when compiling
     inputFiles: string[]; // list of input files to be given to program
-    out?: string; // --out
     outDir?: string; // --outDir
     sourceMap?: boolean; // --map
     mapRoot?: string; // --mapRoot
@@ -158,7 +157,6 @@ class ProjectRunner extends RunnerBase {
                 return {
                     declaration: !!testCase.declaration,
                     sourceMap: !!testCase.sourceMap,
-                    outFile: testCase.out,
                     outDir: testCase.outDir,
                     mapRoot: testCase.resolveMapRoot && testCase.mapRoot ? Harness.IO.resolvePath(testCase.mapRoot) : testCase.mapRoot,
                     sourceRoot: testCase.resolveSourceRoot && testCase.sourceRoot ? Harness.IO.resolvePath(testCase.sourceRoot) : testCase.sourceRoot,
@@ -346,7 +344,6 @@ class ProjectRunner extends RunnerBase {
                             scenario: testCase.scenario,
                             projectRoot: testCase.projectRoot,
                             inputFiles: testCase.inputFiles,
-                            out: testCase.out,
                             outDir: testCase.outDir,
                             sourceMap: testCase.sourceMap,
                             mapRoot: testCase.mapRoot,

tests/baselines/reference/isolatedModulesOut.errors.txt

@@ -1,8 +1,10 @@
 error TS5053: Option 'out' cannot be specified with option 'isolatedModules'.
+error TS5055: Option 'out' cannot be utilized alongside --module or with ES6 modules.
 tests/cases/compiler/file2.ts(1,1): error TS1208: Cannot compile namespaces when the '--isolatedModules' flag is provided.
 
 
 !!! error TS5053: Option 'out' cannot be specified with option 'isolatedModules'.
+!!! error TS5055: Option 'out' cannot be utilized alongside --module or with ES6 modules.
 ==== tests/cases/compiler/file1.ts (0 errors) ====
 
     export var x;