Removed errors for missing module specifier

billti · billti · commit bb28424b4564 · 2016-02-11T14:07:32.000-08:00
(cherry picked from commit f2e7f9f)
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -601,8 +601,8 @@ namespace ts {
         const options: CompilerOptions = {};
         const errors: Diagnostic[] = [];
 
+        options.module = ModuleKind.CommonJS;
         if (configFileName && getBaseFileName(configFileName) === "jsconfig.json") {
-            options.module = ModuleKind.CommonJS;
             options.allowJs = true;
         }
 
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -447,10 +447,6 @@
         "category": "Error",
         "code": 1147
     },
-    "Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.": {
-        "category": "Error",
-        "code": 1148
-    },
     "File name '{0}' differs from already included file name '{1}' only in casing": {
         "category": "Error",
         "code": 1149
@@ -2135,10 +2131,6 @@
         "category": "Error",
         "code": 5042
     },
-    "Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher.": {
-        "category": "Error",
-        "code": 5047
-    },
     "Option 'inlineSources' can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.": {
         "category": "Error",
         "code": 5051
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1652,21 +1652,12 @@ namespace ts {
 
             const firstExternalModuleSourceFile = forEach(files, f => isExternalModule(f) ? f : undefined);
             if (options.isolatedModules) {
-                if (!options.module && languageVersion < ScriptTarget.ES6) {
-                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher));
-                }
-
                 const firstNonExternalModuleSourceFile = forEach(files, f => !isExternalModule(f) && !isDeclarationFile(f) ? f : undefined);
                 if (firstNonExternalModuleSourceFile) {
                     const span = getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
                     programDiagnostics.add(createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
                 }
             }
-            else if (firstExternalModuleSourceFile && languageVersion < ScriptTarget.ES6 && !options.module) {
-                // We cannot use createDiagnosticFromNode because nodes do not have parents yet
-                const span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
-                programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file));
-            }
 
             // Cannot specify module gen target of es6 when below es6
             if (options.module === ModuleKind.ES6 && languageVersion < ScriptTarget.ES6) {
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -376,7 +376,7 @@ namespace ts {
                 sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
                 return;
             }
-            const configParseResult = parseJsonConfigFileContent(configObject, sys, getNormalizedAbsolutePath(getDirectoryPath(configFileName), sys.getCurrentDirectory()), commandLine.options);
+            const configParseResult = parseJsonConfigFileContent(configObject, sys, getNormalizedAbsolutePath(getDirectoryPath(configFileName), sys.getCurrentDirectory()), commandLine.options, configFileName);
             if (configParseResult.errors.length > 0) {
                 reportDiagnostics(configParseResult.errors, /* compilerHost */ undefined);
                 sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);

Original file line number	Diff line number	Diff line change
`@@ -601,8 +601,8 @@ namespace ts {`
`601`	`601`	`const options: CompilerOptions = {};`
`602`	`602`	`const errors: Diagnostic[] = [];`
`603`	`603`
	`604`	`+ options.module = ModuleKind.CommonJS;`
`604`	`605`	`if (configFileName && getBaseFileName(configFileName) === "jsconfig.json") {`
`605`		`- options.module = ModuleKind.CommonJS;`
`606`	`606`	`options.allowJs = true;`
`607`	`607`	`}`
`608`	`608`
Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ namespace ts {`
`376`	`376`	`sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);`
`377`	`377`	`return;`
`378`	`378`	`}`
`379`		`- const configParseResult = parseJsonConfigFileContent(configObject, sys, getNormalizedAbsolutePath(getDirectoryPath(configFileName), sys.getCurrentDirectory()), commandLine.options);`
	`379`	`+ const configParseResult = parseJsonConfigFileContent(configObject, sys, getNormalizedAbsolutePath(getDirectoryPath(configFileName), sys.getCurrentDirectory()), commandLine.options, configFileName);`
`380`	`380`	`if (configParseResult.errors.length > 0) {`
`381`	`381`	`reportDiagnostics(configParseResult.errors, /* compilerHost */ undefined);`
`382`	`382`	`sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);`